diff --git a/base/default.nix b/base/default.nix index 35ec4f2..eca8422 100644 --- a/base/default.nix +++ b/base/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./nix.nix ./users.nix ]; } diff --git a/base/nix.nix b/base/nix.nix deleted file mode 100644 index fe539b1..0000000 --- a/base/nix.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; - - binaryCaches = [ - "https://alarsyo.cachix.org" - ]; - binaryCachePublicKeys = [ - "alarsyo.cachix.org-1:A6BmcaJek5+ZDWWv3fPteHhPm6U8liS9CbDbmegPfmk=" - ]; - - gc = { - automatic = true; - dates = "03:15"; - options = "--delete-older-than 30d"; - }; - }; -} diff --git a/base/users.nix b/base/users.nix index 9eaf453..101a562 100644 --- a/base/users.nix +++ b/base/users.nix @@ -10,10 +10,7 @@ in users.users.alarsyo = { hashedPassword = secrets.shadow-hashed-password-alarsyo; isNormalUser = true; - extraGroups = [ - "media" - "wheel" # Enable ‘sudo’ for the user. - ]; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3rrF3VSWI4n4cpguvlmLAaU3uftuX4AVV/39S/8GO9 alarsyo@thinkpad" diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix index 52141ab..44e8409 100644 --- a/hosts/poseidon/default.nix +++ b/hosts/poseidon/default.nix @@ -121,4 +121,24 @@ in boot.supportedFilesystems = [ "btrfs" ]; + + nix = { + package = pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes + ''; + + binaryCaches = [ + "https://alarsyo.cachix.org" + ]; + binaryCachePublicKeys = [ + "alarsyo.cachix.org-1:A6BmcaJek5+ZDWWv3fPteHhPm6U8liS9CbDbmegPfmk=" + ]; + + gc = { + automatic = true; + dates = "03:15"; + options = "--delete-older-than 30d"; + }; + }; }