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

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;
   };
 }