diff --git a/dragonwell/default.nix b/dragonwell/default.nix index 96988c5e22f2b4349bdeb6531aa582727824620d..ad2682dc07f7e9cd32b0d2e99ab4b0012ad11bd8 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -8,7 +8,6 @@ # ./actual.nix ./caddy.nix ./cfg.nix ./dex.nix - ./forge-lines.nix ./foundry.nix ./git-pr.nix ./golink.nix diff --git a/dragonwell/forge-lines.nix b/dragonwell/forge-lines.nix deleted file mode 100644 index aa5ebf93e4bef7a8844645342648671b83ecc6d4..0000000000000000000000000000000000000000 --- a/dragonwell/forge-lines.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, ... }: -{ - age.secrets = { - forge-lines.file = ../secrets/forge-lines.age; - }; - services.forge-lines = { - enable = true; - discordTokenFile = config.age.secrets.forge-lines.path; - }; -} diff --git a/flake.lock b/flake.lock index 8122b577f11e313f72b58ca8f3277fad353e9562..4ec396d498b4d7078673bfea8e7a580dc92515ea 100644 --- a/flake.lock +++ b/flake.lock @@ -77,24 +77,6 @@ "type": "git", "url": "https://git.jolheiser.com/cfg-playground.git" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -167,29 +149,9 @@ "repo": "flake-utils", "type": "github" } }, - "forge-lines": { - "inputs": { - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1744397145, - "narHash": "sha256-z0lNSzTSZ/4FY2hT69BiPJXrgXasQ0z7V9k33wCURUQ=", - "ref": "refs/heads/main", - "rev": "09d9ac8c345fd6b65c964c8aa1963fd9fa47f066", - "revCount": 12, - "type": "git", - "url": "https://code.winston.sh/winston/forge-lines.git" - }, - "original": { - "type": "git", - "url": "https://code.winston.sh/winston/forge-lines.git" - } - }, "foundry": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1726638033, @@ -208,7 +170,7 @@ }, "git-age": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1699932777, @@ -224,34 +186,9 @@ "type": "git", "url": "https://git.jolheiser.com/git-age.git" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "forge-lines" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "forge-lines", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "git-pr": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1742931784, @@ -267,32 +204,10 @@ "type": "git", "url": "https://git.jolheiser.com/git-pr-nix.git" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "forge-lines", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "golink": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1733941744, @@ -310,7 +225,7 @@ } }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1734344598, @@ -327,7 +242,7 @@ } }, "jolheiser": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1730336541, @@ -373,39 +288,8 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_10": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { "lastModified": 1736798957, "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "nixos", @@ -420,7 +304,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1741481966, "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", @@ -435,7 +319,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -451,7 +335,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -466,7 +350,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1736241350, "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", @@ -482,7 +366,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1741481966, "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", @@ -530,22 +414,6 @@ } }, "nixpkgs_4": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { "lastModified": 1726447378, "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "nixos", @@ -560,7 +428,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1741481966, "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", @@ -575,7 +443,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1742800061, "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", @@ -591,7 +459,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1741310760, "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", @@ -606,7 +474,7 @@ "ref": "nixpkgs-unstable", "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1734119587, "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", @@ -622,10 +490,26 @@ "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "resume": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1697473034, @@ -647,7 +531,6 @@ "agenix": "agenix", "bennet": "bennet", "blog": "blog", "cfg-playground": "cfg-playground", - "forge-lines": "forge-lines", "foundry": "foundry", "git-age": "git-age", "git-pr": "git-pr", @@ -655,7 +538,7 @@ "golink": "golink", "home-manager": "home-manager", "jolheiser": "jolheiser", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "resume": "resume", "tailproxy": "tailproxy", "tclip": "tclip", @@ -755,7 +638,7 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1729968274, @@ -857,7 +740,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "utils": "utils" }, "locked": { @@ -876,7 +759,7 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -915,7 +798,7 @@ }, "website": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index 3f6efb44ec9e92f7d8a1c7fc6f9ab293200fa9a7..f358dbc8633bbc218909adf409c121e59aac616e 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ golink.url = "github:tailscale/golink"; 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"; }; outputs = @@ -73,7 +72,6 @@ inputs.git-pr.nixosModules.default inputs.tailproxy.nixosModules.default inputs.foundry.nixosModules.foundryvtt inputs.cfg-playground.nixosModules.default - inputs.forge-lines.nixosModules.default ./modules/tclip ./modules/miniserve ./dragonwell diff --git a/secrets/forge-lines.age b/secrets/forge-lines.age deleted file mode 100644 index b0e878b4302b7193a26ab71ef9cabc4b518bd266..0000000000000000000000000000000000000000 --- a/secrets/forge-lines.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g z8hVrv3gzEzMDN4oAmowfJTqrfZ8uuf2Ubvj6qPRAUc -bCro6AhefbThDPrKqIDres2F3ZjOgjmK0pW46sNHTTA --> ssh-ed25519 f31uNA hKyGGOikE6vNU0fFA5W6RHTYrME4L3meXZMn4zT7KC8 -XQaAPKvpxhVjZ34B4Eoua1rSn0NR78T1wNHXDq66fiM ---- C5jQ3eF/V8p0hXOKb0GvYkd/3caKl6nM/ezzlLiPoCY -N9¹-Op>!MC–¶6#gRë<~;×u6Xr(§Ù¯ï‡ ÀÏ1ÓÓn¸µô‚ЙéØ™ÈwJƒ*Ù²w¤JB<¶p´³¤³jåJ” %{îaœÒþËi¬ú†r×w‚ÿ—ÂV \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 62984963241bff3f06ee63123d0fb2e15d637954..c73a8e6e50614096ff5e1c3325d25ddfabf9fa6b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -15,5 +15,4 @@ "dex.age".publicKeys = keys; "dex-tailscale.age".publicKeys = keys; "dex-vikunja.age".publicKeys = keys; "dex-tandoor.age".publicKeys = keys; - "forge-lines.age".publicKeys = keys; }