Minimize pkgs use, add stable channel for unstable systems, more separation and such

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

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 {
   home.packages = with pkgs; lib.mkIf config.programs.rofi.enable [
-    (pkgs.writeScriptBin "rofiscratch" ''
+    (writeScriptBin "rofiscratch" ''
       SCRATCHPADS=$(echo -e "Btop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
       case $SCRATCHPADS in
         Btop) foot -a btop -T Btop btop;;
@@ -9,7 +9,7 @@
         Sound) foot -a sound -T Sound pulsemixer;;
       esac
     '')
-    (pkgs.writeScriptBin "rofipower" ''
+    (writeScriptBin "rofipower" ''
       POWER=$(echo -e "Shutdown\nReboot\nLock\nSleep\nKill" | rofi -dmenu -i -p "Power")
       case $POWER in
         Shutdown) poweroff;;

modules/home/programs/terminal/bat/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  programs.bat = {
+    enable = true;
+    config.paging = "never";
+  };
+}

modules/home/programs/terminal/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./bat
     ./btop
     ./eza
     ./fastfetch

modules/home/programs/terminal/fastfetch/small/default.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [ (pkgs.writeScriptBin "pfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ];
+  home.packages = with pkgs; [ (writeScriptBin "pfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ];
   xdg.configFile."fastfetch/small.jsonc".source = ./small.jsonc;
 }

modules/home/programs/terminal/zsh/default.nix

@@ -14,7 +14,6 @@
     };
     initExtra = ''
       pfetch
-      source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
       setopt HIST_IGNORE_SPACE
       setopt RM_STAR_WAIT

modules/home/settings/aliases/default.nix

@@ -9,7 +9,6 @@
     # Shortcuts
     ff = "clear && fastfetch";
     ip = "ip -c";
-    cat = "${pkgs.bat}/bin/bat --paging never";
     spotdl = "spotdl --m3u --format opus";
     copycat = "wl-copy <";
     myip = "curl ifconfig.co";

modules/home/settings/gtk/theme/default.nix

@@ -1,13 +1,13 @@
 { config, pkgs, ... }:
 {
-  gtk = {
+  gtk = with pkgs; {
     font = {
-      name = "${config.look.fonts.main}";
+      name = config.look.fonts.main;
       size = 11;
     };
     theme = {
       name = "Colloid-Dark";
-      package = pkgs.colloid-gtk-theme.override {
+      package = colloid-gtk-theme.override {
         themeVariants = [ "default" ];
         colorVariants = [ "dark" ];
         sizeVariants = [ "standard" ];
@@ -20,8 +20,8 @@
     };
     iconTheme = {
       name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme.override {
-        color = "${config.look.colors.folder}";
+      package = papirus-icon-theme.override {
+        color = config.look.colors.folder;
       };
     };
   };

modules/home/settings/nix/channels/default.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, stable, unstable, ... }:
+{
+  nix.registry.stable.flake = stable;
+  nix.registry.unstable.flake = unstable;
+
+  _module.args.pkgsStable = import stable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
+  _module.args.pkgsUnstable = import unstable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
+}

modules/home/settings/nix/default.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, unstable, ... }:
+{ config, lib, pkgs, ... }:
 {
-  imports = [ ./unfree ];
+  imports = [
+    ./channels
+    ./unfree
+  ];
 
   nix = {
     package = lib.mkForce pkgs.nix;
@@ -8,11 +11,5 @@
       "nix-command"
       "flakes"
     ];
-    registry.unstable.flake = unstable;
-  };
-
-  _module.args.pkgsUnstable = import unstable {
-    inherit (pkgs.stdenv.hostPlatform) system;
-    inherit (config.nixpkgs) config;
   };
 }