Change around workspaces and waybar setup

Remove old "all" workspace and bump everything up Move waybar module files back into default Add some system stats to waybar output
2023-11-04 12:00:40 +00:00 · 2023-11-04 12:00:40 +00:00 · fad083cb25
parent 74410aba72
commit fad083cb25
25 changed files with 179 additions and 269 deletions
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@ -94,8 +94,8 @@ in ''
  bind = SUPER, M, fullscreen, 0
  bind = SUPER SHIFT, M, fullscreen, 1
  bind = SUPER, tab, exec, rofi -replace -show window
-  bind = SUPER, P, exec, rofi-pass -replace
-  bind = SUPER SHIFT, P, exec, rofi-pass -replace --last-used
+  bind = SUPER, P, exec, pkill rofi || rofi-pass
+  bind = SUPER SHIFT, P, exec, pkill rofi || rofi-pass --last-used
  bind = SUPER, X, exec, ${pkgs.mako}/bin/makoctl restore
  bind = SUPER SHIFT, X, exec, ${pkgs.mako}/bin/makoctl dismiss -a

@ -105,10 +105,10 @@ in ''
  bind = SUPER, Return, exec, alacritty
  bind = SUPER SHIFT, Return, exec, rofi -replace -show ssh

-  bind = SUPER ALT, D, exec, [workspace 3] emacs
-  bind = SUPER ALT, W, exec, [workspace 4] nyxt
-  bind = SUPER ALT, F, exec, [workspace 5] thunar
-  bind = SUPER ALT, S, exec, [workspace 6] alacritty -e ncspot
+  bind = SUPER ALT, E, exec, [workspace 2] emacs
+  bind = SUPER ALT, W, exec, [workspace 3] nyxt
+  bind = SUPER ALT, F, exec, [workspace 4] thunar
+  bind = SUPER ALT, S, exec, [workspace 5] alacritty -e ncspot

  # Misc useful binds
  bind=,XF86Calculator,exec,rofi -replace -show calc
@ -164,9 +164,6 @@ in ''
  windowrule = center,(Pinentry)
  windowrule = float,(davmail-imap-ImapConnection)
  windowrule = center,(davmail-imap-ImapConnection)
-  windowrule = pin,(Rofi)
-  windowrule = dimaround,(Rofi)
-  windowrule = stayfocused,(Rofi)
  windowrule = nomaximizerequest, ^(libreoffice).*
  windowrule = nofullscreenrequest, ^(libreoffice).*
  windowrule = group set always,(fractal)
@ -190,61 +187,54 @@ in ''
  windowrulev2 = float,title:(Steam Settings),class:(steam)

  # Workspace definitions
-  # 1: [a]ny (or def[a]ult)
-  bind = SUPER, A, moveworkspacetomonitor, 1 current
-  bind = SUPER, A, workspace, 1
-  bind = SUPER SHIFT, A, movetoworkspace, 1
+  # 1: [t]erminal
+  bind = SUPER, T, moveworkspacetomonitor, 1 current
+  bind = SUPER, T, workspace, 1
+  bind = SUPER SHIFT, T, movetoworkspace, 1

-  # 2: [t]erminal
-  bind = SUPER, T, moveworkspacetomonitor, 2 current
-  bind = SUPER, T, workspace, 2
-  bind = SUPER SHIFT, T, movetoworkspace, 2
+  # 2: [e]ditor
+  bind = SUPER, E, moveworkspacetomonitor, 2 current
+  bind = SUPER, E, workspace, 2
+  bind = SUPER SHIFT, E, movetoworkspace, 2

-  # 3: [d]ev
-  bind = SUPER, D, moveworkspacetomonitor, 3 current
-  bind = SUPER, D, workspace, 3
-  bind = SUPER SHIFT, D, movetoworkspace, 3
+  # 3: [w]eb browser
+  bind = SUPER, W, moveworkspacetomonitor, 3 current
+  bind = SUPER, W, workspace, 3
+  bind = SUPER SHIFT, W, movetoworkspace, 3
+  windowrule = workspace 3, (nyxt)
+  windowrule = workspace 3, (chromium-browser)
+  windowrule = workspace 3, (firefox)

-  # 4: [w]ww
-  bind = SUPER, W, moveworkspacetomonitor, 4 current
-  bind = SUPER, W, workspace, 4
-  bind = SUPER SHIFT, W, movetoworkspace, 4
-  windowrule = workspace 4, (nyxt)
-  windowrule = workspace 4, (chromium-browser)
-  windowrule = workspace 4, (firefox)
+  # 4: [f]iles
+  bind = SUPER, F, moveworkspacetomonitor, 4 current
+  bind = SUPER, F, workspace, 4
+  bind = SUPER SHIFT, F, movetoworkspace, 4

-  # 5: [f]iles
-  bind = SUPER, F, moveworkspacetomonitor, 5 current
-  bind = SUPER, F, workspace, 5
-  bind = SUPER SHIFT, F, movetoworkspace, 5
+  # 5: [s]ongs
+  bind = SUPER, S, moveworkspacetomonitor, 5 current
+  bind = SUPER, S, workspace, 5
+  bind = SUPER SHIFT, S, movetoworkspace, 5

-  # 6: [s]potify (or mu[s]ic)
-  bind = SUPER, S, moveworkspacetomonitor, 6 current
-  bind = SUPER, S, workspace, 6
-  bind = SUPER SHIFT, S, movetoworkspace, 6
-  windowrule = workspace 6, (dev.alextren.Spot)
+  # 6: [c]hat
+  bind = SUPER, C, moveworkspacetomonitor, 6 current
+  bind = SUPER, C, workspace, 6
+  bind = SUPER SHIFT, C, movetoworkspace, 6
+  windowrule = workspace 6, (fractal)
+  windowrule = workspace 6, (discord)
+  windowrule = workspace 6, (teams-for-linux)

-  # 7: [c]hat
-  bind = SUPER, C, moveworkspacetomonitor, 7 current
-  bind = SUPER, C, workspace, 7
-  bind = SUPER SHIFT, C, movetoworkspace, 7
-  windowrule = workspace 7, (fractal)
-  windowrule = workspace 7, (discord)
-  windowrule = workspace 7, (teams-for-linux)
+  # 7: [g]aming
+  bind = SUPER, G, moveworkspacetomonitor, 7 current
+  bind = SUPER, G, workspace, 7
+  bind = SUPER SHIFT, G, movetoworkspace, 7
+  windowrule = workspace 7, (steam)

  # 8: [r]emote
  bind = SUPER, R, moveworkspacetomonitor, 8 current
  bind = SUPER, R, workspace, 8
  bind = SUPER SHIFT, R, movetoworkspace, 8
-  windowrule = workspace 8, (org.remmina.Remmina)
  windowrule = workspace 8, (Nxplayer.bin)

-  # 9: [g]aming
-  bind = SUPER, G, moveworkspacetomonitor, 9 current
-  bind = SUPER, G, workspace, 9
-  bind = SUPER SHIFT, G, movetoworkspace, 9
-  windowrule = workspace 9, (steam)
-
  # Special workspaces
  bind = SUPER, comma, workspace, m-1
  bind = SUPER SHIFT, comma, movetoworkspace, r-1
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@ -32,16 +32,143 @@
    settings.main = {
      layer = "top";
      position = "top";
-      "modules-left" = [ "hyprland/workspaces" ];
-      "modules-center" = [ "mpris" ];
-      "modules-right" = [ "pulseaudio" "backlight" "battery" "clock" "tray" ];
-      "hyprland/workspaces" = import ./modules/hyprland_workspaces.nix;
-      mpris = import ./modules/mpris.nix;
-      pulseaudio = import ./modules/pulseaudio.nix;
-      backlight = import ./modules/backlight.nix;
-      battery = import ./modules/battery.compact.nix;
-      clock = import ./modules/clock.nix;
-      tray = import ./modules/tray.nix;
+      # Layout
+      "modules-left" = [ "custom/launcher" "hyprland/workspaces" ];
+      "modules-center" = [ ];
+      "modules-right" = [
+        "mpris"
+        "pulseaudio"
+        "battery"
+        "disk"
+        "cpu"
+        "memory"
+        "temperature"
+        "clock"
+        "tray"
+      ];
+      # Module config
+      "custom/launcher" = {
+        format = " 󰛡";
+        tooltip = false;
+        on-click = "rofi -show combi";
+      };
+      "hyprland/workspaces" = {
+        format = "{icon}";
+        format-icons = {
+          # "1" = "󰛡"; # [a]ny (or def[a]ult)
+          "1" = "󰟀"; # [t]erminal
+          "2" = "󰳼"; # [e]ditor
+          "3" = "󰖟"; # [w]eb browser
+          "4" = "󰝰"; # [f]iles
+          "5" = "󰲸"; # [s]ongs
+          "6" = "󰭹"; # [c]hat
+          "7" = "󰊗"; # [g]aming
+          "8" = "󰢹"; # [r]emote
+          default = "󰛡";
+          special = "󰓎";
+          urgent = "󰣘";
+        };
+        show-special = true;
+      };
+      "hyprland/window" = {
+        format = "{title}";
+        separate-outputs = true;
+      };
+      mpris = {
+        "format" =
+          "{player_icon} <b>{title}</b> [{position}/{length}] {status_icon}";
+        "interval" = 1;
+        "player-icons" = {
+          "default" = "󰲸";
+          "mpv" = "󰤽";
+          "kdeconnect" = "󱀟";
+          "ncspot" = "󰓇";
+        };
+        "status-icons" = {
+          "playing" = "󰐊";
+          "paused" = "󰏤";
+          "stopped" = "󰓛";
+        };
+        "ignored-players" = [ "firefox" ];
+      };
+      pulseaudio = {
+        scroll-step = 5;
+        format = "{icon} {format_source}";
+        format-bluetooth = "{icon} {format_source}";
+        format-bluetooth-muted = "󰝟 {icon} {format_source}";
+        format-muted = "󰝟 {format_source}";
+        format-source = "󰍬";
+        format-source-muted = "󰍭";
+        format-icons = {
+          headphone = "󰋋";
+          hands-free = "󰥰";
+          headset = "󰋎";
+          phone = "󰏲";
+          portable = "󰏳";
+          car = "󰄍";
+          default = [ "󰕿" "󰖀" "󰕾" ];
+        };
+        on-click = "pavucontrol";
+      };
+      backlight = {
+        format = "{icon}";
+        tooltip-format = "{percent}%";
+        format-icons = [ "" "" "" "" "" "" "" "" "" ];
+      };
+      battery = {
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{icon}";
+        format-charging = "󰂄";
+        format-plugged = "󰚥";
+        tooltip-format = "{time} {capacity}%";
+        format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+      };
+      disk = {
+        format = "{percentage_free}% 󰋊";
+        path = config.home.homeDirectory;
+      };
+      cpu = {
+        format = "{usage}% 󰻠";
+        tooltip = false;
+      };
+      memory = { format = "{}% 󰍛"; };
+      temperature = {
+        critical-threshold = 80;
+        format = "{temperatureC}°C {icon}";
+        format-icons = [ "󱃃" "󰔏" "󱃂" ];
+      };
+      clock = {
+        format = "{:%a %d %b %R}";
+        format-alt = "{:%A %F %T}";
+        tooltip-format = "<tt><small>{calendar}</small></tt>";
+        calendar = {
+          mode = "month";
+          mode-mon-col = 3;
+          weeks-pos = "left";
+          on-scroll = 1;
+          on-click-right = "mode";
+          format = {
+            months = "<span color='#ffead3'><b>{}</b></span>";
+            days = "<span color='#ecc6d9'><b>{}</b></span>";
+            weeks = "<span color='#99ffdd'><b>W{}</b></span>";
+            weekdays = "<span color='#ffcc66'><b>{}</b></span>";
+            today = "<span color='#ff6699'><b><u>{}</u></b></span>";
+          };
+        };
+        actions = {
+          on-click-right = "mode";
+          on-scroll-up = "shift_up";
+          on-scroll-down = "shift_down";
+        };
+      };
+      tray = {
+        icon-size = 16;
+        show-passive-items = true;
+        spacing = 5;
+      };
    };
  };
 }
--- a/home/hyprland/waybar/modules/backlight.nix
+++ b/home/hyprland/waybar/modules/backlight.nix
@ -1,5 +0,0 @@
-{
-  format = "{icon}";
-  tooltip-format = "{percent}%";
-  format-icons = [ "" "" "" "" "" "" "" "" "" ];
-}
--- a/home/hyprland/waybar/modules/battery.compact.nix
+++ b/home/hyprland/waybar/modules/battery.compact.nix
@ -1,11 +0,0 @@
-{
-  states = {
-    warning = 30;
-    critical = 15;
-  };
-  format = "{icon}";
-  format-charging = "󰂄";
-  format-plugged = "󰚥";
-  tooltip-format = "{time} {capacity}%";
-  format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-}
--- a/home/hyprland/waybar/modules/battery.nix
+++ b/home/hyprland/waybar/modules/battery.nix
@ -1,10 +0,0 @@
-{
-  states = {
-    warning = 30;
-    critical = 15;
-  };
-  format = "{time} {capacity}% {icon}";
-  format-charging = "{time} {capacity}% 󰂄";
-  format-plugged = "{capacity}% 󰚥";
-  format-icons = ["󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-}
--- a/home/hyprland/waybar/modules/bluetooth.compact.nix
+++ b/home/hyprland/waybar/modules/bluetooth.compact.nix
@ -1,9 +0,0 @@
-{
-  format = "󰂯";
-  format-disabled = "󰂲";
-  format-off = "󰂲";
-  format-on = "󰂯";
-  format-connected = "󰂱";
-  tooltip-format = "{status} | {device_alias}";
-  on-click = "blueman-manager";
-}
--- a/home/hyprland/waybar/modules/bluetooth.nix
+++ b/home/hyprland/waybar/modules/bluetooth.nix
@ -1,8 +0,0 @@
-{
-  format = "󰂯 {status}";
-  format-disabled = "󰂲 {status}";
-  format-off = "󰂲 {status}";
-  format-on = "󰂯 {status}";
-  format-connected = "󰂱 {device_alias}";
-  on-click = "blueman-manager";
-}
--- a/home/hyprland/waybar/modules/cava.nix
+++ b/home/hyprland/waybar/modules/cava.nix
@ -1,3 +0,0 @@
-{
-  cava_config = "$XDG_CONFIG_HOME/cava/config";
-}
--- a/home/hyprland/waybar/modules/clock.compact.nix
+++ b/home/hyprland/waybar/modules/clock.compact.nix
@ -1,7 +0,0 @@
-let
-  clock = import ./clock.nix;
-in {
-  tooltip-format = clock.tooltip-format;
-  calendar = clock.calendar;
-  actions = clock.actions;
-}
--- a/home/hyprland/waybar/modules/clock.nix
+++ b/home/hyprland/waybar/modules/clock.nix
@ -1,24 +0,0 @@
-{
-  format = "{:%a %d %b %R}";
-  format-alt = "{:%A %F %T}";
-  tooltip-format = "<tt><small>{calendar}</small></tt>";
-  calendar = {
-    mode = "month";
-    mode-mon-col = 3;
-    weeks-pos = "left";
-    on-scroll = 1;
-    on-click-right = "mode";
-    format = {
-      months = "<span color='#ffead3'><b>{}</b></span>";
-      days = "<span color='#ecc6d9'><b>{}</b></span>";
-      weeks = "<span color='#99ffdd'><b>W{}</b></span>";
-      weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-      today = "<span color='#ff6699'><b><u>{}</u></b></span>";
-    };
-  };
-  actions = {
-    on-click-right = "mode";
-    on-scroll-up = "shift_up";
-    on-scroll-down = "shift_down";
-  };
-}
--- a/home/hyprland/waybar/modules/cpu.nix
+++ b/home/hyprland/waybar/modules/cpu.nix
@ -1,4 +0,0 @@
-{
-  format = "{usage}% 󰻠";
-  tooltip = false;
-}
--- a/home/hyprland/waybar/modules/hyprland_submap.nix
+++ b/home/hyprland/waybar/modules/hyprland_submap.nix
@ -1,5 +0,0 @@
-{
-  format = "{}";
-  max-length = 8;
-  tooltip = false;
-}
--- a/home/hyprland/waybar/modules/hyprland_window.nix
+++ b/home/hyprland/waybar/modules/hyprland_window.nix
@ -1,4 +0,0 @@
-{
-  format = "{title}";
-  separate-outputs = true;
-}
--- a/home/hyprland/waybar/modules/hyprland_workspaces.nix
+++ b/home/hyprland/waybar/modules/hyprland_workspaces.nix
@ -1,18 +0,0 @@
-{
-  format = "{icon}";
-  format-icons = {
-    "1" = "󰛡"; # [a]ny (or def[a]ult)
-    "2" = "󰟀"; # [t]erminal
-    "3" = "󰳼"; # [d]ev
-    "4" = "󰖟"; # [b]rowser
-    "5" = "󰝰"; # [f]iles
-    "6" = "󰲸"; # [s]potify (or mu[s]ic)
-    "7" = "󰭹"; # [c]hat
-    "8" = "󰢹"; # [r]emote
-    "9" = "󰊗"; # [g]aming
-    default = "󰛡";
-    special = "󰓎";
-    urgent = "󰣘";
-  };
-  show-special = true;
-}
--- a/home/hyprland/waybar/modules/keyboard-state.nix
+++ b/home/hyprland/waybar/modules/keyboard-state.nix
@ -1,9 +0,0 @@
-{
-  numlock = true;
-  capslock = true;
-  format = "{name} {icon}";
-  format-icons = {
-    locked = "";
-    unlocked = "";
-  };
-}
--- a/home/hyprland/waybar/modules/memory.nix
+++ b/home/hyprland/waybar/modules/memory.nix
@ -1 +0,0 @@
-{format = "{}% 󰍛";}
--- a/home/hyprland/waybar/modules/mpris.nix
+++ b/home/hyprland/waybar/modules/mpris.nix
@ -1,18 +0,0 @@
-let titleFormat = " <b>{title}</b> [{position}/{length}]";
-in {
-  "format" = "{player_icon} ${titleFormat} {status_icon}";
-  "interval" = 1;
-  "player-icons" = {
-    "default" = "󰲸";
-    "mpv" = "󰤽";
-    "kdeconnect" = "󱀟";
-    "ncspot" = "󰓇";
-    "Spot" = "󰓇";
-  };
-  "status-icons" = {
-    "playing" = "󰐊";
-    "paused" = "󰏤";
-    "stopped" = "󰓛";
-  };
-  "ignored-players" = [ "firefox" ];
-}
--- a/home/hyprland/waybar/modules/network.compact.nix
+++ b/home/hyprland/waybar/modules/network.compact.nix
@ -1,9 +0,0 @@
-{
-  format-icons = ["󰤟" "󰤢" "󰤥" "󰤨"];
-  format-wifi = "{icon}";
-  format-ethernet = "󰈁";
-  tooltip-format = "{essid} ({signalStrength}%)";
-  format-linked = "󰈂";
-  format-disconnected = "󰈂";
-  on-click = "nm-connection-editor";
-}
--- a/home/hyprland/waybar/modules/network.nix
+++ b/home/hyprland/waybar/modules/network.nix
@ -1,8 +0,0 @@
-{
-  format-wifi = "{essid} ({signalStrength}%) 󰖩";
-  format-ethernet = "Connected 󰈁";
-  tooltip-format = "{ifname}";
-  format-linked = "{ifname} (No IP) 󰈁";
-  format-disconnected = "Disconnected 󰈂";
-  on-click = "nm-connection-editor";
-}
--- a/home/hyprland/waybar/modules/pulseaudio.compact.nix
+++ b/home/hyprland/waybar/modules/pulseaudio.compact.nix
@ -1,23 +0,0 @@
-{
-  scroll-step = 5;
-  format = "{icon} {format_source}";
-  format-bluetooth = "{icon} {format_source}";
-  format-bluetooth-muted = "󰝟 {icon} {format_source}";
-  format-muted = "󰝟 {format_source}";
-  format-source = "󰍬";
-  format-source-muted = "󰍭";
-  format-icons = {
-    headphone = "󰋋";
-    hands-free = "󰥰";
-    headset = "󰋎";
-    phone = "󰏲";
-    portable = "󰏳";
-    car = "󰄍";
-    default = [
-      "󰕿"
-      "󰖀"
-      "󰕾"
-    ];
-  };
-  on-click = "pavucontrol";
-}
--- a/home/hyprland/waybar/modules/pulseaudio.nix
+++ b/home/hyprland/waybar/modules/pulseaudio.nix
@ -1,19 +0,0 @@
-{
-  scroll-step = 5;
-  format = "{volume}% {icon} {format_source}";
-  format-bluetooth = "{volume}% {icon} {format_source}";
-  format-bluetooth-muted = "󰝟 {icon} {format_source}";
-  format-muted = "󰝟  {format_source}";
-  format-source = "{volume}% 󰍬";
-  format-source-muted = "󰍭";
-  format-icons = {
-    headphone = "󰋋";
-    hands-free = " ";
-    headset = "󰋎";
-    phone = "󰏲";
-    portable = "󰏳";
-    car = "󰄍";
-    default = [ "󰕿" "󰖀" "󰕾" ];
-  };
-  on-click = "pavucontrol";
-}
--- a/home/hyprland/waybar/modules/separator.nix
+++ b/home/hyprland/waybar/modules/separator.nix
@ -1,3 +0,0 @@
-{
-  format = " | ";
-}
--- a/home/hyprland/waybar/modules/temperature.nix
+++ b/home/hyprland/waybar/modules/temperature.nix
@ -1,5 +0,0 @@
-{
-  critical-threshold = 80;
-  format = "{temperatureC}°C {icon}";
-  format-icons = ["󱃃" "󰔏" "󱃂"];
-}
--- a/home/hyprland/waybar/modules/tray.nix
+++ b/home/hyprland/waybar/modules/tray.nix
@ -1,5 +0,0 @@
-{
-  icon-size = 16;
-  show-passive-items = true;
-  spacing = 5;
-}
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@ -26,6 +26,7 @@ tooltip {

 #workspaces,
 #cava,
+#disk,
 #cpu,
 #memory,
 #temperature,