diff --git a/hosts.nix b/hosts.nix index 450de09..156953e 100644 --- a/hosts.nix +++ b/hosts.nix @@ -22,8 +22,8 @@ }; services = { - minecraft-server.enable = true; - nginx.enable = true; + minecraft-server.enable = false; + nginx.enable = false; unbound.enable = false; }; diff --git a/modules/modules.nix b/modules/modules.nix index 9324c6a..681742e 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -1,4 +1,4 @@ -{ pkgs, agenix, ... }: { +{ imports = [ ./firmware.nix ./locales.nix @@ -7,12 +7,4 @@ ./secrets.nix ./users.nix ]; - - environment.systemPackages = with pkgs; [ - screenfetch - agenix - git - vim - tldr - ]; } diff --git a/modules/users.nix b/modules/users.nix index 893ba70..2bfd977 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, agenix, ... }: let hddMountScript = import ../pkgs/hdd-mount.nix { inherit pkgs; }; hddUnmountScript = import ../pkgs/hdd-unmount.nix { inherit pkgs; }; @@ -11,15 +11,19 @@ in packages = with pkgs; [ curl btop - podman-compose dnsutils - ]; + ] ++ pkgs.lib.ifEnable config.virtualisation.podman.enable [ pkgs.podman-compose ]; uid = 1000; }; users.groups.users.gid = 100; - /* group which provides access to restic agenix secrets */ - users.groups.backup = { }; + environment.systemPackages = with pkgs; [ + screenfetch + agenix + git + vim + tldr + ]; users.users.root.packages = [ hddMountScript hddUnmountScript ]; }