some minor fixes

home/modules/wm/hyprland/toothpick/keybinds.nix

@@ -17,7 +17,6 @@ in {
       "$passwordManager" = "keepassxc";
       "$tuirun" = "tuirun-toggle.sh";
       "$menu" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --";
-      "$menuw" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --";
       "$browser" = "firefox";
       "$browserinc" = "firefox --private-window";
       "$ranger" = "rangerscript";
@@ -50,7 +49,6 @@ in {
         "$mod, P, pseudo," # dwindle
         "$mod, J, togglesplit," # dwindle
         "$mod, C, exec, hyprctl dispatch exec copyq toggle"
-        "$mod, TAB, exec, $menuw"
 
         # Move focus with mainMod + arrow keys
         "$mod, left, movefocus, l"

home/users/cnst/shell.nix

@@ -29,10 +29,10 @@ in {
       nixdev = "nix develop ~/.nix-config -c $SHELL";
       nixconfig = "cd /home/$USER/.nix-config/";
       ll = "ls -l";
-      nixupdate = "nh os switch -v -H $HOST && sudo nix run /home/$USER/.nix-config";
+      nixupdate = "nh os switch -v -H $HOST";
-      nixup = "nh os switch -H $HOST && sudo nix run /home/$USER/.nix-config";
+      nixup = "nh os switch -H $HOST";
-      flakeupdate = "nh os switch -u -v -H $HOST && sudo nix run /home/$USER/.nix-config";
+      flakeupdate = "nh os switch -u -v -H $HOST";
-      flakeup = "nh os switch -u -H $HOST && sudo nix run /home/$USER/.nix-config";
+      flakeup = "nh os switch -u -H $HOST";
       ".." = "cd ..";
       "..." = "cd ../../";
       "...." = "cd ../../../";

home/users/toothpick/shell.nix

@@ -29,10 +29,10 @@ in {
       nixdev = "nix develop ~/.nix-config -c $SHELL";
       nixconfig = "cd /home/$USER/.nix-config/";
       ll = "ls -l";
-      nixupdate = "nh os switch -v -H $HOST && sudo nix run /home/$USER/.nix-config";
+      nixupdate = "nh os switch -v -H $HOST";
-      nixup = "nh os switch -H $HOST && sudo nix run /home/$USER/.nix-config";
+      nixup = "nh os switch -H $HOST";
-      flakeupdate = "nh os switch -u -v -H $HOST && sudo nix run /home/$USER/.nix-config";
+      flakeupdate = "nh os switch -u -v -H $HOST";
-      flakeup = "nh os switch -u -H $HOST && sudo nix run /home/$USER/.nix-config";
+      flakeup = "nh os switch -u -H $HOST";
       ".." = "cd ..";
       "..." = "cd ../../";
       "...." = "cd ../../../";

hosts/cnix/default.nix

@@ -8,7 +8,6 @@
 in {
   users.users.cnst = {
     isNormalUser = true;
-    # hashedPasswordFile = config.age.secrets.openai.path;
     shell = pkgs.zsh;
     extraGroups = ifTheyExist [
       "wheel"
@@ -36,17 +35,7 @@ in {
     ./modules.nix
   ];
 
-  # boot = {
+  environment.variables.FLAKE = "/home/cnst/.nix-config";
-  #   consoleLogLevel = 3;
-  #   kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
-  #   kernelParams = [
-  #     "amd_pstate=active"
-  #     "quiet"
-  #     "splash"
-  #   ];
-  # };
-
-  # environment.variables.COPILOT_API_KEY = config.age.secrets.cnstcopilot.path;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = lib.mkDefault "23.11";

hosts/cnix/modules.nix

@@ -66,11 +66,20 @@
         };
       };
     };
+    nix = {
+      nh = {
+        enable = true;
+        clean = {
+          enable = true;
+          extraArgs = "--keep 3 --keep-since 21d";
+        };
+      };
+    };
     studio = {
       blender = {
-        enable = false;
+        enable = true;
         hip = {
-          enable = false;
+          enable = true;
         };
       };
       gimp = {

hosts/cnixpad/default.nix

@@ -42,6 +42,8 @@ in {
     }
   ];
 
+  environment.variables.FLAKE = "/home/cnst/.nix-config";
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = lib.mkDefault "23.11";
 }

hosts/cnixpad/modules.nix

@@ -66,6 +66,15 @@
         };
       };
     };
+    nix = {
+      nh = {
+        enable = true;
+        clean = {
+          enable = true;
+          extraArgs = "--keep 3 --keep-since 21d";
+        };
+      };
+    };
     studio = {
       blender = {
         enable = false;

hosts/default.nix

@@ -3,7 +3,6 @@
   inputs,
   homeImports,
   self,
-  pkgs,
   ...
 }: {
   flake.nixosConfigurations = let
@@ -34,7 +33,6 @@
         shared
         ++ [
           ./cnix
-          "${mod}/nix/nh/cnst"
           "${mod}/dev"
           {
             home-manager = {
@@ -52,7 +50,6 @@
         shared
         ++ [
           ./toothpc
-          "${mod}/nix/nh/toothpick"
           "${mod}/dev"
           {
             home-manager = {
@@ -70,7 +67,6 @@
         shared
         ++ [
           ./cnixpad
-          "${mod}/nix/nh/cnst"
           "${mod}/dev"
           {
             home-manager = {

hosts/toothpc/default.nix

@@ -35,6 +35,8 @@ in {
     ./modules.nix
   ];
 
+  environment.variables.FLAKE = "/home/toothpick/.nix-config";
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = lib.mkDefault "23.11";
 }

hosts/toothpc/modules.nix

@@ -67,6 +67,15 @@
         };
       };
     };
+    nix = {
+      nh = {
+        enable = true;
+        clean = {
+          enable = true;
+          extraArgs = "--keep 3 --keep-since 21d";
+        };
+      };
+    };
     studio = {
       blender = {
         enable = false;

system/modules/default.nix

@@ -13,6 +13,7 @@
     "${systemModules}/hardware/graphics/nvidia"
     "${systemModules}/hardware/logitech"
     "${systemModules}/hardware/network"
+    "${systemModules}/nix/nh"
     "${systemModules}/studio/blender"
     "${systemModules}/studio/gimp"
     "${systemModules}/studio/inkscape"

system/modules/nix/nh/default.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption mkOption;
+  cfg = config.modules.nix.nh;
+in {
+  options = {
+    modules.nix.nh = {
+      enable = mkEnableOption "Enables nix helper";
+      clean = {
+        enable = mkEnableOption "Enables nix helper cleaning";
+        extraArgs = mkOption {
+          type = lib.types.str;
+          description = "Extra arguments for the clean command";
+          default = "";
+        };
+      };
+    };
+  };
+  config = mkIf cfg.enable {
+    programs = {
+      nh = {
+        enable = cfg.enable;
+        clean = {
+          enable = cfg.clean.enable;
+          extraArgs = cfg.clean.extraArgs;
+        };
+      };
+    };
+  };
+}

system/nix/default.nix

@@ -1,3 +1,4 @@
+# Yanked from https://github.com/fufexan/dotfiles
 {
   inputs,
   lib,
@@ -21,10 +22,13 @@
 
   console.useXkbConfig = true;
 
-  nix = {
+  nix = let
+    flakeInputs = lib.filterAttrs (_: v: lib.isType "flake" v) inputs;
+  in {
     package = pkgs.lix;
+
     # pin the registry to avoid downloading and evaling a new nixpkgs version every time
-    registry = lib.mapAttrs (_: v: {flake = v;}) inputs;
+    registry = lib.mapAttrs (_: v: {flake = v;}) flakeInputs;
 
     # set the path for channels compat
     nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry;
@@ -42,11 +46,11 @@
 
       trusted-users = ["root" "@wheel"];
     };
-    gc = {
+    # gc = {
-      automatic = true;
+    #   automatic = true;
-      dates = "weekly";
+    #   dates = "weekly";
-      # Keep the last 3 generations
+    #   # Keep the last 3 generations
-      options = "--delete-older-than 30d";
+    #   options = "--delete-older-than 30d";
-    };
+    # };
   };
 }

system/nix/nh/cnst/default.nix

@@ -1,9 +0,0 @@
-{
-  environment.variables.FLAKE = "/home/cnst/.nix-config";
-  programs = {
-    nh = {
-      enable = true;
-      flake = "/home/cnst/.nix-config";
-    };
-  };
-}

system/nix/nh/toothpick/default.nix

@@ -1,9 +0,0 @@
-{
-  environment.variables.FLAKE = "/home/toothpick/.nix-config";
-  programs = {
-    nh = {
-      enable = true;
-      flake = "/home/toothpick/.nix-config";
-    };
-  };
-}

system/nix/nixpkgs/default.nix

@@ -1,9 +1,9 @@
 {
   nixpkgs = {
     overlays = [
-      (_: prev: {
+      # (_: prev: {
-        python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
+      #   python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
-      })
+      # })
     ];
     config = {
       allowUnfree = true;