diff --git a/flake.lock b/flake.lock index 5350a57..632e078 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1694793763, - "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", + "lastModified": 1695339232, + "narHash": "sha256-6wQHW3uHECpGIBolTccQ6x3/9b8E1SrO+VzTABKe2xM=", "owner": "ryantm", "repo": "agenix", - "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", + "rev": "7f9dfa309f24dc74450ecab6e74bc3d11c7ce735", "type": "github" }, "original": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1694643239, - "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", + "lastModified": 1695224363, + "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", + "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1694948089, - "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", + "lastModified": 1695132891, + "narHash": "sha256-cJR9AFHmt816cW/C9necLJyOg/gsnkvEeFAfxgeM1hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", + "rev": "8b5ab8341e33322e5b66fb46ce23d724050f6606", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ffcd512..faa9d75 100644 --- a/flake.nix +++ b/flake.nix @@ -138,6 +138,36 @@ } ]; }; + seattle = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + (import ./nix/seattle/configuration.nix) + { + _module.args.nixinate = { + host = "seattle"; + sshUser = "gsimmer"; + buildOn = "remote"; + substituteOnTarget = true; + hermetic = false; + }; + } + ]; + }; + glasgow = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + (import ./nix/glasgow/configuration.nix) + { + _module.args.nixinate = { + host = "glasgow"; + sshUser = "gsimmer"; + buildOn = "remote"; + substituteOnTarget = true; + hermetic = false; + }; + } + ]; + }; }; }; } diff --git a/nix/glasgow/configuration.nix b/nix/glasgow/configuration.nix index 9e7be20..7a40878 100644 --- a/nix/glasgow/configuration.nix +++ b/nix/glasgow/configuration.nix @@ -100,8 +100,6 @@ }; }; - system.copySystemConfiguration = true; - system.stateVersion = "23.11"; # dId YoU rEaD tHe CoMmEnT? } diff --git a/nix/seattle/configuration.nix b/nix/seattle/configuration.nix index 0c508a0..58426eb 100644 --- a/nix/seattle/configuration.nix +++ b/nix/seattle/configuration.nix @@ -21,7 +21,6 @@ device = "/var/lib/swapfile"; size = 8*1024; } - ]; nix = { @@ -89,7 +88,7 @@ enable = true; role = "server"; extraFlags = toString [ - "--secrets-encryption --disable=traefik" + "--secrets-encryption --disable=traefik,servicelb" ]; }; }; @@ -101,8 +100,6 @@ }; }; - system.copySystemConfiguration = true; - system.stateVersion = "23.11"; # dId YoU rEaD tHe CoMmEnT? } diff --git a/secrets/healthchecks-telegram.age b/secrets/healthchecks-telegram.age new file mode 100644 index 0000000..3b705b9 --- /dev/null +++ b/secrets/healthchecks-telegram.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 J+a91w A5LjYr2punHwopi3MLVg7gxugarehmt+STgPtlG763g +dR+yv0NzaBoS1wUyCLtdSlYpEr2wwCz9/qEMRWLIwsc +-> ssh-ed25519 qbziOw am3OwHqiNmN6+0DFZvM7Mu1vOtrDzSehvMToKb+N7yY +gYx4pBUfYO2E2FGw+d5/JhilVQe4X8Sqmk5DkkuC93I +-> x+-grease h U~\^ J+ +LfAClfehQO0VuW3SznrgyHZvWuyfnAWw8904J526IEFmqRnYQ0s8bjL7 +--- ldxjeql88IArA1a6Z4IvbDMIwTWX8o17RTat32VcXB0 +â^ëu¾w£‘†^Äè ŠÙ{K»ã±UNd=Èc’Ït7ÆÙƒéj7·„VÉY}_ƒ¡-wÕ×Ç «‡FÒNÊÓð¼øHÎçl׌ŸÅGíö> \ No newline at end of file