diff --git a/flake.lock b/flake.lock index 45e19d2e..f7e432b1 100644 --- a/flake.lock +++ b/flake.lock @@ -92,6 +92,28 @@ "type": "github" } }, + "comin": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1780200954, + "narHash": "sha256-3476T026t+XSpOvgBGzKSG6J4swuRLnPO9dR+OATtq8=", + "owner": "nlewo", + "repo": "comin", + "rev": "4f14d338d755239c27131cbf6b466be4bbb20f91", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "comin", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -168,6 +190,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1767039857, @@ -277,7 +315,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -358,7 +396,7 @@ "mcp-hub": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1755841689, @@ -451,7 +489,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1780065812, @@ -469,6 +507,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -481,7 +535,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -497,7 +551,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1743689281, "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", @@ -661,6 +715,7 @@ "root": { "inputs": { "colmena": "colmena", + "comin": "comin", "disko": "disko", "firefox-addons": "firefox-addons", "git-hooks": "git-hooks", @@ -668,7 +723,7 @@ "nix-secrets": "nix-secrets", "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nvim": "nvim", "sops-nix": "sops-nix", "stylix": "stylix" @@ -836,6 +891,24 @@ "repo": "base16-zed", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6b4b6f92..3b06463e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,6 @@ nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; }; - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; }; @@ -22,6 +18,22 @@ url = "git+ssh://git@github.com/hektor/nix-secrets?shallow=1&ref=main"; flake = false; }; + colmena = { + url = "github:zhaofengli/colmena"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + comin = { + url = "github:nlewo/comin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + git-hooks = { + url = "github:cachix/git-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,23 +50,15 @@ url = "path:./dots/.config/nvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - colmena = { - url = "github:zhaofengli/colmena"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - git-hooks = { - url = "github:cachix/git-hooks.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, nixpkgs, + git-hooks, home-manager, nixgl, - git-hooks, ... }@inputs: let diff --git a/hosts/hecuba/default.nix b/hosts/hecuba/default.nix index edbd229d..c59055c9 100644 --- a/hosts/hecuba/default.nix +++ b/hosts/hecuba/default.nix @@ -11,6 +11,7 @@ imports = [ inputs.disko.nixosModules.disko ./hard.nix + inputs.comin.nixosModules.comin ./host.nix ../../modules ]; @@ -62,8 +63,20 @@ kitty.terminfo ]; - services.fail2ban = { - enable = true; - maxretry = 5; + services = { + comin = { + enable = true; + remotes = [ + { + name = "origin"; + url = "https://git.hektormisplon.xyz/hektor/nix"; + branches.main.name = "main"; + } + ]; + }; + fail2ban = { + enable = true; + maxretry = 5; + }; }; }