diff --git a/hosts/vps/configuration.nix b/hosts/vps/configuration.nix index 7fff9d6..eed8752 100644 --- a/hosts/vps/configuration.nix +++ b/hosts/vps/configuration.nix @@ -21,13 +21,13 @@ let wgHomelab = config.my.subnets.wg-homelab; }; ports = { - giteaSsh = config.my.ports.giteaSsh; - ssh = config.my.ports.ssh; + inherit (config.my.ports) giteaSsh; + inherit (config.my.ports) ssh; web = [ 80 443 ]; - wg = config.my.ports.wg; + inherit (config.my.ports) wg; syncthing = config.my.ports.syncthingRelay; synapseFederation = config.my.ports.synapseSsl; }; diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 5e44f24..a58c39b 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -23,7 +23,6 @@ in ../../config/base.nix ../../config/stylix.nix ../../environments/gnome.nix - ../../config/derek.nix ]; my = import ./toggles.nix { inherit inputs; } // { nix.cores = 8; @@ -33,10 +32,6 @@ in "nixserver" "nixminiserver" ]; - environments.gnome.users = [ - "jawz" - "bearded_dragonn" - ]; }; sops.secrets."workstation/private" = lib.mkIf config.my.secureHost { sopsFile = ../../secrets/wireguard.yaml;