flake.lock

@@ -12,11 +12,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1762618334,
+        "lastModified": 1754433428,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
         "type": "github"
       },
       "original": {
@@ -31,8 +31,7 @@
           "devenv"
         ],
         "flake-compat": [
-          "devenv",
+          "devenv"
-          "flake-compat"
         ],
         "git-hooks": [
           "devenv",
@@ -44,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760971495,
+        "lastModified": 1748883665,
-        "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
+        "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
         "owner": "cachix",
         "repo": "cachix",
-        "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
+        "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
         "type": "github"
       },
       "original": {
@@ -63,11 +62,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1764325801,
+        "lastModified": 1757320803,
-        "narHash": "sha256-LQ7tsrXs1wuB6KBwUctL3JlUsG/FWI2pCI6NkoO52dk=",
+        "narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de",
+        "rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9",
         "type": "github"
       },
       "original": {
@@ -85,11 +84,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1762286984,
+        "lastModified": 1756719547,
-        "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
+        "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
+        "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2",
         "type": "github"
       },
       "original": {
@@ -102,7 +101,6 @@
       "inputs": {
         "cachix": "cachix",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "nix": "nix",
         "nixpkgs": [
@@ -110,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764669403,
+        "lastModified": 1757570236,
-        "narHash": "sha256-aJCOp0CV/9KIR2LTwSbZZN3j9Avg7umYyaqDFPoOVhI=",
+        "narHash": "sha256-Gy15+KtKc/MyT4L9Ad/2wkXQvDiMkhtKy9Tnn3+kPww=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "3f2d25e7af748127da0571266054575dd8fec5ab",
+        "rev": "c57bded76fa6a885ab1dee2c75216cc23d58b311",
         "type": "github"
       },
       "original": {
@@ -142,11 +140,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1747046372,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -175,15 +173,16 @@
       "inputs": {
         "nixpkgs-lib": [
           "devenv",
+          "nix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1760948891,
+        "lastModified": 1733312601,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -197,11 +196,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1748821116,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
         "type": "github"
       },
       "original": {
@@ -219,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1743550720,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -300,11 +299,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760663237,
+        "lastModified": 1750779888,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
         "type": "github"
       },
       "original": {
@@ -342,11 +341,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764788330,
+        "lastModified": 1757784838,
-        "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=",
+        "narHash": "sha256-6aHo1++bAFdW1z+0tfuxM9EmxHvon90mHo8/+izXMcY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d",
+        "rev": "6e28513cf2ee9a985c339fcef24d44f43d23456b",
         "type": "github"
       },
       "original": {
@@ -372,16 +371,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1754860581,
+        "lastModified": 1748294338,
-        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
+        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
         "owner": "NuschtOS",
         "repo": "ixx",
-        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
+        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
         "type": "github"
       },
       "original": {
         "owner": "NuschtOS",
-        "ref": "v0.1.1",
+        "ref": "v0.0.8",
         "repo": "ixx",
         "type": "github"
       }
@@ -392,10 +391,7 @@
           "devenv",
           "flake-compat"
         ],
-        "flake-parts": [
+        "flake-parts": "flake-parts",
-          "devenv",
-          "flake-parts"
-        ],
         "git-hooks-nix": [
           "devenv",
           "git-hooks"
@@ -412,16 +408,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1761648602,
+        "lastModified": 1755029779,
-        "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=",
+        "narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=",
         "owner": "cachix",
         "repo": "nix",
-        "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6",
+        "rev": "b0972b0eee6726081d10b1199f54de6d2917f861",
         "type": "github"
       },
       "original": {
         "owner": "cachix",
-        "ref": "devenv-2.30.6",
+        "ref": "devenv-2.30",
         "repo": "nix",
         "type": "github"
       }
@@ -449,11 +445,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764234087,
+        "lastModified": 1751903740,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
         "type": "github"
       },
       "original": {
@@ -464,11 +460,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764440730,
+        "lastModified": 1757775351,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5",
         "type": "github"
       },
       "original": {
@@ -480,11 +476,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763966396,
+        "lastModified": 1756266583,
-        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
+        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
+        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
         "type": "github"
       },
       "original": {
@@ -496,11 +492,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1761765539,
+        "lastModified": 1748740939,
-        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
+        "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
+        "rev": "656a64127e9d791a334452c6b6606d17539476e2",
         "type": "github"
       },
       "original": {
@@ -511,11 +507,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764667669,
+        "lastModified": 1757487488,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+        "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
+        "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0",
         "type": "github"
       },
       "original": {
@@ -527,27 +523,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1764138170,
+        "lastModified": 1748406211,
-        "narHash": "sha256-2bCmfCUZyi2yj9FFXYKwsDiaZmizN75cLhI/eWmf3tk=",
+        "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bb813de6d2241bcb1b5af2d3059f560c66329967",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1763618868,
-        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
+        "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
         "type": "github"
       },
       "original": {
@@ -560,15 +540,17 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixvim": "nixvim_2"
       },
       "locked": {
-        "lastModified": 1764206843,
+        "lastModified": 1750264863,
-        "narHash": "sha256-ieuOUoc2ZIKR6ZR8HnjnsX9k/3EJr6b/WQ3yZDaxDKg=",
+        "narHash": "sha256-AA+ORNUBYmeeODwkfqP/JG73B/rpMZjXnpikQ6KWkB4=",
         "ref": "main",
-        "rev": "926db427f465f44f454a3ac48216ec461b4a42e8",
+        "rev": "2613c4d8dda028fedffda8f29e52b10cbd0ac13d",
-        "revCount": 52,
+        "revCount": 50,
         "type": "git",
         "url": "https://git.alejandr0angul0.dev/alejandro-angulo/nixvim-config"
       },
@@ -581,16 +563,16 @@
     "nixvim_2": {
       "inputs": {
         "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nuschtosSearch": "nuschtosSearch",
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1764148348,
+        "lastModified": 1749200997,
-        "narHash": "sha256-C9UobzCvMaLwNtRaFrt26TA/SkQtcDhJFmlVQ6DPHyA=",
+        "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7fe6951bf8c2719f437f74224adf3a2e875d6781",
+        "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8",
         "type": "github"
       },
       "original": {
@@ -610,11 +592,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761730856,
+        "lastModified": 1748298102,
-        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
+        "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
+        "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,7 +26,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     nixvim.url = "git+https://git.alejandr0angul0.dev/alejandro-angulo/nixvim-config?ref=main";
-    # nixvim.inputs.nixpkgs.follows = "nixpkgs";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
 
     devenv.url = "github:cachix/devenv";
     devenv.inputs.nixpkgs.follows = "nixpkgs";
@@ -81,7 +81,7 @@
           profiles.system = {
             user = "root";
             sshUser = "alejandro";
-            path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.gospel;
+            path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.node;
             sshOpts = [ "-A" ];
           };
         };

homes/aarch64-linux/alejandro@pi4/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   aa = {
     apps = {
@@ -22,6 +22,6 @@
 
   # misc utils without custom config
   programs = {
-    fzf.enable = lib.mkForce false;
+    fzf.enable = true;
   };
 }

modules/home/tools/git/default.nix

@@ -36,48 +36,35 @@ in
     };
 
     catppuccin.delta.enable = true;
-    programs.delta = {
-      enable = true;
-      enableGitIntegration = true;
-      options = {
-        line-numbers = true;
-        navigate = true;
-      };
-    };
-
     programs.git = {
+      delta = {
+        enable = true;
+        options = {
+          line-numbers = true;
+          navigate = true;
+        };
+      };
+
       enable = true;
-      settings = {
+      userName = cfg.userName;
-        alias = {
+      userEmail = cfg.userEmail;
-          # Prettier log
-          lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
-          # Find log and grab its hash
-          lof = ''
-            !${pkgs.git}/bin/git log --pretty=oneline \
-            | ${pkgs.fzf}/bin/fzf --scheme history \
-            | ${pkgs.gawk}/bin/awk '{print $1}'
-          '';
-          # Push up a new branch with the same as local
-          pushup = "push -u origin HEAD";
-        };
 
-        user = {
+      aliases = {
-          name = cfg.userName;
+        # Prettier log
-          email = cfg.userEmail;
+        lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
-        };
+        # Find log and grab its hash
-
+        lof = ''
-        init = {
+          !${pkgs.git}/bin/git log --pretty=oneline \
-          defaultBranch = "main";
+          | ${pkgs.fzf}/bin/fzf --scheme history \
-        };
+          | ${pkgs.gawk}/bin/awk '{print $1}'
-
+        '';
-        pull = {
+        # Push up a new branch with the same as local
-          rebase = true;
+        pushup = "push -u origin HEAD";
-        };
       };
 
       signing = {
         key = cfg.signingKey;
-        signByDefault = mkDefault false;
+        signByDefault = mkDefault true;
       };
 
       ignores = [
@@ -96,6 +83,16 @@ in
         ".envrc"
         ".direnv"
       ];
+
+      extraConfig = {
+        init = {
+          defaultBranch = "main";
+        };
+
+        pull = {
+          rebase = true;
+        };
+      };
     };
 
     catppuccin.lazygit.enable = true;
@@ -104,12 +101,10 @@ in
       settings = {
         quitOnTopLevelReturn = true;
         gui.nerdFontsVersion = "3";
-        git.pagers = [
+        git.paging = {
-          {
+          colorArg = "always";
-            colorArg = "always";
+          pager = "${pkgs.delta}/bin/delta --dark --paging=never";
-            pager = "${pkgs.delta}/bin/delta --dark --paging=never";
+        };
-          }
-        ];
       };
     };
   };

modules/nixos/nix/default.nix

@@ -20,7 +20,7 @@ in
     enable = mkEnableOption "manage nix configuration.";
     package = mkOption {
       type = types.package;
-      default = pkgs.nixVersions.nix_2_31;
+      default = pkgs.nixVersions.latest;
       description = "Which nix package to use.";
     };
 

modules/nixos/services/homeassistant/default.nix

@@ -49,7 +49,6 @@ in
         "smud"
 
         "cast"
-        "ecobee"
         "homekit_controller"
         "hue"
         "met"
@@ -57,9 +56,7 @@ in
         "octoprint"
         "roborock"
         "shelly"
-        "smlight"
         "zeroconf"
-        "zha"
       ];
 
       customComponents = with pkgs.home-assistant-custom-components; [
@@ -76,23 +73,23 @@ in
         recorder.db_url = "postgresql://@/hass";
 
         "automation ui" = "!include automations.yaml";
-        "scene ui" = "!include scenes.yaml";
       };
     };
 
     services.nginx = {
       enable = true;
-      virtualHosts."hass.kilonull.com" = {
+      virtualHosts."hass.kilonull.com" =
-        locations."/" = {
+        {
-          recommendedProxySettings = true;
+          locations."/" = {
-          proxyWebsockets = true;
+            recommendedProxySettings = true;
-          proxyPass = "http://127.0.0.1:${toString hass_cfg.config.http.server_port}";
+            proxyWebsockets = true;
+            proxyPass = "http://127.0.0.1:${toString hass_cfg.config.http.server_port}";
+          };
+        }
+        // lib.optionalAttrs (cfg.acmeCertName != "") {
+          forceSSL = true;
+          useACMEHost = cfg.acmeCertName;
         };
-      }
-      // lib.optionalAttrs (cfg.acmeCertName != "") {
-        forceSSL = true;
-        useACMEHost = cfg.acmeCertName;
-      };
     };
 
     services.postgresql = {

modules/nixos/services/mosquitto/default.nix

@@ -15,7 +15,6 @@ in
       hass_mqtt.file = ../../../../secrets/hass_mqtt.age;
       theengs_ble_mqtt.file = ../../../../secrets/theengs_ble_mqtt.age;
       teslamate_mqtt.file = ../../../../secrets/teslamate_mqtt.age;
-      zigbee2mqtt_mqtt.file = ../../../../secrets/zigbee2mqtt_mqtt.age;
     };
 
     services.mosquitto = {
@@ -27,7 +26,6 @@ in
               acl = [
                 "readwrite home/#"
                 "readwrite homeassistant/#"
-                "readwrite zigbee2mqtt/#"
                 "read teslamate/#"
               ];
               passwordFile = config.age.secrets.hass_mqtt.path;
@@ -43,14 +41,6 @@ in
               acl = [ "readwrite teslamate/#" ];
               passwordFile = config.age.secrets.teslamate_mqtt.path;
             };
-            zigbee2mqtt = {
-              acl = [
-                # "readwrite" "home/#"
-                "readwrite zigbee2mqtt/#"
-                "readwrite homeassistant/#"
-              ];
-              passwordFile = config.age.secrets.zigbee2mqtt_mqtt.path;
-            };
           };
         }
       ];

modules/nixos/services/nextcloud/default.nix

@@ -54,7 +54,7 @@ in
 
     services.nextcloud = {
       enable = true;
-      package = pkgs.nextcloud32;
+      package = pkgs.nextcloud31;
       hostName = "nextcloud.kilonull.com";
       https = true;
       database.createLocally = true;

modules/nixos/services/zigbee2mqtt/default.nix

@@ -1,80 +0,0 @@
-{
-  config,
-  lib,
-  namespace,
-  ...
-}:
-let
-  cfg = config.${namespace}.services.zigbee2mqtt;
-in
-{
-  options.${namespace}.services.zigbee2mqtt = {
-    enable = lib.mkEnableOption "zigbee2mqtt";
-    acmeCertName = lib.mkOption {
-      type = lib.types.str;
-      default = "";
-      description = ''
-        If set to a non-empty string, forces SSL with the supplied acme
-        certificate.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    age.secrets.zigbee2mqtt_creds = {
-      file = ../../../../secrets/zigbee2mqtt_creds.age;
-      path = "/var/lib/zigbee2mqtt/secret.yaml";
-      owner = "zigbee2mqtt";
-      group = "zigbee2mqtt";
-      mode = "0400";
-    };
-
-    services.zigbee2mqtt = {
-      enable = true;
-      settings = {
-        version = 4;
-        mqtt = {
-          base_topic = "zigbee2mqtt";
-          server = "mqtt://192.168.113.42:1883";
-          # TODO: Write secret.yaml file
-          user = "!secret.yaml user";
-          password = "!secret.yaml password";
-        };
-        serial = {
-          port = "tcp://192.168.113.90:6638";
-          baudrate = 115200;
-          adapter = "ember";
-          disable_led = false;
-          advanced.transmit_power = 20;
-        };
-        advanced = {
-          channel = 11;
-        };
-        frontend = {
-          enabled = true;
-          port = 8080;
-        };
-        homeassistant = {
-          enabled = true;
-        };
-        availability.enabled = true;
-      };
-    };
-
-    services.nginx = {
-      enable = true;
-      recommendedProxySettings = true;
-      virtualHosts."zigbee2mqtt.kilonull.com" = {
-        locations."/" = {
-          recommendedProxySettings = true;
-          proxyWebsockets = true;
-          proxyPass = "http://127.0.0.1:8080";
-        };
-      }
-      // lib.optionalAttrs (cfg.acmeCertName != "") {
-        forceSSL = true;
-        useACMEHost = cfg.acmeCertName;
-      };
-    };
-  };
-}

modules/nixos/suites/utils/default.nix

@@ -16,14 +16,13 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = (
+    environment.systemPackages =
-      with pkgs;
+      (with pkgs; [
-      [
         bat
         bind # for dig
         curl
         deploy-rs
-        dust
+        du-dust
         fd
         file
         gnupg
@@ -35,13 +34,12 @@ in
         pre-commit
         progress
         python3
-        ragenix
         ripgrep
         sqlite
         tcpdump
         usbutils
         wget
-      ]
+      ])
-    );
+      ++ [ inputs.agenix.packages.x86_64-linux.default ];
   };
 }

overlays/signal-desktop-bin/default.nix

@@ -1,10 +0,0 @@
-{ ... }:
-(final: prev: {
-  signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (oldAttrs: {
-    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.makeWrapper ];
-    postInstall = oldAttrs.postInstall or "" + ''
-      wrapProgram $out/bin/signal-desktop \
-        --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland"
-    '';
-  });
-})

packages/catppuccin-swaync/default.nix

@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "catppuccin-swaync";
-  version = "1.0.1";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "https://github.com/catppuccin/swaync/releases/download/v${version}/catppuccin-${flavor}.css";
+    url = "https://github.com/catppuccin/swaync/releases/download/v${version}/${flavor}.css";
-    hash = "sha256-EKTAKCU9HlxrrVjNhyMRq7WGfz8DM9IFPUIEGl3nHbo=";
+    hash = "sha256-Hie/vDt15nGCy4XWERGy1tUIecROw17GOoasT97kIfc=";
   };
 
   donBuild = true;

secrets/secrets.nix

@@ -2,8 +2,6 @@ let
   # Remember to pass '--identity identities/me.txt` when using this key
   users.me = "age1yubikey1qdwgvfqrcqmyw56ux7azuvqr6f8nanszu27nztvxmn4utmplgxctzt90g25";
 
-  tmp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICJ7IsNxP/wa3X8isEp8Js7yVgk3gX2ud7EClvZClDpS";
-
   machines = {
     gospel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDzjXVoQEfO9JIcFbp56EvQ0oBdr9Cmhxp4z0ih+ZEZ";
     node = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETLBnc8kJokmFiA28BaSYpeE7flY1W0SM5C1pWv/tOv";
@@ -72,14 +70,4 @@ in
     machines.pi4
     machines.gospel
   ];
-  "zigbee2mqtt_mqtt.age".publicKeys = [
-    users.me
-    tmp
-    machines.pi4
-  ];
-  "zigbee2mqtt_creds.age".publicKeys = [
-    users.me
-    tmp
-    machines.node
-  ];
 }

secrets/zigbee2mqtt_creds.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> piv-p256 UIEGzg Ai9Ksp5u8wvOwiHy2wyH97mm6Pf0rcbuB4R8wotlG6xR
-REDbwR5Kqc2Y10j9HnPlHEqOORVMnlhTH/JySz7nVDo
--> ssh-ed25519 PZKfOQ N2nxHXlO0ZvqbSQLVT1l0ivTxGgkMxsuuO7pMMHzyC8
-5fSbG09zq6VrFxW4lCQHczvYF8ldfPenl1uEbQZq1g8
--> ssh-ed25519 Yk7ehg vtLVcIkOX3SwD64gm9Jlgg+pDpdR920/Aldck5v+oTk
-J8n4fgLOZ8LA4CFuT3O8+U1b9d7RFlG3P87PMrX3aok
---- X/MHaeT+EReR45PXmvXG1p3bFIip2OBva4/X2/GRhxM
-€ˆsaÜ)ŽŸdùã®OèöýT›8k7ù…ý§àâ ö
h04V¹uûºB/‹U¿Óö5W“>‡Ÿ¸¼à©SäÂh©õØp
2§¹G5hlÌl—ë

systems/aarch64-linux/pi4/default.nix

@@ -24,7 +24,7 @@
 
   aa = {
     nix.enable = true;
-    nix.useSelfhostedCache = false;
+    nix.useSelfhostedCache = true;
 
     services.tailscale = {
       enable = true;

systems/x86_64-linux/carbon/default.nix

@@ -9,8 +9,8 @@
   aa = {
     nix = {
       enable = true;
-      useSelfhostedCache = false;
+      useSelfhostedCache = true;
-      remoteBuilder.client.enable = false;
+      remoteBuilder.client.enable = true;
     };
 
     archetypes.workstation.enable = true;
@@ -27,10 +27,6 @@
 
     system.zfs.enable = true;
     apps.yubikey.enable = true;
-
-    user.extraGroups = [
-      "dialout"
-    ];
   };
 
   networking = {
@@ -69,12 +65,7 @@
     vlc
     signal-desktop-bin
   ];
-  environment.pathsToLink = [
-    "/share/applications"
-    "/share/xdg-desktop-portal"
-  ];
 
-  programs.adb.enable = true;
   programs.light.enable = true;
 
   # This value determines the NixOS release from which the default

systems/x86_64-linux/node/default.nix

@@ -17,7 +17,7 @@
 
   aa = {
     nix.enable = true;
-    nix.useSelfhostedCache = false;
+    nix.useSelfhostedCache = true;
 
     services.tailscale = {
       enable = true;
@@ -62,11 +62,6 @@
       acmeCertName = "kilonull.com";
     };
 
-    services.zigbee2mqtt = {
-      enable = true;
-      acmeCertName = "kilonull.com";
-    };
-
     security.acme = {
       enable = true;
       domainName = "kilonull.com";