some fixes

home/linux.nix

@@ -52,7 +52,12 @@
     ../modules/zellij
     ../modules/mpv
     ../modules/zen
-    ../modules/wm
+    ../modules/wm/swaync
+    ../modules/wm/cliphist
+    ../modules/wm/awww
+    ../modules/wm/fuzzel
+    ../modules/wm/waybar
+    ../modules/wm/niri
   ];
 
   programs.home-manager.enable = true;

modules/wm/niri/config/config.kdl

@@ -180,6 +180,7 @@ layout {
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "tailscale systray"
+spawn-at-startup "waybar"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 
 hotkey-overlay {
@@ -214,20 +215,12 @@ overview {
     backdrop-color "#0f0b15"
 }
 
-workspace "main"
-workspace "code"
-workspace "gaming"
-workspace "other"
-workspace "chat"
-workspace "media"
-
 // Window rules let you adjust behavior for individual windows.
 // Find more information on the wiki:
 // https://yalter.github.io/niri/Configuration:-Window-Rules
 
 window-rule {
     match app-id=r#"^steam$"#
-    open-on-workspace "gaming"
 }
 
 // window-rule {
@@ -424,21 +417,21 @@ binds {
     //
     // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
     // will all refer to the 3rd workspace.
-    Alt+1 { focus-workspace "main"; }
+    Alt+1 { focus-workspace 1; }
-    Alt+2 { focus-workspace "code"; }
+    Alt+2 { focus-workspace 2; }
-    Alt+3 { focus-workspace "gaming"; }
+    Alt+3 { focus-workspace 3; }
-    Alt+4 { focus-workspace "other"; }
+    Alt+4 { focus-workspace 4; }
-    Alt+5 { focus-workspace "chat"; }
+    Alt+5 { focus-workspace 5; }
-    Alt+6 { focus-workspace "media"; }
+    Alt+6 { focus-workspace 6; }
     Alt+7 { focus-workspace 7; }
     Alt+8 { focus-workspace 8; }
     Alt+9 { focus-workspace 9; }
-    Alt+Ctrl+1 { move-column-to-workspace "main"; }
+    Alt+Ctrl+1 { move-column-to-workspace 1; }
-    Alt+Ctrl+2 { move-column-to-workspace "code"; }
+    Alt+Ctrl+2 { move-column-to-workspace 2; }
-    Alt+Ctrl+3 { move-column-to-workspace "gaming"; }
+    Alt+Ctrl+3 { move-column-to-workspace 3; }
-    Alt+Ctrl+4 { move-column-to-workspace "other"; }
+    Alt+Ctrl+4 { move-column-to-workspace 4; }
-    Alt+Ctrl+5 { move-column-to-workspace "chat"; }
+    Alt+Ctrl+5 { move-column-to-workspace 5; }
-    Alt+Ctrl+6 { move-column-to-workspace "media"; }
+    Alt+Ctrl+6 { move-column-to-workspace 6; }
     Alt+Ctrl+7 { move-column-to-workspace 7; }
     Alt+Ctrl+8 { move-column-to-workspace 8; }
     Alt+Ctrl+9 { move-column-to-workspace 9; }

modules/wm/waybar/config/config.jsonc

@@ -5,8 +5,6 @@
   "margin-left": 8,
   "margin-top": 8,
   "margin-bottom": 8,
-  // TODO: Remove
-  "reload_style_on_change": true,
   // Placing Modules
   "modules-left": [
     "clock",
@@ -15,7 +13,9 @@
     "custom/memory-label",
     "memory",
     "custom/disk-label",
-    "disk"
+    "disk",
+    "custom/nvidia-label",
+    "custom/nvidia"
   ],
   "modules-center": [
     "niri/workspaces"
@@ -68,6 +68,16 @@
     "format": "{percentage_used}%",
     "max-length": 2
   },
+  "custom/nvidia-label": {
+    "format": "GPU",
+    "tooltip": false
+  },
+  "custom/nvidia": {
+    "exec": "nvidia-smi --query-gpu=temperature.gpu --format=csv,nounits,noheader",
+    "format": "{}°",
+    "tooltip": false,
+    "interval": 10
+  },
   "wireplumber#source": {
     "node-type": "Audio/Source",
     "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",

modules/wm/waybar/config/power_menu.xml

@@ -3,12 +3,12 @@
     <object class="GtkMenu" id="menu">
         <child>
             <object class="GtkMenuItem" id="lock">
-                <property name="label">Suspend</property>
+                <property name="label">Lock</property>
             </object>
         </child>
         <child>
             <object class="GtkMenuItem" id="reboot">
-                <property name="label">Hibernate</property>
+                <property name="label">Reboot</property>
             </object>
         </child>
         <child>

modules/wm/waybar/config/style.css

@@ -43,19 +43,21 @@ window#waybar {
 
 #custom-cpu-label,
 #custom-memory-label,
-#custom-disk-label {
+#custom-disk-label,
+#custom-nvidia-label {
   color: #572454;
   padding-top: 6px;
   border-top: 1px solid #572454;
 }
 
-#disk {
+#custom-nvidia {
   border-bottom: 1px solid #572454;
 }
 
 #cpu,
 #memory,
-#disk {
+#disk,
+#custom-nvidia {
   color: #d369af;
   padding-bottom: 8px;
 }

modules/wm/waybar/default.nix

@@ -5,11 +5,5 @@
     source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/wm/waybar/config";
   };
 
-  programs.waybar = {
+  programs.waybar.enable = true;
-    enable = true;
-    systemd = {
-      enable = true;
-      target = "graphical-session.target";
-    };
-  };
 }