Update flake

common/boot/remote-luks-unlock.nix

@@ -45,52 +45,57 @@ in
       authorizedKeys = cfg.sshAuthorizedKeys;
     };
 
-    boot.initrd.postDeviceCommands = ''
+    # Use systemd-tty-ask-password-agent for interactive LUKS passphrase entry over SSH
-      echo 'waiting for root device to be opened...'
+    boot.initrd.systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent --watch";
-      mkfifo /crypt-ramfs/passphrase
-      echo /crypt-ramfs/passphrase >> /dev/null
-    '';
 
+    # Tor hidden service for remote unlock over onion
     boot.initrd.secrets = lib.mkIf cfg.enableTorUnlock {
       "/etc/tor/onion/bootup" = cfg.onionConfig;
     };
-    boot.initrd.extraUtilsCommands = lib.mkIf cfg.enableTorUnlock ''
-      copy_bin_and_libs ${pkgs.tor}/bin/tor
-      copy_bin_and_libs ${pkgs.haveged}/bin/haveged
-    '';
-    boot.initrd.network.postCommands = lib.mkMerge [
-      (
-        ''
-          # Add nice prompt for giving LUKS passphrase over ssh
-          echo 'read -s -p "Unlock Passphrase: " passphrase && echo $passphrase > /crypt-ramfs/passphrase && exit' >> /root/.profile
-        ''
-      )
 
-      (
+    boot.initrd.systemd.storePaths = lib.mkIf cfg.enableTorUnlock [
-        let torRc = (pkgs.writeText "tor.rc" ''
+      "${pkgs.tor}/bin/tor"
+      "${pkgs.haveged}/bin/haveged"
+    ];
+
+    boot.initrd.systemd.services.tor-unlock = lib.mkIf cfg.enableTorUnlock {
+      description = "Tor Hidden Service for Boot Unlock";
+      wantedBy = [ "initrd.target" ];
+      after = [ "network.target" "sshd.service" ];
+      wants = [ "network.target" ];
+
+      unitConfig.DefaultDependencies = false;
+
+      serviceConfig = {
+        Type = "forking";
+        RemainAfterExit = true;
+      };
+
+      script =
+        let
+          torRc = pkgs.writeText "tor.rc" ''
             DataDirectory /etc/tor
             SOCKSPort 127.0.0.1:9050 IsolateDestAddr
             SOCKSPort 127.0.0.1:9063
             HiddenServiceDir /etc/tor/onion/bootup
             HiddenServicePort 22 127.0.0.1:22
-        ''); in
+          '';
-        lib.mkIf cfg.enableTorUnlock ''
+        in
-          echo "tor: preparing onion folder"
+        ''
-          # have to do this otherwise tor does not want to start
+          # Fix permissions for tor
           chmod -R 700 /etc/tor
 
-          echo "make sure localhost is up"
+          # Ensure loopback is up
-          ip a a 127.0.0.1/8 dev lo
+          ip a a 127.0.0.1/8 dev lo 2>/dev/null || true
           ip link set lo up
 
-          echo "haveged: starting haveged"
+          # Start haveged for entropy
-          haveged -F &
+          ${pkgs.haveged}/bin/haveged -F &
 
-          echo "tor: starting tor"
+          # Verify and start tor
-          tor -f ${torRc} --verify-config
+          ${pkgs.tor}/bin/tor -f ${torRc} --verify-config
-          tor -f ${torRc} &
+          ${pkgs.tor}/bin/tor -f ${torRc} &
-        ''
+        '';
-      )
+    };
-    ];
   };
 }

flake.lock

@@ -53,11 +53,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773106230,
+        "lastModified": 1778800550,
-        "narHash": "sha256-ob/uMOU6CyRES+/SIxnMDhDAZUQr228JdBPKkGu8m/c=",
+        "narHash": "sha256-nLhQjocD45BwMS946dShAF6BnafpTTe10s8LAcIcLjo=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "5cbf0a4eba950cdc7d7982774a9bc189ab21cb99",
+        "rev": "1ba489d6e95f7bccf58250f7bdc5142122d53f2f",
         "type": "github"
       },
       "original": {
@@ -78,15 +78,15 @@
       "locked": {
         "lastModified": 1772394520,
         "narHash": "sha256-9c0sHyzoVtvufkSqVNGGydsgjpKv5Zf7062LmOm4Gsc=",
-        "ref": "refs/heads/master",
+        "owner": "GoogleBot42",
+        "repo": "dailybot",
         "rev": "d07483c17bf31d416de3642a2faec484ea1810ed",
-        "revCount": 21,
+        "type": "github"
-        "type": "git",
-        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
       },
       "original": {
-        "type": "git",
+        "owner": "GoogleBot42",
-        "url": "https://git.neet.dev/zuckerberg/dailybot.git"
+        "repo": "dailybot",
+        "type": "github"
       }
     },
     "darwin": {
@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772893680,
+        "lastModified": 1775585728,
-        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+        "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+        "rev": "580633fa3fe5fc0379905986543fd7495481913d",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773179137,
+        "lastModified": 1778853583,
-        "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
+        "narHash": "sha256-0P4/nDOxxufeh5SD5vqpfFw0n4mq29WZISYAgfryD3Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
+        "rev": "1bedcc8740b9aa2f7d3e1312a6c88baf00909f54",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1773018425,
+        "lastModified": 1778669912,
-        "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=",
+        "narHash": "sha256-WT2iimtOBZM/6AcZeBoJU2EgUSaywtlItsEgNkZBda0=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "25ebda3c558e923720c965832dc9a04f559a055c",
+        "rev": "a7a7009064cec75d9da652c6723412ce27b9bc44",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772945408,
+        "lastModified": 1778393439,
-        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
+        "narHash": "sha256-mOtQxUjtKaPHLeoLOY/YEDctmud1X9KwJr4kE1MJ3Wc=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
+        "rev": "01466c414c7357ae2ce32be4a272a7c69e94ab5f",
         "type": "github"
       },
       "original": {
@@ -285,11 +285,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1772972630,
+        "lastModified": 1778593042,
-        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
+        "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
+        "rev": "9bd7c80d43e258aaa607d83b43661df11444d808",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772963539,
+        "lastModified": 1778443072,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
         "type": "github"
       },
       "original": {
@@ -344,16 +344,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1773194666,
+        "lastModified": 1777287493,
-        "narHash": "sha256-YbsbqtTB3q0JjP7/G7GO58ea49cps1+8sb95/Bt7oVs=",
+        "narHash": "sha256-Fj7S91TuZm6+DG/v6SFme/p+sWrYMQICGX6yQ5KD43Q=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "489fbc4e0ef987cfdce700476abafe3269ebf3e5",
+        "rev": "e33fbde199eaad513ef5d0746db19d5878150232",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "master",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }

flake.nix

@@ -25,7 +25,7 @@
 
     # Mail Server
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
@@ -44,7 +44,7 @@
 
     # Dailybot
     dailybot = {
-      url = "git+https://git.neet.dev/zuckerberg/dailybot.git";
+      url = "github:GoogleBot42/dailybot";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";

home/googlebot.nix

@@ -59,7 +59,7 @@ in
     enable = thisMachineIsPersonal;
   };
 
-  programs.vscode = {
+  programs.vscodium = {
     enable = thisMachineIsPersonal;
     # Must use fhs version for vscode-lldb
     package = pkgs.vscodium-fhs;

machines/fry/default.nix

@@ -75,7 +75,7 @@
   # Get wildcard cert
   security.acme.certs."fry.neet.dev" = {
     dnsProvider = "digitalocean";
-    credentialsFile = "/run/agenix/digitalocean-dns-credentials";
+    environmentFile = "/run/agenix/digitalocean-dns-credentials";
     extraDomainNames = [ "*.fry.neet.dev" ];
     group = "nginx";
     dnsResolver = "1.1.1.1:53";

machines/fry/hardware-configuration.nix

@@ -43,7 +43,13 @@
     ];
 
   # Ensures that dhcp is active during initrd (Network Manager is used post boot)
-  boot.initrd.network.udhcpc.enable = true;
+  boot.initrd.systemd.network = {
+    enable = true;
+    networks."10-default" = {
+      matchConfig.Type = "ether";
+      networkConfig.DHCP = "yes";
+    };
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

machines/storage/s0/default.nix

@@ -259,7 +259,7 @@
   # Get wildcard cert
   security.acme.certs."s0.neet.dev" = {
     dnsProvider = "digitalocean";
-    credentialsFile = "/run/agenix/digitalocean-dns-credentials";
+    environmentFile = "/run/agenix/digitalocean-dns-credentials";
     extraDomainNames = [ "*.s0.neet.dev" ];
     group = "nginx";
     dnsResolver = "1.1.1.1:53";