diff --git a/dragonwell/default.nix b/dragonwell/default.nix index 2814451187b6a0a9527c34d4045cc9b7d2e409c0..8d367f7d75e25d2544578d0ba497b48c04c7a1f2 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -11,7 +11,6 @@ ./forge-lines.nix ./foundry.nix #./git-bug.nix ./git-pr.nix - ./horcrux.nix ./mealie.nix ./miniserve.nix ./pocket-id.nix diff --git a/dragonwell/horcrux.nix b/dragonwell/horcrux.nix deleted file mode 100644 index d4dc26c97434ae869703f6b7821f068f8c68b43a..0000000000000000000000000000000000000000 --- a/dragonwell/horcrux.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, ... }: -{ - age.secrets.horcrux = { - file = ../secrets/horcrux.age; - owner = "horcrux"; - }; - services.horcrux = { - enable = true; - config = { - key = config.age.secrets.horcrux.path; - interval = "15m"; - repos = - let - repo = name: { - inherit name; - source = "https://git.jolheiser.com/${name}.git"; - dest = [ - "git@github.com:jolheiser/${name}" - "git@tangled.sh:jolheiser.com/${name}" - ]; - }; - in - [ - (repo "horcrux") - (repo "ugit") - (repo "helix.drv") - ]; - }; - }; -} diff --git a/flake.lock b/flake.lock index 88f8e4c109105f10a5537d08e95f0344342f3f1a..672e87f72d22aa3898e4fbeaae4f512c01fe1e05 100644 --- a/flake.lock +++ b/flake.lock @@ -287,27 +287,9 @@ "id": "home-manager", "type": "indirect" } }, - "horcrux": { - "inputs": { - "nixpkgs": "nixpkgs_10" - }, - "locked": { - "lastModified": 1757095920, - "narHash": "sha256-L9BkBUiMM3P88ECIGwyXa9I1mgU368C+7AseKsG2axg=", - "ref": "refs/heads/main", - "rev": "8cbda0b74aa054bc4659636eb91b2d5cf831ce6d", - "revCount": 5, - "type": "git", - "url": "https://git.jolheiser.com/horcrux.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/horcrux.git" - } - }, "mazanoke": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1746646765, @@ -370,22 +352,6 @@ } }, "nixpkgs_10": { "locked": { - "lastModified": 1756819007, - "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { "lastModified": 1746397377, "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", "owner": "nixos", @@ -400,7 +366,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1756386758, "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", @@ -416,7 +382,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1752012998, "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", @@ -432,7 +398,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1697383814, "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=", @@ -447,7 +413,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1729665710, "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", @@ -463,7 +429,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -478,7 +444,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1736241350, "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", @@ -494,7 +460,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { "lastModified": 1747060738, "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", @@ -510,7 +476,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1695806987, "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", @@ -526,13 +492,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { @@ -542,13 +508,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_2": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -670,7 +636,7 @@ } }, "oidc": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1752529116, @@ -688,7 +654,7 @@ } }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1753062776, @@ -717,10 +683,9 @@ "git-age": "git-age", "git-pr": "git-pr", "golink": "golink", "home-manager": "home-manager", - "horcrux": "horcrux", "mazanoke": "mazanoke", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "oidc": "oidc", "resume": "resume", "tailproxy": "tailproxy", @@ -791,7 +756,7 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1740421538, @@ -851,7 +816,7 @@ } }, "tailwind-ctp-lsp_2": { "inputs": { - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1699401590, @@ -869,7 +834,7 @@ } }, "tailwind-ctp_2": { "inputs": { - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1695841587, @@ -887,7 +852,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "utils": "utils" }, "locked": { @@ -906,7 +871,7 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -944,7 +909,7 @@ } }, "website": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index e0b33cd6ce439c38bfa45f09eac8d59ddf7c8bd4..e09cd4681a5f1b52c310a129eeff810d47482536 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,6 @@ cfg-playground.url = "git+https://git.jolheiser.com/cfg-playground.git"; ugit.url = "git+https://git.jolheiser.com/ugit.git"; git-pr.url = "git+https://git.jolheiser.com/git-pr-nix.git"; oidc.url = "git+https://git.jolheiser.com/oidc.git"; - horcrux.url = "git+https://git.jolheiser.com/horcrux.git"; # Other flakes golink.url = "github:tailscale/golink"; tclip.url = "github:tailscale-dev/tclip"; @@ -54,7 +53,6 @@ tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ; }) inputs.golink.overlays.default - # TODO remove this hack once mealie tests work again (_: prev: { mealie = prev.mealie.overrideAttrs (_: { doCheck = false; @@ -80,7 +78,6 @@ dragonwell.imports = [ inputs.agenix.nixosModules.default inputs.ugit.nixosModules.default inputs.git-pr.nixosModules.default - inputs.horcrux.nixosModules.default inputs.tailproxy.nixosModules.default inputs.foundry.nixosModules.foundryvtt inputs.forge-lines.nixosModules.default diff --git a/secrets/horcrux.age b/secrets/horcrux.age deleted file mode 100644 index f5682b987c8965ed0b1c196294a2eb51e9101330..0000000000000000000000000000000000000000 Binary files a/secrets/horcrux.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index eac658a54716684cfe43ee31693bd19cb8356b34..39ac8fd5916de4e5f12527d92e878720e8f69582 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -35,5 +35,4 @@ "beszel-jasmine.age".publicKeys = jasmineKeys; "beszel-gunpowder.age".publicKeys = gunpowderKeys; "mealie.age".publicKeys = dragonwellKeys; "pds.age".publicKeys = dragonwellKeys; - "horcrux.age".publicKeys = dragonwellKeys; }