From 12a0213098e34dc11f325821b22b44517e553d59 Mon Sep 17 00:00:00 2001 From: James Walker Date: Sun, 25 Aug 2024 13:42:38 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20remove=20homestar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 1796 +-------------------------------- flake.nix | 9 +- hosts/plato/configuration.nix | 26 - modules/dev/default.nix | 1 - secrets/secrets.yaml | 7 +- services/homestar.nix | 85 -- 6 files changed, 30 insertions(+), 1894 deletions(-) delete mode 100644 services/homestar.nix diff --git a/flake.lock b/flake.lock index f6a07a0..f983446 100644 --- a/flake.lock +++ b/flake.lock @@ -1,184 +1,5 @@ { "nodes": { - "HTTP": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1708191677, - "narHash": "sha256-7M3B0E8ZjB0HOuNTO2XzJwFPE9A8y/t54UU1QIKKEC8=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "4484e7ae6bc8d214cd5e9c376028578aeeff7ce0", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, - "cabal-32": { - "flake": false, - "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", - "owner": "haskell", - "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.2", - "repo": "cabal", - "type": "github" - } - }, - "cabal-34": { - "flake": false, - "locked": { - "lastModified": 1645834128, - "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", - "owner": "haskell", - "repo": "cabal", - "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", - "type": "github" - } - }, - "cabal-36": { - "flake": false, - "locked": { - "lastModified": 1669081697, - "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", - "owner": "haskell", - "repo": "cabal", - "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" - } - }, - "cardano-shell": { - "flake": false, - "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", - "type": "github" - } - }, - "command-utils": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1709702368, - "narHash": "sha256-1YOPubkJ5M6HigdfN0gn0AZ3kx6MHboG9UbWpYpk3gM=", - "owner": "expede", - "repo": "nix-command-utils", - "rev": "8f7179876383495b1f98311e53ebb41649ca270a", - "type": "github" - }, - "original": { - "owner": "expede", - "repo": "nix-command-utils", - "type": "github" - } - }, - "crane": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": [ - "fission", - "homestar", - "nixify", - "nix-log", - "nixify", - "flake-utils" - ], - "nixpkgs": [ - "fission", - "homestar", - "nixify", - "nix-log", - "nixify", - "nixpkgs" - ], - "rust-overlay": [ - "fission", - "homestar", - "nixify", - "nix-log", - "nixify", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1679255352, - "narHash": "sha256-nkGwGuNkhNrnN33S4HIDV5NzkzMLU5mNStRn9sZwq8c=", - "owner": "rvolosatovs", - "repo": "crane", - "rev": "cec65880599a4ec6426186e24342e663464f5933", - "type": "github" - }, - "original": { - "owner": "rvolosatovs", - "ref": "feat/wit", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -186,11 +7,11 @@ ] }, "locked": { - "lastModified": 1724469941, - "narHash": "sha256-+U5152FwmDD9EUOiFi5CFxCK6/yFESyDei9jEIlmUtI=", + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ea319a737939094b48fda9063fa3201ef2479aac", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "type": "github" }, "original": { @@ -251,154 +72,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "fission", - "homestar", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1709446916, - "narHash": "sha256-MX3eR3ao971besQvKt9aKu4tN8tZht7Do3G/eNylNY8=", - "owner": "nix-community", - "repo": "fenix", - "rev": "4b07da0f91ea99f263f47165a11a48678c9e0dc3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "fission", - "homestar", - "nixify", - "nixpkgs-nixos" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1708150887, - "narHash": "sha256-lyEaeShLZqQtFO+ULLfxF9fYaYpTal0Ck1B+iKYBOMs=", - "owner": "nix-community", - "repo": "fenix", - "rev": "761431323e30846bae160e15682cfa687c200606", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_3": { - "inputs": { - "nixpkgs": [ - "fission", - "homestar", - "nixify", - "nix-log", - "nixify", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_3" - }, - "locked": { - "lastModified": 1679552560, - "narHash": "sha256-L9Se/F1iLQBZFGrnQJO8c9wE5z0Mf8OiycPGP9Y96hA=", - "owner": "nix-community", - "repo": "fenix", - "rev": "fb49a9f5605ec512da947a21cc7e4551a3950397", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fission": { - "inputs": { - "fission": "fission_2", - "fission-server": "fission-server", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", - "homestar": "homestar", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710876331, - "narHash": "sha256-gNHB8RXM8jz3sZj5s3c0Jjrl06kMoksAi/qWvPT5E04=", - "owner": "fission-codes", - "repo": "nix-overlay", - "rev": "c3c370a793f7b9ee1d254d66e81fafd29b53bdfa", - "type": "github" - }, - "original": { - "owner": "fission-codes", - "repo": "nix-overlay", - "type": "github" - } - }, - "fission-server": { - "inputs": { - "command-utils": "command-utils", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable_2", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1710790309, - "narHash": "sha256-Kgk/pqe0gvc34up4JOyXVWkJ3yFABFo0GF+xjJorxl8=", - "owner": "fission-codes", - "repo": "fission-server", - "rev": "b5f7228f2efe09989665dac519acf8cc04887647", - "type": "github" - }, - "original": { - "owner": "fission-codes", - "repo": "fission-server", - "rev": "b5f7228f2efe09989665dac519acf8cc04887647", - "type": "github" - } - }, - "fission_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "haskellNix": "haskellNix", - "nixpkgs": [ - "fission", - "fission", - "haskellNix", - "nixpkgs-2305" - ] - }, - "locked": { - "lastModified": 1707949101, - "narHash": "sha256-vTed5vRYfeS+6Y+QbwyCc9LohsfsWsEA0+5kAgJg7Yc=", - "owner": "fission-codes", - "repo": "fission", - "rev": "16f4562ee31cf9458efd2a6f9db3849a91e2b079", - "type": "github" - }, - "original": { - "owner": "fission-codes", - "ref": "walkah/haskell-nix", - "repo": "fission", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -434,16 +107,15 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", - "owner": "input-output-hk", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -464,96 +136,16 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_9": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -566,77 +158,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -651,111 +172,6 @@ "type": "github" } }, - "flake-utils_7": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "ghc-8.6.5-iohk": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "ghc98X": { - "flake": false, - "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "ref": "ghc-9.8", - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, - "ghc99": { - "flake": false, - "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", - "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -777,198 +193,9 @@ "type": "github" } }, - "hackage": { - "flake": false, - "locked": { - "lastModified": 1707870123, - "narHash": "sha256-pOvz6uuPYw3CiPgi63QhNYumoKeyzDh9JOkLDngGWsE=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "75345eba5d4159e6f54cbdc38785d1e0d0e655e0", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "haskellNix": { - "inputs": { - "HTTP": "HTTP", - "cabal-32": "cabal-32", - "cabal-34": "cabal-34", - "cabal-36": "cabal-36", - "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_3", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc98X": "ghc98X", - "ghc99": "ghc99", - "hackage": "hackage", - "hls-1.10": "hls-1.10", - "hls-2.0": "hls-2.0", - "hls-2.2": "hls-2.2", - "hls-2.3": "hls-2.3", - "hls-2.4": "hls-2.4", - "hls-2.5": "hls-2.5", - "hls-2.6": "hls-2.6", - "hpc-coveralls": "hpc-coveralls", - "hydra": "hydra", - "iserv-proxy": "iserv-proxy", - "nix-tools-static": "nix-tools-static", - "nixpkgs": [ - "fission", - "fission", - "haskellNix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", - "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-unstable": "nixpkgs-unstable", - "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage" - }, - "locked": { - "lastModified": 1707876653, - "narHash": "sha256-hsj9chw/cy9h8XuxQkxnfFR22Ek8xEm33aON2+TcUaI=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "d1a608f84c9ed00ceca8571b253e79f67a1ae2d6", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "hls-1.10": { - "flake": false, - "locked": { - "lastModified": 1680000865, - "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "1.10.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.0": { - "flake": false, - "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.0.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.2": { - "flake": false, - "locked": { - "lastModified": 1693064058, - "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.2.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.3": { - "flake": false, - "locked": { - "lastModified": 1695910642, - "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.3.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.4": { - "flake": false, - "locked": { - "lastModified": 1699862708, - "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.4.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.5": { - "flake": false, - "locked": { - "lastModified": 1701080174, - "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.5.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.6": { - "flake": false, - "locked": { - "lastModified": 1705325287, - "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.6.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1724435763, @@ -984,370 +211,7 @@ "type": "github" } }, - "homestar": { - "inputs": { - "fenix": "fenix", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", - "nixify": "nixify", - "nixlib": "nixlib_3", - "nixos-unstable": "nixos-unstable", - "nixpkgs": "nixpkgs_6", - "wit-deps": "wit-deps" - }, - "locked": { - "lastModified": 1710354597, - "narHash": "sha256-0O7+4SkVxrxKbX5lYazcCwvSSUH+2RUDgASkgdZ4Rc8=", - "owner": "ipvm-wg", - "repo": "homestar", - "rev": "20513a1586fdf3474809c3c5748201ccd4ebb37d", - "type": "github" - }, - "original": { - "owner": "ipvm-wg", - "ref": "homestar-runtime-v0.3.0", - "repo": "homestar", - "type": "github" - } - }, - "hpc-coveralls": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hydra": { - "inputs": { - "nix": "nix", - "nixpkgs": [ - "fission", - "fission", - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", - "owner": "NixOS", - "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "iserv-proxy": { - "flake": false, - "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" - }, - "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "macos-sdk": { - "flake": false, - "locked": { - "lastModified": 1693509154, - "narHash": "sha256-TEvVJy+NMPyzgWSk/6S29ZMQR+ICFxSdS3tw247uhFc=", - "type": "tarball", - "url": "https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-filter_2": { - "locked": { - "lastModified": 1678109515, - "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-flake-tests": { - "locked": { - "lastModified": 1677844186, - "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", - "owner": "antifuchs", - "repo": "nix-flake-tests", - "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", - "type": "github" - }, - "original": { - "owner": "antifuchs", - "repo": "nix-flake-tests", - "type": "github" - } - }, - "nix-flake-tests_2": { - "locked": { - "lastModified": 1677844186, - "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", - "owner": "antifuchs", - "repo": "nix-flake-tests", - "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", - "type": "github" - }, - "original": { - "owner": "antifuchs", - "repo": "nix-flake-tests", - "type": "github" - } - }, - "nix-log": { - "inputs": { - "nix-flake-tests": "nix-flake-tests", - "nixify": "nixify_2", - "nixlib": "nixlib_2" - }, - "locked": { - "lastModified": 1681933283, - "narHash": "sha256-phDsQdaoUEI4DUTErR6Tz7lS0y3kXvDwwbqtxpzd0eo=", - "owner": "rvolosatovs", - "repo": "nix-log", - "rev": "833d31e3c1a677eac81ba87e777afa5076071d66", - "type": "github" - }, - "original": { - "owner": "rvolosatovs", - "repo": "nix-log", - "type": "github" - } - }, - "nix-log_2": { - "inputs": { - "nix-flake-tests": "nix-flake-tests_2", - "nixify": [ - "fission", - "homestar", - "wit-deps", - "nixify" - ], - "nixlib": [ - "fission", - "homestar", - "wit-deps", - "nixlib" - ] - }, - "locked": { - "lastModified": 1681933283, - "narHash": "sha256-phDsQdaoUEI4DUTErR6Tz7lS0y3kXvDwwbqtxpzd0eo=", - "owner": "rvolosatovs", - "repo": "nix-log", - "rev": "833d31e3c1a677eac81ba87e777afa5076071d66", - "type": "github" - }, - "original": { - "owner": "rvolosatovs", - "repo": "nix-log", - "type": "github" - } - }, - "nix-tools-static": { - "flake": false, - "locked": { - "lastModified": 1706266250, - "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", - "owner": "input-output-hk", - "repo": "haskell-nix-example", - "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "haskell-nix-example", - "type": "github" - } - }, - "nixify": { - "inputs": { - "advisory-db": "advisory-db", - "crane": "crane", - "fenix": "fenix_2", - "flake-utils": "flake-utils_6", - "macos-sdk": "macos-sdk", - "nix-filter": "nix-filter", - "nix-log": "nix-log", - "nixlib": [ - "fission", - "homestar", - "nixlib" - ], - "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-jshon": "nixpkgs-jshon", - "nixpkgs-nixos": "nixpkgs-nixos", - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1708246952, - "narHash": "sha256-amIS9blx/k8mHIhYsfqOEaswd13d3661Wex5fV9dv60=", - "owner": "rvolosatovs", - "repo": "nixify", - "rev": "037635eaf516922675872794f923e25c99d144be", - "type": "github" - }, - "original": { - "owner": "rvolosatovs", - "repo": "nixify", - "type": "github" - } - }, - "nixify_2": { - "inputs": { - "crane": "crane_2", - "fenix": "fenix_3", - "flake-utils": "flake-utils_7", - "nix-filter": "nix-filter_2", - "nixlib": "nixlib", - "nixpkgs": "nixpkgs_5", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1679748566, - "narHash": "sha256-yA4yIJjNCOLoUh0py9S3SywwbPnd/6NPYbXad+JeOl0=", - "owner": "rvolosatovs", - "repo": "nixify", - "rev": "80e823959511a42dfec4409fef406a14ae8240f3", - "type": "github" - }, - "original": { - "owner": "rvolosatovs", - "repo": "nixify", - "type": "github" - } - }, "nixlib": { - "locked": { - "lastModified": 1679187309, - "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "44214417fe4595438b31bdb9469be92536a61455", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixlib_2": { - "locked": { - "lastModified": 1679791877, - "narHash": "sha256-tTV1Mf0hPWIMtqyU16Kd2JUBDWvfHlDC9pF57vcbgpQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "cc060ddbf652a532b54057081d5abd6144d01971", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixlib_3": { - "locked": { - "lastModified": 1709426687, - "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixlib_4": { "locked": { "lastModified": 1723942470, "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=", @@ -1364,7 +228,7 @@ }, "nixos-generators": { "inputs": { - "nixlib": "nixlib_4", + "nixlib": "nixlib", "nixpkgs": [ "nixpkgs" ] @@ -1385,11 +249,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724495652, - "narHash": "sha256-Q/sAhwemnZqAsSadjTNqTkoLN2xPouPdU1oLJ3Tjlhg=", + "lastModified": 1724575805, + "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1c84c314db42dd40ed6cf9293b9451ec2e7ebee4", + "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", "type": "github" }, "original": { @@ -1399,213 +263,22 @@ "type": "github" } }, - "nixos-unstable": { - "locked": { - "lastModified": 1709558755, - "narHash": "sha256-hx4FIbk4X4ve1oiHLOj+VE6dzO4CtXBR5RSU6kaq34M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "207107bbc7d6d19a8b2c36a088d3756d03490243", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable-small", - "type": "indirect" - } - }, "nixpkgs": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2003": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2205": { - "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2211": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2305": { - "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2311": { - "locked": { - "lastModified": 1701386440, - "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-darwin": { - "locked": { - "lastModified": 1708105575, - "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-23.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-jshon": { - "locked": { - "lastModified": 1701781644, - "narHash": "sha256-z6MHVdvNM6PnwxofjyCTXYrDCRB6dXs82lMyAxfK2ik=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "89023fc074c2333ec5f1d28075602c94341655d2", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "89023fc074c2333ec5f1d28075602c94341655d2", - "type": "github" - } - }, - "nixpkgs-nixos": { - "locked": { - "lastModified": 1708105575, - "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -1638,131 +311,7 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1694822471, - "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", - "type": "github" - } - }, - "nixpkgs-unstable_2": { - "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1709569716, - "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "617579a787259b9a6419492eaac670a5f7663917", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1679577639, - "narHash": "sha256-7u7bsNP0ApBnLgsHVROQ5ytoMqustmMVMgtaFS/P7EU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8f1bcd72727c5d4cd775545595d068be410f2a7e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -1778,26 +327,9 @@ "type": "github" } }, - "old-ghc-nix": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -1823,158 +355,17 @@ "darwin": "darwin", "deploy-rs": "deploy-rs", "dotfiles": "dotfiles", - "fission": "fission", - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_8", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", "home-manager": "home-manager", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "sops-nix": "sops-nix", "workon": "workon" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1709373076, - "narHash": "sha256-vRBRyCVMhH+giewRQgOgNO+p7VlGeJNgCqrZBnvfWQc=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "4ef6a49b44e8aa380da7522442234bfd7a52c55e", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1708018577, - "narHash": "sha256-B75VUqKvQeIqAUnYw4bGjY3xxrCqzRBJHLbmD0MAWEw=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "b9b0d29b8e69b02457cfabe20c4c69cdb45f3cc5", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_3": { - "flake": false, - "locked": { - "lastModified": 1679520343, - "narHash": "sha256-AJGSGWRfoKWD5IVTu1wEsR990wHbX0kIaolPqNMEh0c=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "eb791f31e688ae00908eb75d4c704ef60c430a92", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "fission", - "fission-server", - "flake-utils" - ], - "nixpkgs": [ - "fission", - "fission-server", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710727870, - "narHash": "sha256-Ulsx+t4SnRmjMJx4eF2Li+3rBGYhZp0XNShVjIheCfg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a1b17cacfa7a6ed18f553a195a047f4e73e95da9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "fission", - "homestar", - "nixify", - "nix-log", - "nixify", - "flake-utils" - ], - "nixpkgs": [ - "fission", - "homestar", - "nixify", - "nix-log", - "nixify", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679537973, - "narHash": "sha256-R6borgcKeyMIjjPeeYsfo+mT8UdS+OwwbhhStdCfEjg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "fbc7ae3f14d32e78c0e8d7865f865cc28a46b232", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "flake-utils": [ - "fission", - "homestar", - "nixify", - "flake-utils" - ], - "nixpkgs": [ - "fission", - "homestar", - "nixify", - "nixpkgs-nixos" - ] - }, - "locked": { - "lastModified": 1708135817, - "narHash": "sha256-EUMO/K3+Wgh0THOLoRXhxrh6G/pQ7BlJ8No+ciy1nKA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c77e68d33a84ce3f9e86905c0f2ef78d5defad28", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1996,22 +387,6 @@ "type": "github" } }, - "stackage": { - "flake": false, - "locked": { - "lastModified": 1707782972, - "narHash": "sha256-kJMGCvGbkYUM1XYubcYpeOTvsNSW2UAU+5xtR3mSV3A=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "e9080d9ae6b8f5bd5e1a3981cfa214fc3c36fe16", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -2057,96 +432,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" @@ -2165,39 +450,10 @@ "type": "github" } }, - "wit-deps": { - "inputs": { - "nix-log": "nix-log_2", - "nixify": [ - "fission", - "homestar", - "nixify" - ], - "nixlib": [ - "fission", - "homestar", - "nixlib" - ] - }, - "locked": { - "lastModified": 1700564022, - "narHash": "sha256-1vU6go1MLuFIB1up2jn6hlIHSfaRr+7/Yf0Cj4hShAU=", - "owner": "bytecodealliance", - "repo": "wit-deps", - "rev": "5c24e323fc57314f98f69ca5c417f565993a8bb1", - "type": "github" - }, - "original": { - "owner": "bytecodealliance", - "ref": "v0.3.5", - "repo": "wit-deps", - "type": "github" - } - }, "workon": { "inputs": { - "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_9", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 84e8dfa..743f3d0 100644 --- a/flake.nix +++ b/flake.nix @@ -37,12 +37,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Fission packages - fission = { - url = "github:fission-codes/nix-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # My stuff dotfiles = { url = "github:walkah/dotfiles"; @@ -60,7 +54,7 @@ }; }; - outputs = { self, nixpkgs, flake-utils, deploy-rs, pre-commit-hooks, fission, workon, ... }@inputs: + outputs = { self, nixpkgs, flake-utils, deploy-rs, pre-commit-hooks, workon, ... }@inputs: flake-utils.lib.eachDefaultSystem (system: let @@ -77,7 +71,6 @@ // { hosts = import ./nix/hosts.nix; overlays.default = nixpkgs.lib.composeManyExtensions [ - fission.overlay workon.overlays.default ]; diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index 914f7af..229c4aa 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -19,8 +19,6 @@ in ../../modules/postgresql ../../modules/sops ../../modules/traefik - - ../../services/homestar.nix ]; boot = { binfmt.emulatedSystems = [ "aarch64-linux" ]; @@ -115,9 +113,6 @@ in sops.secrets = { filesystems-parthenon = { }; - plato-homestar = { - owner = "homestar"; - }; upsmon = { }; }; @@ -136,27 +131,6 @@ in startAt = "daily"; }; - homestar = { - enable = true; - settings = { - node.network = { - keypair_config = { - existing = { - key_type = "ed25519"; - inherit (secrets.plato-homestar) path; - }; - }; - libp2p = { - node_addresses = [ - "/dns4/homestar.fission.dev/tcp/7001/p2p/12D3KooWGvhfR6UF1sxqMiGLHS17STtAz9wdwjg7huq28scqJxHz" - ]; - }; - rpc = { - port = 9820; - }; - }; - }; - }; grafana = { enable = true; settings = { diff --git a/modules/dev/default.nix b/modules/dev/default.nix index 0b82f0b..1e9ccb9 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -34,7 +34,6 @@ nixpkgs-fmt # My stuff - homestar workon ]; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index b47a8d9..08990a5 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -10,7 +10,6 @@ akkoma-vapid-public-key: ENC[AES256_GCM,data:HnUAyTq7dwa+A9L1X3YyxkiJ71BoZis5TdE akkoma-joken-signer: ENC[AES256_GCM,data:6GbXC7teDXxr0z7eBLm9EvJv59Bvd1FqRuBGntAH9YzM79MVUMsx4JnCZ+bPR9hLiIVgITeAc5djk2tiJewh6w==,iv:q7A8f7kocb1Go7acFkVSxdmhObPxpGlfbPgfrOXHEjg=,tag:lS4UNS1ivVZdmm8AMS/1MQ==,type:str] filesystems-parthenon: ENC[AES256_GCM,data:dYO+QjvWhR3oXrDfAEaUvTLx147NIDFcPUa7p3Jv558ynqmmEnVZ3+fVMUQVIw==,iv:ASmXqNA8/TZvSRo31CFAzt6StsZzZpVFvz15LN5+QmQ=,tag:Wx6kDCXqZ1iSmxpggBKVxA==,type:str] upsmon: ENC[AES256_GCM,data:Rlqkhh7w8S9jD3mwUdkt3g==,iv:hiMkbAhea1f6r5gGTRw49ebepMtTYBVyH+bHwp/T61Q=,tag:cbaxIDuD4JNeCC5MiMGl6w==,type:str] -plato-homestar: ENC[AES256_GCM,data:KfdlHUSy7Wtc9TpKaNm7e2XvE+QXwuuQiqRKTKLbTcgPT+Vq4kCcU4nW4cXh0/Tw1BhPca3t2BCJdnjKxTQ48ooplPQuWwdYjPNbXotXO7wVyTlJwtPtNPAFmr9x1nah/SOd5gMi3sW8bx2jL/tUzQ3A86fI1ks=,iv:YWMZY5+0SfORfWFYevsdv0fHxqjBFOgIOams3DvCCBQ=,tag:dT4ubjuqYve5InxuEAVelQ==,type:str] sops: kms: [] gcp_kms: [] @@ -80,8 +79,8 @@ sops: dFZacUhiZDFxK0xZMDJJeCtQUmtuSGcKVz2TOsyw5F4mpFgbZnkWPjQPB7nSKkzd 96r8RHs8CrlSpBUP6TG6Q+Tz77G1XIgcZrN9EVyYCQB7zOukIdZ5zw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-15T14:18:53Z" - mac: ENC[AES256_GCM,data:WbnsF/YBxeLlRTNqgvXvssLhOsYUnHuABSpIJ2dFAnThbEv9U5q5ERDpBb1OPyHmM5qtNt7ENBkOSIZEXK1QIbrRTl2Uva4Nqm/lfvSBcczrcvlnn76jK3IFlLk5TselPZCkMmlW3qbCjsOBXFWXydciAwPG9NC0uLhfJhiWXzM=,iv:WhHCmSroTgO8+8CmjH4hiGUScwl9bwse/icswMrqfJE=,tag:jDKToUBC/rmG+RsitxVg/A==,type:str] + lastmodified: "2024-08-25T17:15:30Z" + mac: ENC[AES256_GCM,data:ZvvD8D4Lv3vbz4Le5/aUjlRbKA3Iqr7f6hSPBRg7t4+3ohBkOn1HMV8UjXUt8ixnUBTAw4/FfT0nzGKB9p2dzRGif8mPB85y//ZPUfQ6DDfUp7gZkMlo5Dnr2rvNQDoFH3bb+L99UDqh9UYUp3SkGnR0VXF1TfUOoCfu0hfzzDo=,iv:onc7AXgH9K6Qxjur6MBRdCdtJcrP6TGtTNdZll9grrQ=,tag:7PjPlc4W4Xrk3M1WckXoqg==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.9.0 diff --git a/services/homestar.nix b/services/homestar.nix deleted file mode 100644 index 8684e3f..0000000 --- a/services/homestar.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.homestar; - - format = pkgs.formats.toml { }; - configFile = format.generate "homestar.toml" cfg.settings; -in -{ - options.services.homestar = { - enable = mkEnableOption "homestar"; - - package = mkPackageOption pkgs "homestar" { }; - - settings = mkOption { - inherit ((pkgs.formats.json { })) type; - default = { }; - description = "Homestar settings"; - }; - - user = mkOption { - type = types.str; - default = "homestar"; - description = "User under which the Homestar daemon runs"; - }; - - group = mkOption { - type = types.str; - default = "homestar"; - description = "Group under which the Homestar daemon runs"; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/lib/homestar"; - description = "Homestar data directory"; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package pkgs.sqlite ]; - networking.firewall = { - allowPing = true; - allowedTCPPorts = [ - 1337 - 3030 - 4000 - 7001 - ]; - allowedUDPPorts = [ - 7001 - ]; - }; - - users.users = mkIf (cfg.user == "homestar") { - homestar = { - inherit (cfg) group; - home = cfg.dataDir; - createHome = true; - isSystemUser = true; - description = "Homestar daemon user"; - }; - }; - - users.groups = mkIf (cfg.group == "homestar") { - homestar = { }; - }; - - systemd.services.homestar = { - description = "Homestar daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/homestar start --config ${configFile}"; - Restart = "always"; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = cfg.dataDir; - }; - }; - }; -} -