feat(sway): waybar -> i3status-rs (again)
This commit is contained in:
parent
4fa23f5a32
commit
bbff5d6535
2 changed files with 93 additions and 154 deletions
|
@ -1,133 +1,75 @@
|
||||||
{
|
{
|
||||||
config,
|
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
||||||
in {
|
ctp = {
|
||||||
home.packages = lib.mkIf isLinux [pkgs.playerctl];
|
base = "#1e1e2e";
|
||||||
|
crust = "#11111b";
|
||||||
programs.waybar = lib.mkIf isLinux {
|
text = "#cdd6f4";
|
||||||
enable = true;
|
pink = "#f5c2e7";
|
||||||
settings = [
|
red = "#f38ba8";
|
||||||
{
|
mauve = "#cba6f7";
|
||||||
bar_id = "bar-0";
|
};
|
||||||
ipc = true;
|
in {
|
||||||
layer = "top";
|
programs.i3status-rust = lib.mkIf isLinux {
|
||||||
position = "top";
|
enable = true;
|
||||||
margin-left = 7;
|
bars.top = {
|
||||||
margin-right = 7;
|
blocks = [
|
||||||
margin-top = 7;
|
{
|
||||||
height = 32;
|
block = "vpn";
|
||||||
modules-left = ["sway/workspaces" "sway/mode"];
|
driver = "mullvad";
|
||||||
modules-center = ["mpris"];
|
format_connected = "";
|
||||||
modules-right = ["tray" "pulseaudio" "clock" "custom/notification"];
|
format_disconnected = "";
|
||||||
"sway/workspaces" = {
|
state_connected = "good";
|
||||||
disable-scroll = true;
|
state_disconnected = "critical";
|
||||||
format = "{name}";
|
}
|
||||||
};
|
{
|
||||||
"sway/mode" = {
|
block = "tea_timer";
|
||||||
format = "{}";
|
done_cmd = "notify-send 'Timer Finished'";
|
||||||
};
|
}
|
||||||
"custom/notification" = {
|
{
|
||||||
tooltip = false;
|
block = "time";
|
||||||
format = "{icon}";
|
interval = 60;
|
||||||
format-icons = {
|
format = " $timestamp.datetime(f:'%d/%m %R') ";
|
||||||
notification = " <span foreground='red'><sup> </sup></span>";
|
}
|
||||||
none = " ";
|
{
|
||||||
dnd-notification = " <span foreground='red'><sup> </sup></span>";
|
block = "notify";
|
||||||
dnd-none = " ";
|
format = " $icon {($notification_count.eng(w:1)) |}";
|
||||||
inhibited-notification = " <span foreground='red'><sup> </sup></span>";
|
driver = "swaync";
|
||||||
inhibited-none = " ";
|
click = [
|
||||||
dnd-inhibited-notification = " <span foreground='red'><sup> </sup></span>";
|
{
|
||||||
dnd-inhibited-none = " ";
|
button = "left";
|
||||||
};
|
action = "show";
|
||||||
return-type = "json";
|
}
|
||||||
exec-if = "which swaync-client";
|
{
|
||||||
exec = "swaync-client -swb";
|
button = "right";
|
||||||
on-click = "swaync-client -t -sw";
|
action = "toggle_paused";
|
||||||
on-click-right = "swaync-client -d -sw";
|
}
|
||||||
escape = true;
|
];
|
||||||
};
|
}
|
||||||
|
];
|
||||||
pulseaudio = {
|
settings = {
|
||||||
format = "{icon} {volume}%";
|
icons.icons = "material-nf";
|
||||||
format-bluetooth = "{icon} {volume}% ";
|
theme.overrides = {
|
||||||
format-muted = " ";
|
idle_fg = ctp.text;
|
||||||
format-icons = {
|
idle_bg = "#00000000";
|
||||||
headphone = " ";
|
info_fg = "#89b4fa";
|
||||||
hands-free = " ";
|
info_bg = "#00000000";
|
||||||
headset = " ";
|
good_fg = "#a6e3a1";
|
||||||
phone = " ";
|
good_bg = "#00000000";
|
||||||
portable = " ";
|
warning_fg = "#fab387";
|
||||||
car = " ";
|
warning_bg = "#00000000";
|
||||||
default = [" " " " " "];
|
critical_fg = "#f38ba8";
|
||||||
};
|
critical_bg = "#00000000";
|
||||||
on-click = "pavucontrol";
|
separator = " ";
|
||||||
};
|
separator_bg = "auto";
|
||||||
mpris = {
|
separator_fg = "auto";
|
||||||
format = "{dynamic}";
|
};
|
||||||
format-paused = "";
|
};
|
||||||
interval = 10;
|
};
|
||||||
};
|
|
||||||
tray = {
|
|
||||||
reverse-direction = true;
|
|
||||||
spacing = 5;
|
|
||||||
};
|
|
||||||
spacing = 4;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
style = ''
|
|
||||||
@define-color red #f38ba8;
|
|
||||||
@define-color mauve #cba6f7;
|
|
||||||
@define-color pink #f5c2e7;
|
|
||||||
@define-color crust #11111c;
|
|
||||||
@define-color base #1e1e2e;
|
|
||||||
@define-color text #cdd6f4;
|
|
||||||
|
|
||||||
* {
|
|
||||||
font-family: IBM Plex Sans;
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar {
|
|
||||||
background-color: @base;
|
|
||||||
border: 2px solid @crust;
|
|
||||||
border-radius: 5px;
|
|
||||||
color: @text;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0 5px;
|
|
||||||
color: alpha(@mauve, 0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.focused {
|
|
||||||
color: @pink;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
|
||||||
color: @crust;
|
|
||||||
background-color: @red;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock,
|
|
||||||
#mpris,
|
|
||||||
#pulseaudio,
|
|
||||||
#tray {
|
|
||||||
padding: 0 5px;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
wayland.windowManager.sway.config.bars = [
|
|
||||||
{
|
|
||||||
position = "top";
|
|
||||||
command = "${config.programs.waybar.package}/bin/waybar";
|
|
||||||
mode = "hide";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.rofi = lib.mkIf isLinux {
|
programs.rofi = lib.mkIf isLinux {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -164,27 +164,27 @@ in {
|
||||||
"${mod}+m" = "[class=\"discord\"] scratchpad show";
|
"${mod}+m" = "[class=\"discord\"] scratchpad show";
|
||||||
|
|
||||||
# switch to workspace
|
# switch to workspace
|
||||||
"${modFocus}+1" = "workspace $ws1";
|
"${modFocus}+1" = "workspace 1";
|
||||||
"${modFocus}+2" = "workspace $ws2";
|
"${modFocus}+2" = "workspace 2";
|
||||||
"${modFocus}+3" = "workspace $ws3";
|
"${modFocus}+3" = "workspace 3";
|
||||||
"${modFocus}+4" = "workspace $ws4";
|
"${modFocus}+4" = "workspace 4";
|
||||||
"${modFocus}+5" = "workspace $ws5";
|
"${modFocus}+5" = "workspace 5";
|
||||||
"${modFocus}+6" = "workspace $ws6";
|
"${modFocus}+6" = "workspace 6";
|
||||||
"${modFocus}+7" = "workspace $ws7";
|
"${modFocus}+7" = "workspace 7";
|
||||||
"${modFocus}+8" = "workspace $ws8";
|
"${modFocus}+8" = "workspace 8";
|
||||||
"${modFocus}+9" = "workspace $ws9";
|
"${modFocus}+9" = "workspace 9";
|
||||||
"${modFocus}+0" = "workspace $ws10";
|
"${modFocus}+0" = "workspace 10";
|
||||||
# Move to workspace with focused container
|
# Move to workspace with focused container
|
||||||
"${modMove}+1" = "move container to workspace $ws1; workspace $ws1";
|
"${modMove}+1" = "move container to workspace 1; workspace 1";
|
||||||
"${modMove}+2" = "move container to workspace $ws2; workspace $ws2";
|
"${modMove}+2" = "move container to workspace 2; workspace 2";
|
||||||
"${modMove}+3" = "move container to workspace $ws3; workspace $ws3";
|
"${modMove}+3" = "move container to workspace 3; workspace 3";
|
||||||
"${modMove}+4" = "move container to workspace $ws4; workspace $ws4";
|
"${modMove}+4" = "move container to workspace 4; workspace 4";
|
||||||
"${modMove}+5" = "move container to workspace $ws5; workspace $ws5";
|
"${modMove}+5" = "move container to workspace 5; workspace 5";
|
||||||
"${modMove}+6" = "move container to workspace $ws6; workspace $ws6";
|
"${modMove}+6" = "move container to workspace 6; workspace 6";
|
||||||
"${modMove}+7" = "move container to workspace $ws7; workspace $ws7";
|
"${modMove}+7" = "move container to workspace 7; workspace 7";
|
||||||
"${modMove}+8" = "move container to workspace $ws8; workspace $ws8";
|
"${modMove}+8" = "move container to workspace 8; workspace 8";
|
||||||
"${modMove}+9" = "move container to workspace $ws9; workspace $ws9";
|
"${modMove}+9" = "move container to workspace 9; workspace 9";
|
||||||
"${modMove}+0" = "move container to workspace $ws10; workspace $ws10";
|
"${modMove}+0" = "move container to workspace 10; workspace 10";
|
||||||
# rofi instead of drun
|
# rofi instead of drun
|
||||||
"${mod}+space" = "exec --no-startup-id ${menu} -show drun -dpi $dpi";
|
"${mod}+space" = "exec --no-startup-id ${menu} -show drun -dpi $dpi";
|
||||||
# 1password
|
# 1password
|
||||||
|
@ -258,20 +258,17 @@ in {
|
||||||
inner = 5;
|
inner = 5;
|
||||||
outer = 2;
|
outer = 2;
|
||||||
};
|
};
|
||||||
|
bars = [
|
||||||
|
{
|
||||||
|
inherit fonts;
|
||||||
|
mode = "hide";
|
||||||
|
position = "top";
|
||||||
|
statusCommand = "${config.programs.i3status-rust.package}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set $ws1 1:Ⅰ
|
|
||||||
set $ws2 2:Ⅱ
|
|
||||||
set $ws3 3:Ⅲ
|
|
||||||
set $ws4 4:Ⅳ
|
|
||||||
set $ws5 5:Ⅴ
|
|
||||||
set $ws6 6:Ⅵ
|
|
||||||
set $ws7 7:Ⅶ
|
|
||||||
set $ws8 8:Ⅷ
|
|
||||||
set $ws9 9:Ⅸ
|
|
||||||
set $ws10 10:Ⅹ
|
|
||||||
|
|
||||||
for_window [floating] border pixel 2
|
for_window [floating] border pixel 2
|
||||||
|
|
||||||
# floating sticky
|
# floating sticky
|
||||||
|
|
Loading…
Reference in a new issue