move nix settings from home-manager to nixos

This commit is contained in:
Noah Masur 2025-03-10 02:40:01 +00:00
parent fbb00d9504
commit 2b1106ec94
3 changed files with 7 additions and 4 deletions

View File

@ -35,7 +35,6 @@ in
nixpkgs.enable = lib.mkDefault true; nixpkgs.enable = lib.mkDefault true;
}; };
services = { services = {
nix.enable = lib.mkDefault true;
loadkey.enable = lib.mkDefault true; loadkey.enable = lib.mkDefault true;
}; };
}; };

View File

@ -6,6 +6,7 @@
}: }:
let let
inherit (config.nmasur.settings) username;
cfg = config.nmasur.presets.services.nix; cfg = config.nmasur.presets.services.nix;
in in
@ -23,7 +24,7 @@ in
# For security, only allow specific users # For security, only allow specific users
settings.allowed-users = [ settings.allowed-users = [
"@wheel" # Anyone in the wheel group "@wheel" # Anyone in the wheel group
config.home.username # The current user username # The current user
]; ];
# Enable features in Nix commands # Enable features in Nix commands
@ -49,10 +50,10 @@ in
# Add community Cachix to binary cache # Add community Cachix to binary cache
# Don't use at work because blocked by corporate firewall # Don't use at work because blocked by corporate firewall
builders-use-substitutes = true; builders-use-substitutes = true;
substituters = lib.mkIf (!config.nmasur.profiles.work.enable) [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
]; ];
trusted-public-keys = lib.mkIf (!config.nmasur.profiles.work.enable) [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];

View File

@ -21,6 +21,9 @@ in
programs = { programs = {
doas.enable = lib.mkDefault true; doas.enable = lib.mkDefault true;
}; };
services = {
nix.enable = lib.mkDefault true;
};
}; };
programs.fish.enable = lib.mkDefault config.home-manager.users.${username}.programs.fish.enable; programs.fish.enable = lib.mkDefault config.home-manager.users.${username}.programs.fish.enable;