From 8bab145d7bef9a1382cba536dcfc19fee0e229f1 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 17 Sep 2024 20:05:54 +0200 Subject: [PATCH] feat: clean up nuOS --- flake.nix | 2 +- hosts/lambdaos/configuration.nix | 2 +- hosts/nuos/configuration.nix | 15 ++------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 8476e42..5e95b50 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,7 @@ inputs.agenix.nixosModules.default ]; }; - NoasServer = nixpkgs.lib.nixosSystem { + nuOS = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; inherit nix-colors; diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix index e2f877b..f0d1082 100644 --- a/hosts/lambdaos/configuration.nix +++ b/hosts/lambdaos/configuration.nix @@ -295,7 +295,7 @@ virtualHosts = { - "noasserver" = { + "lambdaos" = { locations."/".proxyPass = "http://127.0.0.1:22332"; }; diff --git a/hosts/nuos/configuration.nix b/hosts/nuos/configuration.nix index 52aaec9..fd4c5a7 100644 --- a/hosts/nuos/configuration.nix +++ b/hosts/nuos/configuration.nix @@ -21,7 +21,7 @@ hardware.enableAllFirmware = true; networking = { - hostName = "NoasServer"; # Define your hostname. + hostName = "nuOS"; # Define your hostname. networkmanager.enable = true; # Easiest to use and most distros use this by default. }; # Pick only one of the below networking options. @@ -117,7 +117,7 @@ path = with pkgs; [ nixos-rebuild ]; - script = ''nixos-rebuild switch --flake github:itepastra/nixconf''; + script = ''nixos-rebuild switch --flake github:itepastra/nixconf#nuOS''; serviceConfig = { Type = "oneshot"; User = "root"; @@ -159,12 +159,6 @@ settings.PasswordAuthentication = false; settings.KbdInteractiveAuthentication = false; }; - nix-serve = { - enable = true; - secretKeyFile = "/var/cache-priv-key.pem"; - bindAddress = "127.0.0.1"; - port = 22332; - }; radicale = { enable = true; settings = { @@ -264,11 +258,6 @@ }; "calendar.itepastra.nl" = proxy "itepastra.nl" "http://[::1]:29341"; - - "noasserver" = { - locations."/".proxyPass = "http://127.0.0.1:22332"; - }; - }; }; roundcube = {