diff --git a/flake.lock b/flake.lock index f4d3850..58bceac 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1713178514, - "narHash": "sha256-WbG/7YWAT0n37LS7unI6gJjYQERkORsRXRovBCXAYqw=", + "lastModified": 1714043270, + "narHash": "sha256-WTpyfCMHEaGWLKQR0rVTXwxFnGzyC8VYwHYVsOTdf1Q=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "546bfa46a80292e800d2767db90170d64d92c200", + "rev": "7705ea7bb501453ffb1f085b4ddbdc606f5463f8", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1712765734, - "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", + "lastModified": 1713379868, + "narHash": "sha256-L/QhOkRmzB/gmwrWrqxct/sD6XIL4AOGguRhb4ahO/8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", + "rev": "d0a9666a2976b983daf72eb0c0f8d41c04443f84", "type": "github" }, "original": { @@ -179,6 +179,47 @@ "type": "github" } }, + "crane_3": { + "flake": false, + "locked": { + "lastModified": 1699217310, + "narHash": "sha256-xpW3VFUG7yE6UE6Wl0dhqencuENSkV7qpnpe9I8VbPw=", + "owner": "ipetkov", + "repo": "crane", + "rev": "d535642bbe6f377077f7c23f0febb78b1463f449", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "v0.15.0", + "repo": "crane", + "type": "github" + } + }, + "dream2nix": { + "inputs": { + "nixpkgs": [ + "nix-inspect", + "nci", + "nixpkgs" + ], + "purescript-overlay": "purescript-overlay", + "pyproject-nix": "pyproject-nix" + }, + "locked": { + "lastModified": 1709959559, + "narHash": "sha256-Gb+tUU+clGKVBwiznTQf0emZZ+heALqoVwUgI0O13L8=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "42838c590971da17a4b6483962707b7fb7b8b9a7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -343,11 +384,11 @@ }, "gnome46": { "locked": { - "lastModified": 1712940244, - "narHash": "sha256-4+4+srH+X4k7rlj8r1fQlQArE55cUUEcUCUGP1xuwJw=", + "lastModified": 1713814968, + "narHash": "sha256-WI+qn3uHqIZowzB5ih9GZEOSqvZ0bKftAvGCDMiP1Ns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20d23bf9b180bbedd067d685f8f5493a0d3ee3f5", + "rev": "3d96608e696256e110666409a0ddca12c9d835c1", "type": "github" }, "original": { @@ -365,16 +406,17 @@ ] }, "locked": { - "lastModified": 1702537497, - "narHash": "sha256-br4Z7OFEHWN8oOnKf40BoS6QFt1EyVLqwaVGBG7/DT8=", - "rev": "7a88cdedbda35f808ed2f329a7a811e0511870f9", - "revCount": 3192, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3192%2Brev-7a88cdedbda35f808ed2f329a7a811e0511870f9/018c6725-7e9b-7e8e-bb57-f493c0e4f7dc/source.tar.gz" + "lastModified": 1713682182, + "narHash": "sha256-2RSqVmQMFmn6OjQ21SXnWC+HuSeqDLWLftRv/ZhEDZE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "4cec20dbf5c0a716115745ae32531e34816ecbbe", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/home-manager/0.1.%2A.tar.gz" + "owner": "nix-community", + "repo": "home-manager", + "type": "github" } }, "home-manager-stable": { @@ -384,11 +426,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1714042918, + "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", "type": "github" }, "original": { @@ -404,11 +446,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1714042918, + "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", "type": "github" }, "original": { @@ -441,11 +483,11 @@ ] }, "locked": { - "lastModified": 1712909442, - "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", + "lastModified": 1713606448, + "narHash": "sha256-JMKo6uoAcUip9N10a3r1T2IoLz+pUStwIFrsVW/R4MA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", + "rev": "96cbbcd3712a0cb7f128c54b21ec2af0950d88d0", "type": "github" }, "original": { @@ -467,11 +509,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712983637, - "narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=", + "lastModified": 1713647546, + "narHash": "sha256-oiLxCGkICL2LXHZV6hhm3858JC/+6oANV5guVaRM6Wg=", "owner": "martinvonz", "repo": "jj", - "rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d", + "rev": "77eaf67f96c6ea438e2dd1a5636f34b6a321e6be", "type": "github" }, "original": { @@ -507,6 +549,49 @@ "type": "github" } }, + "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" + } + }, + "nci": { + "inputs": { + "crane": "crane_3", + "dream2nix": "dream2nix", + "mk-naked-shell": "mk-naked-shell", + "nixpkgs": [ + "nix-inspect", + "nixpkgs" + ], + "parts": "parts", + "rust-overlay": "rust-overlay_3", + "treefmt": "treefmt" + }, + "locked": { + "lastModified": 1710137478, + "narHash": "sha256-+hbUWY1PEItyx3CBOGsHlJEDO2wRY2N1mpBhiLBblck=", + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "rev": "f3cc8751427e16ec48c0467357b3f3979a53ae9c", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "type": "github" + } + }, "niri": { "inputs": { "crane": [ @@ -531,11 +616,11 @@ ] }, "locked": { - "lastModified": 1712992043, - "narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=", + "lastModified": 1713620717, + "narHash": "sha256-YuYowUw5ecPa78bhT72zY2b99wn68mO3vVkop8hnb8M=", "owner": "YaLTeR", "repo": "niri", - "rev": "71be19b234d58f4ec447e921633506beb81a52c0", + "rev": "6a80078259ca3e3854b0748a15e98c7293d0822a", "type": "github" }, "original": { @@ -549,11 +634,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -615,18 +700,38 @@ "type": "github" } }, + "nix-inspect": { + "inputs": { + "nci": "nci", + "nixpkgs": "nixpkgs_3", + "parts": "parts_2" + }, + "locked": { + "lastModified": 1713493270, + "narHash": "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=", + "owner": "bluskript", + "repo": "nix-inspect", + "rev": "86f636b1e01579b3a63b2c778c21a818b00c3d1e", + "type": "github" + }, + "original": { + "owner": "bluskript", + "repo": "nix-inspect", + "type": "github" + } + }, "nixos-apple-silicon": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_3" + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1712279577, - "narHash": "sha256-Bwn4rmQi2L2iX6g3ycQMA4baE3zgPHAO0xPBpr2T4/k=", + "lastModified": 1713653951, + "narHash": "sha256-ExbWsXGdCGIxq9iVBfP9troLzgapwh4rjGtX9neCVOc=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "d47afc3f0f8b3078c818da8609c41340af61a2ec", + "rev": "15dbcfd42d9f4924b2f9cca5942d3cb0048e147f", "type": "github" }, "original": { @@ -637,11 +742,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713864415, + "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", "type": "github" }, "original": { @@ -653,12 +758,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", - "revCount": 611350, + "lastModified": 1713895582, + "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "revCount": 615930, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.611350%2Brev-cfd6b5fc90b15709b780a5a1619695a88505a176/018eddfc-e6d9-74bb-a823-20f2ae60079b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.615930%2Brev-572af610f6151fd41c212f897c71f7056e3fb518/018f13c0-577e-75c4-a6ac-41b8bc32f7b3/source.tar.gz" }, "original": { "type": "tarball", @@ -699,11 +804,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { @@ -713,6 +818,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1687274257, @@ -728,27 +849,43 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -758,6 +895,49 @@ "type": "github" } }, + "parts": { + "inputs": { + "nixpkgs-lib": [ + "nix-inspect", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nix-inspect", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -789,6 +969,47 @@ "type": "github" } }, + "purescript-overlay": { + "inputs": { + "nixpkgs": [ + "nix-inspect", + "nci", + "dream2nix", + "nixpkgs" + ], + "slimlock": "slimlock" + }, + "locked": { + "lastModified": 1696022621, + "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "rev": "047c7933abd6da8aa239904422e22d190ce55ead", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "type": "github" + } + }, + "pyproject-nix": { + "flake": false, + "locked": { + "lastModified": 1702448246, + "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=", + "owner": "davhau", + "repo": "pyproject.nix", + "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb", + "type": "github" + }, + "original": { + "owner": "davhau", + "ref": "dream2nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "chaotic": "chaotic", @@ -799,10 +1020,12 @@ "lanzaboote": "lanzaboote", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", + "nix-inspect": "nix-inspect", "nixos-apple-silicon": "nixos-apple-silicon", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-unstable": "nixpkgs-unstable" } }, "rust-analyzer-src": { @@ -875,6 +1098,22 @@ } }, "rust-overlay_3": { + "flake": false, + "locked": { + "lastModified": 1710123130, + "narHash": "sha256-EoGL/WSM1M2L099Q91mPKO/FRV2iu2ZLOEp3y5sLfiE=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "73aca260afe5d41d3ebce932c8d896399c9d5174", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "flake": false, "locked": { "lastModified": 1686795910, @@ -890,6 +1129,30 @@ "type": "github" } }, + "slimlock": { + "inputs": { + "nixpkgs": [ + "nix-inspect", + "nci", + "dream2nix", + "purescript-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688610262, + "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", + "owner": "thomashoneyman", + "repo": "slimlock", + "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "slimlock", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -920,6 +1183,28 @@ "type": "github" } }, + "treefmt": { + "inputs": { + "nixpkgs": [ + "nix-inspect", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710088047, + "narHash": "sha256-eSqKs6ZCsX9xJyNYLeMDMrxzIDsYtaWClfZCOp0ok6Y=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "720322c5352d7b7bd2cb3601a9176b0e91d1de7d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "yafas": { "inputs": { "flake-schemas": [ diff --git a/flake.nix b/flake.nix index 9fe48da..5fe748c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,8 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + nix-inspect.url = "github:bluskript/nix-inspect"; + # Desktop nix-flatpak.url = "github:gmodena/nix-flatpak"; impermanence.url = "github:nix-community/impermanence"; @@ -19,6 +21,7 @@ gnome46.url = "github:NixOS/nixpkgs/gnome-46"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager-stable.url = "github:nix-community/home-manager"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; @@ -31,7 +34,12 @@ }; outputs = { self, nixpkgs, nixpkgs-stable, chaotic, lanzaboote, impermanence, nix-flatpak, home-manager - , nixos-hardware, nix-darwin, nixos-apple-silicon, home-manager-stable, gnome46 }@inputs: { + , nixos-hardware, nix-darwin, nixos-apple-silicon, home-manager-stable, gnome46, nix-inspect, nixpkgs-unstable }@inputs: +let + inherit (self) outputs; +in { + overlays = import ./overlays {inherit inputs;}; + nixosConfigurations = { # Desktop "matt-nixos" = gnome46.lib.nixosSystem { @@ -55,6 +63,7 @@ # NAS "jallen-nas" = nixpkgs-stable.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; modules = [ ./hosts/nas/configuration.nix home-manager-stable.nixosModules.home-manager diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index 6823cd6..ce66ad2 100644 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, ... }: +{ inputs, outputs, config, lib, pkgs, ... }: let user = "admin"; password = @@ -331,6 +331,7 @@ in { cockpit packagekit gnome.gnome-packagekit + unstable.nix-inspect ]; }; @@ -370,6 +371,10 @@ in { # Configure nixpkgs nixpkgs = { + overlays = [ + outputs.overlays.nixpkgs-unstable + ]; + config = { # Enable non free allowUnfree = true; diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..17e1a8d --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,10 @@ +{inputs, ...}: { + + nixpkgs-unstable = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +} +