all repos — nixfiles @ ac01bd182f575a268e12b556f5ef5cdfbc4499a2

System and user configuration, managed by nix and home-manager

deploy to linde with colmena

Alan Pearce
commit

ac01bd182f575a268e12b556f5ef5cdfbc4499a2

parent

5efe9faa9ad762667137e00c742823beabc5be6d

4 files changed, 56 insertions(+), 6 deletions(-)

jump to
A hive.nix
@@ -0,0 +1,26 @@
+{
+  meta = {
+    nixpkgs = <nixpkgs>;
+    specialArgs = {
+      srvos = import <srvos>;
+    };
+  };
+
+  defaults = { pkgs, ... }: {
+    deployment = {
+      buildOnTarget = true;
+    };
+  };
+
+  linde = { name, nodes, srvos, ... }: {
+    imports = [
+      srvos.nixosModules.server
+      srvos.nixosModules.hardware-hetzner-cloud-arm
+      <agenix/modules/age.nix>
+      (builtins.getFlake (toString <searchix>)).nixosModules.web
+      (builtins.getFlake (toString <golink>)).nixosModules.default
+      ./packages/modules/nixos/laminar.nix
+      ./system/linde.nix
+    ];
+  };
+}
M npins/sources.json → npins/sources.json
@@ -36,6 +36,21 @@ "revision": "d9492638daa77fca7bf84e5b218cd95598ac3f72",
       "url": "https://github.com/nix-community/emacs-overlay/archive/d9492638daa77fca7bf84e5b218cd95598ac3f72.tar.gz",
       "hash": "0wr8y84g8q45y0vahvwx5px7728i88qskj3657g2i8j08skndlw6"
     },
+    "golink": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "tailscale",
+        "repo": "golink"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v1.0.0",
+      "revision": "b1db61ed5e5c1ee78403a6f1930f266f8f43eea6",
+      "url": "https://api.github.com/repos/tailscale/golink/tarball/v1.0.0",
+      "hash": "0l4b24h0r1ap7jl0pws7qpnyanjp4r1ix2r48ff3vrh5xk8sb2bh"
+    },
     "home-manager": {
       "type": "Git",
       "repository": {

@@ -89,6 +104,20 @@ "branch": "main",
       "revision": "eb2e9317b9e301ed5cbe2b07cb57b33558b79670",
       "url": "https://github.com/nix-community/NUR/archive/eb2e9317b9e301ed5cbe2b07cb57b33558b79670.tar.gz",
       "hash": "0gg453khpw5255rc6jgndid8qh2l9nh0jnrc1mlp24zjjqn567g8"
+    },
+    "searchix": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "Git",
+        "url": "https://git.alanpearce.eu/searchix"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v0.1.17",
+      "revision": "1b4bc895cf7a1943ba61448b29bb1dadd81c8182",
+      "url": null,
+      "hash": "1jnwisaamd7hnsp9f96c2n3x24n28a9bnkn48jkgid09ajzar725"
     },
     "srvos": {
       "type": "Git",
M shell.nix → shell.nix
@@ -11,6 +11,7 @@
   buildInputs = with pkgs; [
     npins
     fish
+    colmena
     (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { })
     (import sources.home-manager { inherit pkgs; }).home-manager
   ];
M system/linde.nix → system/linde.nix
@@ -17,7 +17,6 @@ net-mask6 = 64;
   net-gw6 = "fe80::1";
   domain = "alanpearce.eu";
   ts-domain = "hydra-pinecone.ts.net";
-  golink = (builtins.getFlake (toString <golink>)).nixosModules.default;
 in
 {
   imports =

@@ -25,8 +24,6 @@ [
       <personal/modules/nixos/laminar.nix>
       <home-manager/nixos>
       <agenix/modules/age.nix>
-      <searchix/nix/modules>
-      golink
       # Include the results of the hardware scan.
       ./linde-hardware.nix
 

@@ -296,9 +293,6 @@ openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII8VIII+598QOBxi/52O1Kb19RdUdX0aZmS1/dNoyqc5 alan@hetzner.strongbox"
       "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@secretive.marvin"
     ];
-  };
-  home-manager = {
-    users.alan = import ../user/server.nix;
   };
 
   users.users.nixremote = {