More server changes and generalization of the waybar

modules/home/programs/gui/rofi/default.nix

@@ -125,37 +125,23 @@
   };
 
   home.packages = with pkgs; [
-    (pkgs.writeScriptBin "rofiscripts" ''
-      # Scratchpad function
-      scratchpads() {
-        SCRATCHPADS=$(echo -e "Btop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
-        case $SCRATCHPADS in
-          Btop) foot -a btop -T Btop btop;;
-          Music) foot -a music -T Music ncmpcpp;;
-          Sound) foot -a sound -T Sound pulsemixer;;
-        esac
-      }
-      
-      # Lock menu
-      power() {
-        POWER=$(echo -e "Shutdown\nReboot\nSleep\nLock\nKill" | rofi -dmenu -i -p "Power")
-        case $POWER in
-          Shutdown) poweroff;;
-          Reboot) reboot;;
-          Sleep) sleep-$XDG_CURRENT_DESKTOP &;;
-          Lock) swaylock &;;
-          Kill) pkill -9 $XDG_CURRENT_DESKTOP;;
-        esac
-      }
-      
-      # Check for command-line arguments
-      if [ "$1" == "--scratchpads" ]; then
-        scratchpads
-      elif [ "$1" == "--power" ]; then
-        power
-      else
-        echo "Please --scratchpads or --power."
-      fi
+    (pkgs.writeScriptBin "rofiscratch" ''
+      SCRATCHPADS=$(echo -e "Btop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
+      case $SCRATCHPADS in
+        Btop) foot -a btop -T Btop btop;;
+        Music) foot -a music -T Music ncmpcpp;;
+        Sound) foot -a sound -T Sound pulsemixer;;
+      esac
+    '')
+    (pkgs.writeScriptBin "rofipower" ''
+      POWER=$(echo -e "Shutdown\nReboot\nSleep\nLock\nKill" | rofi -dmenu -i -p "Power")
+      case $POWER in
+        Shutdown) poweroff;;
+        Reboot) reboot;;
+        Sleep) sleep-$XDG_CURRENT_DESKTOP &;;
+        Lock) swaylock &;;
+        Kill) pkill -9 $XDG_CURRENT_DESKTOP;;
+      esac
     '')
     rofi-bluetooth
     bemoji

modules/home/programs/misc/avtools/spotdl/default.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [ spotdl ];
-  programs.zsh.shellAliases.spotdl = "spotdl --m3u --format opus";
+  home = {
+    packages = with pkgs; [ spotdl ];
+    shellAliases.spotdl = "spotdl --m3u --format opus";
+  };
 }

modules/home/programs/misc/avtools/yt-dlp/default.nix

@@ -1,20 +1,19 @@
 { ... }:
 {
-  programs = {
-    yt-dlp = {
-      enable = true;
-      settings = {
-        add-metadata = true;
-        embed-thumbnail = true;
-        convert-thumbnails = "jpg";
-        audio-format = "opus";
-        output = ''"%(artist)s - %(title)s.%(ext)s"'';
-      };
-    };
-    zsh.shellAliases = {
-      ytm3u = "yt-dlp -gS proto:m3u8";
-      opusdl = ''yt-dlp -f ba -x --audio-quality 0'';
-      spotdl = "spotdl --m3u --format opus";
+  programs.yt-dlp = {
+    enable = true;
+    settings = {
+      add-metadata = true;
+      embed-thumbnail = true;
+      convert-thumbnails = "jpg";
+      audio-format = "opus";
+      output = ''"%(artist)s - %(title)s.%(ext)s"'';
     };
   };
+
+  home.shellAliases = {
+    ytm3u = "yt-dlp -gS proto:m3u8";
+    opusdl = ''yt-dlp -f ba -x --audio-quality 0'';
+    spotdl = "spotdl --m3u --format opus";
+  };
 }

modules/home/programs/misc/gaming/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./launchers
-    ./games
     ./emulators
   ];
 }

modules/home/programs/misc/gaming/games/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ xash3d ];
-}

modules/home/wms/hyprland/hotkeys/default.nix

@@ -21,7 +21,7 @@
       # Prime + key
       "${primeMod}, s, exec, rofi -show run -p Command"
       "${primeMod}, c, exec, clipman pick -t rofi"
-      "${primeMod}, x, exec, rofiscripts --power"
+      "${primeMod}, x, exec, rofipower"
       "${primeMod}, b, exec, pkill -USR1 waybar"
       "${primeMod}, Return, exec, foot"
       
@@ -33,7 +33,7 @@
       "${primeMod} Shift, Return, exec, foot ranger"
       
       # Prime + ctrl + key
-      "${primeMod} Ctrl, s, exec, rofiscripts --scratchpads"
+      "${primeMod} Ctrl, s, exec, rofiscratch"
       ''${primeMod} Ctrl, c, exec, wlpicker && notify-send "Color copied to clipboard"''
       
       ## Media

modules/home/wms/niri/hotkeys/default.nix

@@ -20,7 +20,7 @@
       // Prime + key
       ${primeMod}+s { spawn "sh" "-c" "rofi -show run -p Command"; }
       ${primeMod}+c { spawn "sh" "-c" "clipman pick -t rofi"; }
-      ${primeMod}+x { spawn "sh" "-c" "rofiscripts --power"; }
+      ${primeMod}+x { spawn "sh" "-c" "rofipower"; }
       ${primeMod}+b { spawn "sh" "-c" "pkill -USR1 waybar"; }
       ${primeMod}+Return { spawn "sh" "-c" "foot"; }
     
@@ -32,7 +32,7 @@
       ${primeMod}+Shift+Return { spawn "sh" "-c" "foot ranger"; }
     
       // Prime + ctrl + key
-      ${primeMod}+Ctrl+s { spawn "sh" "-c" "rofiscripts --scratchpads"; }
+      ${primeMod}+Ctrl+s { spawn "sh" "-c" "rofiscratch"; }
       ${primeMod}+Ctrl+c { spawn "sh" "-c" "wlpicker && notify-send \"Color copied to clipboard\""; }
     
       //// Media

modules/home/wms/programs/waybar/default.nix

@@ -248,7 +248,7 @@
         "sway/scratchpad" = scratchpadModule;
         "tray" = trayModule;
         "bluetooth" = bluetoothModule;
-        "network" = networkModule // { interface = "enp*"; };
+        "network" = networkModule;
       };
 
       display2 = {

modules/home/wms/sway/hotkeys/default.nix

@@ -23,7 +23,7 @@
       # Prime + key
       "${primeMod}+s" = ''exec rofi -show run -p Command'';
       "${primeMod}+c" = ''exec clipman pick -t rofi'';
-      "${primeMod}+x" = ''exec rofiscripts --power'';
+      "${primeMod}+x" = ''exec rofipower'';
       "${primeMod}+b" = ''exec pkill -USR1 waybar'';
       "${primeMod}+Return" = ''exec foot'';
 
@@ -36,7 +36,7 @@
 
       # Prime + ctrl + key
       "${primeMod}+Ctrl+x" = ''exec prop-sway'';
-      "${primeMod}+Ctrl+s" = ''exec rofiscripts --scratchpads'';
+      "${primeMod}+Ctrl+s" = ''exec rofiscratch'';
       "${primeMod}+Ctrl+c" = ''exec wlpicker && notify-send "Color copied to clipboard"'';
 
       ## Media