fix: uid toString

home/environments/niri/konawall.nix

@@ -8,7 +8,6 @@
       interval = 30 * 60;
       rotate = true;
       tags = [
-        "rating:s"
         "score:>=100"
         "width:>=1500"
       ];

modules/system/colmena.nix

@@ -1,11 +1,10 @@
 {
-  name,
   config,
   lib,
   inputs,
   ...
 }: let
-  inherit (lib.modules) mkIf mkOptionDefault mkDefault;
+  inherit (lib.modules) mkOptionDefault mkDefault;
 in {
   options = let
     inherit (lib.types) nullOr;
@@ -23,22 +22,5 @@ in {
         "all"
       ];
     };
-    deploy = let
-      nixos = config.built;
-    in {
-      sshUser = mkOptionDefault "deploy";
-      user = mkOptionDefault "root";
-      sshOpts = mkIf (config.type == "NixOS") (
-        mkOptionDefault ["-p" "${builtins.toString (builtins.head nixos.config.services.openssh.ports)}"]
-      );
-      autoRollback = mkOptionDefault true;
-      magicRollback = mkOptionDefault true;
-      fastConnection = mkOptionDefault false;
-      hostname = mkOptionDefault "${name}.devices.inskip.me";
-      profiles.system = {
-        user = "root";
-        path = inputs.deploy-rs.lib.${config.system}.activate.nixos inputs.self.nixosConfigurations.${name};
-      };
-    };
   };
 }

nixos/profiles/graphical/distributed.nix

@@ -0,0 +1,28 @@
+{config, ...}: {
+  programs.ssh.extraConfig = ''
+    Host daiyousei-build
+        HostName daiyousei.inskip.me
+        User root
+        IdentityAgent /run/user/${toString config.users.users.kat.uid}/gnupg/S.gpg-agent.ssh
+        ControlMaster auto
+        ControlPath ${config.users.users.kat.home}/.ssh/master-%r@%n:%p
+        ControlPersist 10m
+  '';
+  nix = {
+    buildMachines = [
+      {
+        hostName = "daiyousei-build";
+        system = "aarch64-linux";
+        protocol = "ssh-ng";
+        maxJobs = 100;
+        speedFactor = 1;
+        supportedFeatures = ["benchmark" "big-parallel" "kvm"];
+        mandatoryFeatures = [];
+      }
+    ];
+    distributedBuilds = true;
+    extraOptions = ''
+      builders-use-substitutes = true
+    '';
+  };
+}

nixos/profiles/performance/scx.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  services.scx = {
+    enable = true;
+    package = pkgs.scx_git.full;
+    scheduler = "scx_lavd";
+  };
+}

nixos/profiles/performance/zram.nix

@@ -0,0 +1,3 @@
+_: {
+  zramSwap.enable = true;
+}

nixos/profiles/server/fqdn.nix

@@ -0,0 +1,3 @@
+_: {
+  networking.domain = "inskip.me";
+}

nixos/servers/web/nginx.nix

@@ -1,4 +1,4 @@
-_: {
+{config, ...}: {
   services.nginx = {
     enable = true;
     recommendedTlsSettings = true;
@@ -6,5 +6,32 @@ _: {
     recommendedGzipSettings = true;
     recommendedProxySettings = true;
     statusPage = true;
+    virtualHosts = let
+      vHost = {
+        extraConfig = ''
+          add_header Content-Type text/plain;
+          return 200 "meep?";
+        '';
+        /*
+          locations = {
+          "/" = {
+            extraConfig = ''
+              add_header Content-Type text/plain;
+              return 200 "meep?";
+            '';
+          };
+        };
+        */
+      };
+    in {
+      "${config.networking.fqdn}" =
+        vHost
+        // {
+          enableACME = true;
+          forceSSL = true;
+          default = true;
+        };
+      "localhost" = vHost;
+    };
   };
 }

systems/daiyousei.nix

@@ -1,5 +1,6 @@
 _: let
   hostConfig = {
+    pkgs,
     tree,
     modulesPath,
     ...
@@ -28,6 +29,10 @@ _: let
         web
       ]);
 
+    environment.systemPackages = [
+      pkgs.numix-icon-theme
+    ];
+
     # TODO: Add config.microvm.stateDir to backup schedule?
     # TODO: figure out updateFlake?
     #microvm = {

systems/goliath.nix

@@ -50,6 +50,7 @@ _: let
         quiet-boot
         wireless
         gaming
+        performance
         dev
       ])
       ++ (with tree.nixos.environments; [
@@ -172,30 +173,6 @@ _: let
 
     networking.hostId = "c3b94e85";
 
-    programs.ssh.extraConfig = ''
-      Host daiyousei-build
-          HostName 140.238.156.121
-          User root
-          IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh
-    '';
-    nix = {
-      buildMachines = [
-        {
-          hostName = "daiyousei-build";
-          system = "aarch64-linux";
-          protocol = "ssh-ng";
-          maxJobs = 100;
-          speedFactor = 1;
-          supportedFeatures = ["benchmark" "big-parallel" "kvm"];
-          mandatoryFeatures = [];
-        }
-      ];
-      distributedBuilds = true;
-      extraOptions = ''
-        builders-use-substitutes = true
-      '';
-    };
-
     services.xserver.videoDrivers = ["nvidia"];
 
     hardware.nvidia = {
@@ -206,14 +183,6 @@ _: let
       powerManagement.enable = true;
     };
 
-    services.scx = {
-      enable = false;
-      package = pkgs.scx_git.full;
-      scheduler = "scx_lavd";
-    };
-
-    zramSwap.enable = true;
-
     boot = {
       zfs.requestEncryptionCredentials = true;
       loader = {

systems/koishi.nix

@@ -1,7 +1,6 @@
 _: let
   hostConfig = {
     tree,
-    pkgs,
     lib,
     config,
     ...
@@ -53,6 +52,7 @@ _: let
         wireless
         laptop
         gaming
+        performance
       ])
       ++ (with tree.nixos.environments; [
         niri
@@ -106,39 +106,6 @@ _: let
         ];
       };
 
-      services.scx = {
-        enable = true;
-        package = pkgs.scx_git.full;
-        scheduler = "scx_lavd";
-      };
-
-      zramSwap.enable = true;
-
-      programs.ssh.extraConfig = ''
-        Host daiyousei-build
-            HostName 140.238.156.121
-            User root
-            IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh
-      '';
-
-      nix = {
-        buildMachines = [
-          {
-            hostName = "daiyousei-build";
-            system = "aarch64-linux";
-            protocol = "ssh-ng";
-            maxJobs = 100;
-            speedFactor = 1;
-            supportedFeatures = ["benchmark" "big-parallel" "kvm"];
-            mandatoryFeatures = [];
-          }
-        ];
-        distributedBuilds = true;
-        extraOptions = ''
-          builders-use-substitutes = true
-        '';
-      };
-
       # optional, useful when the builder has a faster internet connection than yours
       services = {
         printing.enable = true;