diff --git a/dragonwell/caddy.nix b/dragonwell/caddy.nix index efaf57ec970bfa78338e847540a2b0d9cd963e63..c6d1b0ec85ebe3b02d37ced90629eabd8fbd36c5 100644 --- a/dragonwell/caddy.nix +++ b/dragonwell/caddy.nix @@ -77,13 +77,6 @@ ''; "pds.jolheiser.com".extraConfig = '' reverse_proxy localhost:2759 ''; - "budget.jolheiser.com".extraConfig = '' - handle_path /static/* { - root * ${pkgs.jolheiser.mint}/lib/mint/static/ - file_server - } - reverse_proxy localhost:6468 - ''; "dev.jolheiser.com".extraConfig = '' reverse_proxy localhost:3389 handle_errors 502 503 504 { diff --git a/dragonwell/default.nix b/dragonwell/default.nix index 65134be94c6ca975b8542510645deff828bcef54..2814451187b6a0a9527c34d4045cc9b7d2e409c0 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -14,7 +14,6 @@ ./git-pr.nix ./horcrux.nix ./mealie.nix ./miniserve.nix - ./mint.nix ./pocket-id.nix ./pubserve.nix ./restic.nix diff --git a/dragonwell/mint.nix b/dragonwell/mint.nix deleted file mode 100644 index 6fef2695f7d3b46a9768999acf21eed459fd2e31..0000000000000000000000000000000000000000 --- a/dragonwell/mint.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: -{ - age.secrets.mint.file = ../secrets/mint.age; - services.mint = { - enable = true; - settings = { - MINT_LOG_LEVEL = "INFO"; - }; - environmentFile = config.age.secrets.mint.path; - }; -} diff --git a/flake.lock b/flake.lock index bfd2d23ce2bbc822d71dc2d172ff6eb60275a6d1..22ac092df49c5866625e90dea9f702590a19f77a 100644 --- a/flake.lock +++ b/flake.lock @@ -323,24 +323,6 @@ "repo": "mazanoke-nix", "type": "github" } }, - "mint": { - "inputs": { - "nixpkgs": "nixpkgs_12" - }, - "locked": { - "lastModified": 1758713828, - "narHash": "sha256-QhEy7h4lC68kgWlX7DdjkJVWFdhaZR2RysamJaH2H8M=", - "ref": "refs/heads/main", - "rev": "b054f24312ec9aa6f942324fa6941abc2d10ec2b", - "revCount": 13, - "type": "git", - "url": "https://git.jolheiser.com/mint.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/mint.git" - } - }, "nixos-hardware": { "locked": { "lastModified": 1757943327, @@ -420,22 +402,6 @@ } }, "nixpkgs_12": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { "lastModified": 1758198701, "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", @@ -450,7 +416,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1752012998, "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", @@ -466,7 +432,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1697383814, "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=", @@ -481,7 +447,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1748856973, "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", @@ -497,7 +463,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -512,7 +478,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { "lastModified": 1755205935, "narHash": "sha256-EQ6qHuJWguaoBZyxdqsgJqyEdS77k+2CnlKrfFxlkRY=", @@ -528,7 +494,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1747060738, "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", @@ -544,13 +510,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1753399495, + "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", "type": "github" }, "original": { @@ -560,13 +526,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_2": { "locked": { - "lastModified": 1753399495, - "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -576,7 +542,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_20": { "locked": { "lastModified": 1699343069, "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", @@ -704,7 +670,7 @@ } }, "oidc": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1752529116, @@ -722,7 +688,7 @@ } }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1753062776, @@ -753,9 +719,8 @@ "golink": "golink", "home-manager": "home-manager", "horcrux": "horcrux", "mazanoke": "mazanoke", - "mint": "mint", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "oidc": "oidc", "resume": "resume", "tailproxy": "tailproxy", @@ -826,7 +791,7 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1755099374, @@ -886,7 +851,7 @@ } }, "tailwind-ctp-lsp_2": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1699401590, @@ -904,7 +869,7 @@ } }, "tailwind-ctp_2": { "inputs": { - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1753803577, @@ -922,7 +887,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "utils": "utils" }, "locked": { @@ -941,7 +906,7 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -979,7 +944,7 @@ } }, "website": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index b7754f6f81a339d8609a5dbdc7640de3032ad32e..e0b33cd6ce439c38bfa45f09eac8d59ddf7c8bd4 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ 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"; - mint.url = "git+https://git.jolheiser.com/mint.git"; # Other flakes golink.url = "github:tailscale/golink"; tclip.url = "github:tailscale-dev/tclip"; @@ -50,7 +49,6 @@ resume = inputs.resume.packages.${prev.system}.default; git-age = inputs.git-age.packages.${prev.system}.default; blog = inputs.blog.packages.${prev.system}.default; bennet = inputs.bennet.packages.${prev.system}.default; - mint = inputs.mint.packages.${prev.system}.default; }; tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ; @@ -83,7 +81,6 @@ inputs.agenix.nixosModules.default inputs.ugit.nixosModules.default inputs.git-pr.nixosModules.default inputs.horcrux.nixosModules.default - inputs.mint.nixosModules.default inputs.tailproxy.nixosModules.default inputs.foundry.nixosModules.foundryvtt inputs.forge-lines.nixosModules.default diff --git a/secrets/mint.age b/secrets/mint.age deleted file mode 100644 index 021fc7a5a17911feeafae493fd4f5f37ceb3f864..0000000000000000000000000000000000000000 Binary files a/secrets/mint.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index bb6d574ca05206b8465ad8e99d9ce563383d80f9..eac658a54716684cfe43ee31693bd19cb8356b34 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -36,5 +36,4 @@ "beszel-gunpowder.age".publicKeys = gunpowderKeys; "mealie.age".publicKeys = dragonwellKeys; "pds.age".publicKeys = dragonwellKeys; "horcrux.age".publicKeys = dragonwellKeys; - "mint.age".publicKeys = dragonwellKeys; }