diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 101 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | flake/devshells.nix | 1 | ||||
| -rw-r--r-- | flake/hosts.nix | 37 | ||||
| -rw-r--r-- | machines/nixos/x86_64-linux/do-rproxy/default.nix | 7 | ||||
| -rw-r--r-- | machines/nixos/x86_64-linux/synology-vm/default.nix | 7 |
6 files changed, 154 insertions, 4 deletions
@@ -23,6 +23,30 @@ "type": "github" } }, + "colmena": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "stable": "stable" + }, + "locked": { + "lastModified": 1755272288, + "narHash": "sha256-ypTPb2eKcOBbOoyvPV0j4ZOXs4kayo73/2KI456QnE0=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "5bf4ce6a24adba74a5184f4a9bef01d545a09473", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -110,6 +134,22 @@ "flake-compat": { "flake": false, "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { "lastModified": 1747046372, "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", @@ -123,7 +163,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -202,6 +242,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -306,7 +361,7 @@ }, "my-go-tools": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" @@ -325,6 +380,27 @@ "url": "https://code.fcuny.net/fcuny/x" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "colmena", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1755274400, @@ -412,7 +488,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "my-go-tools", @@ -435,7 +511,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" @@ -458,6 +534,7 @@ "root": { "inputs": { "agenix": "agenix", + "colmena": "colmena", "darwin": "darwin_2", "disko": "disko", "emacs-overlay": "emacs-overlay", @@ -472,6 +549,22 @@ "treefmt-nix": "treefmt-nix_2" } }, + "stable": { + "locked": { + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -56,6 +56,11 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; + colmena = { + url = "github:zhaofengli/colmena"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + my-go-tools.url = "git+https://code.fcuny.net/fcuny/x"; }; diff --git a/flake/devshells.nix b/flake/devshells.nix index 15c571b..3540bf5 100644 --- a/flake/devshells.nix +++ b/flake/devshells.nix @@ -52,6 +52,7 @@ with pkgs; [ nixos-rebuild + colmena git inputs.agenix.packages."${system}".default ] diff --git a/flake/hosts.nix b/flake/hosts.nix index 3ae840e..ff2b5a9 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -169,5 +169,42 @@ in { flake = { inherit nixosConfigurations darwinConfigurations; + colmena = { + meta = { + nixpkgs = import inputs.nixpkgs { + system = "x86_64-linux"; + overlays = [ + inputs.agenix.overlays.default + inputs.my-go-tools.overlays.default + ]; + }; + + specialArgs = { + inherit inputs self; + adminUser = { + name = "fcuny"; + uid = 1000; + userinfo = { + email = "franck@fcuny.net"; + fullName = "Franck Cuny"; + }; + }; + }; + }; + + defaults = + { + ... + }: + { + imports = defaultModules ++ [ + inputs.my-go-tools.nixosModules.default + inputs.home-manager.nixosModules.home-manager + ]; + }; + + synology-vm = import ../machines/nixos/x86_64-linux/synology-vm; + do-rproxy = import ../machines/nixos/x86_64-linux/do-rproxy; + }; }; } diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix index e187bd2..f308e79 100644 --- a/machines/nixos/x86_64-linux/do-rproxy/default.nix +++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix @@ -36,6 +36,13 @@ ./profiles/nginx.nix ]; + deployment = { + targetHost = "code.fcuny.net"; # I need to fix the mismatch + targetUser = "fcuny"; + buildOnTarget = true; + allowLocalDeployment = false; + }; + # do not use DHCP, as DigitalOcean provisions IPs using cloud-init networking.useDHCP = lib.mkForce false; diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix index 9316432..47a4a60 100644 --- a/machines/nixos/x86_64-linux/synology-vm/default.nix +++ b/machines/nixos/x86_64-linux/synology-vm/default.nix @@ -33,6 +33,13 @@ ./profiles/goget.nix ]; + deployment = { + targetHost = "vm-synology"; # I need to fix the mismatch + targetUser = "fcuny"; + buildOnTarget = true; + allowLocalDeployment = false; + }; + boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot.enable = true; |