From fddfd8b18cd98d286ba50f9aa00e8d9139ba35cd Mon Sep 17 00:00:00 2001 From: noe Date: Sat, 23 Mar 2024 16:29:31 -0400 Subject: [PATCH] add doll.repair; sync aerial --- Justfile | 9 +++++++-- nixos/base.nix | 1 + nixos/features/plasma6.nix | 6 +++--- nixos/hosts/aerial/default.nix | 8 ++++++-- nixos/hosts/aerial/hardware-configuration.nix | 2 +- nixos/hosts/ingress-proxy/default.nix | 6 ++++++ 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Justfile b/Justfile index 4925d56..f1fb9cf 100644 --- a/Justfile +++ b/Justfile @@ -48,13 +48,18 @@ switch target_host=hostname: # Update flake inputs to their latest revisions update: - nix flake update + nix flake update + +upgit: update + git add flake.lock + git commit -m "update flake.lock" + git push # Garbage collect old OS generations and remove stale packages from the nix store gc generations="5d": sudo nix-env --delete-generations {{generations}} sudo nix-store --gc - sudo nix-collect-garbage -d + sudo nix-collect-garbage -d --delete-older-than {{generations}} # Add a machine's age key for SOPS sops-add machine_name target: diff --git a/nixos/base.nix b/nixos/base.nix index aa146de..95f2247 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -8,6 +8,7 @@ ]; boot.tmp.cleanOnBoot = true; + boot.loader.systemd-boot.configurationLimit = 5; # Set ET time.timeZone = lib.mkDefault "America/New_York"; diff --git a/nixos/features/plasma6.nix b/nixos/features/plasma6.nix index e672db7..f2aaca2 100644 --- a/nixos/features/plasma6.nix +++ b/nixos/features/plasma6.nix @@ -1,7 +1,7 @@ { inputs, ... }: { - imports = [ - inputs.kde2nix.nixosModules.plasma6 - ]; + # imports = [ + # inputs.kde2nix.nixosModules.plasma6 + # ]; services.xserver = { enable = true; diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix index 777d014..5b084fe 100644 --- a/nixos/hosts/aerial/default.nix +++ b/nixos/hosts/aerial/default.nix @@ -3,7 +3,7 @@ ./hardware-configuration.nix ../../client.nix - ../../features/plasma5.nix + ../../features/plasma6.nix ../../features/tailscale.nix ../../features/sound ../../features/nvidia.nix @@ -34,5 +34,9 @@ ]; networking.firewall.allowedTCPPorts = [ 42069 8000 ]; - networking.firewall.allowedUDPPorts = [ 42069 ]; + networking.firewall.allowedUDPPorts = [ 42069 ]; + + services.xserver.displayManager.setupCommands = '' + nvidia-settings -a AllowVRR=0 + ''; } diff --git a/nixos/hosts/aerial/hardware-configuration.nix b/nixos/hosts/aerial/hardware-configuration.nix index 2691fa7..68849c8 100644 --- a/nixos/hosts/aerial/hardware-configuration.nix +++ b/nixos/hosts/aerial/hardware-configuration.nix @@ -30,7 +30,7 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - networking.dhcpcd.IPv6rs = true; + # networking.dhcpcd.IPv6rs = true; # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; diff --git a/nixos/hosts/ingress-proxy/default.nix b/nixos/hosts/ingress-proxy/default.nix index da0081c..f20989b 100644 --- a/nixos/hosts/ingress-proxy/default.nix +++ b/nixos/hosts/ingress-proxy/default.nix @@ -123,6 +123,12 @@ in { serverAliases = [ "metagame-new.ps2.live" ]; }; + "doll.repair" = static { + src = inputs.noe-sh.packages.${pkgs.system}.default; + }; + + "porcelain.doll.repair" = placeholder; + # Generic store for /.well-known/ paths. # "well-known.sapphic.engineer" = defaultConfig // { # locations."=/.well-known/matrix/server" = let