From ece39daaa48db764d15dd129f2984abf22e2439e Mon Sep 17 00:00:00 2001 From: dusk Date: Tue, 22 Jul 2025 19:26:51 +0000 Subject: [PATCH] refactor(treewide): replace all flake inputs to not use flakes --- flake.lock | 902 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- flake.nix | 47 ++++++++++++++++++++++++++--------------------- hosts/default.nix | 7 ++++--- pkgs-set/default.nix | 13 ++++++++----- shells/default.nix | 3 ++- hosts/wolumonde/default.nix | 6 +++--- hosts/wsl/default.nix | 4 ++-- modules/base/nix.nix | 2 -- pkgs-set/overlays/_lix.nix | 5 +++++ pkgs-set/pkgs/buildGoApplication.nix | 4 ++++ pkgs-set/pkgs/nsid-tracker-server.nix | 1 + pkgs-set/pkgs/tangled-knot.nix | 19 +++++++++++++++++++ pkgs-set/pkgs/tangled-modules.nix | 1 + pkgs-set/pkgs/tangled-spindle.nix | 14 ++++++++++++++ pkgs-set/pkgs/tangled-sqlite-lib.nix | 4 ++++ users/dusk@devel.mobi/default.nix | 2 +- users/dusk@devel.mobi/nsid-tracker.nix | 4 ++-- users/firewatch/default.nix | 1 - hosts/wolumonde/modules/limbusart.nix | 2 +- hosts/wolumonde/modules/nsid-tracker.nix | 13 ++++++++++--- hosts/wolumonde/modules/tangled.nix | 9 +++++++-- 21 file(s) changed, 173 insertion(s)(+), 890 deletion(s)(-) diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -1,14 +1,7 @@ { "nodes": { "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, + "flake": false, "locked": { "lastModified": 1750173260, "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", @@ -39,245 +32,30 @@ "url": "https://git.gaze.systems/90008/website.git" } }, - "crane": { - "inputs": { - "nixpkgs": [ - "limbusart", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716745752, - "narHash": "sha256-8K1R9Yg4r08rYk86Yq+lu3E9L3uRUb4xMqYHgl0VGS0=", - "owner": "ipetkov", - "repo": "crane", - "rev": "19ca94ec2d288de334ae932107816b4a97736cd8", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { + "gomod2nix": { "flake": false, "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.19.0", - "repo": "crane", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "dream2nix": { - "inputs": { - "nixpkgs": [ - "nsid-tracker", - "nci", - "nixpkgs" - ], - "purescript-overlay": "purescript-overlay", - "pyproject-nix": "pyproject-nix" - }, - "locked": { - "lastModified": 1752547840, - "narHash": "sha256-T6wYez5urMcY8oUetwOIqPcqj77Ey3qka7wQsi6YCd4=", + "lastModified": 1753096219, + "narHash": "sha256-MaaWYgN/nia7xJcOYLBtPk+cFo7X2zEM1d9xIGPQrLU=", "owner": "nix-community", - "repo": "dream2nix", - "rev": "667ba5ee25c95cf63ace92307db270e235dce66e", + "repo": "gomod2nix", + "rev": "be828766411cad04c194c8f714d46aa2b2596362", "type": "github" }, "original": { "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "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-parts": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "tangled", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", + "repo": "gomod2nix", "type": "github" } }, "home": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, + "flake": false, "locked": { - "lastModified": 1752467539, - "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=", + "lastModified": 1753181343, + "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e54837569e0b80797c47be4720fab19e0db1616", + "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", "type": "github" }, "original": { @@ -287,137 +65,24 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "htmx-src": { - "flake": false, - "locked": { - "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=", - "type": "file", - "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" - }, - "original": { - "type": "file", - "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" - } - }, - "htmx-ws-src": { - "flake": false, - "locked": { - "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=", - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" - }, - "original": { - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" - } - }, - "ibm-plex-mono-src": { - "flake": false, - "locked": { - "lastModified": 1731402384, - "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", - "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" - }, - "original": { - "type": "tarball", - "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" - } - }, - "indigo": { - "flake": false, - "locked": { - "lastModified": 1745333930, - "narHash": "sha256-83fIHqDE+dfnZ88HaNuwfKFO+R0RKAM1WxMfNh/Matk=", - "owner": "oppiliappan", - "repo": "indigo", - "rev": "e4e59280737b8676611fc077a228d47b3e8e9491", - "type": "github" - }, - "original": { - "owner": "oppiliappan", - "repo": "indigo", - "type": "github" - } - }, - "inter-fonts-src": { - "flake": false, - "locked": { - "lastModified": 1731687360, - "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", - "type": "tarball", - "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" - }, - "original": { - "type": "tarball", - "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" - } - }, "limbusart": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1730724204, - "narHash": "sha256-5JFyxJ3ZD1pNd/23h1/qoq2FzIvm6LjLK2Cb6u0JvoM=", - "ref": "refs/heads/master", - "rev": "a0ac4e867111f3bc8cf05d0229ebfce974b3b11f", - "revCount": 43, - "type": "git", - "url": "https://git.gaze.systems/dusk/limbusart.git" - }, - "original": { - "type": "git", - "url": "https://git.gaze.systems/dusk/limbusart.git" - } - }, - "lix": { "flake": false, "locked": { - "lastModified": 1751235704, - "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=", - "rev": "1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6.tar.gz?rev=1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6" + "lastModified": 1753207355, + "narHash": "sha256-xATZz/sHYHkEXjwcmq1DSntclWxnDIKCpH314MaL63U=", + "ref": "refs/heads/master", + "rev": "7f29ab57b73eb8a4db7163fc7d19a71cf89c3d8b", + "revCount": 45, + "type": "git", + "url": "https://git.gaze.systems/90008/limbusart.git" }, "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" + "type": "git", + "url": "https://git.gaze.systems/90008/limbusart.git" } }, "lix-module": { - "inputs": { - "flake-utils": "flake-utils_3", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, + "flake": false, "locked": { "lastModified": 1751240025, "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", @@ -428,35 +93,6 @@ "original": { "type": "tarball", "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" - } - }, - "lucide-src": { - "flake": false, - "locked": { - "lastModified": 1742302029, - "narHash": "sha256-OyPVtpnC4/AAmPq84Wt1r1Gcs48d9KG+UBCtZK87e9k=", - "type": "tarball", - "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" - }, - "original": { - "type": "tarball", - "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" - } - }, - "mk-naked-shell": { - "flake": false, - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" } }, "naked-shell": { @@ -475,111 +111,30 @@ "type": "github" } }, - "naked-shell_2": { - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "90-008", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "90-008", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "nci": { - "inputs": { - "crane": "crane_2", - "dream2nix": "dream2nix", - "mk-naked-shell": "mk-naked-shell", - "nixpkgs": [ - "nsid-tracker", - "nixpkgs" - ], - "parts": "parts", - "rust-overlay": "rust-overlay_2", - "treefmt": "treefmt" - }, - "locked": { - "lastModified": 1752905922, - "narHash": "sha256-fhwoEa+rjxLsRANRqh4jl4evnGpVNTLWUf4a/KDkQ3k=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "47e02f590e1e2c72b4ffc2bcf92b2b11c3195395", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, "ncr": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, + "flake": false, "locked": { - "lastModified": 1752857134, - "narHash": "sha256-1ANFEQe6KW3ncMuIOxwLiwvwC3dpALUSYxq9CSPsOz8=", + "lastModified": 1752858743, + "narHash": "sha256-miZ64o8p+ToR6VIpcco/wq0rdHGjHsfepJdMcSiJEDk=", "ref": "refs/heads/main", - "rev": "52576c71435602e25555a4116dfb0a42f3412b11", - "revCount": 17, + "rev": "4660aa9cd9b24bef569696eee46dbe7e8df3e237", + "revCount": 19, "type": "git", "url": "https://tangled.sh/@poor.dog/nixos-cloud-resources" }, "original": { "type": "git", "url": "https://tangled.sh/@poor.dog/nixos-cloud-resources" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixos-persistence": { - "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" } }, "nixos-wsl": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ] - }, + "flake": false, "locked": { - "lastModified": 1752199438, - "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=", + "lastModified": 1752682362, + "narHash": "sha256-ZNIpqCG/CfhmV+TgIeyO/XbhDjSWpwWokHM44j0Mn0w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "d34d9412556d3a896e294534ccd25f53b6822e80", + "rev": "20001f9bf0aaf2b1c307e43a5eec8cf8f800fe14", "type": "github" }, "original": { @@ -589,59 +144,13 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1716715802, - "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1752500273, - "narHash": "sha256-+181HrGUKtZdFsUSY/OShMbzywZkfqPzdCOoeRy77MA=", - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "rev": "93a1c3840f99e29ab21f28fcb1db22aee3eb2d0a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -651,13 +160,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-flake": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -668,224 +177,56 @@ } }, "nsid-tracker": { - "inputs": { - "naked-shell": "naked-shell_2", - "nci": "nci", - "nixpkgs": [ - "nixpkgs" - ], - "parts": "parts_2", - "systems": "systems_5" - }, + "flake": false, "locked": { - "lastModified": 1752990833, - "narHash": "sha256-c8H6QAX2iIDLaYTLN8b1iOKxnpQouJoSGtDqMuyV9Nw=", + "lastModified": 1753208692, + "narHash": "sha256-8c+EbZC7ZWA+uYJlR6fez+gcQNck1xC2uOMo2nzwfjg=", "ref": "refs/heads/main", - "rev": "73978e71f695685986843f71c46387117fc8f4f8", - "revCount": 28, + "rev": "9bab265d0ef9b2800614073f5ccdd89ea3eeedee", + "revCount": 29, "type": "git", "url": "https://tangled.sh/@poor.dog/nsid-tracker" }, "original": { "type": "git", "url": "https://tangled.sh/@poor.dog/nsid-tracker" - } - }, - "nur": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1752516337, - "narHash": "sha256-L8hgYfH5jBhelcJPDaF1UBjLmW2FoZ/J52eE840s34I=", - "owner": "nix-community", - "repo": "NUR", - "rev": "7b211af6eb79bad838a3fa44484ee597ac26a5fb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "parts": { - "inputs": { - "nixpkgs-lib": [ - "nsid-tracker", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "purescript-overlay": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nsid-tracker", - "nci", - "dream2nix", - "nixpkgs" - ], - "slimlock": "slimlock" - }, - "locked": { - "lastModified": 1728546539, - "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "nsid-tracker", - "nci", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752481895, - "narHash": "sha256-luVj97hIMpCbwhx3hWiRwjP2YvljWy8FM+4W9njDhLA=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "16ee295c25107a94e59a7fc7f2e5322851781162", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" } }, "root": { "inputs": { "agenix": "agenix", "blog": "blog", + "gomod2nix": "gomod2nix", "home": "home", "limbusart": "limbusart", "lix-module": "lix-module", "naked-shell": "naked-shell", "ncr": "ncr", - "nixos-hardware": "nixos-hardware", - "nixos-persistence": "nixos-persistence", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", - "nixpkgs-wayland": "nixpkgs-wayland", + "nixpkgs": "nixpkgs", + "nixpkgs-flake": "nixpkgs-flake", "nsid-tracker": "nsid-tracker", - "nur": "nur", - "tangled": "tangled" + "tangled": "tangled", + "tangled-sqlite-lib": "tangled-sqlite-lib" } }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "limbusart", - "nixpkgs" - ] - }, + "tangled": { + "flake": false, "locked": { - "lastModified": 1717985971, - "narHash": "sha256-24h/qKp0aeI+Ew13WdRF521kY24PYa5HOvw0mlrABjk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "abfe5b3126b1b7e9e4daafc1c6478d17f0b584e7", - "type": "github" + "lastModified": 1753210331, + "narHash": "sha256-hmEO0FRxOeAfApQYb5DVy0iuxjJBzyY9dZxO/0NuWEA=", + "ref": "refs/heads/master", + "rev": "84c9175d8a3f00516d73e5e2a4bdb14b72dc3b2e", + "revCount": 980, + "type": "git", + "url": "https://tangled.sh/@poor.dog/core" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "type": "git", + "url": "https://tangled.sh/@poor.dog/core" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nsid-tracker", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752892850, - "narHash": "sha256-LLvDqLiK2+dr7bQqKTnZIZ8F1H67DLt3FUyVrGolGVw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "742248f12aed0183a124637e8b27a238a47f46a2", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "slimlock": { - "inputs": { - "nixpkgs": [ - "nsid-tracker", - "nci", - "dream2nix", - "purescript-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688756706, - "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", - "owner": "thomashoneyman", - "repo": "slimlock", - "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "slimlock", - "type": "github" - } - }, - "sqlite-lib-src": { + "tangled-sqlite-lib": { "flake": false, "locked": { "lastModified": 1706631843, @@ -896,131 +237,6 @@ "original": { "type": "tarball", "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "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": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", - "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-linux", - "type": "github" - } - }, - "tangled": { - "inputs": { - "gitignore": "gitignore", - "htmx-src": "htmx-src", - "htmx-ws-src": "htmx-ws-src", - "ibm-plex-mono-src": "ibm-plex-mono-src", - "indigo": "indigo", - "inter-fonts-src": "inter-fonts-src", - "lucide-src": "lucide-src", - "nixpkgs": [ - "nixpkgs" - ], - "sqlite-lib-src": "sqlite-lib-src" - }, - "locked": { - "lastModified": 1752497420, - "narHash": "sha256-EcAkSyTGxOEwfAqj599ILbNBxT2Dm4REdPtDapi1klo=", - "ref": "refs/heads/master", - "rev": "839375653ac0b77875079305f5b2772c02a9b69f", - "revCount": 935, - "type": "git", - "url": "https://tangled.sh/@tangled.sh/core" - }, - "original": { - "type": "git", - "url": "https://tangled.sh/@tangled.sh/core" - } - }, - "treefmt": { - "inputs": { - "nixpkgs": [ - "nsid-tracker", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" } } }, diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -3,51 +3,56 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nur.url = "github:nix-community/NUR"; + nixpkgs.flake = false; + nixpkgs-flake.url = "github:nixos/nixpkgs/nixos-unstable"; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + flake = false; }; nixos-wsl.url = "github:nix-community/NixOS-WSL"; - nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; + nixos-wsl.flake = false; home.url = "github:nix-community/home-manager/master"; - home.inputs.nixpkgs.follows = "nixpkgs"; - - nixos-hardware.url = "github:nixos/nixos-hardware"; - nixos-persistence.url = "github:nix-community/impermanence"; - - nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - nixpkgs-wayland.flake = false; + home.flake = false; blog.url = "git+https://git.gaze.systems/90008/website.git"; blog.flake = false; agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixpkgs"; - - limbusart.url = "git+https://git.gaze.systems/dusk/limbusart.git"; - # limbusart.inputs.nixpkgs.follows = "nixpkgs"; + agenix.flake = false; naked-shell.url = "github:yusdacra/mk-naked-shell"; naked-shell.flake = false; - tangled.url = "git+https://tangled.sh/@tangled.sh/core"; - tangled.inputs.nixpkgs.follows = "nixpkgs"; - ncr.url = "git+https://tangled.sh/@poor.dog/nixos-cloud-resources"; - ncr.inputs.nixpkgs.follows = "nixpkgs"; + ncr.flake = false; + + limbusart.url = "git+https://git.gaze.systems/90008/limbusart.git"; + limbusart.flake = false; nsid-tracker.url = "git+https://tangled.sh/@poor.dog/nsid-tracker"; - nsid-tracker.inputs.nixpkgs.follows = "nixpkgs"; + nsid-tracker.flake = false; + + tangled.url = "git+https://tangled.sh/@poor.dog/core"; + tangled.flake = false; + + tangled-sqlite-lib = { + url = "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip"; + flake = false; + }; + + gomod2nix = { + url = "github:nix-community/gomod2nix"; + flake = false; + }; }; outputs = inputs: let - lib = inputs.nixpkgs.lib; + lib = import "${inputs.nixpkgs}/lib"; tlib = import ./lib lib; l = lib; @@ -70,7 +75,7 @@ (_: set: ( l.mapAttrs (_: app: app.program) - (inputs.ncr.makeApps {inherit (set) pkgs; inherit (inputs) self;}) + (import "${inputs.ncr}/makeApps.nix" {inherit (set) pkgs; inherit (inputs) self;}) ) // { generate-firefox-addons = toString "${set.pkgs.generate-firefox-addons}/bin/generate-firefox-addons"; dns = toString "${set.pkgs.dnsmngmt}/bin/dns"; diff --git a/hosts/default.nix b/hosts/default.nix --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,13 +9,14 @@ baseModules = [ ../modules ../locale - inputs.home.nixosModules.default + "${inputs.home}/nixos" ]; mkSystem = name: set: - lib.nixosSystem { - system = set.pkgs.system; + import "${inputs.nixpkgs}/nixos/lib/eval-config.nix" { + inherit lib; + system = null; modules = baseModules ++ [ { networking.hostName = name; } { nixpkgs.pkgs = set.pkgs; } diff --git a/pkgs-set/default.nix b/pkgs-set/default.nix --- a/pkgs-set/default.nix +++ b/pkgs-set/default.nix @@ -31,11 +31,14 @@ # config.permittedInsecurePackages = ["electron-25.9.0"]; }; terraPkgs = - l.genAttrs - (l.map (l.removeSuffix ".nix") (l.attrNames (l.readDir ./pkgs))) - (name: pkgs.callPackage "${./pkgs}/${name}.nix" { - inherit inputs tlib; - }); + pkgs.lib.makeScope pkgs.newScope ( + self: + l.genAttrs + (l.map (l.removeSuffix ".nix") (l.attrNames (l.readDir ./pkgs))) + (name: self.callPackage "${./pkgs}/${name}.nix" { + inherit inputs tlib; + }) + ); pkgsToExport = pkgs.lib.getAttrs (import ./exported.nix) (pkgs // terraPkgs); in { inherit pkgs; diff --git a/shells/default.nix b/shells/default.nix --- a/shells/default.nix +++ b/shells/default.nix @@ -10,9 +10,10 @@ let inherit (set) pkgs; mkNakedShell = pkgs.callPackage inputs.naked-shell { }; + agenix = pkgs.callPackage "${inputs.agenix}/pkgs/agenix.nix" {}; agenix-wrapped = pkgs.writeShellApplication { name = "agenix"; - runtimeInputs = [ inputs.agenix.packages.${system}.default ]; + runtimeInputs = [ agenix ]; text = '' if [ -z "''${1-}" ]; then agenix diff --git a/hosts/wolumonde/default.nix b/hosts/wolumonde/default.nix --- a/hosts/wolumonde/default.nix +++ b/hosts/wolumonde/default.nix @@ -6,9 +6,9 @@ }: { imports = [ - inputs.agenix.nixosModules.default - inputs.ncr.nixosModules.firewall - inputs.ncr.nixosModules.firewall-hetzner + "${inputs.agenix}/modules/age.nix" + "${inputs.ncr}/firewall" + "${inputs.ncr}/firewall/hetzner" ] ++ (tlib.importFolder (toString ./modules)); environment.systemPackages = with pkgs; [ diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix --- a/hosts/wsl/default.nix +++ b/hosts/wsl/default.nix @@ -10,8 +10,8 @@ imports = [ ../../users/root ../../users/firewatch - inputs.nixos-wsl.nixosModules.wsl - inputs.agenix.nixosModules.default + "${inputs.nixos-wsl}/modules" + "${inputs.agenix}/modules/age.nix" ] ++ (tlib.importFolder (toString ./modules)); wsl.enable = true; diff --git a/modules/base/nix.nix b/modules/base/nix.nix --- a/modules/base/nix.nix +++ b/modules/base/nix.nix @@ -4,8 +4,6 @@ ... }: { - imports = [ inputs.lix-module.nixosModules.default ]; - nix = { registry = builtins.mapAttrs (_: v: { flake = v; }) (lib.filterAttrs (_: v: v ? outputs) inputs); gc.automatic = false; diff --git a/pkgs-set/overlays/_lix.nix b/pkgs-set/overlays/_lix.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/overlays/_lix.nix @@ -0,0 +1,5 @@ +{inputs}: final: prev: +(import "${inputs.lix-module}/overlay.nix" {lix = null;}) +final (prev // { + lix = final.lixPackageSets.latest.lix; +}) diff --git a/pkgs-set/pkgs/buildGoApplication.nix b/pkgs-set/pkgs/buildGoApplication.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/pkgs/buildGoApplication.nix @@ -0,0 +1,4 @@ +{callPackage, inputs, ...}: +(callPackage "${inputs.gomod2nix}/builder" { + gomod2nix = null; +}).buildGoApplication diff --git a/pkgs-set/pkgs/nsid-tracker-server.nix b/pkgs-set/pkgs/nsid-tracker-server.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/pkgs/nsid-tracker-server.nix @@ -0,0 +1,1 @@ +{callPackage, inputs, ...}: callPackage "${inputs.nsid-tracker}/nix/server.nix" {} diff --git a/pkgs-set/pkgs/tangled-knot.nix b/pkgs-set/pkgs/tangled-knot.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/pkgs/tangled-knot.nix @@ -0,0 +1,19 @@ +{ + callPackage, + inputs, + tangled-modules, + tangled-sqlite-lib, + ... +}: +let + unwrapped = (callPackage "${inputs.tangled}/nix/pkgs/knot-unwrapped.nix" { + modules = tangled-modules; + sqlite-lib = tangled-sqlite-lib; + gitignoreSource = null; + }).overrideAttrs (_: { + src = inputs.tangled; + }); +in + callPackage "${inputs.tangled}/nix/pkgs/knot.nix" { + knot-unwrapped = unwrapped; + } diff --git a/pkgs-set/pkgs/tangled-modules.nix b/pkgs-set/pkgs/tangled-modules.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/pkgs/tangled-modules.nix @@ -0,0 +1,1 @@ +{inputs, ...}: "${inputs.tangled}/nix/gomod2nix.toml" diff --git a/pkgs-set/pkgs/tangled-spindle.nix b/pkgs-set/pkgs/tangled-spindle.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/pkgs/tangled-spindle.nix @@ -0,0 +1,14 @@ +{ + callPackage, + inputs, + tangled-modules, + tangled-sqlite-lib, + ... +}: +(callPackage "${inputs.tangled}/nix/pkgs/spindle.nix" { + modules = tangled-modules; + sqlite-lib = tangled-sqlite-lib; + gitignoreSource = null; +}).overrideAttrs (_: { + src = inputs.tangled; +}) diff --git a/pkgs-set/pkgs/tangled-sqlite-lib.nix b/pkgs-set/pkgs/tangled-sqlite-lib.nix new file mode 100644 --- /dev/null +++ b/pkgs-set/pkgs/tangled-sqlite-lib.nix @@ -0,0 +1,4 @@ +{callPackage, inputs, ...}: +callPackage "${inputs.tangled}/nix/pkgs/sqlite-lib.nix" { + sqlite-lib-src = inputs.tangled-sqlite-lib; +} diff --git a/users/dusk@devel.mobi/default.nix b/users/dusk@devel.mobi/default.nix --- a/users/dusk@devel.mobi/default.nix +++ b/users/dusk@devel.mobi/default.nix @@ -34,7 +34,7 @@ ]; in l.flatten [ - inputs.agenix.homeManagerModules.default + "${inputs.agenix}/modules/age-home.nix" ../../modules/persist/null.nix (tlib.prefixStrings "${inputs.self}/users/modules/" modulesToEnable) ./nsid-tracker.nix diff --git a/users/dusk@devel.mobi/nsid-tracker.nix b/users/dusk@devel.mobi/nsid-tracker.nix --- a/users/dusk@devel.mobi/nsid-tracker.nix +++ b/users/dusk@devel.mobi/nsid-tracker.nix @@ -1,10 +1,10 @@ { pkgs, - inputs, + terra, ... }: let - server = inputs.nsid-tracker.packages.${pkgs.system}.server; + server = terra.nsid-tracker-server; port = 6432; in { diff --git a/users/firewatch/default.nix b/users/firewatch/default.nix --- a/users/firewatch/default.nix +++ b/users/firewatch/default.nix @@ -78,7 +78,6 @@ packages = with pkgs; [ # Programs nix-output-monitor - inputs.nh.packages.${pkgs.system}.default ]; file.".ssh/authorized_keys".text = '' ${signKeyText} diff --git a/hosts/wolumonde/modules/limbusart.nix b/hosts/wolumonde/modules/limbusart.nix --- a/hosts/wolumonde/modules/limbusart.nix +++ b/hosts/wolumonde/modules/limbusart.nix @@ -5,7 +5,7 @@ ... }: let - pkg = inputs.limbusart.packages.${pkgs.system}.default; + pkg = pkgs.callPackage "${inputs.limbusart}/package.nix" {}; in { systemd.services.limbusart = { diff --git a/hosts/wolumonde/modules/nsid-tracker.nix b/hosts/wolumonde/modules/nsid-tracker.nix --- a/hosts/wolumonde/modules/nsid-tracker.nix +++ b/hosts/wolumonde/modules/nsid-tracker.nix @@ -1,13 +1,20 @@ { pkgs, + terra, inputs, ... }: let - server = inputs.nsid-tracker.packages.${pkgs.system}.server; - client = inputs.nsid-tracker.packages.${pkgs.system}.client.overrideAttrs (old: { + client-modules = + (pkgs.callPackage "${inputs.nsid-tracker}/nix/client-modules.nix" {}) + .overrideAttrs (_: { + outputHash = "sha256-TzTafbNTng/mMyf0yR9Rc6XS9/zzipwmK9SUWm2XxeY="; + }); + client = pkgs.callPackage "${inputs.nsid-tracker}/nix/client.nix" { PUBLIC_API_URL = "gaze.systems/nsid-tracker/api"; - }); + inherit client-modules; + }; + server = terra.nsid-tracker-server; port = 6432; in { diff --git a/hosts/wolumonde/modules/tangled.nix b/hosts/wolumonde/modules/tangled.nix --- a/hosts/wolumonde/modules/tangled.nix +++ b/hosts/wolumonde/modules/tangled.nix @@ -1,15 +1,19 @@ -{ lib, config, inputs, ... }: +{ lib, config, inputs, terra, ... }: let knotCfg = config.services.tangled-knot; spindleCfg = config.services.tangled-spindle; in { - imports = [ inputs.tangled.nixosModules.knot inputs.tangled.nixosModules.spindle ]; + imports = [ + "${inputs.tangled}/nix/modules/knot.nix" + "${inputs.tangled}/nix/modules/spindle.nix" + ]; age.secrets.tangledKnot.file = ../../../secrets/tangledKnot.age; services.tangled-knot = { enable = true; + package = terra.tangled-knot; gitUser = "git"; server = { listenAddr = "0.0.0.0:7777"; @@ -31,6 +35,7 @@ services.tangled-spindle = { enable = true; + package = terra.tangled-spindle; server = { listenAddr = "0.0.0.0:7391"; hostname = "spindle.gaze.systems"; -- tangled.sh