🔧 aristotle: move to raspberry-pi-nix

also re-deployed form, matter and purpose

.sops.yaml

@@ -2,9 +2,9 @@ keys:
   - &walkah age16yv7atd8n880ja98pksqqvunu2yw00660lkh4n0sg39j5vt3dujshyu95j
   - &plato age12m47c7xvqttncps0e79pwamzqa4nmnxekwumtwcv5ju6q74fufaqp9d0xh
   - &agent age1vc8svd5277rjkgzg7frf04uaa45w3crhfvg628rqyrqmxul3q9nsjz6yxk
-  - &form age1ulmzprdmcd8r0w47a0nrrlg8melkjk6evl2rc54yh6lxkcfas36q6wrsv9
+  - &form age1mnrl9u8vpdjncge33pg7quakl0qdf5dlfgch87jhrs0wrvup4s0s5xh7ly
-  - &matter age1lfjkch3pqaq3uwmjxyucpm2tws6llxqqjglj4yn49jkwkf50xvmqrl974e
+  - &matter age1tt0gwcm03zmpelerpph49knn8f6t8z7aq9una2qys76kf4rwxpnquxkvz3
-  - &purpose age1jnf94uq5ap96vk7nfk3qkr38ylhletc6pskj0ypc470d7gmt0qeqskdy5z
+  - &purpose age1px55dk5n3whfdyshzyxqmyjvqdmv9au6myx6w67jw3cqp9sdx9rsa6xep9
   - &socrates age12wakcnv487c5rkgv7z6umzywrqwcy6dgguq0dug6lxp64scjsq6sspkmgz
 creation_rules:
   - path_regex: secrets/[^/]+\.yaml$

flake.lock

@@ -137,11 +137,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726308872,
+        "lastModified": 1726440980,
-        "narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
+        "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
+        "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
         "type": "github"
       },
       "original": {
@@ -150,6 +150,40 @@
         "type": "github"
       }
     },
+    "libcamera-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718617480,
+        "narHash": "sha256-qqEMJzMotybf1nJp1dsz3zc910Qj0TmqCm1CwuSb1VY=",
+        "owner": "raspberrypi",
+        "repo": "libcamera",
+        "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "repo": "libcamera",
+        "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
+        "type": "github"
+      }
+    },
+    "libpisp-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718613892,
+        "narHash": "sha256-V/d4RrXoq8HNc8r/Kr1gH3E7YTZzfIdgbaJtq/Xi7uQ=",
+        "owner": "raspberrypi",
+        "repo": "libpisp",
+        "rev": "b567f04556801ca350331ed21a1ae3eef4675c23",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "v1.0.6",
+        "repo": "libpisp",
+        "type": "github"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1725757153,
@@ -186,29 +220,13 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1725885300,
-        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726206720,
+        "lastModified": 1726396940,
-        "narHash": "sha256-tI7141IHDABMNgz4iXDo8agCp0SeTLbaIZ2DRndwcmk=",
+        "narHash": "sha256-EpiSl9nSINTmIW6MG6CulGwNAa6sHrBt8gQdyHUXzR4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "673d99f1406cb09b8eb6feab4743ebdf70046557",
+        "rev": "76d7694a3f681b0b750c01783df5d2177ef39fe7",
         "type": "github"
       },
       "original": {
@@ -250,6 +268,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1718835956,
+        "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -273,6 +307,34 @@
         "type": "github"
       }
     },
+    "raspberry-pi-nix": {
+      "inputs": {
+        "libcamera-src": "libcamera-src",
+        "libpisp-src": "libpisp-src",
+        "nixpkgs": "nixpkgs_2",
+        "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
+        "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
+        "rpi-firmware-src": "rpi-firmware-src",
+        "rpi-linux-6_10_0-rc5-src": "rpi-linux-6_10_0-rc5-src",
+        "rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src",
+        "rpicam-apps-src": "rpicam-apps-src",
+        "u-boot-src": "u-boot-src"
+      },
+      "locked": {
+        "lastModified": 1722091021,
+        "narHash": "sha256-XwBhi3XVa3DfdwW84wm7UY6hhg1OE2dijdHQQGsK2u4=",
+        "owner": "nix-community",
+        "repo": "raspberry-pi-nix",
+        "rev": "be1defc74eb0aa8b07dc7f15da6f67d7b084c310",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v0.4.0",
+        "repo": "raspberry-pi-nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
@@ -281,12 +343,114 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixos-generators": "nixos-generators",
-        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks",
+        "raspberry-pi-nix": "raspberry-pi-nix",
         "sops-nix": "sops-nix"
       }
     },
+    "rpi-bluez-firmware-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708969706,
+        "narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
+        "owner": "RPi-Distro",
+        "repo": "bluez-firmware",
+        "rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RPi-Distro",
+        "ref": "bookworm",
+        "repo": "bluez-firmware",
+        "type": "github"
+      }
+    },
+    "rpi-firmware-nonfree-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708967191,
+        "narHash": "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=",
+        "owner": "RPi-Distro",
+        "repo": "firmware-nonfree",
+        "rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897",
+        "type": "github"
+      },
+      "original": {
+        "owner": "RPi-Distro",
+        "ref": "bookworm",
+        "repo": "firmware-nonfree",
+        "type": "github"
+      }
+    },
+    "rpi-firmware-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716978780,
+        "narHash": "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=",
+        "owner": "raspberrypi",
+        "repo": "firmware",
+        "rev": "3590de0c181d433af368a95f15bc480bdaff8b47",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "1.20240529",
+        "repo": "firmware",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_10_0-rc5-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1719265450,
+        "narHash": "sha256-xd/Pz/uZFYW9hJIFKryWDE9Aks6f2EIvEDCmfk0C70c=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "f61d3aca8045e70d64b55f7b98f083738f639ad2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "rpi-6.10.y",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpi-linux-6_6_31-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716545726,
+        "narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=",
+        "owner": "raspberrypi",
+        "repo": "linux",
+        "rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "stable_20240529",
+        "repo": "linux",
+        "type": "github"
+      }
+    },
+    "rpicam-apps-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717081637,
+        "narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
+        "owner": "raspberrypi",
+        "repo": "rpicam-apps",
+        "rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
+        "type": "github"
+      },
+      "original": {
+        "owner": "raspberrypi",
+        "ref": "v1.5.0",
+        "repo": "rpicam-apps",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -338,6 +502,19 @@
         "type": "github"
       }
     },
+    "u-boot-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712055538,
+        "narHash": "sha256-IlaDdjKq/Pq2orzcU959h93WXRZfvKBGDO/MFw9mZMg=",
+        "type": "tarball",
+        "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix/v0.4.0";
     flake-utils.url = "github:numtide/flake-utils";
 
     deploy-rs = {
@@ -63,5 +63,16 @@
       darwinConfigurations = import ./nix/darwin.nix inputs;
       nixosConfigurations = import ./nix/nixos.nix inputs;
       deploy = import ./nix/deploy.nix inputs;
+
+      nixConfig = {
+        extra-substituters = [
+          "https://walkah.cachix.org"
+          "https://nix-community.cachix.org"
+        ];
+        extra-trusted-public-keys = [
+          "walkah.cachix.org-1:D8cO78JoJC6UPV1ZMgd1V5znpk3jNUERGIeAKN15hxo="
+          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        ];
+      };
     };
 }

nix/hosts.nix

@@ -19,19 +19,19 @@
   };
   form = {
     type = "nixos";
-    address = "100.87.220.71";
+    address = "100.104.247.27";
     system = "aarch64-linux";
     sshUser = "root";
   };
   matter = {
     type = "nixos";
-    address = "100.126.255.109";
+    address = "100.95.77.67";
     system = "aarch64-linux";
     sshUser = "root";
   };
   purpose = {
     type = "nixos";
-    address = "100.74.59.80";
+    address = "100.117.49.15";
     system = "aarch64-linux";
     sshUser = "root";
   };

nix/hosts/aristotle/configuration.nix

@@ -1,18 +1,26 @@
-{ pkgs, nixos-hardware, ... }:
+{ pkgs, raspberry-pi-nix, ... }:
 
 {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    nixos-hardware.nixosModules.raspberry-pi-4
     ../../modules/base/nixos.nix
-
+    raspberry-pi-nix.nixosModules.raspberry-pi
     ../../modules/ipfs/cluster.nix
     ../../modules/sops
   ];
 
-  hardware = {
+  raspberry-pi-nix.board = "bcm2711";
-    raspberry-pi."4".poe-hat.enable = true;
+  hardware.raspberry-pi.config = {
+    all = {
+      dt-overlays = {
+        rpi-poe = {
+          enable = true;
+          params = { };
+        };
+
+      };
+    };
   };
 
   time.timeZone = "America/Toronto";
@@ -34,4 +42,5 @@
   ];
 
   environment.systemPackages = with pkgs; [ libraspberrypi raspberrypi-eeprom ];
+  security.sudo.wheelNeedsPassword = false;
 }

nix/modules/base/common.nix

@@ -13,12 +13,12 @@ _:
     settings = {
       substituters = [
         "https://walkah.cachix.org"
-        "https://cache.garnix.io"
+        "https://nix-community.cachix.org"
       ];
 
       trusted-public-keys = [
         "walkah.cachix.org-1:D8cO78JoJC6UPV1ZMgd1V5znpk3jNUERGIeAKN15hxo="
-        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
     };
   };

nix/modules/base/nixos.nix

@@ -1,7 +1,11 @@
-{ config, pkgs, ... }: {
+{ pkgs, ... }: {
 
   imports = [ ./common.nix ../monitoring ../../users ];
 
+  documentation = {
+    enable = false;
+  };
+
   environment.systemPackages = with pkgs; [
     htop
     inetutils
@@ -32,12 +36,6 @@
   };
 
   system = {
-    autoUpgrade = {
-      enable = true;
-      flake = "github:walkah/athens#${config.networking.hostName}";
-      dates = "daily";
-      randomizedDelaySec = "5m";
-    };
     stateVersion = "23.05";
   };
 }

nix/modules/coredns/walkah.lab.zone

@@ -11,9 +11,9 @@ socrates        IN A    100.103.57.96
 plato           IN A    100.111.208.75
 ; aristotle
 agent           IN A    100.95.167.126
-form            IN A    100.87.220.71
+form            IN A    100.104.247.27
-matter          IN A    100.126.255.109
+matter          IN A    100.95.77.67
-purpose         IN A    100.74.59.80
+purpose         IN A    100.117.49.15
 
 parthenon       IN A    100.106.65.39
 epicurus        IN A    100.66.26.116

nix/modules/ipfs/gateway.nix

@@ -7,18 +7,18 @@ let
       Addrs = [ "/ip4/100.95.167.126/tcp/4001" ];
     }
     {
-      ID = "12D3KooWMqSiDukubKNKrK7J4PaF3mfNnZFVAd3Lh7qj3Y3e5bcN";
+      ID = "12D3KooWC5ncgKeJV2G6QBdGMkT2gLbeviaDxpYR7V6NVTsma3C5";
-      Addrs = [ "/ip4/100.87.220.71/tcp/4001" ];
+      Addrs = [ "/ip4/100.104.247.27/tcp/4001" ];
 
     }
     {
-      ID = "12D3KooWGmNRyqP969QbyP8NLVRZNK2i6yCcP6N6N2r2DCG4H34v";
+      ID = "12D3KooW9xeqfnnNWafiDkLXWjC5YdUnBrG5tJDd3tnm86kqVwhA";
-      Addrs = [ "/ip4/100.126.255.109/tcp/4001" ];
+      Addrs = [ "/ip4/100.95.77.67/tcp/4001" ];
 
     }
     {
-      ID = "12D3KooWFkR8nsG5pzffoAfMzmwBcSakXxnogVa6inRxUbpfN5ua";
+      ID = "12D3KooWLYPckqA4JACJ4vioWc4tYuPjmfLMbgviECnWqazjSgK9";
-      Addrs = [ "/ip4/100.74.59.80/tcp/4001" ];
+      Addrs = [ "/ip4/100.117.49.15/tcp/4001" ];
 
     }
   ];

nix/nixos.nix

@@ -1,4 +1,4 @@
-{ self, nixpkgs, home-manager, nixos-hardware, sops-nix, ... }:
+{ self, nixpkgs, home-manager, raspberry-pi-nix, sops-nix, ... }:
 let
   mkSystem = hostName: modules:
     let
@@ -14,7 +14,7 @@ let
           nixpkgs.config.allowUnfree = true;
         })
       ] ++ modules;
-      specialArgs = { inherit nixos-hardware sops-nix; };
+      specialArgs = { inherit raspberry-pi-nix sops-nix; };
     };
 in
 {

nix/secrets/secrets.yaml

@@ -19,68 +19,68 @@ sops:
         - recipient: age16yv7atd8n880ja98pksqqvunu2yw00660lkh4n0sg39j5vt3dujshyu95j
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPZlFKbFY4YjNnN3hhNTNw
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6M1FuWHpaR2paWW00aFh4
-            V1N0ZVh6ZDJrSng4M1pBMWxqZTJmcUJLWUdNCm55K2RpVSs0NHNGK1F4K28xTk9q
+            UjcxYmxWRUNSYmI5bUFYZkpUN2dRNFFiNG5vCnQzcTRTSHJndWNoR3dqamlGMWNs
-            UHVESitPSEs2eEZCT3RreWpVam80ZmMKLS0tIHJ4Q3pHOFVTOStBUGprR0FvRHhl
+            RU1IM2llN21nOFgxRk5naW8zaktkSWsKLS0tIGVidlRrUi9ZaVBKUUhpTFJYTjFC
-            VzhmT3BzYy8veHhaZUtUSmxCZDh5V1kKsjFBNoqtUD44d8ImP/DcvS+gBkQJi/Vt
+            TXRqc0tVcVlpNnJ3dWo0eGF6UG1TcEkK9I7E1rfAkG0wdh9MIRYZ3awVVFjPBY6c
-            0NlkRRhWndFGss6gkcf7aIObHw9kAlU6RsspJt5Wte6ZLHj3eATkfA==
+            Faf++fAT90TmkYJht7h0GVel23GXyL5FTUzDraI0xKQqrhyFjYiThQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age12m47c7xvqttncps0e79pwamzqa4nmnxekwumtwcv5ju6q74fufaqp9d0xh
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTbVlQY1kzb3RxZG90RWlG
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxS3ZvMUw4YllOTmExZlJY
-            eUNBZlZPNUhEZXBqcFFUdTVXWUgyOFllMjB3Cm9lS09tdXZuYmpzUWJDSnI1OTlG
+            SzE5MzI2Rm5WWWM0cmpjWW1KS0p1czNBWnk0Cjd4aFlkOWducnY1b3VJUlhvOWh4
-            NDBlcWFBSDg3UnB2YVlMRUduTXZsaUUKLS0tIFkwTWxRNnVER3g1VVYzbURKM2ha
+            N2NrSE9MdERtc3V1K1owc0hqZ3R3MzAKLS0tIGFhajdJSTh6dkNuZ0ZsLzQ2U3By
-            b09tcStFNWlrRVdBSFhZMVRaYkFGSE0KeHfPNNADsP6v0H9PihaKEDXWjun8ORsb
+            R3ZyN3lFeU14eTF4dVQyUDgraWRqekkKaww2hwqRj86QIJ+NvjHftRRz2kfxOj1C
-            uQKLTz8wKTUk8JIFfY1g5iUqNxG+XvOQrSx/8Cepz+h/2sn3sAcaXw==
+            5i9+ArHXL02flDmfcpSMsmp7yiS5z+imWdrp8x1LoHDggfCIdca6zg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1vc8svd5277rjkgzg7frf04uaa45w3crhfvg628rqyrqmxul3q9nsjz6yxk
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuWFYzS1B1NVZBZDFNTXRv
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrMGQvWFUzbWpvQ3ZqVkpH
-            TS9EOUd5Umw2c2pmUmhzb0ViUUsrZTBNQ0JnClZvajN4ODNYME11aXFiSmxZUlV3
+            eWlRbjVoT2IvajBGalc2c0pkazNmTFRDTjB3ClpHMGo4VitGZlpaVktGaVpEdVR4
-            eDlhTWFxSkF1UWlGVS9jZkk2SmlsKzQKLS0tIGE0TmNucGNiV2VJV1FnZmw4TEJy
+            SGZxS0YxTlpGQmZGQk9PdGFvZnk5TEEKLS0tIElIeFJDQUM1eHZ6OXVhc0piOUE4
-            aHpTLzdFeGZ6MVkzTmRjZit0U1I0Zk0Kd6DJlpqsqwwlAXC8Tl0AhijCQ8gHtFwX
+            SVJWYkhUa2dlWHc4ZDlDWTBYY0xCckUKG+4qRNI0YkJugyB+CDZ2Jq3dmOTBBYax
-            VeTC0PsUdMxEoTq3mg4aM0M5AML4txDKRpFH4XkH9G6lgU9hNebXUA==
+            SM4vUNWT8VC8IIFMjlPz8dx905KYHm2N+l3d+o6ZpwpFMySiiWET8w==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1ulmzprdmcd8r0w47a0nrrlg8melkjk6evl2rc54yh6lxkcfas36q6wrsv9
+        - recipient: age1mnrl9u8vpdjncge33pg7quakl0qdf5dlfgch87jhrs0wrvup4s0s5xh7ly
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyS21pT3U4R3pjU255QVdV
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGRFJuRWJNTVJWRWlmTDhr
-            NXgrTDhVT3IvVVQ4N051TkdFT3NJMWozRFhvCnloNmRROTdMZHpkSDB6L25vVWlX
+            Z212S1ZoMUVhOHo0ajViaXU5aWJrbjFHK1ZJCjRnVVlEb2xLTk1Vdjk0dGtTL0s4
-            RWNTM2czYmNKcUI5NTVZdmwvRWhmQ00KLS0tIElJTmI4aC9xVHk4dHF4cWtEQ0RQ
+            NzBmRDNOSktRdnRLbkZjY1lsdE9NdTAKLS0tIHlGbHNIa052VHUxQ2Nwd0Jwc1FX
-            VTJzUUtIaklZVVVNS3JLOWZSbXJYWDgKHcnC1EQ9qSfCgnoNPUa1/fTWJd8zhSAA
+            VGZUWlduOUNlYkd5eXlQSm5iL0FiZWMKUUUNLHUk/5QuRYeV6TKdLAQ9hgZhVi0q
-            +5aMUt6Ff4FF3I3e+CIbbTHZdpjgLoO3BgAYFMwn7iImjGDYTuSHQA==
+            u6j+PwxaQbtuPw4wZxWsbz1xVjSvMH0IgCR7FFWC+MtTA5ilYKM1HQ==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1lfjkch3pqaq3uwmjxyucpm2tws6llxqqjglj4yn49jkwkf50xvmqrl974e
+        - recipient: age1tt0gwcm03zmpelerpph49knn8f6t8z7aq9una2qys76kf4rwxpnquxkvz3
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiR1JnZzhpQzdYTll5cFhQ
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmSHBWQ05wd0c0czFuc25H
-            em83Zjh0TjhIZmhRd3hHTVkwendPNzFNMUZJClNqb08vQjVTdjgvblN2YTJsOGZM
+            dm1JWjdhRVFyTGxKZXZ3TWZheXR4cHpQdmpnClo5ZGNjWHMvbXpNRzMzUHZURVAr
-            VU1udXh1NmFOS284ZFJQanNQN1JGbUkKLS0tICtla1RRdHo0TE54bm1YUGJ0R3Jw
+            RkZZdXZhYytWQmY3N2Z1cDFzY1cvNzgKLS0tIHRzVk83TEprQzRxWm13MFEvUW1X
-            WTdQMXdFMFJidTFyY3o3a080MUU0c3MKtG/7ruQyF9g++O3YHAhJO8MzflCtjYw3
+            dUQxMkZzcHRuVFZBRTFlOUg3Q2Eyd2MK+th7D9b4pQ08yiM3y0sYfSZNZ0Xlrk3f
-            HgzCF68X14ow/47/oKOPjlM19L8lO4a/sDtQ5RevDWn/+RQLY8mUlQ==
+            fOoiUnWS/5be4LDoyUq90liULdKMi2QueymhIikoxNY8wRRbPoOm2Q==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1jnf94uq5ap96vk7nfk3qkr38ylhletc6pskj0ypc470d7gmt0qeqskdy5z
+        - recipient: age1px55dk5n3whfdyshzyxqmyjvqdmv9au6myx6w67jw3cqp9sdx9rsa6xep9
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPKzB6a0pyUTRWeExLaUFu
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwSHlnUk52bWJPUDVZNHhO
-            NzlsaEFDNFdkUFZQbmFiTDRObFIrZjBmd1dnCnBqa2l5N01CZ3Voay9vTTgyRmtk
+            RTJjNHV1dHV1UkE3YmFXYUhOYkQ5RE0zWHo4CjdLSlZSd1EvdjNid1hMK0hpY1d1
-            V0JYM3NwVVlBVWwxS2o1QVpKSE9SRk0KLS0tIGNaWGxoczh0UG4wOGY1azlnWEtm
+            bCt2Tk5uc0c0QUNCR0FNeGJsR2FiZDgKLS0tIDU1bXpTcUxYeWVQQTNTdUxhNXN4
-            VGh2SVVSMDh5VnBoOWc1Mi92R1hPLzAKaCkUGHbc1rR6vMZX97cqH4OLhyM+MmMc
+            UjIwdzZzc2RZS3M0VmhBb1lFUndDK2cK/bkEC3QvBdIuI4fEznatzrXpUES+PHyJ
-            jPJ2pbrmdZwjHmBVhZUHb+Ow8x8lyERW6Z1mbr1F6eEd5of6dVJ23w==
+            njWmB18AW6VhJnVHP11ejV3zTT8cYPrEwp6ZJjhIW2UoSbkrC2FYAg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age12wakcnv487c5rkgv7z6umzywrqwcy6dgguq0dug6lxp64scjsq6sspkmgz
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4UzQ0OFBPZ1BFY0VGSHNF
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtbFoybE5OMzlsbHlaL1NT
-            V0tpTFZIdkVtbHE2RkVSZ2lqYi95eGwzbW5jCm9BS0tLZDhwRGhIRExNTjVvVDNy
+            TFpjRndsRHhldXJRQmcvZmpmYVMyN01maHdZCjZNVHZjRmU4WS9lRkNkYkxpWXZ5
-            RzUwWmdBMEUyMUpQSWhKK21ZWUNPeEUKLS0tIG9KdlpXaDFLckVhVlBQaWJxeVJm
+            VlEwSDB0bzRwM3hienBvTUE3UVlDUjgKLS0tIFY2blRpRlhTMWhoZ0JSS0VMc0pX
-            dFZacUhiZDFxK0xZMDJJeCtQUmtuSGcKVz2TOsyw5F4mpFgbZnkWPjQPB7nSKkzd
+            Y0FJMjh3NGtlanIvNHZRMjZUeTQ0UFkKrsGGcBSvc8N6ZzBBD+45pQQXcdcq4qeg
-            96r8RHs8CrlSpBUP6TG6Q+Tz77G1XIgcZrN9EVyYCQB7zOukIdZ5zw==
+            NqmipWnKmwSYXo7pCalEUn9Re0Lh2fIYjXLRIf5tseS3SNurn0Eegw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-25T17:15:30Z"
+    lastmodified: "2024-09-15T21:21:18Z"
-    mac: ENC[AES256_GCM,data:ZvvD8D4Lv3vbz4Le5/aUjlRbKA3Iqr7f6hSPBRg7t4+3ohBkOn1HMV8UjXUt8ixnUBTAw4/FfT0nzGKB9p2dzRGif8mPB85y//ZPUfQ6DDfUp7gZkMlo5Dnr2rvNQDoFH3bb+L99UDqh9UYUp3SkGnR0VXF1TfUOoCfu0hfzzDo=,iv:onc7AXgH9K6Qxjur6MBRdCdtJcrP6TGtTNdZll9grrQ=,tag:7PjPlc4W4Xrk3M1WckXoqg==,type:str]
+    mac: ENC[AES256_GCM,data:d9w1fqaPnPyObVNUlSEdCFsBf+oOgM9HNnjhFuEp7Jy0xTKxLqHKieecw5phnCUOYj9H87/oSB8q8QAkg5CGMf0yV2T/V1SHYb2cS53sTvG4l2Ladg1W6r4GpI7fJ7hO/NRbzuY5YR/51AZ3y1z2VO8UqVQSxb5WbrhVQyqgpME=,iv:QY4Grz4LKQ0IucxLEL3D9BwgVo2vmDNl/VIJITqg+EM=,tag:PfnKXp15Q5iB/ImtARgtCw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

nix/users/walkah/home.nix

@@ -1,19 +1,18 @@
 { lib, pkgs, ... }: {
   home = {
-    username = "walkah";
-    # homeDirectory = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah";
-
     packages = with pkgs; [
       chezmoi
       direnv
       eza
       fzf
       git
+      htop
       starship
       tmux
     ];
 
     activation.chezmoi = lib.hm.dag.entryAfter [ "installPackages" ] ''
+      export PATH="${pkgs.git}/bin:$PATH"
       $DRY_RUN_CMD ${pkgs.chezmoi}/bin/chezmoi init --apply walkah/dotfiles
     '';