diff --git a/dragonwell/default.nix b/dragonwell/default.nix index d2ce5cdd8083b4028064ad97ba291e4cfb335c1d..797b691424f46ca879c857eb0bba1393e1f3ad47 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -5,16 +5,19 @@ in { imports = [ ./caddy.nix + ./cfg.nix ./dex.nix ./forge-lines.nix ./foundry.nix ./git-pr.nix + ./golink.nix ./miniserve.nix ./pocket-id.nix ./pubserve.nix ./restic.nix ./soju.nix ./tandoor.nix + ./tclip.nix ./ugit.nix ./hardware.nix ]; diff --git a/flake.lock b/flake.lock index 3491c18df2df298b9072f6551ea1a33b59d8b5b7..38ce81c6d9b927caf3e300b6546c1bec522f4fa5 100644 --- a/flake.lock +++ b/flake.lock @@ -41,22 +41,6 @@ "type": "git", "url": "https://git.jolheiser.com/bennet.git" } }, - "beszel": { - "locked": { - "lastModified": 1742939577, - "narHash": "sha256-uia88Accp/sOZk5C0PMBQsImDE6KJ1J/hyM7W/58cnA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3755166bcb88619f292c885831cfef6485fff014", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3755166bcb88619f292c885831cfef6485fff014", - "type": "github" - } - }, "blog": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -359,24 +343,6 @@ "type": "git", "url": "https://git.jolheiser.com/nixpkgs.git" } }, - "mazanoke": { - "inputs": { - "nixpkgs": "nixpkgs_11" - }, - "locked": { - "lastModified": 1746641281, - "narHash": "sha256-EU8w6Hq5s175ymaxGZhLo6Exbciq4htbJFYzMZ8Hj6Y=", - "owner": "jolheiser", - "repo": "mazanoke-nix", - "rev": "e0f7ea2066e1166afa8501d640199dc5237705e4", - "type": "github" - }, - "original": { - "owner": "jolheiser", - "repo": "mazanoke-nix", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1734352517, @@ -440,22 +406,6 @@ } }, "nixpkgs_11": { "locked": { - "lastModified": 1746397377, - "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { "lastModified": 1746141548, "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", @@ -470,7 +420,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1741481966, "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", @@ -485,7 +435,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -501,7 +451,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -516,7 +466,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1736241350, "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", @@ -532,7 +482,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1741481966, "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", @@ -675,7 +625,7 @@ }, "resume": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1697473034, @@ -695,7 +645,6 @@ "root": { "inputs": { "agenix": "agenix", "bennet": "bennet", - "beszel": "beszel", "blog": "blog", "cfg-playground": "cfg-playground", "forge-lines": "forge-lines", @@ -705,9 +654,8 @@ "git-pr": "git-pr", "golink": "golink", "home-manager": "home-manager", "jolheiser": "jolheiser", - "mazanoke": "mazanoke", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "resume": "resume", "tailproxy": "tailproxy", "tclip": "tclip", @@ -807,7 +755,7 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1729968274, @@ -909,7 +857,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils" }, "locked": { @@ -928,7 +876,7 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -967,7 +915,7 @@ }, "website": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index f627d6db890c98e4322f52fb24d816c7e7f09efd..3f6efb44ec9e92f7d8a1c7fc6f9ab293200fa9a7 100644 --- a/flake.nix +++ b/flake.nix @@ -26,14 +26,11 @@ tclip.url = "github:tailscale-dev/tclip"; foundry.url = "github:reckenrode/nix-foundryvtt"; tailproxy.url = "git+https://git.jolheiser.com/tailproxy.git"; forge-lines.url = "git+https://code.winston.sh/winston/forge-lines.git"; - mazanoke.url = "github:jolheiser/mazanoke-nix"; - beszel.url = "github:nixos/nixpkgs/3755166bcb88619f292c885831cfef6485fff014"; }; outputs = { nixpkgs, - beszel, home-manager, nixos-hardware, agenix, @@ -61,37 +58,31 @@ { colmena = { meta = { nixpkgs = import nixpkgs { inherit overlays system; }; - nodeNixpkgs.shincha = import beszel { inherit overlays system; }; specialArgs = { inherit inputs; }; }; - dragonwell.imports = [ - inputs.agenix.nixosModules.default - inputs.ugit.nixosModules.default - inputs.git-pr.nixosModules.default - inputs.tailproxy.nixosModules.default - inputs.foundry.nixosModules.foundryvtt - inputs.forge-lines.nixosModules.default - ./modules/miniserve - ./dragonwell - ]; - jasmine.imports = [ ./jasmine ]; - gunpowder.imports = [ ./gunpowder ]; - shincha = + dragonwell = { pkgs, ... }: { imports = [ inputs.agenix.nixosModules.default inputs.golink.nixosModules.default + inputs.ugit.nixosModules.default + inputs.git-pr.nixosModules.default + inputs.tailproxy.nixosModules.default + inputs.foundry.nixosModules.foundryvtt inputs.cfg-playground.nixosModules.default - inputs.mazanoke.nixosModules.default - inputs.tailproxy.nixosModules.default + inputs.forge-lines.nixosModules.default ./modules/tclip - ./shincha + ./modules/miniserve + ./dragonwell ]; services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd; }; + jasmine.imports = [ ./jasmine ]; + gunpowder.imports = [ ./gunpowder ]; + shincha.imports = [ ./shincha ]; }; nixConfig = { extra-substitutors = [ "https://jolheiser.cachix.org" ]; diff --git a/secrets/beszel-shincha.age b/secrets/beszel-shincha.age deleted file mode 100644 index e81d7d4442ba48f270a4fa036e5415983caacbdc..0000000000000000000000000000000000000000 --- a/secrets/beszel-shincha.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g 3hWESZAMXSKnKnUWosMEJwXbSeudiQ40NCoF48kVS24 -JVP/xt+qVIugu+uNS0sg9gW5OdwrXjVhuSDmGZyCVGw --> ssh-ed25519 f31uNA bKfpISFkhxXfCLL2SwxWORIEROu+8GLdJUy389SPBGE -HKuav0FlZZw0Dg9gbTweNr3YIsen0VTGGDgcX0Q82Qc ---- 2uciEdq5AjFeD0f48YwHOe/MeXFewnijFaquOkEw75c -Ùêk>çØa‘FÔG}à[‚ôzœ2¯x´"§O¼+_Ô` \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5fcb8306f95888ca37bfd7cbe307b3048bddba6b..c22f7fd8f5810299ee5f59f4edf61ec6a928cff1 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -16,5 +16,4 @@ "dex-tailscale.age".publicKeys = keys; "dex-tandoor.age".publicKeys = keys; "forge-lines.age".publicKeys = keys; "pocket-id.age".publicKeys = keys; - "beszel-shincha.age".publicKeys = keys; } diff --git a/shincha/beszel.nix b/shincha/beszel.nix deleted file mode 100644 index 82e79d033f0522facad298d3151afe16778d1869..0000000000000000000000000000000000000000 --- a/shincha/beszel.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, ... }: -{ - age.secrets.beszel-shincha.file = ../secrets/beszel-shincha.age; - services = { - beszel = { - agent = { - enable = false; - environment = { - LOG_LEVEL = "info"; - KEY_FILE = config.age.secrets.beszel-shincha.path; - }; - }; - hub = { - enable = true; - environment = { - APP_URL = "https://monit"; - DISABLE_PASSWORD_AUTH = "true"; - }; - }; - }; - tailproxy.beszel = { - enable = true; - hostname = "monit"; - authKey = "tskey-auth-krRJB4JVL321CNTRL-Vfaa8HZwsVXzTU4MUAnBWXsZMCcFbrLVe"; # One-time key - port = 8090; - }; - }; -} diff --git a/shincha/cfg.nix b/dragonwell/cfg.nix rename from shincha/cfg.nix rename to dragonwell/cfg.nix diff --git a/shincha/default.nix b/shincha/default.nix index 139321e03fe4372aed7f54f87d0e0572aa17b73b..26a2950a9fd7b3f5e5c9f52da49e44a04496bf07 100644 --- a/shincha/default.nix +++ b/shincha/default.nix @@ -4,11 +4,6 @@ key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBxdG9mduIWiQ+egYKMvUKKCyShdeM8O6QsLs6g5aGt"; in { imports = [ - ./beszel.nix - ./cfg.nix - ./golink.nix - ./mazanoke.nix - ./tclip.nix ./hardware.nix ]; diff --git a/shincha/golink.nix b/dragonwell/golink.nix rename from shincha/golink.nix rename to dragonwell/golink.nix diff --git a/shincha/mazanoke.nix b/shincha/mazanoke.nix deleted file mode 100644 index db0415476f795cba4c8c4a20e7bcba8344248e8b..0000000000000000000000000000000000000000 --- a/shincha/mazanoke.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - services = { - mazanoke.enable = true; - tailproxy.mazanoke = { - enable = true; - hostname = "img"; - authKey = "tskey-auth-kN76twaVyw11CNTRL-aUgvGLQsBSjuJ94BgsDVSjRhTGCmXAmi"; # One-time key - funnel = true; - port = 6292; - }; - }; -} diff --git a/shincha/tclip.nix b/dragonwell/tclip.nix rename from shincha/tclip.nix rename to dragonwell/tclip.nix