diff --git a/flake.lock b/flake.lock index 4fb5eb36432fd6971161eb6a0d91708fbb6eefb0..d55bd20aaa37b2420ae0a896578f3e2b6c976cbc 100644 --- a/flake.lock +++ b/flake.lock @@ -402,22 +402,6 @@ } }, "nixpkgs_12": { "locked": { - "lastModified": 1752012998, - "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2a2130494ad647f953593c4e84ea4df839fbd68c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { "lastModified": 1697383814, "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=", "owner": "nixos", @@ -431,7 +415,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1729665710, "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", @@ -447,7 +431,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -462,7 +446,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1736241350, "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", @@ -478,7 +462,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1747060738, "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", @@ -494,7 +478,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { "lastModified": 1695806987, "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", @@ -510,7 +494,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1699343069, "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", @@ -652,28 +636,10 @@ "repo": "nixpkgs", "type": "github" } }, - "oidc": { - "inputs": { - "nixpkgs": "nixpkgs_12" - }, - "locked": { - "lastModified": 1752529116, - "narHash": "sha256-gqpQ9Bm3CLJzQKpDyepArECW8LvrMHaQmd9p3eH6m1Y=", - "ref": "refs/heads/main", - "rev": "123af8cc2c47cd0feb2de7add5655d02b3158bb0", - "revCount": 6, - "type": "git", - "url": "https://git.jolheiser.com/oidc.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/oidc.git" - } - }, "resume": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1697473034, @@ -705,7 +671,6 @@ "home-manager": "home-manager", "mazanoke": "mazanoke", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_11", - "oidc": "oidc", "resume": "resume", "tailproxy": "tailproxy", "tclip": "tclip", @@ -790,7 +755,7 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1740421538, @@ -850,7 +815,7 @@ } }, "tailwind-ctp-lsp_2": { "inputs": { - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1699401590, @@ -868,7 +833,7 @@ } }, "tailwind-ctp_2": { "inputs": { - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1695841587, @@ -886,7 +851,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils" }, "locked": { @@ -905,7 +870,7 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -943,7 +908,7 @@ } }, "website": { "inputs": { - "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 942d80cc13fc5528317a4a77eb922b0f9bab1c1b..d4bf99c73982453ad27c35186d2def722bc8735d 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,6 @@ git-age.url = "git+https://git.jolheiser.com/git-age.git"; 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"; # Other flakes golink.url = "github:tailscale/golink"; tclip.url = "github:tailscale-dev/tclip"; @@ -98,7 +97,6 @@ inputs.golink.nixosModules.default inputs.cfg-playground.nixosModules.default inputs.mazanoke.nixosModules.default inputs.tailproxy.nixosModules.default - inputs.oidc.nixosModules.default ./modules/tclip ./shincha beszelHub diff --git a/shincha/default.nix b/shincha/default.nix index 27364a6479942c44d2490b6ae1e04f1d8f90d12d..3803d44daa505644407452167719b4857c04f55d 100644 --- a/shincha/default.nix +++ b/shincha/default.nix @@ -8,7 +8,6 @@ ./beszel.nix ./cfg.nix ./golink.nix ./mazanoke.nix - ./oidc.nix ./tclip.nix ./hardware.nix ]; diff --git a/shincha/oidc.nix b/shincha/oidc.nix deleted file mode 100644 index 5e32e51e8a5fa9232b4f5d65de28d87763778245..0000000000000000000000000000000000000000 --- a/shincha/oidc.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - services = { - oidc-playground = { - enable = true; - origin = "https://oidc"; - }; - tailproxy.oidc-playground = { - enable = true; - hostname = "oidc"; - authKey = "tskey-auth-kkFJ2NFkCX11CNTRL-Doq9XTGfm9Vxn8nb6QQU9VjmAh6ZFgih"; # One-time key - port = 6432; - }; - }; -}