diff --git a/flake.lock b/flake.lock index 850fb56..ffb65a8 100644 --- a/flake.lock +++ b/flake.lock @@ -40,26 +40,6 @@ "type": "github" } }, - "nh": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710573382, - "narHash": "sha256-oGPasBk516A6pNE7iBEOmtrNsbqd+frR7O+z9lr1cLw=", - "owner": "viperML", - "repo": "nh", - "rev": "60c019a930e1718f1c5b6638f16dc221bf667d61", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "nh", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -116,7 +96,6 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", - "nh": "nh", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index 94ef51e..228bfa3 100644 --- a/flake.nix +++ b/flake.nix @@ -21,11 +21,6 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - nh = { - url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = {nixpkgs, ...} @ inputs: let diff --git a/hosts/dell-laptop/default.nix b/hosts/dell-laptop/default.nix index 76caf4f..b58b853 100644 --- a/hosts/dell-laptop/default.nix +++ b/hosts/dell-laptop/default.nix @@ -26,7 +26,6 @@ sops.enable = true; optimization.mode = "powersave"; doas.enable = false; - nix-helper.enable = true; printing.enable = true; }; diff --git a/hosts/seb-desktop/default.nix b/hosts/seb-desktop/default.nix index 7cdc5a7..224d3e4 100644 --- a/hosts/seb-desktop/default.nix +++ b/hosts/seb-desktop/default.nix @@ -28,7 +28,6 @@ vpn.lgs.enable = true; comma.enable = true; sops.enable = true; - nix-helper.enable = true; printing.enable = true; }; diff --git a/modules/home/shell.nix b/modules/home/shell.nix index bc1dd5d..357190b 100644 --- a/modules/home/shell.nix +++ b/modules/home/shell.nix @@ -10,25 +10,12 @@ in { bash.enable = lib.mkEnableOption ""; zsh.enable = lib.mkEnableOption ""; starship.enable = lib.mkEnableOption ""; - nixAliases = { - enable = lib.mkEnableOption ""; - nix-helper.enable = lib.mkEnableOption ""; - }; + nixAliases.enable = lib.mkEnableOption ""; improvedCommands.enable = lib.mkEnableOption ""; direnv.enable = lib.mkEnableOption ""; }; config = { - assertions = [ - { - assertion = - if cfg.nixAliases.nix-helper.enable - then osConfig.myConfig.nix-helper.enable - else true; - message = "The nix-helper has to be enabled on the OS level."; - } - ]; - programs.bash.enable = cfg.bash.enable; programs.zsh.enable = cfg.zsh.enable; @@ -49,10 +36,7 @@ in { home.shellAliases = let nixAliases = lib.mkIf cfg.nixAliases.enable { - nr = - if cfg.nixAliases.nix-helper.enable - then "nh os" - else "sudo nixos-rebuild --flake $FLAKE"; + nr = "sudo nixos-rebuild --flake $FLAKE"; nrs = "nr switch"; nrt = "nr test"; nrb = "nr boot"; diff --git a/modules/system/auto-gc.nix b/modules/system/auto-gc.nix index 819dff3..8a420f0 100644 --- a/modules/system/auto-gc.nix +++ b/modules/system/auto-gc.nix @@ -6,12 +6,10 @@ options.myConfig.auto-gc.enable = lib.mkEnableOption ""; config = lib.mkIf config.myConfig.auto-gc.enable { - myConfig.nix-helper.enable = true; - - nh.clean = { - enable = true; + nix.gc = { + automatic = true; dates = "weekly"; - extraArgs = "--keep-since 7d --keep 10"; + options = "--delete-older-than 7d"; }; }; } diff --git a/modules/system/default.nix b/modules/system/default.nix index b72f733..dc67ade 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -15,7 +15,6 @@ ./dm.nix ./sound.nix ./boot-loader.nix - ./nix-helper.nix ./printing.nix ]; } diff --git a/modules/system/nix-helper.nix b/modules/system/nix-helper.nix deleted file mode 100644 index 9075de8..0000000 --- a/modules/system/nix-helper.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - inputs, - config, - lib, - ... -}: { - imports = [inputs.nh.nixosModules.default]; - - options.myConfig.nix-helper.enable = lib.mkEnableOption ""; - - config = lib.mkIf config.myConfig.nix-helper.enable { - nh.enable = true; - }; -} diff --git a/users/seb/home.nix b/users/seb/home.nix index b303a67..5bd690b 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -5,10 +5,7 @@ shell = { bash.enable = true; starship.enable = true; - nixAliases = { - enable = true; - nix-helper.enable = true; - }; + nixAliases.enable = true; improvedCommands.enable = true; direnv.enable = true; };