SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 15:11:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove nix-helper

Browse source
This commit is contained in:
SebastianStork 2024-03-23 12:42:54 +01:00
parent 978733f40c
commit 9541e99a78
9 changed files with 6 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -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"

5
flake.nix
View file

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

1
hosts/dell-laptop/default.nix
View file

@ -26,7 +26,6 @@
sops.enable = true;
optimization.mode = "powersave";
doas.enable = false;
nix-helper.enable = true;
printing.enable = true;
};

1
hosts/seb-desktop/default.nix
View file

@ -28,7 +28,6 @@
vpn.lgs.enable = true;
comma.enable = true;
sops.enable = true;
nix-helper.enable = true;
printing.enable = true;
};

20
modules/home/shell.nix
View file

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

8
modules/system/auto-gc.nix
View file

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

1
modules/system/default.nix
View file

@ -15,7 +15,6 @@
./dm.nix
./sound.nix
./boot-loader.nix
./nix-helper.nix
./printing.nix
];
}

14
modules/system/nix-helper.nix
View file

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

5
users/seb/home.nix
View file

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