Move some more things around and restructure things better

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

@@ -22,8 +22,8 @@
     '';
   };
 
-  home.packages = let
-    makoToggle = pkgs.writeScriptBin "makotoggle" ''
+  home.packages = with pkgs; [ 
+    (pkgs.writeScriptBin "makotoggle" ''
       # Run makoctl mode and store the output in a variable
       mode_output=$(makoctl mode)
 
@@ -40,6 +40,6 @@
         sleep 2
         makoctl mode -a do-not-disturb
       fi
-    '';
-  in with pkgs; [ makoToggle ];
+    '')
+  ];
 }

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

@@ -123,9 +123,8 @@
       };
     };
   };
-  home.packages = let
-    # A script to execute commands with Rofi
-    rofiScripts = pkgs.writeScriptBin "rofiscripts" ''
+  home.packages = with pkgs; [
+    (pkgs.writeScriptBin "rofiscripts" ''
       # Scratchpad function
       handle_scratchpads() {
         SCRATCHPADS=$(echo -e "Gotop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
@@ -143,7 +142,7 @@
         case $POWER in
           Shutdown) poweroff;;
           Reboot) reboot;;
-          Sleep) swaylock --sleep &;;
+          Sleep) swaysleep &;;
           Lock) swaylock &;;
           Kill) pkill -9 sway;;
         esac
@@ -176,9 +175,7 @@
       else
         echo "Please use a valid argument."
       fi
-    '';
-  in with pkgs; [
-    rofiScripts
+    '')
     rofi-bluetooth
     bemoji
   ];