Switch to the nh nixpkgs package

This commit is contained in:
SebastianStork 2024-04-17 23:30:44 +02:00
parent 9a4b64345d
commit bf1c4dc513
7 changed files with 3 additions and 42 deletions

21
flake.lock generated
View file

@ -230,26 +230,6 @@
"type": "github" "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": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -325,7 +305,6 @@
"hypridle": "hypridle", "hypridle": "hypridle",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"nh": "nh",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"

View file

@ -22,11 +22,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nh = {
url = "github:viperML/nh";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprlock = { hyprlock = {

View file

@ -25,10 +25,10 @@
sops.enable = true; sops.enable = true;
printing.enable = true; printing.enable = true;
syncthing.enable = true; syncthing.enable = true;
nix-helper.enable = true;
}; };
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
programs.nh.enable = true;
programs.steam.enable = true; programs.steam.enable = true;
} }

View file

@ -29,11 +29,11 @@
sops.enable = true; sops.enable = true;
printing.enable = true; printing.enable = true;
syncthing.enable = true; syncthing.enable = true;
nix-helper.enable = true;
}; };
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
programs.nh.enable = true;
services.auto-cpufreq.enable = true; services.auto-cpufreq.enable = true;
hardware.brillo.enable = true; hardware.brillo.enable = true;
} }

View file

@ -15,6 +15,5 @@
./boot-loader.nix ./boot-loader.nix
./printing.nix ./printing.nix
./syncthing.nix ./syncthing.nix
./nix-helper.nix
]; ];
} }

View file

@ -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;
}

View file

@ -22,7 +22,7 @@
starship.enable = true; starship.enable = true;
nixAliases = { nixAliases = {
enable = true; enable = true;
nh.enable = osConfig.nh.enable; nh.enable = osConfig.programs.nh.enable;
}; };
enhancedCommands.enable = true; enhancedCommands.enable = true;
direnv.enable = true; direnv.enable = true;