From bf08d2878543a7b9595ed332096b8c01e9b00212 Mon Sep 17 00:00:00 2001 From: blacknull Date: Thu, 10 Oct 2024 14:40:41 -0500 Subject: [PATCH] rename disko input to diskoConfig for clarity --- flake.lock | 569 ++++++++++++++++++++----------- flake.nix | 12 +- home/flake.nix | 2 + home/packages/external/flake.nix | 2 +- home/packages/flake.nix | 2 +- system/disko/flake.nix | 2 +- system/flake.nix | 4 +- 7 files changed, 379 insertions(+), 214 deletions(-) diff --git a/flake.lock b/flake.lock index 92c3ffa..44d866a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-hU9uZ4UrSrBntg9vhwQUzn7nC3UTeIV1iC5uprGhj+Y=", - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/ags", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/ags", "type": "path" }, "original": { - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/ags", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/ags", "type": "path" } }, @@ -21,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1727303518, - "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", "owner": "Aylur", "repo": "ags", - "rev": "cd543afec4d9ed708990e5ba52184716809bf248", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1727261104, - "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", + "lastModified": 1728326504, + "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b82fdaff917582a9d568969e15e61b398c71e990", + "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", "type": "github" }, "original": { @@ -123,11 +123,11 @@ ] }, "locked": { - "lastModified": 1727261104, - "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", + "lastModified": 1728326504, + "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b82fdaff917582a9d568969e15e61b398c71e990", + "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", "type": "github" }, "original": { @@ -185,6 +185,23 @@ "url": "https://github.com/hneemann/Digital/releases/latest/download/Digital.zip" } }, + "disko": { + "inputs": { + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "owner": "nix-community", + "repo": "disko", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "type": "github" + }, + "original": { + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/disko", + "type": "path" + } + }, "external": { "inputs": { "digital": "digital", @@ -192,12 +209,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-71q6+u+ztKLS1V8MHPbIYyENwCenJspceTrY4TbLLh0=", - "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/external", + "narHash": "sha256-l1WDl+R58X4JNg/qcL3b+SiSnNGRuJg4Ou3q0Lbs9UM=", + "path": "/nix/store/c36bkp3cdc9ri3flyvp3mhdnrp6ifnsv-source/external", "type": "path" }, "original": { - "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/external", + "path": "/nix/store/c36bkp3cdc9ri3flyvp3mhdnrp6ifnsv-source/external", "type": "path" } }, @@ -229,6 +246,22 @@ } }, "flake-compat": { + "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_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -242,7 +275,23 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { + "flake-compat_3": { + "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_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -339,7 +388,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "nathan", "prgms", @@ -370,6 +419,31 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "nathan", + "prgms", + "hyprland", + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "nathan", @@ -394,6 +468,31 @@ "type": "github" } }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -464,11 +563,11 @@ ] }, "locked": { - "lastModified": 1727532803, - "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", + "lastModified": 1727821604, + "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", + "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", "type": "github" }, "original": { @@ -502,11 +601,11 @@ ] }, "locked": { - "lastModified": 1727532803, - "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", + "lastModified": 1727821604, + "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", + "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", "type": "github" }, "original": { @@ -521,12 +620,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-PoIwfLB8FwRvchRfLuR5Zt1Xez/G35ivu7y3ne4BrVo=", - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/hyprland", + "narHash": "sha256-7ifKOxXXOg09qaTQ92CM1R6rgkSIcTK0RkpBroT1Mlw=", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/hyprland", "type": "path" }, "original": { - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/hyprland", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/hyprland", "type": "path" } }, @@ -548,11 +647,11 @@ ] }, "locked": { - "lastModified": 1727451107, - "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -562,39 +661,6 @@ } }, "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "nathan", - "prgms", - "hyprland", - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "nathan", - "prgms", - "hyprland", - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_3": { "inputs": { "nixpkgs": [ "system", @@ -612,44 +678,11 @@ ] }, "locked": { - "lastModified": 1727451107, - "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_4": { - "inputs": { - "nixpkgs": [ - "system", - "prgms", - "hyprland", - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "system", - "prgms", - "hyprland", - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -667,15 +700,16 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1727900725, - "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", + "lastModified": 1728554473, + "narHash": "sha256-wzVeYNRedx8aAi8NsUvBbPJAilozHp+mC49NUKYk73c=", "ref": "refs/heads/main", - "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", - "revCount": 5287, + "rev": "b65773bea9b912a41cfcbc789fb2e60a07e3d0c1", + "revCount": 5325, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -705,20 +739,21 @@ "inputs": { "aquamarine": "aquamarine_2", "hyprcursor": "hyprcursor_2", - "hyprland-protocols": "hyprland-protocols_3", + "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", + "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_4", "xdph": "xdph_2" }, "locked": { - "lastModified": 1727900725, - "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", + "lastModified": 1728554473, + "narHash": "sha256-wzVeYNRedx8aAi8NsUvBbPJAilozHp+mC49NUKYk73c=", "ref": "refs/heads/main", - "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", - "revCount": 5287, + "rev": "b65773bea9b912a41cfcbc789fb2e60a07e3d0c1", + "revCount": 5325, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -754,11 +789,11 @@ ] }, "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -792,11 +827,11 @@ ] }, "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -929,6 +964,36 @@ "type": "github" } }, + "impermanence": { + "inputs": { + "impermanence": "impermanence_2" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-Y+1PqDnNncMOtfzxU3d69VtMGRgCOnmgzruIA8UAL38=", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/impermanence", + "type": "path" + }, + "original": { + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/impermanence", + "type": "path" + } + }, + "impermanence_2": { + "locked": { + "lastModified": 1727649413, + "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "type": "github" + } + }, "kitty": { "locked": { "lastModified": 1, @@ -961,12 +1026,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-MJ7qeRlZKHt+WoFCOYpFgNgRrBb/tD1cglGLG4Z5jLg=", - "path": "/nix/store/21nf0p8ql9xkf5n5xw8p3qwy7dpp0zd7-source/home", + "narHash": "sha256-44GWVRPvMv2i9dkN0/eSCBkSW2xOGC32KWQYF0gOdc8=", + "path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/home", "type": "path" }, "original": { - "path": "/nix/store/21nf0p8ql9xkf5n5xw8p3qwy7dpp0zd7-source/home", + "path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/home", "type": "path" } }, @@ -996,11 +1061,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -1022,29 +1087,45 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, - "nixpkgs-old": { + "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", - "owner": "nixos", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.11", + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-us": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1056,11 +1137,11 @@ }, "nixpkgs-us_2": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1072,11 +1153,23 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 0, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "path": "/nix/store/s9hbmmf7hgg7imnm5q6ny7gznbh0amfy-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1104,11 +1197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1152,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -1168,11 +1261,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -1200,14 +1293,18 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 0, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", - "path": "/nix/store/s9hbmmf7hgg7imnm5q6ny7gznbh0amfy-source", - "type": "path" + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixvim": { @@ -1217,11 +1314,10 @@ "nixvim": "nixvim_2" }, "locked": { + "dirtyRev": "e6cb7d523142dc038c816fe5be57c19cf7a8d5f3-dirty", + "dirtyShortRev": "e6cb7d5-dirty", "lastModified": 1727986301, - "narHash": "sha256-z7+Wa2JaaJyyGCiiEE6Ta5m7f98ZWVRQ6HV+Seu2tEM=", - "ref": "refs/heads/master", - "rev": "e6cb7d523142dc038c816fe5be57c19cf7a8d5f3", - "revCount": 1, + "narHash": "sha256-EXfHCw4gd6Ck8pu8tyHrg6pjv4Nw9u0ZD9YRN/LjMwM=", "type": "git", "url": "file:///home/nathan/Projects/Nixvim" }, @@ -1233,7 +1329,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -1296,18 +1392,17 @@ "packages": { "inputs": { "external": "external", - "nixpkgs-old": "nixpkgs-old", "nixpkgs-us": "nixpkgs-us", "scripts": "scripts" }, "locked": { "lastModified": 1, - "narHash": "sha256-c/j1wAoDhJC3sxfp1mX1p3FfQdksPp20wnRXQPxwT+g=", - "path": "/nix/store/nz05qzah5l5ch4cb4gl1vbc4qyh1grna-source/packages", + "narHash": "sha256-TL0xy/MpGfUX5KeUw81gfFrjPDgnD16AxDwuVFEjb08=", + "path": "/nix/store/616d9i5bswbzdgzp4zibf3vby8jzffmw-source/packages", "type": "path" }, "original": { - "path": "/nix/store/nz05qzah5l5ch4cb4gl1vbc4qyh1grna-source/packages", + "path": "/nix/store/616d9i5bswbzdgzp4zibf3vby8jzffmw-source/packages", "type": "path" } }, @@ -1318,14 +1413,68 @@ "locked": { "lastModified": 1, "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/packages", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/packages", "type": "path" }, "original": { - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/packages", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/packages", "type": "path" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "nathan", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_3", + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "prgms": { "inputs": { "ags": "ags", @@ -1337,12 +1486,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-7zc0u56+lt5YSb1qOMyLKh2b0B0vvUGm2K6mDVt761U=", - "path": "/nix/store/nz05qzah5l5ch4cb4gl1vbc4qyh1grna-source/programs", + "narHash": "sha256-+1SoE3VFWwcnYotZsvBukIpBVhqxeADqz0hA+loeXVE=", + "path": "/nix/store/616d9i5bswbzdgzp4zibf3vby8jzffmw-source/programs", "type": "path" }, "original": { - "path": "/nix/store/nz05qzah5l5ch4cb4gl1vbc4qyh1grna-source/programs", + "path": "/nix/store/616d9i5bswbzdgzp4zibf3vby8jzffmw-source/programs", "type": "path" } }, @@ -1354,11 +1503,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-96Dpr1ejZUBA7m2x2YfNJJxwDRj7Z8r5QV4UrGGxdoU=", - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/programs", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/programs", "type": "path" }, "original": { - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/programs", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/programs", "type": "path" } }, @@ -1372,11 +1521,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-EVhBDAt1miiP7BA3SooJNTCm0pESsl4VlRYCDSMutFY=", - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/pywal", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/pywal", "type": "path" }, "original": { - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/pywal", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/pywal", "type": "path" } }, @@ -1400,11 +1549,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-W1pO/5h94bemSfBkgwMcjnRJAySAtzd5RMTWKcmLkOI=", - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/rofi", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/rofi", "type": "path" }, "original": { - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/rofi", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/rofi", "type": "path" } }, @@ -1419,12 +1568,12 @@ "scripts": { "locked": { "lastModified": 1, - "narHash": "sha256-3gz8CcgRRpjmlapraNgn6or9kWsnw7VwAI1P7mjhQWo=", - "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/scripts", + "narHash": "sha256-ZwYj8HHcPq6WRFdoHvQ27fL2twOZgUdyw1Dba2Hbj+U=", + "path": "/nix/store/c36bkp3cdc9ri3flyvp3mhdnrp6ifnsv-source/scripts", "type": "path" }, "original": { - "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/scripts", + "path": "/nix/store/c36bkp3cdc9ri3flyvp3mhdnrp6ifnsv-source/scripts", "type": "path" } }, @@ -1435,11 +1584,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-1lPCRKFKK2qmdS+akk6dkrSjXOBe0iBgQp6oTi5vCWM=", - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/sddm", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/sddm", "type": "path" }, "original": { - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/sddm", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/sddm", "type": "path" } }, @@ -1461,15 +1610,15 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1727929035, - "narHash": "sha256-buGueZsmGX/TKzSIO8alIK4QWcm0ciZ6j6veO1nxVKM=", + "lastModified": 1728533825, + "narHash": "sha256-3+Sz3NWHQZWLsIr4B/Q2CSmZmpQyk/tE7rTB6urzjZI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "829a81049fb019d12be8daf867c03de2ee52d49f", + "rev": "d6e8bdf856dfba9f704fd58df4c865be8d819b30", "type": "github" }, "original": { @@ -1485,11 +1634,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-cuHsChgkjeeNyQiP8xebtVcqixs7dJLV59Q9BKIVXqI=", - "path": "/nix/store/nz05qzah5l5ch4cb4gl1vbc4qyh1grna-source/services", + "path": "/nix/store/616d9i5bswbzdgzp4zibf3vby8jzffmw-source/services", "type": "path" }, "original": { - "path": "/nix/store/nz05qzah5l5ch4cb4gl1vbc4qyh1grna-source/services", + "path": "/nix/store/616d9i5bswbzdgzp4zibf3vby8jzffmw-source/services", "type": "path" } }, @@ -1500,16 +1649,18 @@ "locked": { "lastModified": 1, "narHash": "sha256-77xH7oSwHTKWMPseY3d8isc0oV0SgNM+CdrIxhRBOzQ=", - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/services", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/services", "type": "path" }, "original": { - "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/services", + "path": "/nix/store/0vbi7ydq3snblz8zjw9jdhx36c8qis8y-source/services", "type": "path" } }, "system": { "inputs": { + "disko": "disko", + "impermanence": "impermanence", "pckgs": "pckgs", "prgms": "prgms_2", "sddm": "sddm", @@ -1517,12 +1668,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-M8gn3JNWaujqDckXceQofrr/295Qt2puwAcxkR7p3DI=", - "path": "/nix/store/21nf0p8ql9xkf5n5xw8p3qwy7dpp0zd7-source/system", + "narHash": "sha256-TiB1Oc14weyDgkA0rI9aAOwuMb4s2tnGayCekZXUTWY=", + "path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/system", "type": "path" }, "original": { - "path": "/nix/store/21nf0p8ql9xkf5n5xw8p3qwy7dpp0zd7-source/system", + "path": "/nix/store/4ph3kjb0v3abp5i24yx8bdaj81mlnbh2-source/system", "type": "path" } }, @@ -1599,11 +1750,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-2h0M0hXa3L6rQJ2hmDadiZBYJcoxRqFdlXD7tK0LFrM=", - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/terminal", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/terminal", "type": "path" }, "original": { - "path": "/nix/store/yx9hd0zzj8k0jijpk9zp6g4g331jaisg-source/terminal", + "path": "/nix/store/sybdaaqrrry1hjanqgx482bl4hbchmwp-source/terminal", "type": "path" } }, @@ -1627,11 +1778,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1723741990, - "narHash": "sha256-miZF6mUk2C04L6NXv7pZBsNOcTpooBbZdmyTlQV00yE=", + "lastModified": 1728495787, + "narHash": "sha256-D8G2OWQiYAENKDgD+V2M6PWbxxE1KN6erH/iRVNQ4Wc=", "owner": "danihek", "repo": "themecord", - "rev": "8d9791d6f97492ae88d248a29bff5c126016f2ae", + "rev": "37bfb39805a545bad1f04d587f822c174e9a915a", "type": "github" }, "original": { @@ -1678,14 +1829,14 @@ }, "waveforms": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1727720938, - "narHash": "sha256-DvHmS+mcZP5bcBcI4WfugMgiXjmTLGGy+hdANYJFyts=", + "lastModified": 1728376004, + "narHash": "sha256-mTib24PapKexOaTUNsGiTtZFaXR2LYaQazVBGzlnAig=", "owner": "liff", "repo": "waveforms-flake", - "rev": "2ec4881d3a3ec5af30e65a5abb419fe5d813db63", + "rev": "1d58c63da1ce63a2896d13a3d66238ff9aca89e4", "type": "github" }, "original": { @@ -1696,7 +1847,13 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols_2", + "hyprland-protocols": [ + "nathan", + "prgms", + "hyprland", + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "nathan", "prgms", @@ -1734,11 +1891,11 @@ ] }, "locked": { - "lastModified": 1727524473, - "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { @@ -1749,7 +1906,13 @@ }, "xdph_2": { "inputs": { - "hyprland-protocols": "hyprland-protocols_4", + "hyprland-protocols": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "system", "prgms", @@ -1787,11 +1950,11 @@ ] }, "locked": { - "lastModified": 1727524473, - "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 648dddf..632021f 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ nathan.url = "./home"; system.url = "./system"; - system.inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; + system.inputs.diskoConfig.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -41,8 +41,8 @@ }; modules = [ - inputs.system.nixosModule - inputs.home-manager.nixosModules.home-manager + core_inputs.system.nixosModule + core_inputs.home-manager.nixosModules.home-manager ({ lib, ... }: { sysconfig.${host}.enable = true; @@ -82,14 +82,14 @@ packages.${iso_system}.default = nixosConfigurations.iso.config.system.build.isoImage; - homeConfigurations."nathan" = inputs.home-manager.lib.homeManagerConfiguration { + homeConfigurations."nathan" = core_inputs.home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit core_inputs; }; - modules = [ inputs.nathan.homeManagerModule ]; + modules = [ core_inputs.nathan.homeManagerModule ]; }; }; diff --git a/home/flake.nix b/home/flake.nix index 44d4ef7..04af9ca 100644 --- a/home/flake.nix +++ b/home/flake.nix @@ -41,6 +41,8 @@ iconTheme.name = "Tokyonight-Dark"; }; + externalPackages.enable = true; + services.mpris-proxy.enable = true; programs.ssh.enable = true; diff --git a/home/packages/external/flake.nix b/home/packages/external/flake.nix index 40f0528..395d232 100644 --- a/home/packages/external/flake.nix +++ b/home/packages/external/flake.nix @@ -34,7 +34,7 @@ }; - hmModule = import ./. { inherit self; }; + hmModule = { config, lib, pkgs, ... }: import ./. { inherit config lib pkgs self; }; }; } diff --git a/home/packages/flake.nix b/home/packages/flake.nix index f9ccdff..8f1a59f 100644 --- a/home/packages/flake.nix +++ b/home/packages/flake.nix @@ -20,7 +20,7 @@ in { - hmModule = import ./. { inherit pkgs-us self; }; + hmModule = { pkgs, ... }: import ./. { inherit pkgs pkgs-us self; }; }; } diff --git a/system/disko/flake.nix b/system/disko/flake.nix index ec251aa..5535215 100644 --- a/system/disko/flake.nix +++ b/system/disko/flake.nix @@ -7,7 +7,7 @@ disko.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { ... }@inputs: { + outputs = { self, ... }@inputs: { module = { config, lib, pkgs, devices, ... }: { imports = [ diff --git a/system/flake.nix b/system/flake.nix index 353fb5f..2116a26 100755 --- a/system/flake.nix +++ b/system/flake.nix @@ -11,7 +11,7 @@ prgms.url = "./programs"; - disko.url = "./disko"; + diskoConfig.url = "./disko"; impermanence.url = "./impermanence"; @@ -22,7 +22,7 @@ nixosModule = { config, lib, pkgs, core_inputs, ... }: { imports = [ ./configuration/configuration.nix - inputs.disko.module + inputs.diskoConfig.module inputs.impermanence.module inputs.sddm.module inputs.srvcs.module