diff --git a/config/common/default.nix b/config/common/default.nix index 69931e7..4c7d8a1 100644 --- a/config/common/default.nix +++ b/config/common/default.nix @@ -11,7 +11,7 @@ with lib; { kitty.terminfo bat ripgrep - utils-coreutils + uutils-coreutils git bmon bottom diff --git a/config/hosts/web02/configuration.nix b/config/hosts/web02/configuration.nix index 4f69247..424f2a0 100644 --- a/config/hosts/web02/configuration.nix +++ b/config/hosts/web02/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ config, pkgs, lib, ... }: let extraConfig = '' add_header Strict-Transport-Security $hsts_header; @@ -26,7 +26,7 @@ let useACMEHost = vhostCfg.redirectTo; globalRedirect = vhostCfg.redirectTo; } else ( - optionalAttrs !(builtins.hasAttr "useACMEHost" vhostCfg) { + optionalAttrs (!(builtins.hasAttr "useACMEHost" vhostCfg)) { enableACME = true; }); extraCfg = if builtins.hasAttr "extraConfig" vhostCfg @@ -39,8 +39,8 @@ let in { networking = { hostName = "web02"; - firewall.allowedTCPPort = [ 80 443 ]; - firewall.allowedUDPPort = [ 443 ]; + firewall.allowedTCPPorts = [ 80 443 ]; + firewall.allowedUDPPorts = [ 443 ]; }; systemd.network.networks."98-eth-default" = { address = [ @@ -141,7 +141,6 @@ in { include ${pkgs.nginxQuic}/conf/fastcgi_params; include ${pkgs.nginxQuic}/conf/fastcgi.conf; ''; - }; }; }; }; diff --git a/config/lxc.nix b/config/lxc.nix index 269f092..d23d9b9 100644 --- a/config/lxc.nix +++ b/config/lxc.nix @@ -9,10 +9,7 @@ with lib; { manageHostName = true; }; - time.timeZone = mkDefault "Europe/Berlin"; - system.autoUpgrade.enable = true; - system.stateVersion = "23.05"; nix.optimise.automatic = true; nix.gc.automatic = true; nix.gc.options = "--delete-older-than 2d"; diff --git a/config/users/emily/default.nix b/config/users/emily/default.nix index 5f16d6e..d7ddb67 100644 --- a/config/users/emily/default.nix +++ b/config/users/emily/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { users.users.emily = { isNormalUser = true; - shell = pkgs.zsh; + shell = pkgs.bash; extraGroups = [ "wheel" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/+iN407+HsfHbbC3tfdA8Yf4TZ08qXQMb4tb/SDAs+ emily@card" diff --git a/flake.nix b/flake.nix index 8fb9208..b1e6228 100644 --- a/flake.nix +++ b/flake.nix @@ -16,15 +16,15 @@ ./config/hosts/web02/configuration.nix ]; }; - ryuuko = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = attrs; - modules = [ - ./config/common - ./config/x1.nix - ./config/hosts/ryuuko/configuration.nix - ]; - }; +# ryuuko = nixpkgs.lib.nixosSystem { +# system = "x86_64-linux"; +# specialArgs = attrs; +# modules = [ +# ./config/common +# ./config/x1.nix +# ./config/hosts/ryuuko/configuration.nix +# ]; +# }; }; }; } diff --git a/modules/vhost/default.nix b/modules/vhost/default.nix index 7beb513..11e62b8 100644 --- a/modules/vhost/default.nix +++ b/modules/vhost/default.nix @@ -28,7 +28,7 @@ with lib; let useACMEHost = vhostCfg.redirectTo; globalRedirect = vhostCfg.redirectTo; } else ( - optionalAttrs !(builtins.hasAttr "useACMEHost" vhostCfg) { + optionalAttrs (!(builtins.hasAttr "useACMEHost" vhostCfg)) { enableACME = true; }); extraCfg = if builtins.hasAttr "extraConfig" vhostCfg @@ -46,7 +46,7 @@ in { }; }; config = { - services.nginx.virtualHosts = createHostFunc (cfg); + services.nginx.virtualHosts = mkIf (cfg != null) (createHostFunc (cfg)); }; }