diff --git a/flake.lock b/flake.lock index f49b892..bde3fc3 100644 --- a/flake.lock +++ b/flake.lock @@ -230,26 +230,6 @@ "type": "github" } }, - "nh": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712645404, - "narHash": "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M=", - "owner": "viperML", - "repo": "nh", - "rev": "fe4a96a0b0b0662dba7c186b4a1746c70bbcad03", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "nh", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -325,7 +305,6 @@ "hypridle": "hypridle", "hyprland": "hyprland", "hyprlock": "hyprlock", - "nh": "nh", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index 2632897..d809afc 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nh = { - url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland.url = "github:hyprwm/Hyprland"; hyprlock = { diff --git a/hosts/seb-desktop/default.nix b/hosts/seb-desktop/default.nix index 270dde1..2fd57f3 100644 --- a/hosts/seb-desktop/default.nix +++ b/hosts/seb-desktop/default.nix @@ -25,10 +25,10 @@ sops.enable = true; printing.enable = true; syncthing.enable = true; - nix-helper.enable = true; }; boot.kernelPackages = pkgs.linuxPackages_latest; + programs.nh.enable = true; programs.steam.enable = true; } diff --git a/hosts/seb-laptop/default.nix b/hosts/seb-laptop/default.nix index d604704..ade1f4b 100644 --- a/hosts/seb-laptop/default.nix +++ b/hosts/seb-laptop/default.nix @@ -29,11 +29,11 @@ sops.enable = true; printing.enable = true; syncthing.enable = true; - nix-helper.enable = true; }; boot.kernelPackages = pkgs.linuxPackages_latest; + programs.nh.enable = true; services.auto-cpufreq.enable = true; hardware.brillo.enable = true; } diff --git a/modules/system/default.nix b/modules/system/default.nix index f567e58..7512cd5 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -15,6 +15,5 @@ ./boot-loader.nix ./printing.nix ./syncthing.nix - ./nix-helper.nix ]; } diff --git a/modules/system/nix-helper.nix b/modules/system/nix-helper.nix deleted file mode 100644 index 1f14215..0000000 --- a/modules/system/nix-helper.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - inputs, - config, - lib, - ... -}: { - imports = [inputs.nh.nixosModules.default]; - - options.myConfig.nix-helper.enable = lib.mkEnableOption ""; - - config.nh.enable = config.myConfig.nix-helper.enable; -} diff --git a/users/seb/home.nix b/users/seb/home.nix index d33e0b9..fe52a8c 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -22,7 +22,7 @@ starship.enable = true; nixAliases = { enable = true; - nh.enable = osConfig.nh.enable; + nh.enable = osConfig.programs.nh.enable; }; enhancedCommands.enable = true; direnv.enable = true;