home manager uses global packages

flake.nix

@@ -22,7 +22,7 @@
           allowUnfree = true;
           allowUnfreePredicate = (_: true);
         };
-        overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default ];
+        overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default inputs.chaotic.overlays.default ];
       };
 
       pkgs-stable = import inputs.nixpkgs-stable {
@@ -58,7 +58,8 @@
 
               # home manager
               inputs.home-manager.nixosModules.home-manager
-              { home-manager.extraSpecialArgs = {
+              {
+                home-manager.extraSpecialArgs = {
                   inherit pkgs;
                   inherit pkgs-stable;
                   inherit inputs;

modules/system/overlays/brave.nix

@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+{
+  config = {
+    nixpkgs.config.overlays = [
+      (self: super: {
+        brave = super.brave.override {
+          commandLineArgs = [
+            "--password-store=gnome-libsecret"
+            "--ignore-gpu-blocklist"
+            "--enable-gpu-rasterization"
+            "--enable-accelerated-video-decode"
+            "--enable-quic"
+            "--enable-zero-copy"
+            "--enable-native-gpu-memory-buffers"
+            "--num-raster-threads=4"
+          ];
+        };
+      })
+    ];
+  };
+}

modules/system/overlays/ranger.nix

@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+{
+  config = {
+    nixpkgs.overlays = [
+      (self: super:
+        {
+          ranger = super.ranger.overrideAttrs (oldAttrs: rec {
+          preConfigure = ''
+            substituteInPlace ranger/__init__.py \
+              --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin pkgs.bat}/bin/bat'"
+        
+            # give image previews out of the box when building with w3m
+            substituteInPlace ranger/config/rc.conf \
+              --replace "set preview_images false" "set preview_images true"
+
+            # adds this patch: https://github.com/ranger/ranger/pull/1758
+            # fixes a bug for kitty users that use image previews
+            substituteInPlace ranger/ext/img_display.py \
+              --replace "self.image_id -= 1" "self.image_id = max(0, self.image_id - 1)"
+
+            # fixes the .desktop file
+            substituteInPlace doc/ranger.desktop \
+              --replace "Icon=utilities-terminal" "Icon=user-desktop"
+            substituteInPlace doc/ranger.desktop \
+              --replace "Terminal=true" "Terminal=false"
+            substituteInPlace doc/ranger.desktop \
+              --replace "Exec=ranger" "Exec=kitty -e ranger %U"
+          '';
+          });
+        }
+      )
+    ];
+  };
+}

modules/user/browser/brave.nix

@@ -12,23 +12,6 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = [ pkgs.brave ];
 
-    nixpkgs.config.overlays = [
-      (self: super: {
-        brave = super.brave.override {
-          commandLineArgs = [
-            "--password-store=gnome-libsecret"
-            "--ignore-gpu-blocklist"
-            "--enable-gpu-rasterization"
-            "--enable-accelerated-video-decode"
-            "--enable-quic"
-            "--enable-zero-copy"
-            "--enable-native-gpu-memory-buffers"
-            "--num-raster-threads=4"
-          ];
-        };
-      })
-    ];
-
     xdg.mimeApps.defaultApplications = lib.mkIf (config.userSettings.browser == "brave" ) {
       "text/html" = "brave-browser.desktop";
       "x-scheme-handler/http" = "brave-browser.desktop";

modules/user/browser/qutebrowser.nix

@@ -150,7 +150,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     home.packages = [ pkgs.qutebrowser
-                      (pkgs.callPackage qute-containers {}) # TODO disabled for debugging
+                      (pkgs.callPackage qute-containers {})
                     ];
 
     home.file.".config/qutebrowser/userscripts/container-open".source = "${(pkgs.callPackage qute-containers {})}/bin/container-open";

modules/user/home.nix

@@ -1,6 +1,5 @@
 { config, lib, pkgs, inputs, ... }:
 
 {
-  imports = [ inputs.chaotic.homeManagerModules.default ];
+
-              
 }

modules/user/media/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 let
   cfg = config.userSettings.media;
@@ -12,8 +12,8 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       vlc
-      #yt-dlp_git # TODO disabled for debugging
       mpv mpc
+      yt-dlp_git
       ffmpeg
     ];
 

modules/user/nix/default.nix

@@ -2,24 +2,6 @@
 
 {
   config = {
-    nix = {
-      package = lib.mkForce pkgs.nix;
-      settings = {
-        substituters = [
-          "https://cache.nixos.org"
-          "https://hyprland.cachix.org"
-          "https://nix-community.cachix.org"
-        ];
-        trusted-public-keys = [
-          "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        ];
-        trusted-users = [ "@wheel" ];
-        auto-optimise-store = true;
-        download-buffer-size = 500000000;
-      };
-    };
     home.stateVersion = "22.11";
   };
 }

modules/user/ranger/ranger.nix

@@ -10,36 +10,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.overlays = [
-      (self: super:
-        {
-          ranger = super.ranger.overrideAttrs (oldAttrs: rec {
-          preConfigure = ''
-            substituteInPlace ranger/__init__.py \
-              --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin pkgs.bat}/bin/bat'"
-        
-            # give image previews out of the box when building with w3m
-            substituteInPlace ranger/config/rc.conf \
-              --replace "set preview_images false" "set preview_images true"
-
-            # adds this patch: https://github.com/ranger/ranger/pull/1758
-            # fixes a bug for kitty users that use image previews
-            substituteInPlace ranger/ext/img_display.py \
-              --replace "self.image_id -= 1" "self.image_id = max(0, self.image_id - 1)"
-
-            # fixes the .desktop file
-            substituteInPlace doc/ranger.desktop \
-              --replace "Icon=utilities-terminal" "Icon=user-desktop"
-            substituteInPlace doc/ranger.desktop \
-              --replace "Terminal=true" "Terminal=false"
-            substituteInPlace doc/ranger.desktop \
-              --replace "Exec=ranger" "Exec=kitty -e ranger %U"
-          '';
-          });
-        }
-      )
-    ];
-
     home.packages = with pkgs; [
       ranger
       ripdrag