some minor fixes

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 = {
-      automatic = true;
-      dates = "weekly";
-      # Keep the last 3 generations
-      options = "--delete-older-than 30d";
-    };
+    # gc = {
+    #   automatic = true;
+    #   dates = "weekly";
+    #   # Keep the last 3 generations
+    #   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: {
-        python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
-      })
+      # (_: prev: {
+      #   python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
+      # })
     ];
     config = {
       allowUnfree = true;