diff --git a/.sops.yaml b/.sops.yaml deleted file mode 100644 index b495e9a..0000000 --- a/.sops.yaml +++ /dev/null @@ -1,7 +0,0 @@ -keys: - - &ooks age16ecqs0u4h4qvnp7nr2rdhd0d2qrw7x5kk60u473d6988a0amsass4d5a22 -creation_rules: - - path_regex: secrets/secrets.yaml$ - key_groups: - - age: - - *ooks diff --git a/flake.lock b/flake.lock index 0abc802..e33da34 100644 --- a/flake.lock +++ b/flake.lock @@ -1,44 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1714991158, - "narHash": "sha256-QRtQD3YqbambczxavUUkRv7iGxoJ1J6e6mD20mZv3a4=", - "owner": "Aylur", - "repo": "ags", - "rev": "05e0f23534fa30c1db2a142664ee8f71e38db260", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713259062, - "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=", - "owner": "Kirottu", - "repo": "anyrun", - "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39", - "type": "github" - }, - "original": { - "owner": "Kirottu", - "repo": "anyrun", - "type": "github" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -99,40 +60,18 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixarr", "nixpkgs" ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", - "owner": "numtide", - "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -150,11 +89,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1715659401, - "narHash": "sha256-pqeXE2v8b3Hvvr4BP5Qco3j/KCG2MUOdNcfZk4KcVvQ=", + "lastModified": 1715140979, + "narHash": "sha256-0I873xD9WrsFBvjf/M+lNP4zwlND4U+w62kClxJDm+c=", "owner": "rycee", "repo": "nur-expressions", - "rev": "78de0ad8fdb664b581614be18ce1cadf2674014b", + "rev": "ac4efe03632b5180a4bec10df256077fbe055972", "type": "gitlab" }, "original": { @@ -179,61 +118,12 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "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-parts": { "inputs": { "nixpkgs-lib": [ - "anyrun", "nixpkgs" ] }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1714641030, "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", @@ -248,7 +138,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixarr", @@ -256,11 +146,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -269,7 +159,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -291,49 +181,13 @@ "type": "github" } }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-root": { "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "lastModified": 1692742795, + "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=", "owner": "srid", "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, - "flake-root_2": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937", "type": "github" }, "original": { @@ -377,14 +231,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_9" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -395,25 +249,7 @@ }, "flake-utils_4": { "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_5": { - "inputs": { - "systems": "systems_5" + "systems": "systems_10" }, "locked": { "lastModified": 1701680307, @@ -429,9 +265,27 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_11" + }, + "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_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -447,76 +301,21 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_10" - }, - "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" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "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" - } - }, - "hardware": { - "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs" + "nixpkgs-small" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715676857, - "narHash": "sha256-SSohpqbkPgyzLGT89hDxBD9WC88tm+eN5wGOZ6cupEc=", + "lastModified": 1715111020, + "narHash": "sha256-U1XMl9ns5pHTifPfSt0cpzh3ZkBBGQVIoGSiVWA2CJU=", "owner": "helix-editor", "repo": "helix", - "rev": "e76020ddb93eeb051de606c24f92189c3fc55547", + "rev": "f656b4f3a782786b3cd4f4b457e5f4bc5d710cf7", "type": "github" }, "original": { @@ -532,32 +331,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -597,25 +375,16 @@ }, "hypridle": { "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "hyprlang": "hyprlang", + "nixpkgs": "nixpkgs", + "systems": "systems_3" }, "locked": { - "lastModified": 1715635326, - "narHash": "sha256-FBjZypcQcNJJ44YQHyEgu+jhHJL17w/6Lur29NjTyjw=", + "lastModified": 1713472482, + "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", "owner": "hyprwm", "repo": "hypridle", - "rev": "50da2e7bf4f8164dc0c163141e9260dd3702103f", + "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", "type": "github" }, "original": { @@ -627,18 +396,18 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", - "systems": "systems_2", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1715635266, - "narHash": "sha256-c4l89M8/x4h0VHds7IC1W8yfu27lVN4uoeY57/OmI5Q=", + "lastModified": 1715526061, + "narHash": "sha256-cVhbpdH8ln4ybFAG3yJFDTbKYTATok8cEkOM94IM0cU=", "ref": "refs/heads/main", - "rev": "ba696521930059aa489ac6ffabe28553edaf2fa3", - "revCount": 4683, + "rev": "fd35b35000fa11ce540d944966ff17c71c31fd27", + "revCount": 4678, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -649,6 +418,24 @@ "url": "https://github.com/hyprwm/Hyprland" } }, + "hyprland-contrib": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1713780596, + "narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "110e6dc761d5c3d352574def3479a9c39dfc4358", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, "hyprland-plugins": { "inputs": { "hyprland": [ @@ -661,11 +448,11 @@ ] }, "locked": { - "lastModified": 1715609979, - "narHash": "sha256-3v/P6UyVhQxrQfIv2/0fCO0moCyWv+4QKp6EfD+TPww=", + "lastModified": 1714916173, + "narHash": "sha256-XP9v42PdSBkP/JlllfZR/0FDD1PMAVqw+LhOi79g0MA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "c2c70332a173c93b568ba41a5bb17c66db58d95e", + "rev": "d716d1221348b5bef9d13161876caa91a3e33705", "type": "github" }, "original": { @@ -688,11 +475,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -729,13 +516,10 @@ "hyprlang": { "inputs": { "nixpkgs": [ - "hyprland", + "hypridle", "nixpkgs" ], - "systems": [ - "hyprland", - "systems" - ] + "systems": "systems_2" }, "locked": { "lastModified": 1713121246, @@ -752,12 +536,78 @@ } }, "hyprlang_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_3": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_4": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "systems": "systems_7" + }, + "locked": { + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_5": { "inputs": { "nixpkgs": [ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_12" }, "locked": { "lastModified": 1713121246, @@ -775,25 +625,16 @@ }, "hyprlock": { "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "hyprlang": "hyprlang_3", + "nixpkgs": "nixpkgs_4", + "systems": "systems_6" }, "locked": { - "lastModified": 1715610114, - "narHash": "sha256-ffGEiaL5bVR559adZNHsYBWMefhX8G9oyTrKorbx3h8=", + "lastModified": 1714843107, + "narHash": "sha256-89WxndRGO3CGuWE5XCaHKnsV3IKBRdOWqScp6o8enT4=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "386a1e6fc290fc33177d0b44cd393e32c5433925", + "rev": "c87af3aa1f6e6bd06cffaabcc400bd45e26d565a", "type": "github" }, "original": { @@ -804,18 +645,9 @@ }, "hyprpaper": { "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "hyprlang": "hyprlang_4", + "nixpkgs": "nixpkgs_6", + "systems": "systems_8" }, "locked": { "lastModified": 1714910693, @@ -843,11 +675,11 @@ ] }, "locked": { - "lastModified": 1715608589, - "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", + "lastModified": 1715090986, + "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", + "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b", "type": "github" }, "original": { @@ -856,31 +688,10 @@ "type": "github" } }, - "hyprwm-contrib": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715621965, - "narHash": "sha256-S5Wzi3hhFOiCaeZqmx3zBdrv8KzaEafD5hCfY8ixz0A=", - "owner": "hyprwm", - "repo": "contrib", - "rev": "46d2206858657d439792926958f52b037534de49", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "contrib", - "type": "github" - } - }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs-lib": "nixpkgs-lib_3" + "flake-utils": "flake-utils_5", + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1715515815, @@ -916,6 +727,28 @@ "type": "github" } }, + "nil": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs-small" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1714571717, + "narHash": "sha256-o4tqlTzi9kcVub167kTGXgCac9jM3kW4+v9MH/ue4Hk=", + "owner": "oxalica", + "repo": "nil", + "rev": "2f3ed6348bbf1440fcd1ab0411271497a0fbbfa4", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -935,40 +768,19 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1715248291, - "narHash": "sha256-npC9Swu4VIlRIiEP0XFGoIukd6vOufS/M3PdHk6rQpc=", + "lastModified": 1715804156, + "narHash": "sha256-GtIHP86Cz1kD9xZO/cKbNQACHKdoT9WFbLJAq6W2EDY=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "63154bdfb22091041b307d17863bdc0e01a32a00", + "rev": "bb95091f6c6f38f6cfc215a1797a2dd466312c8b", "type": "github" }, "original": { @@ -1000,27 +812,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715755172, - "narHash": "sha256-2v7pBDWk72JmslM7yMtbUvSMFgWPyjFZofmavBsJZo8=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "d7237db9587d3df4fcd35f1eb0ead185abe5bfef", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1074,18 +865,18 @@ "nixarr": { "inputs": { "devshell": "devshell", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix", "vpnconfinement": "vpnconfinement" }, "locked": { - "lastModified": 1715249591, - "narHash": "sha256-gH0Bx8MGRXhVkpnUeEMf/yg18CnbvozNMOn3xAkQnzg=", + "lastModified": 1711370011, + "narHash": "sha256-PpaiwmQ8EjDogQJLsk1R0J+mKmXLnQ0yygPApIm8tPE=", "owner": "rasmus-kirk", "repo": "nixarr", - "rev": "fd8d42475e9b95f1de1a179431633d028233fa99", + "rev": "b3f42c2f5f5cb316374a25017df0959d01649a3b", "type": "github" }, "original": { @@ -1096,11 +887,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "type": "github" }, "original": { @@ -1158,18 +949,6 @@ } }, "nixpkgs-lib_2": { - "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" - } - }, - "nixpkgs-lib_3": { "locked": { "lastModified": 1715474941, "narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=", @@ -1184,18 +963,18 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-small": { "locked": { - "lastModified": 1715458492, - "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", - "owner": "NixOS", + "lastModified": 1715571466, + "narHash": "sha256-7o7OwQ7D35K7fsBaDjEqHfpbbg+EKhAtz93cHg3LXBw=", + "owner": "Nixos", "repo": "nixpkgs", - "rev": "8e47858badee5594292921c2668c11004c3b0142", + "rev": "adc44ac0ee8454f4f51ef5dd1bdcc60080141e24", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-23.11", + "owner": "Nixos", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1205,16 +984,14 @@ "flake-compat": "flake-compat", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1715674923, - "narHash": "sha256-m41FbXu2OvLfoBhVHZD2wqovxr5w1YKzx8tN9htXF6k=", + "lastModified": 1716085914, + "narHash": "sha256-oYr/nsrTUffbvqHQUJGIdwTbuA2Q2hqC9P249lzaF5w=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "f5d416937554cd7d1d1e8c7feacb0fa1688fd1fd", + "rev": "b7377bc9b0ce7c7b3e6d8533708c1970cd34aeda", "type": "github" }, "original": { @@ -1223,45 +1000,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_10": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1713562564, - "narHash": "sha256-NQpYhgoy0M89g9whRixSwsHb8RFIbwlxeYiVSDwSXJg=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "92d295f588631b0db2da509f381b4fb1e74173c5", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -1271,7 +1016,39 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_11": { + "locked": { + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -1287,6 +1064,70 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { "locked": { "lastModified": 1712963716, @@ -1304,6 +1145,38 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1711231723, + "narHash": "sha256-dARJQ8AJOv6U+sdRePkbcVyVbXJTi1tReCrkkOeusiA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e1d501922fd7351da4200e1275dfcf5faaad1220", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "owner": "Nixos", + "repo": "nixpkgs", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "type": "github" + }, + "original": { + "owner": "Nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -1319,34 +1192,6 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_5", - "flake-root": "flake-root_2", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks", - "treefmt-nix": "treefmt-nix_3" - }, - "locked": { - "lastModified": 1715582453, - "narHash": "sha256-pW8a12PHt/PUphG8Tn0nb+mfbTS7JS4YbThGPepCcb0=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "4530a35bad28a0e8b21905b0817a225e6387811c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -1403,9 +1248,7 @@ }, "ooks-scripts": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1712473070, @@ -1421,59 +1264,27 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { - "ags": "ags", - "anyrun": "anyrun", "firefox-addons": "firefox-addons", - "hardware": "hardware", + "flake-parts": "flake-parts", "helix": "helix", "home-manager": "home-manager", "hypridle": "hypridle", "hyprland": "hyprland", + "hyprland-contrib": "hyprland-contrib", "hyprland-plugins": "hyprland-plugins", "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", - "hyprwm-contrib": "hyprwm-contrib", "nh": "nh", + "nil": "nil", "nix-colors": "nix-colors", - "nix-gaming": "nix-gaming", "nix-on-droid": "nix-on-droid", "nixarr": "nixarr", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_8", + "nixpkgs-small": "nixpkgs-small", "nixpkgs-wayland": "nixpkgs-wayland", - "nixvim": "nixvim", "ooks-scripts": "ooks-scripts", - "sops-nix": "sops-nix", - "systems": "systems_7", "xdg-portal-hyprland": "xdg-portal-hyprland", "zjstatus": "zjstatus" } @@ -1504,6 +1315,31 @@ } }, "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "nil", + "flake-utils" + ], + "nixpkgs": [ + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714529851, + "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "flake-utils": [ "zjstatus", @@ -1544,27 +1380,6 @@ "type": "github" } }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1715482972, - "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1595,6 +1410,66 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_12": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_13": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_14": { + "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": 1689347949, @@ -1612,61 +1487,61 @@ }, "systems_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1702,16 +1577,16 @@ }, "systems_9": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1723,11 +1598,11 @@ ] }, "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", + "lastModified": 1710781103, + "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", + "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", "type": "github" }, "original": { @@ -1758,27 +1633,6 @@ "type": "github" } }, - "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "vpnconfinement": { "inputs": { "nixpkgs": [ @@ -1787,11 +1641,11 @@ ] }, "locked": { - "lastModified": 1711570356, - "narHash": "sha256-SiOKmuE+ezmmZlIbjwtl9BPtT0M/T1X0f/mQwynZRTE=", + "lastModified": 1711303689, + "narHash": "sha256-XelIFUk1AdOzPuotnhCzj4jYJ9LlrJ3qEptzkYppQMk=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "7f35705087b742e22f3fb07704c04c4818fff2c7", + "rev": "5964d68b584799ed9b4eb3d41b81b0c0bb1f7720", "type": "github" }, "original": { @@ -1803,9 +1657,9 @@ "xdg-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_6", - "systems": "systems_9" + "hyprlang": "hyprlang_5", + "nixpkgs": "nixpkgs_12", + "systems": "systems_13" }, "locked": { "lastModified": 1714662532, @@ -1838,11 +1692,11 @@ ] }, "locked": { - "lastModified": 1714662532, - "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", + "lastModified": 1714060055, + "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1f228ba2f1f254195c0b571302b37482861abee3", + "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "type": "github" }, "original": { @@ -1854,16 +1708,16 @@ "zjstatus": { "inputs": { "crane": "crane_2", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7", - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_13", + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1715177960, - "narHash": "sha256-47EdSIRvRfn0ZIOGHeoBQxpA2nyY29VjFPjSRYel/tU=", + "lastModified": 1715068400, + "narHash": "sha256-KlUQXz2tJD5texFCH9fpuJHmCqZjTCAauYc0fUCxlGQ=", "owner": "dj95", "repo": "zjstatus", - "rev": "d124427b2fa597aacd330d0f73557e4fb20fbbdd", + "rev": "3f91eda1cd51e34f35020110a1fa1c092a2f6d84", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b6ea31..0c04a26 100644 --- a/flake.nix +++ b/flake.nix @@ -1,206 +1,104 @@ { + # ooknix + description = "a nix configuration written by an orangutan"; + + outputs = { flake-parts, nixpkgs, self, ... } @ inputs: + flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: { + + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + + imports = [ + ./outputs/pkgs + ]; + + flake = { + nixosConfigurations = import ./outputs/nixos {inherit self inputs nixpkgs;}; + }; + + }); + + # External inputs we depend on inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + ## TODO: + ## look into nix-super + ## IMPLEMENT SECRETS YOU APE (agenix looks best) + + # unstable because why not + nixpkgs.url = "github:Nixos/nixpkgs/nixos-unstable"; + nixpkgs-small.url = "github:Nixos/nixpkgs/nixos-unstable-small"; - home-manager.url = "github:nix-community/home-manager"; + # contains more up-to-date wayland related packages + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + # split your flake into... parts? + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + # dotfile configuration + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # nix shell environment on android nix-on-droid = { url = "github:nix-community/nix-on-droid/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - hardware.url = "github:nixos/nixos-hardware"; - - nix-colors.url = "github:misterio77/nix-colors"; - - ags.url = "github:Aylur/ags"; - - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - firefox-addons = { - url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # schizofox = { - # url = "github:schizofox/schizofox"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - - systems.url = "github:nix-systems/default-linux"; - # hyprland "ecosystem" - - hyprland = { - url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - }; - - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - - hyprwm-contrib = { - url = "github:hyprwm/contrib"; - inputs.nixpkgs.follows = "hyprland/nixpkgs"; - }; - - hypridle = { - url = "github:hyprwm/hypridle"; - inputs.nixpkgs.follows = "hyprland/nixpkgs"; - inputs.systems.follows = "hyprland/systems"; - inputs.hyprlang.follows = "hyprland/hyprlang"; - }; - - hyprlock = { - url = "github:hyprwm/hyprlock"; - inputs.nixpkgs.follows = "hyprland/nixpkgs"; - inputs.systems.follows = "hyprland/systems"; - inputs.hyprlang.follows = "hyprland/hyprlang"; - }; - - hyprpaper = { - url = "github:hyprwm/hyprpaper"; - inputs.nixpkgs.follows = "hyprland/nixpkgs"; - inputs.systems.follows = "hyprland/systems"; - inputs.hyprlang.follows = "hyprland/hyprlang"; - }; - - xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; - - - ooks-scripts = { - url = "github:ooks-io/scripts"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - - helix = { - url = "github:helix-editor/helix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + # wrapper for nix rebuild nh = { url = "github:viperML/nh"; inputs.nixpkgs.follows = "nixpkgs"; }; - anyrun = { - url = "github:Kirottu/anyrun"; + # nix language server that berates me for my mistakes + nil = { + url = "github:oxalica/nil"; + inputs.nixpkgs.follows = "nixpkgs-small"; + }; + + # colorschemes library + nix-colors.url = "github:misterio77/nix-colors"; + + + # hyprland "ecosystem". hyprDE perhaps? + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprlock.url = "github:hyprwm/hyprlock"; + hypridle.url = "github:hyprwm/hypridle"; + hyprpaper.url = "github:hyprwm/hyprpaper"; + hyprland-contrib.url = "github:hyprwm/contrib"; + xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + + # helix because noun -> verb helps scratches my ape brain in the right spot + helix = { + url = "github:helix-editor/helix"; + inputs.nixpkgs.follows = "nixpkgs-small"; + }; + + # packaged firefox addons + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; + # zellij status bar zjstatus.url = "github:dj95/zjstatus"; - nixarr = { - url = "github:rasmus-kirk/nixarr"; - }; + # media server module for hosting my legally purchased linux isos + nixarr.url = "github:rasmus-kirk/nixarr"; - nixpkgs-wayland = { - url = "github:nix-community/nixpkgs-wayland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nix-gaming = { - url = "github:fufexan/nix-gaming"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - }; - - - outputs = { self, nixpkgs, home-manager, nix-on-droid, ... }@inputs: - let - inherit (self) outputs; - lib = nixpkgs.lib // home-manager.lib; - systems = [ "x86_64-linux" "aarch64-linux" ]; - forEachSystem = f: lib.genAttrs systems (sys: f pkgsFor.${sys}); - pkgsFor = nixpkgs.legacyPackages; - - hm = inputs.home-manager.nixosModules.home-manager; - in - { - inherit lib; - - overlays = import ./overlays { inherit inputs outputs; }; - - packages = forEachSystem (pkgs: { - live-buds-cli = pkgs.callPackage ./pkgs/live-buds-cli { }; - }); - - devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; }); - formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt); - - nixosConfigurations = { - # T480s - ookst480s = lib.nixosSystem { - modules = [ - ./system/hosts/ookst480s - hm - ]; - specialArgs = { inherit inputs outputs self; }; - }; - # Main Desktop - ooksdesk = lib.nixosSystem { - modules = [ - ./system/hosts/ooksdesk - hm - ]; - specialArgs = { inherit inputs outputs self; }; - }; - # GPD Micro-PC - ooksmicro = lib.nixosSystem { - modules = [ ./system/hosts/ooksmicro ]; - specialArgs = { inherit inputs outputs; }; - }; - # Media Server/Alternative desktop - ooksmedia = lib.nixosSystem { - modules = [ ./system/hosts/ooksmedia ]; - specialArgs = { inherit inputs outputs; }; - }; - }; - homeConfigurations = { - # T480s - "ooks@ookst480s" = lib.homeManagerConfiguration { - modules = [ ./home/user/ooks/ookst480s ]; - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - }; - # Main Desktop - "ooks@ooksdesk" = lib.homeManagerConfiguration { - modules = [ ./home/user/ooks/ooksdesk ]; - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - }; - # GPD Micro-PC - "ooks@ooksmicro" = lib.homeManagerConfiguration { - modules = [ ./home/user/ooks/ooksmicro ]; - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - }; - # Media Server/Alternative desktop - "ooks@ooksmedia" = lib.homeManagerConfiguration { - modules = [ ./home/user/ooks/ooksmedia ]; - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - }; - }; - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - modules = [ ./system/hosts/ooksphone ]; - pkgs = import nixpkgs { - system = "aarch64-linux"; - }; - system = "aarch64-linux"; - extraSpecialArgs = { inherit inputs outputs; }; - }; + # personal scripts repo + ooks-scripts.url = "github:ooks-io/scripts"; }; } diff --git a/home/secrets/default.nix b/home/secrets/default.nix deleted file mode 100644 index 7d44e85..0000000 --- a/home/secrets/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, config, inputs, pkgs, ... }: - -let - cfg = config.homeModules.sops; -in - -{ - - imports = [ - inputs.sops-nix.homeManagerModules.sops - ]; - options.homeModules.sops.enable = lib.mkEnableOption "Enable sops"; - - config = lib.mkIf cfg.enable { - home.packages = [ pkgs.sops ]; - sops = { - age.keyFile = "/home/ooks/.config/sops/age/keys.txt"; - defaultSopsFile = ./secrets.yaml; - - secrets = { - spotifyClientId = { }; - }; - }; - }; -} diff --git a/home/secrets/secrets.yaml b/home/secrets/secrets.yaml deleted file mode 100644 index f975207..0000000 --- a/home/secrets/secrets.yaml +++ /dev/null @@ -1,22 +0,0 @@ -spotifyClientId: ENC[AES256_GCM,data:T9OJK/xEr87HdeOKadpIY1Oe5fJzqVjhOU6W/DHeYvc=,iv:oweEMqRAPf0WwPADSgB+lDldj23KOlueLyNIgtfWzbo=,tag:/pUN92uMWB+j0okvjYJUGg==,type:str] -spotifyUserId: ENC[AES256_GCM,data:MeowarV/Wg==,iv:Guqwg3rulJCuMwuSeluMPiQnjaQxDEmYEgDffzkGyqc=,tag:hdkZS5Uj733EcODZxJAxaw==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age16ecqs0u4h4qvnp7nr2rdhd0d2qrw7x5kk60u473d6988a0amsass4d5a22 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZT3Z5NnJKaE1SMGVvZEk1 - cFlYYkNUQW4zVFdqQ1MyY1gyOGxhNCt5K21FCmlKMlQzWTJ0K1NqNVEwY2k4bW9z - NmhEejRBeGNUQ3ZSUTNHVE0wUEJnL0EKLS0tIFVhc0l3ZjYyYnY5M2ZJdnZ4VTRU - cHZyWXZHd29UU05xdTBOVnhiUFdoNlkKzLFZ6bf8Ap7Tkd8sr+U9OmpX88WGvOC7 - 4XxfEq5iFaYZemIGtdNJzURN8pdB6su8dG9ChV7m89If5SC9VXYmEg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-02-12T10:19:55Z" - mac: ENC[AES256_GCM,data:uFJWneNsB9652npOK0bq+8fCHrU4xFMhxpSr1G9fZevP2+NJ3SWNTOQomigmLpSszaj0sf7y6VuHZE2DFun8BCy13yR1PJtM8vQTfAJ+HMyps1YT4jcraZwFyZx5skuVvEDd7xV7+8tQwHR+c7GXrib+92/2wKFS/wbhn6l9qYY=,iv:GZDdkc527os5e2QKsQqsXYGvdJ+ymoiFnihghzMtTOY=,tag:YEoJQ+zNawIYfmPQlawbBw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/inputs/default.nix b/inputs/default.nix new file mode 100644 index 0000000..5587101 --- /dev/null +++ b/inputs/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./home + ./system + ]; +} diff --git a/home/modules/config/default.nix b/inputs/home/modules/config/default.nix similarity index 100% rename from home/modules/config/default.nix rename to inputs/home/modules/config/default.nix diff --git a/home/modules/config/home/default.nix b/inputs/home/modules/config/home/default.nix similarity index 100% rename from home/modules/config/home/default.nix rename to inputs/home/modules/config/home/default.nix diff --git a/home/modules/config/mimeApps/default.nix b/inputs/home/modules/config/mimeApps/default.nix similarity index 100% rename from home/modules/config/mimeApps/default.nix rename to inputs/home/modules/config/mimeApps/default.nix diff --git a/home/modules/config/monitors/default.nix b/inputs/home/modules/config/monitors/default.nix similarity index 100% rename from home/modules/config/monitors/default.nix rename to inputs/home/modules/config/monitors/default.nix diff --git a/home/modules/config/nix/default.nix b/inputs/home/modules/config/nix/default.nix similarity index 100% rename from home/modules/config/nix/default.nix rename to inputs/home/modules/config/nix/default.nix diff --git a/home/modules/config/userDirs/default.nix b/inputs/home/modules/config/userDirs/default.nix similarity index 100% rename from home/modules/config/userDirs/default.nix rename to inputs/home/modules/config/userDirs/default.nix diff --git a/home/modules/console/default.nix b/inputs/home/modules/console/default.nix similarity index 100% rename from home/modules/console/default.nix rename to inputs/home/modules/console/default.nix diff --git a/home/modules/console/editor/default.nix b/inputs/home/modules/console/editor/default.nix similarity index 97% rename from home/modules/console/editor/default.nix rename to inputs/home/modules/console/editor/default.nix index 6caf123..0f37368 100644 --- a/home/modules/console/editor/default.nix +++ b/inputs/home/modules/console/editor/default.nix @@ -3,7 +3,7 @@ imports = [ ./helix - ./nvim + # ./nvim ]; options.homeModules.console.editor = { diff --git a/home/modules/console/editor/helix/default.nix b/inputs/home/modules/console/editor/helix/default.nix similarity index 100% rename from home/modules/console/editor/helix/default.nix rename to inputs/home/modules/console/editor/helix/default.nix diff --git a/home/modules/console/editor/helix/languages.nix b/inputs/home/modules/console/editor/helix/languages.nix similarity index 100% rename from home/modules/console/editor/helix/languages.nix rename to inputs/home/modules/console/editor/helix/languages.nix diff --git a/home/modules/console/editor/helix/theme.nix b/inputs/home/modules/console/editor/helix/theme.nix similarity index 100% rename from home/modules/console/editor/helix/theme.nix rename to inputs/home/modules/console/editor/helix/theme.nix diff --git a/home/modules/console/editor/nvim/default.nix b/inputs/home/modules/console/editor/nvim/default.nix similarity index 100% rename from home/modules/console/editor/nvim/default.nix rename to inputs/home/modules/console/editor/nvim/default.nix diff --git a/home/modules/console/editor/nvim/keymapping.nix b/inputs/home/modules/console/editor/nvim/keymapping.nix similarity index 100% rename from home/modules/console/editor/nvim/keymapping.nix rename to inputs/home/modules/console/editor/nvim/keymapping.nix diff --git a/home/modules/console/editor/nvim/plugins/default.nix b/inputs/home/modules/console/editor/nvim/plugins/default.nix similarity index 100% rename from home/modules/console/editor/nvim/plugins/default.nix rename to inputs/home/modules/console/editor/nvim/plugins/default.nix diff --git a/home/modules/console/editor/nvim/plugins/indent.nix b/inputs/home/modules/console/editor/nvim/plugins/indent.nix similarity index 100% rename from home/modules/console/editor/nvim/plugins/indent.nix rename to inputs/home/modules/console/editor/nvim/plugins/indent.nix diff --git a/home/modules/console/editor/nvim/plugins/lualine.nix b/inputs/home/modules/console/editor/nvim/plugins/lualine.nix similarity index 100% rename from home/modules/console/editor/nvim/plugins/lualine.nix rename to inputs/home/modules/console/editor/nvim/plugins/lualine.nix diff --git a/home/modules/console/editor/nvim/plugins/telescope.nix b/inputs/home/modules/console/editor/nvim/plugins/telescope.nix similarity index 100% rename from home/modules/console/editor/nvim/plugins/telescope.nix rename to inputs/home/modules/console/editor/nvim/plugins/telescope.nix diff --git a/home/modules/console/editor/nvim/settings.nix b/inputs/home/modules/console/editor/nvim/settings.nix similarity index 100% rename from home/modules/console/editor/nvim/settings.nix rename to inputs/home/modules/console/editor/nvim/settings.nix diff --git a/home/modules/console/fileManager/default.nix b/inputs/home/modules/console/fileManager/default.nix similarity index 100% rename from home/modules/console/fileManager/default.nix rename to inputs/home/modules/console/fileManager/default.nix diff --git a/home/modules/console/fileManager/lf/default.nix b/inputs/home/modules/console/fileManager/lf/default.nix similarity index 100% rename from home/modules/console/fileManager/lf/default.nix rename to inputs/home/modules/console/fileManager/lf/default.nix diff --git a/home/modules/console/multiplexer/default.nix b/inputs/home/modules/console/multiplexer/default.nix similarity index 100% rename from home/modules/console/multiplexer/default.nix rename to inputs/home/modules/console/multiplexer/default.nix diff --git a/home/modules/console/multiplexer/tmux/default.nix b/inputs/home/modules/console/multiplexer/tmux/default.nix similarity index 100% rename from home/modules/console/multiplexer/tmux/default.nix rename to inputs/home/modules/console/multiplexer/tmux/default.nix diff --git a/home/modules/console/multiplexer/zellij/default.nix b/inputs/home/modules/console/multiplexer/zellij/default.nix similarity index 100% rename from home/modules/console/multiplexer/zellij/default.nix rename to inputs/home/modules/console/multiplexer/zellij/default.nix diff --git a/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix b/inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix similarity index 100% rename from home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix rename to inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix diff --git a/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix b/inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix similarity index 100% rename from home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix rename to inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix diff --git a/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix b/inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix similarity index 100% rename from home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix rename to inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix diff --git a/home/modules/console/prompt/default.nix b/inputs/home/modules/console/prompt/default.nix similarity index 100% rename from home/modules/console/prompt/default.nix rename to inputs/home/modules/console/prompt/default.nix diff --git a/home/modules/console/prompt/starship/default.nix b/inputs/home/modules/console/prompt/starship/default.nix similarity index 100% rename from home/modules/console/prompt/starship/default.nix rename to inputs/home/modules/console/prompt/starship/default.nix diff --git a/home/modules/console/shell/bash/default.nix b/inputs/home/modules/console/shell/bash/default.nix similarity index 100% rename from home/modules/console/shell/bash/default.nix rename to inputs/home/modules/console/shell/bash/default.nix diff --git a/home/modules/console/shell/default.nix b/inputs/home/modules/console/shell/default.nix similarity index 100% rename from home/modules/console/shell/default.nix rename to inputs/home/modules/console/shell/default.nix diff --git a/home/modules/console/shell/fish/default.nix b/inputs/home/modules/console/shell/fish/default.nix similarity index 100% rename from home/modules/console/shell/fish/default.nix rename to inputs/home/modules/console/shell/fish/default.nix diff --git a/home/modules/console/utility/default.nix b/inputs/home/modules/console/utility/default.nix similarity index 100% rename from home/modules/console/utility/default.nix rename to inputs/home/modules/console/utility/default.nix diff --git a/home/modules/console/utility/git/default.nix b/inputs/home/modules/console/utility/git/default.nix similarity index 100% rename from home/modules/console/utility/git/default.nix rename to inputs/home/modules/console/utility/git/default.nix diff --git a/home/modules/console/utility/nixIndex/default.nix b/inputs/home/modules/console/utility/nixIndex/default.nix similarity index 100% rename from home/modules/console/utility/nixIndex/default.nix rename to inputs/home/modules/console/utility/nixIndex/default.nix diff --git a/home/modules/console/utility/ssh/default.nix b/inputs/home/modules/console/utility/ssh/default.nix similarity index 100% rename from home/modules/console/utility/ssh/default.nix rename to inputs/home/modules/console/utility/ssh/default.nix diff --git a/home/modules/console/utility/tools/default.nix b/inputs/home/modules/console/utility/tools/default.nix similarity index 100% rename from home/modules/console/utility/tools/default.nix rename to inputs/home/modules/console/utility/tools/default.nix diff --git a/home/modules/console/utility/transientServices/default.nix b/inputs/home/modules/console/utility/transientServices/default.nix similarity index 100% rename from home/modules/console/utility/transientServices/default.nix rename to inputs/home/modules/console/utility/transientServices/default.nix diff --git a/home/modules/default.nix b/inputs/home/modules/default.nix similarity index 100% rename from home/modules/default.nix rename to inputs/home/modules/default.nix diff --git a/home/modules/desktop/browser/brave/default.nix b/inputs/home/modules/desktop/browser/brave/default.nix similarity index 100% rename from home/modules/desktop/browser/brave/default.nix rename to inputs/home/modules/desktop/browser/brave/default.nix diff --git a/home/modules/desktop/browser/chrome/default.nix b/inputs/home/modules/desktop/browser/chrome/default.nix similarity index 100% rename from home/modules/desktop/browser/chrome/default.nix rename to inputs/home/modules/desktop/browser/chrome/default.nix diff --git a/home/modules/desktop/browser/default.nix b/inputs/home/modules/desktop/browser/default.nix similarity index 100% rename from home/modules/desktop/browser/default.nix rename to inputs/home/modules/desktop/browser/default.nix diff --git a/home/modules/desktop/browser/firefox/default.nix b/inputs/home/modules/desktop/browser/firefox/default.nix similarity index 100% rename from home/modules/desktop/browser/firefox/default.nix rename to inputs/home/modules/desktop/browser/firefox/default.nix diff --git a/home/modules/desktop/browser/firefox/settings/narsilUserjs.nix b/inputs/home/modules/desktop/browser/firefox/settings/narsilUserjs.nix similarity index 100% rename from home/modules/desktop/browser/firefox/settings/narsilUserjs.nix rename to inputs/home/modules/desktop/browser/firefox/settings/narsilUserjs.nix diff --git a/home/modules/desktop/browser/firefox/settings/ooksJs.nix b/inputs/home/modules/desktop/browser/firefox/settings/ooksJs.nix similarity index 100% rename from home/modules/desktop/browser/firefox/settings/ooksJs.nix rename to inputs/home/modules/desktop/browser/firefox/settings/ooksJs.nix diff --git a/home/modules/desktop/browser/firefox/theme/penguinFox.nix b/inputs/home/modules/desktop/browser/firefox/theme/penguinFox.nix similarity index 100% rename from home/modules/desktop/browser/firefox/theme/penguinFox.nix rename to inputs/home/modules/desktop/browser/firefox/theme/penguinFox.nix diff --git a/home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix b/inputs/home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix similarity index 100% rename from home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix rename to inputs/home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix diff --git a/home/modules/desktop/browser/schizofox/default.nix b/inputs/home/modules/desktop/browser/schizofox/default.nix similarity index 100% rename from home/modules/desktop/browser/schizofox/default.nix rename to inputs/home/modules/desktop/browser/schizofox/default.nix diff --git a/home/modules/desktop/communication/default.nix b/inputs/home/modules/desktop/communication/default.nix similarity index 100% rename from home/modules/desktop/communication/default.nix rename to inputs/home/modules/desktop/communication/default.nix diff --git a/home/modules/desktop/communication/discord/default.nix b/inputs/home/modules/desktop/communication/discord/default.nix similarity index 100% rename from home/modules/desktop/communication/discord/default.nix rename to inputs/home/modules/desktop/communication/discord/default.nix diff --git a/home/modules/desktop/creative/audio/audacity/default.nix b/inputs/home/modules/desktop/creative/audio/audacity/default.nix similarity index 100% rename from home/modules/desktop/creative/audio/audacity/default.nix rename to inputs/home/modules/desktop/creative/audio/audacity/default.nix diff --git a/home/modules/desktop/creative/audio/default.nix b/inputs/home/modules/desktop/creative/audio/default.nix similarity index 100% rename from home/modules/desktop/creative/audio/default.nix rename to inputs/home/modules/desktop/creative/audio/default.nix diff --git a/home/modules/desktop/creative/default.nix b/inputs/home/modules/desktop/creative/default.nix similarity index 100% rename from home/modules/desktop/creative/default.nix rename to inputs/home/modules/desktop/creative/default.nix diff --git a/home/modules/desktop/creative/image/default.nix b/inputs/home/modules/desktop/creative/image/default.nix similarity index 100% rename from home/modules/desktop/creative/image/default.nix rename to inputs/home/modules/desktop/creative/image/default.nix diff --git a/home/modules/desktop/creative/image/inkscape/default.nix b/inputs/home/modules/desktop/creative/image/inkscape/default.nix similarity index 100% rename from home/modules/desktop/creative/image/inkscape/default.nix rename to inputs/home/modules/desktop/creative/image/inkscape/default.nix diff --git a/home/modules/desktop/default.nix b/inputs/home/modules/desktop/default.nix similarity index 100% rename from home/modules/desktop/default.nix rename to inputs/home/modules/desktop/default.nix diff --git a/home/modules/desktop/gaming/default.nix b/inputs/home/modules/desktop/gaming/default.nix similarity index 100% rename from home/modules/desktop/gaming/default.nix rename to inputs/home/modules/desktop/gaming/default.nix diff --git a/home/modules/desktop/gaming/factorio/default.nix b/inputs/home/modules/desktop/gaming/factorio/default.nix similarity index 100% rename from home/modules/desktop/gaming/factorio/default.nix rename to inputs/home/modules/desktop/gaming/factorio/default.nix diff --git a/home/modules/desktop/gaming/lutris/default.nix b/inputs/home/modules/desktop/gaming/lutris/default.nix similarity index 100% rename from home/modules/desktop/gaming/lutris/default.nix rename to inputs/home/modules/desktop/gaming/lutris/default.nix diff --git a/home/modules/desktop/media/default.nix b/inputs/home/modules/desktop/media/default.nix similarity index 100% rename from home/modules/desktop/media/default.nix rename to inputs/home/modules/desktop/media/default.nix diff --git a/home/modules/desktop/media/image/default.nix b/inputs/home/modules/desktop/media/image/default.nix similarity index 100% rename from home/modules/desktop/media/image/default.nix rename to inputs/home/modules/desktop/media/image/default.nix diff --git a/home/modules/desktop/media/image/imv/default.nix b/inputs/home/modules/desktop/media/image/imv/default.nix similarity index 100% rename from home/modules/desktop/media/image/imv/default.nix rename to inputs/home/modules/desktop/media/image/imv/default.nix diff --git a/home/modules/desktop/media/music/default.nix b/inputs/home/modules/desktop/media/music/default.nix similarity index 100% rename from home/modules/desktop/media/music/default.nix rename to inputs/home/modules/desktop/media/music/default.nix diff --git a/home/modules/desktop/media/music/easyeffects/default.nix b/inputs/home/modules/desktop/media/music/easyeffects/default.nix similarity index 100% rename from home/modules/desktop/media/music/easyeffects/default.nix rename to inputs/home/modules/desktop/media/music/easyeffects/default.nix diff --git a/home/modules/desktop/media/music/tui/default.nix b/inputs/home/modules/desktop/media/music/tui/default.nix similarity index 100% rename from home/modules/desktop/media/music/tui/default.nix rename to inputs/home/modules/desktop/media/music/tui/default.nix diff --git a/home/modules/desktop/media/video/default.nix b/inputs/home/modules/desktop/media/video/default.nix similarity index 100% rename from home/modules/desktop/media/video/default.nix rename to inputs/home/modules/desktop/media/video/default.nix diff --git a/home/modules/desktop/media/video/jellyfin/default.nix b/inputs/home/modules/desktop/media/video/jellyfin/default.nix similarity index 100% rename from home/modules/desktop/media/video/jellyfin/default.nix rename to inputs/home/modules/desktop/media/video/jellyfin/default.nix diff --git a/home/modules/desktop/media/video/mpv/default.nix b/inputs/home/modules/desktop/media/video/mpv/default.nix similarity index 100% rename from home/modules/desktop/media/video/mpv/default.nix rename to inputs/home/modules/desktop/media/video/mpv/default.nix diff --git a/home/modules/desktop/media/video/youtube/default.nix b/inputs/home/modules/desktop/media/video/youtube/default.nix similarity index 100% rename from home/modules/desktop/media/video/youtube/default.nix rename to inputs/home/modules/desktop/media/video/youtube/default.nix diff --git a/home/modules/desktop/productivity/default.nix b/inputs/home/modules/desktop/productivity/default.nix similarity index 100% rename from home/modules/desktop/productivity/default.nix rename to inputs/home/modules/desktop/productivity/default.nix diff --git a/home/modules/desktop/productivity/obsidian/default.nix b/inputs/home/modules/desktop/productivity/obsidian/default.nix similarity index 100% rename from home/modules/desktop/productivity/obsidian/default.nix rename to inputs/home/modules/desktop/productivity/obsidian/default.nix diff --git a/home/modules/desktop/productivity/office/default.nix b/inputs/home/modules/desktop/productivity/office/default.nix similarity index 100% rename from home/modules/desktop/productivity/office/default.nix rename to inputs/home/modules/desktop/productivity/office/default.nix diff --git a/home/modules/desktop/productivity/zathura/default.nix b/inputs/home/modules/desktop/productivity/zathura/default.nix similarity index 100% rename from home/modules/desktop/productivity/zathura/default.nix rename to inputs/home/modules/desktop/productivity/zathura/default.nix diff --git a/home/modules/desktop/security/default.nix b/inputs/home/modules/desktop/security/default.nix similarity index 100% rename from home/modules/desktop/security/default.nix rename to inputs/home/modules/desktop/security/default.nix diff --git a/home/modules/desktop/security/polkit/default.nix b/inputs/home/modules/desktop/security/polkit/default.nix similarity index 100% rename from home/modules/desktop/security/polkit/default.nix rename to inputs/home/modules/desktop/security/polkit/default.nix diff --git a/home/modules/desktop/terminal/default.nix b/inputs/home/modules/desktop/terminal/default.nix similarity index 100% rename from home/modules/desktop/terminal/default.nix rename to inputs/home/modules/desktop/terminal/default.nix diff --git a/home/modules/desktop/terminal/foot/default.nix b/inputs/home/modules/desktop/terminal/foot/default.nix similarity index 100% rename from home/modules/desktop/terminal/foot/default.nix rename to inputs/home/modules/desktop/terminal/foot/default.nix diff --git a/home/modules/desktop/terminal/kitty/default.nix b/inputs/home/modules/desktop/terminal/kitty/default.nix similarity index 100% rename from home/modules/desktop/terminal/kitty/default.nix rename to inputs/home/modules/desktop/terminal/kitty/default.nix diff --git a/home/modules/desktop/tools/default.nix b/inputs/home/modules/desktop/tools/default.nix similarity index 100% rename from home/modules/desktop/tools/default.nix rename to inputs/home/modules/desktop/tools/default.nix diff --git a/home/modules/desktop/tools/kdeconnect/default.nix b/inputs/home/modules/desktop/tools/kdeconnect/default.nix similarity index 100% rename from home/modules/desktop/tools/kdeconnect/default.nix rename to inputs/home/modules/desktop/tools/kdeconnect/default.nix diff --git a/home/modules/desktop/wayland/bar/ags/default.nix b/inputs/home/modules/desktop/wayland/bar/ags/default.nix similarity index 100% rename from home/modules/desktop/wayland/bar/ags/default.nix rename to inputs/home/modules/desktop/wayland/bar/ags/default.nix diff --git a/home/modules/desktop/wayland/bar/default.nix b/inputs/home/modules/desktop/wayland/bar/default.nix similarity index 96% rename from home/modules/desktop/wayland/bar/default.nix rename to inputs/home/modules/desktop/wayland/bar/default.nix index a6d36e0..3dc43d4 100644 --- a/home/modules/desktop/wayland/bar/default.nix +++ b/inputs/home/modules/desktop/wayland/bar/default.nix @@ -2,7 +2,7 @@ { imports = [ #./eww - ./ags + # ./ags ./waybar ]; diff --git a/home/modules/desktop/wayland/bar/eww/default.nix b/inputs/home/modules/desktop/wayland/bar/eww/default.nix similarity index 100% rename from home/modules/desktop/wayland/bar/eww/default.nix rename to inputs/home/modules/desktop/wayland/bar/eww/default.nix diff --git a/home/modules/desktop/wayland/bar/waybar/default.nix b/inputs/home/modules/desktop/wayland/bar/waybar/default.nix similarity index 100% rename from home/modules/desktop/wayland/bar/waybar/default.nix rename to inputs/home/modules/desktop/wayland/bar/waybar/default.nix diff --git a/home/modules/desktop/wayland/default.nix b/inputs/home/modules/desktop/wayland/default.nix similarity index 100% rename from home/modules/desktop/wayland/default.nix rename to inputs/home/modules/desktop/wayland/default.nix diff --git a/home/modules/desktop/wayland/launcher/anyrun/default.nix b/inputs/home/modules/desktop/wayland/launcher/anyrun/default.nix similarity index 100% rename from home/modules/desktop/wayland/launcher/anyrun/default.nix rename to inputs/home/modules/desktop/wayland/launcher/anyrun/default.nix diff --git a/home/modules/desktop/wayland/launcher/default.nix b/inputs/home/modules/desktop/wayland/launcher/default.nix similarity index 96% rename from home/modules/desktop/wayland/launcher/default.nix rename to inputs/home/modules/desktop/wayland/launcher/default.nix index a923325..b05a96f 100644 --- a/home/modules/desktop/wayland/launcher/default.nix +++ b/inputs/home/modules/desktop/wayland/launcher/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./anyrun + # ./anyrun ./rofi ./tofi ]; diff --git a/home/modules/desktop/wayland/launcher/rofi/default.nix b/inputs/home/modules/desktop/wayland/launcher/rofi/default.nix similarity index 100% rename from home/modules/desktop/wayland/launcher/rofi/default.nix rename to inputs/home/modules/desktop/wayland/launcher/rofi/default.nix diff --git a/home/modules/desktop/wayland/launcher/tofi/default.nix b/inputs/home/modules/desktop/wayland/launcher/tofi/default.nix similarity index 100% rename from home/modules/desktop/wayland/launcher/tofi/default.nix rename to inputs/home/modules/desktop/wayland/launcher/tofi/default.nix diff --git a/home/modules/desktop/wayland/lockscreen/default.nix b/inputs/home/modules/desktop/wayland/lockscreen/default.nix similarity index 100% rename from home/modules/desktop/wayland/lockscreen/default.nix rename to inputs/home/modules/desktop/wayland/lockscreen/default.nix diff --git a/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix b/inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix similarity index 100% rename from home/modules/desktop/wayland/lockscreen/hyprlock/default.nix rename to inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix diff --git a/home/modules/desktop/wayland/lockscreen/swaylock/default.nix b/inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix similarity index 100% rename from home/modules/desktop/wayland/lockscreen/swaylock/default.nix rename to inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix diff --git a/home/modules/desktop/wayland/notification/default.nix b/inputs/home/modules/desktop/wayland/notification/default.nix similarity index 100% rename from home/modules/desktop/wayland/notification/default.nix rename to inputs/home/modules/desktop/wayland/notification/default.nix diff --git a/home/modules/desktop/wayland/notification/mako/default.nix b/inputs/home/modules/desktop/wayland/notification/mako/default.nix similarity index 100% rename from home/modules/desktop/wayland/notification/mako/default.nix rename to inputs/home/modules/desktop/wayland/notification/mako/default.nix diff --git a/home/modules/desktop/wayland/utility/default.nix b/inputs/home/modules/desktop/wayland/utility/default.nix similarity index 100% rename from home/modules/desktop/wayland/utility/default.nix rename to inputs/home/modules/desktop/wayland/utility/default.nix diff --git a/home/modules/desktop/wayland/utility/gammastep/default.nix b/inputs/home/modules/desktop/wayland/utility/gammastep/default.nix similarity index 100% rename from home/modules/desktop/wayland/utility/gammastep/default.nix rename to inputs/home/modules/desktop/wayland/utility/gammastep/default.nix diff --git a/home/modules/desktop/wayland/utility/tools/default.nix b/inputs/home/modules/desktop/wayland/utility/tools/default.nix similarity index 100% rename from home/modules/desktop/wayland/utility/tools/default.nix rename to inputs/home/modules/desktop/wayland/utility/tools/default.nix diff --git a/home/modules/desktop/wayland/windowManager/default.nix b/inputs/home/modules/desktop/wayland/windowManager/default.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/default.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix similarity index 85% rename from home/modules/desktop/wayland/windowManager/hyprland/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix index df1117a..b7be2e9 100644 --- a/home/modules/desktop/wayland/windowManager/hyprland/default.nix +++ b/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix @@ -13,8 +13,7 @@ in config = lib.mkIf cfg.enable { xdg.portal = { - extraPortals = [ pkgs.inputs.hyprland.xdg-desktop-portal-hyprland ]; - configPackages = [ pkgs.inputs.hyprland.hyprland ]; + extraPortals = [ inputs.xdg-portal-hyprland.packages.${pkgs.system}.default ]; }; home.packages = [ diff --git a/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix similarity index 95% rename from home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix index 8a3d424..e35beb5 100644 --- a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix +++ b/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix @@ -9,7 +9,7 @@ in home.packages = with inputs; [ # Screenshot tool - hyprwm-contrib.packages.${pkgs.system}.grimblast + hyprland-contrib.packages.${pkgs.system}.grimblast # Screen recording tool ooks-scripts.packages.${pkgs.system}.hyprrecord ]; diff --git a/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix similarity index 89% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix index 3e6c56f..e8f53bb 100644 --- a/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix +++ b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix @@ -12,7 +12,7 @@ in ]; exec-once = [ "${pkgs._1password-gui}/bin/1password --silent" - "${pkgs.live-buds-cli}/bin/earbuds -d" + # "${pkgs.live-buds-cli}/bin/earbuds -d" # "waybar" ]; }; diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix diff --git a/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix similarity index 100% rename from home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix rename to inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix diff --git a/home/modules/theme/cursor/default.nix b/inputs/home/modules/theme/cursor/default.nix similarity index 100% rename from home/modules/theme/cursor/default.nix rename to inputs/home/modules/theme/cursor/default.nix diff --git a/home/modules/theme/default.nix b/inputs/home/modules/theme/default.nix similarity index 100% rename from home/modules/theme/default.nix rename to inputs/home/modules/theme/default.nix diff --git a/home/modules/theme/fonts/default.nix b/inputs/home/modules/theme/fonts/default.nix similarity index 100% rename from home/modules/theme/fonts/default.nix rename to inputs/home/modules/theme/fonts/default.nix diff --git a/home/modules/theme/gtk/default.nix b/inputs/home/modules/theme/gtk/default.nix similarity index 100% rename from home/modules/theme/gtk/default.nix rename to inputs/home/modules/theme/gtk/default.nix diff --git a/home/modules/theme/qt/default.nix b/inputs/home/modules/theme/qt/default.nix similarity index 100% rename from home/modules/theme/qt/default.nix rename to inputs/home/modules/theme/qt/default.nix diff --git a/home/modules/theme/wallpaper/default.nix b/inputs/home/modules/theme/wallpaper/default.nix similarity index 100% rename from home/modules/theme/wallpaper/default.nix rename to inputs/home/modules/theme/wallpaper/default.nix diff --git a/home/profile/base/default.nix b/inputs/home/profile/base/default.nix similarity index 95% rename from home/profile/base/default.nix rename to inputs/home/profile/base/default.nix index a1b658c..dc860cb 100644 --- a/home/profile/base/default.nix +++ b/inputs/home/profile/base/default.nix @@ -6,7 +6,6 @@ in { imports = [ ../../modules - ../../secrets ]; config = lib.mkIf cfg.enable { @@ -14,8 +13,6 @@ in systemd.user.startServices = mkDefault "sd-switch"; homeModules = { - sops.enable = true; - config = { # nix.enable = true; # nixColors.enable = true; diff --git a/home/profile/creative/default.nix b/inputs/home/profile/creative/default.nix similarity index 100% rename from home/profile/creative/default.nix rename to inputs/home/profile/creative/default.nix diff --git a/home/profile/default.nix b/inputs/home/profile/default.nix similarity index 100% rename from home/profile/default.nix rename to inputs/home/profile/default.nix diff --git a/home/profile/gaming/default.nix b/inputs/home/profile/gaming/default.nix similarity index 100% rename from home/profile/gaming/default.nix rename to inputs/home/profile/gaming/default.nix diff --git a/home/profile/hyprland/default.nix b/inputs/home/profile/hyprland/default.nix similarity index 100% rename from home/profile/hyprland/default.nix rename to inputs/home/profile/hyprland/default.nix diff --git a/home/profile/productivity/default.nix b/inputs/home/profile/productivity/default.nix similarity index 100% rename from home/profile/productivity/default.nix rename to inputs/home/profile/productivity/default.nix diff --git a/home/profile/themes/default.nix b/inputs/home/profile/themes/default.nix similarity index 100% rename from home/profile/themes/default.nix rename to inputs/home/profile/themes/default.nix diff --git a/home/profile/themes/minimal/default.nix b/inputs/home/profile/themes/minimal/default.nix similarity index 100% rename from home/profile/themes/minimal/default.nix rename to inputs/home/profile/themes/minimal/default.nix diff --git a/home/profile/themes/phone/default.nix b/inputs/home/profile/themes/phone/default.nix similarity index 100% rename from home/profile/themes/phone/default.nix rename to inputs/home/profile/themes/phone/default.nix diff --git a/home/user/erika@ookst480.nix b/inputs/home/user/erika@ookst480.nix similarity index 100% rename from home/user/erika@ookst480.nix rename to inputs/home/user/erika@ookst480.nix diff --git a/home/user/ooks/ooksdesk/default.nix b/inputs/home/user/ooks/ooksdesk/default.nix similarity index 100% rename from home/user/ooks/ooksdesk/default.nix rename to inputs/home/user/ooks/ooksdesk/default.nix diff --git a/home/user/ooks/ooksmedia/default.nix b/inputs/home/user/ooks/ooksmedia/default.nix similarity index 100% rename from home/user/ooks/ooksmedia/default.nix rename to inputs/home/user/ooks/ooksmedia/default.nix diff --git a/home/user/ooks/ooksmicro/default.nix b/inputs/home/user/ooks/ooksmicro/default.nix similarity index 100% rename from home/user/ooks/ooksmicro/default.nix rename to inputs/home/user/ooks/ooksmicro/default.nix diff --git a/home/user/ooks/ooksphone/default.nix b/inputs/home/user/ooks/ooksphone/default.nix similarity index 100% rename from home/user/ooks/ooksphone/default.nix rename to inputs/home/user/ooks/ooksphone/default.nix diff --git a/home/user/ooks/ookst480s/default.nix b/inputs/home/user/ooks/ookst480s/default.nix similarity index 100% rename from home/user/ooks/ookst480s/default.nix rename to inputs/home/user/ooks/ookst480s/default.nix diff --git a/system/modules/audio/default.nix b/inputs/system/modules/base/audio/default.nix similarity index 100% rename from system/modules/audio/default.nix rename to inputs/system/modules/base/audio/default.nix diff --git a/system/modules/audio/pipewire/default.nix b/inputs/system/modules/base/audio/pipewire/default.nix similarity index 100% rename from system/modules/audio/pipewire/default.nix rename to inputs/system/modules/base/audio/pipewire/default.nix diff --git a/system/modules/bootloader/default.nix b/inputs/system/modules/base/bootloader/default.nix similarity index 100% rename from system/modules/bootloader/default.nix rename to inputs/system/modules/base/bootloader/default.nix diff --git a/system/modules/bootloader/grub/default.nix b/inputs/system/modules/base/bootloader/grub/default.nix similarity index 100% rename from system/modules/bootloader/grub/default.nix rename to inputs/system/modules/base/bootloader/grub/default.nix diff --git a/system/modules/bootloader/plymouth/default.nix b/inputs/system/modules/base/bootloader/plymouth/default.nix similarity index 100% rename from system/modules/bootloader/plymouth/default.nix rename to inputs/system/modules/base/bootloader/plymouth/default.nix diff --git a/system/modules/bootloader/systemd/default.nix b/inputs/system/modules/base/bootloader/systemd/default.nix similarity index 100% rename from system/modules/bootloader/systemd/default.nix rename to inputs/system/modules/base/bootloader/systemd/default.nix diff --git a/system/modules/default.nix b/inputs/system/modules/base/default.nix similarity index 100% rename from system/modules/default.nix rename to inputs/system/modules/base/default.nix diff --git a/system/modules/displayManager/default.nix b/inputs/system/modules/base/displayManager/default.nix similarity index 100% rename from system/modules/displayManager/default.nix rename to inputs/system/modules/base/displayManager/default.nix diff --git a/system/modules/displayManager/tuigreet/default.nix b/inputs/system/modules/base/displayManager/tuigreet/default.nix similarity index 100% rename from system/modules/displayManager/tuigreet/default.nix rename to inputs/system/modules/base/displayManager/tuigreet/default.nix diff --git a/system/modules/gaming/default.nix b/inputs/system/modules/base/gaming/default.nix similarity index 100% rename from system/modules/gaming/default.nix rename to inputs/system/modules/base/gaming/default.nix diff --git a/system/modules/host/admin/default.nix b/inputs/system/modules/base/host/admin/default.nix similarity index 95% rename from system/modules/host/admin/default.nix rename to inputs/system/modules/base/host/admin/default.nix index cce85c2..af2ecee 100644 --- a/system/modules/host/admin/default.nix +++ b/inputs/system/modules/base/host/admin/default.nix @@ -58,7 +58,7 @@ in verbose = true; extraSpecialArgs = { inherit inputs outputs self; }; users.${cfg.name} = { - imports = [ "${self}/home/user/${cfg.name}/${host.name}" ]; + imports = [ "${self}/inputs/home/user/${cfg.name}/${host.name}" ]; }; }; }; diff --git a/system/modules/host/default.nix b/inputs/system/modules/base/host/default.nix similarity index 100% rename from system/modules/host/default.nix rename to inputs/system/modules/base/host/default.nix diff --git a/system/modules/host/function/default.nix b/inputs/system/modules/base/host/function/default.nix similarity index 100% rename from system/modules/host/function/default.nix rename to inputs/system/modules/base/host/function/default.nix diff --git a/system/modules/host/function/workstation/default.nix b/inputs/system/modules/base/host/function/workstation/default.nix similarity index 100% rename from system/modules/host/function/workstation/default.nix rename to inputs/system/modules/base/host/function/workstation/default.nix diff --git a/system/modules/host/hardware/common/default.nix b/inputs/system/modules/base/host/hardware/common/default.nix similarity index 100% rename from system/modules/host/hardware/common/default.nix rename to inputs/system/modules/base/host/hardware/common/default.nix diff --git a/system/modules/host/hardware/cpu/amd/default.nix b/inputs/system/modules/base/host/hardware/cpu/amd/default.nix similarity index 100% rename from system/modules/host/hardware/cpu/amd/default.nix rename to inputs/system/modules/base/host/hardware/cpu/amd/default.nix diff --git a/system/modules/host/hardware/cpu/default.nix b/inputs/system/modules/base/host/hardware/cpu/default.nix similarity index 100% rename from system/modules/host/hardware/cpu/default.nix rename to inputs/system/modules/base/host/hardware/cpu/default.nix diff --git a/system/modules/host/hardware/cpu/intel/default.nix b/inputs/system/modules/base/host/hardware/cpu/intel/default.nix similarity index 100% rename from system/modules/host/hardware/cpu/intel/default.nix rename to inputs/system/modules/base/host/hardware/cpu/intel/default.nix diff --git a/system/modules/host/hardware/default.nix b/inputs/system/modules/base/host/hardware/default.nix similarity index 100% rename from system/modules/host/hardware/default.nix rename to inputs/system/modules/base/host/hardware/default.nix diff --git a/system/modules/host/hardware/features/backlight/default.nix b/inputs/system/modules/base/host/hardware/features/backlight/default.nix similarity index 100% rename from system/modules/host/hardware/features/backlight/default.nix rename to inputs/system/modules/base/host/hardware/features/backlight/default.nix diff --git a/system/modules/host/hardware/features/battery/default.nix b/inputs/system/modules/base/host/hardware/features/battery/default.nix similarity index 100% rename from system/modules/host/hardware/features/battery/default.nix rename to inputs/system/modules/base/host/hardware/features/battery/default.nix diff --git a/system/modules/host/hardware/features/bluetooth/default.nix b/inputs/system/modules/base/host/hardware/features/bluetooth/default.nix similarity index 100% rename from system/modules/host/hardware/features/bluetooth/default.nix rename to inputs/system/modules/base/host/hardware/features/bluetooth/default.nix diff --git a/system/modules/host/hardware/features/default.nix b/inputs/system/modules/base/host/hardware/features/default.nix similarity index 100% rename from system/modules/host/hardware/features/default.nix rename to inputs/system/modules/base/host/hardware/features/default.nix diff --git a/system/modules/host/hardware/features/ssd/default.nix b/inputs/system/modules/base/host/hardware/features/ssd/default.nix similarity index 100% rename from system/modules/host/hardware/features/ssd/default.nix rename to inputs/system/modules/base/host/hardware/features/ssd/default.nix diff --git a/system/modules/host/hardware/gpu/amd/default.nix b/inputs/system/modules/base/host/hardware/gpu/amd/default.nix similarity index 100% rename from system/modules/host/hardware/gpu/amd/default.nix rename to inputs/system/modules/base/host/hardware/gpu/amd/default.nix diff --git a/system/modules/host/hardware/gpu/default.nix b/inputs/system/modules/base/host/hardware/gpu/default.nix similarity index 100% rename from system/modules/host/hardware/gpu/default.nix rename to inputs/system/modules/base/host/hardware/gpu/default.nix diff --git a/system/modules/host/hardware/gpu/intel/default.nix b/inputs/system/modules/base/host/hardware/gpu/intel/default.nix similarity index 100% rename from system/modules/host/hardware/gpu/intel/default.nix rename to inputs/system/modules/base/host/hardware/gpu/intel/default.nix diff --git a/system/modules/host/hardware/gpu/nvidia/default.nix b/inputs/system/modules/base/host/hardware/gpu/nvidia/default.nix similarity index 100% rename from system/modules/host/hardware/gpu/nvidia/default.nix rename to inputs/system/modules/base/host/hardware/gpu/nvidia/default.nix diff --git a/system/modules/host/name/default.nix b/inputs/system/modules/base/host/name/default.nix similarity index 100% rename from system/modules/host/name/default.nix rename to inputs/system/modules/base/host/name/default.nix diff --git a/system/modules/host/type/default.nix b/inputs/system/modules/base/host/type/default.nix similarity index 100% rename from system/modules/host/type/default.nix rename to inputs/system/modules/base/host/type/default.nix diff --git a/system/modules/locale/default.nix b/inputs/system/modules/base/locale/default.nix similarity index 100% rename from system/modules/locale/default.nix rename to inputs/system/modules/base/locale/default.nix diff --git a/system/modules/networking/default.nix b/inputs/system/modules/base/networking/default.nix similarity index 100% rename from system/modules/networking/default.nix rename to inputs/system/modules/base/networking/default.nix diff --git a/system/modules/networking/firewall/default.nix b/inputs/system/modules/base/networking/firewall/default.nix similarity index 100% rename from system/modules/networking/firewall/default.nix rename to inputs/system/modules/base/networking/firewall/default.nix diff --git a/system/modules/networking/resolved/default.nix b/inputs/system/modules/base/networking/resolved/default.nix similarity index 100% rename from system/modules/networking/resolved/default.nix rename to inputs/system/modules/base/networking/resolved/default.nix diff --git a/system/modules/networking/ssh/default.nix b/inputs/system/modules/base/networking/ssh/default.nix similarity index 100% rename from system/modules/networking/ssh/default.nix rename to inputs/system/modules/base/networking/ssh/default.nix diff --git a/system/modules/networking/tailscale/default.nix b/inputs/system/modules/base/networking/tailscale/default.nix similarity index 100% rename from system/modules/networking/tailscale/default.nix rename to inputs/system/modules/base/networking/tailscale/default.nix diff --git a/system/modules/networking/tcp/default.nix b/inputs/system/modules/base/networking/tcp/default.nix similarity index 100% rename from system/modules/networking/tcp/default.nix rename to inputs/system/modules/base/networking/tcp/default.nix diff --git a/system/modules/networking/tools/default.nix b/inputs/system/modules/base/networking/tools/default.nix similarity index 100% rename from system/modules/networking/tools/default.nix rename to inputs/system/modules/base/networking/tools/default.nix diff --git a/system/modules/nix/default.nix b/inputs/system/modules/base/nix/default.nix similarity index 100% rename from system/modules/nix/default.nix rename to inputs/system/modules/base/nix/default.nix diff --git a/system/modules/nix/nh/default.nix b/inputs/system/modules/base/nix/nh/default.nix similarity index 100% rename from system/modules/nix/nh/default.nix rename to inputs/system/modules/base/nix/nh/default.nix diff --git a/system/modules/nix/nix/default.nix b/inputs/system/modules/base/nix/nix/default.nix similarity index 100% rename from system/modules/nix/nix/default.nix rename to inputs/system/modules/base/nix/nix/default.nix diff --git a/system/modules/nix/nixpkgs/default.nix b/inputs/system/modules/base/nix/nixpkgs/default.nix similarity index 55% rename from system/modules/nix/nixpkgs/default.nix rename to inputs/system/modules/base/nix/nixpkgs/default.nix index fc31ea5..7cb5a22 100644 --- a/system/modules/nix/nixpkgs/default.nix +++ b/inputs/system/modules/base/nix/nixpkgs/default.nix @@ -1,4 +1,4 @@ -{ outputs, lib, config, ... }: +{ lib, config, inputs, ... }: let inherit (lib) mkIf; @@ -8,7 +8,6 @@ in { config = mkIf (host.type != "phone") { nixpkgs = { - overlays = builtins.attrValues outputs.overlays; config = { allowUnfree = true; permittedInsecurePackages = [ @@ -16,6 +15,12 @@ in "electron-25.9.0" ]; }; + overlays = [ + (final: prev: { + waybar = inputs.nixpkgs-wayland.packages.${prev.system}.waybar; + zjstatus = inputs.zjstatus.packages.${prev.system}.default; + }) + ]; }; }; } diff --git a/system/modules/nix/subs/default.nix b/inputs/system/modules/base/nix/subs/default.nix similarity index 100% rename from system/modules/nix/subs/default.nix rename to inputs/system/modules/base/nix/subs/default.nix diff --git a/system/modules/programs/bandwhich/default.nix b/inputs/system/modules/base/programs/bandwhich/default.nix similarity index 100% rename from system/modules/programs/bandwhich/default.nix rename to inputs/system/modules/base/programs/bandwhich/default.nix diff --git a/system/modules/programs/dconf/default.nix b/inputs/system/modules/base/programs/dconf/default.nix similarity index 100% rename from system/modules/programs/dconf/default.nix rename to inputs/system/modules/base/programs/dconf/default.nix diff --git a/system/modules/programs/default.nix b/inputs/system/modules/base/programs/default.nix similarity index 100% rename from system/modules/programs/default.nix rename to inputs/system/modules/base/programs/default.nix diff --git a/system/modules/programs/kdeconnect/default.nix b/inputs/system/modules/base/programs/kdeconnect/default.nix similarity index 100% rename from system/modules/programs/kdeconnect/default.nix rename to inputs/system/modules/base/programs/kdeconnect/default.nix diff --git a/system/modules/programs/seahorse/default.nix b/inputs/system/modules/base/programs/seahorse/default.nix similarity index 100% rename from system/modules/programs/seahorse/default.nix rename to inputs/system/modules/base/programs/seahorse/default.nix diff --git a/system/modules/programs/wireshark/default.nix b/inputs/system/modules/base/programs/wireshark/default.nix similarity index 100% rename from system/modules/programs/wireshark/default.nix rename to inputs/system/modules/base/programs/wireshark/default.nix diff --git a/system/modules/security/1password/default.nix b/inputs/system/modules/base/security/1password/default.nix similarity index 100% rename from system/modules/security/1password/default.nix rename to inputs/system/modules/base/security/1password/default.nix diff --git a/system/modules/security/default.nix b/inputs/system/modules/base/security/default.nix similarity index 100% rename from system/modules/security/default.nix rename to inputs/system/modules/base/security/default.nix diff --git a/system/modules/security/kernel/default.nix b/inputs/system/modules/base/security/kernel/default.nix similarity index 100% rename from system/modules/security/kernel/default.nix rename to inputs/system/modules/base/security/kernel/default.nix diff --git a/system/modules/security/pam/default.nix b/inputs/system/modules/base/security/pam/default.nix similarity index 100% rename from system/modules/security/pam/default.nix rename to inputs/system/modules/base/security/pam/default.nix diff --git a/system/modules/security/polkit/default.nix b/inputs/system/modules/base/security/polkit/default.nix similarity index 100% rename from system/modules/security/polkit/default.nix rename to inputs/system/modules/base/security/polkit/default.nix diff --git a/system/modules/security/sudo/default.nix b/inputs/system/modules/base/security/sudo/default.nix similarity index 100% rename from system/modules/security/sudo/default.nix rename to inputs/system/modules/base/security/sudo/default.nix diff --git a/system/modules/services/dbus/default.nix b/inputs/system/modules/base/services/dbus/default.nix similarity index 100% rename from system/modules/services/dbus/default.nix rename to inputs/system/modules/base/services/dbus/default.nix diff --git a/system/modules/services/default.nix b/inputs/system/modules/base/services/default.nix similarity index 100% rename from system/modules/services/default.nix rename to inputs/system/modules/base/services/default.nix diff --git a/system/modules/services/gnome/default.nix b/inputs/system/modules/base/services/gnome/default.nix similarity index 100% rename from system/modules/services/gnome/default.nix rename to inputs/system/modules/base/services/gnome/default.nix diff --git a/system/modules/services/gvfs/default.nix b/inputs/system/modules/base/services/gvfs/default.nix similarity index 100% rename from system/modules/services/gvfs/default.nix rename to inputs/system/modules/base/services/gvfs/default.nix diff --git a/system/modules/services/mediaServer/default.nix b/inputs/system/modules/base/services/mediaServer/default.nix similarity index 100% rename from system/modules/services/mediaServer/default.nix rename to inputs/system/modules/base/services/mediaServer/default.nix diff --git a/system/modules/services/system76Scheduler/default.nix b/inputs/system/modules/base/services/system76Scheduler/default.nix similarity index 100% rename from system/modules/services/system76Scheduler/default.nix rename to inputs/system/modules/base/services/system76Scheduler/default.nix diff --git a/system/modules/shell/bash/default.nix b/inputs/system/modules/base/shell/bash/default.nix similarity index 100% rename from system/modules/shell/bash/default.nix rename to inputs/system/modules/base/shell/bash/default.nix diff --git a/system/modules/shell/default.nix b/inputs/system/modules/base/shell/default.nix similarity index 100% rename from system/modules/shell/default.nix rename to inputs/system/modules/base/shell/default.nix diff --git a/system/modules/shell/fish/default.nix b/inputs/system/modules/base/shell/fish/default.nix similarity index 100% rename from system/modules/shell/fish/default.nix rename to inputs/system/modules/base/shell/fish/default.nix diff --git a/system/modules/shell/zsh/default.nix b/inputs/system/modules/base/shell/zsh/default.nix similarity index 100% rename from system/modules/shell/zsh/default.nix rename to inputs/system/modules/base/shell/zsh/default.nix diff --git a/system/modules/video/default.nix b/inputs/system/modules/base/video/default.nix similarity index 100% rename from system/modules/video/default.nix rename to inputs/system/modules/base/video/default.nix diff --git a/system/modules/virtualization/default.nix b/inputs/system/modules/base/virtualization/default.nix similarity index 100% rename from system/modules/virtualization/default.nix rename to inputs/system/modules/base/virtualization/default.nix diff --git a/outputs/nixos/default.nix b/outputs/nixos/default.nix new file mode 100644 index 0000000..f5d7762 --- /dev/null +++ b/outputs/nixos/default.nix @@ -0,0 +1,24 @@ +{ inputs, nixpkgs, self, ... }: + +let + inherit (nixpkgs.lib) nixosSystem; + + hm = inputs.home-manager.nixosModules.home-manager; + + systemInputs = "${self}/inputs/system"; + base = "${systemInputs}/modules/base"; + + specialArgs = {inherit inputs self;}; +in + +{ + ooksdesk = nixosSystem { + inherit specialArgs; + system = "x86_64-linux"; + modules = [ + ./ooksdesk + hm + base + ]; + }; +} diff --git a/system/hosts/ooks-x1/default.nix b/outputs/nixos/ooks-x1/default.nix similarity index 100% rename from system/hosts/ooks-x1/default.nix rename to outputs/nixos/ooks-x1/default.nix diff --git a/system/hosts/ooks-x1/hardware-configuration.nix b/outputs/nixos/ooks-x1/hardware-configuration.nix similarity index 100% rename from system/hosts/ooks-x1/hardware-configuration.nix rename to outputs/nixos/ooks-x1/hardware-configuration.nix diff --git a/system/hosts/ooksdesk/default.nix b/outputs/nixos/ooksdesk/default.nix similarity index 97% rename from system/hosts/ooksdesk/default.nix rename to outputs/nixos/ooksdesk/default.nix index 0b89553..df0036c 100644 --- a/system/hosts/ooksdesk/default.nix +++ b/outputs/nixos/ooksdesk/default.nix @@ -7,7 +7,6 @@ in { imports = [ ./hardware-configuration.nix - ../../modules ]; systemModules.host = { diff --git a/system/hosts/ooksdesk/hardware-configuration.nix b/outputs/nixos/ooksdesk/hardware-configuration.nix similarity index 100% rename from system/hosts/ooksdesk/hardware-configuration.nix rename to outputs/nixos/ooksdesk/hardware-configuration.nix diff --git a/system/hosts/ooksmedia/default.nix b/outputs/nixos/ooksmedia/default.nix similarity index 100% rename from system/hosts/ooksmedia/default.nix rename to outputs/nixos/ooksmedia/default.nix diff --git a/system/hosts/ooksmedia/hardware-configuration.nix b/outputs/nixos/ooksmedia/hardware-configuration.nix similarity index 100% rename from system/hosts/ooksmedia/hardware-configuration.nix rename to outputs/nixos/ooksmedia/hardware-configuration.nix diff --git a/system/hosts/ooksmedia/nixarr.nix b/outputs/nixos/ooksmedia/nixarr.nix similarity index 100% rename from system/hosts/ooksmedia/nixarr.nix rename to outputs/nixos/ooksmedia/nixarr.nix diff --git a/system/hosts/ooksmicro/default.nix b/outputs/nixos/ooksmicro/default.nix similarity index 100% rename from system/hosts/ooksmicro/default.nix rename to outputs/nixos/ooksmicro/default.nix diff --git a/system/hosts/ooksmicro/hardware-configuration.nix b/outputs/nixos/ooksmicro/hardware-configuration.nix similarity index 100% rename from system/hosts/ooksmicro/hardware-configuration.nix rename to outputs/nixos/ooksmicro/hardware-configuration.nix diff --git a/system/hosts/ooksphone/default.nix b/outputs/nixos/ooksphone/default.nix similarity index 100% rename from system/hosts/ooksphone/default.nix rename to outputs/nixos/ooksphone/default.nix diff --git a/system/hosts/ooksphone/modules/default.nix b/outputs/nixos/ooksphone/modules/default.nix similarity index 100% rename from system/hosts/ooksphone/modules/default.nix rename to outputs/nixos/ooksphone/modules/default.nix diff --git a/system/hosts/ooksphone/modules/openssh.nix b/outputs/nixos/ooksphone/modules/openssh.nix similarity index 100% rename from system/hosts/ooksphone/modules/openssh.nix rename to outputs/nixos/ooksphone/modules/openssh.nix diff --git a/system/hosts/ooksphone/modules/theme.nix b/outputs/nixos/ooksphone/modules/theme.nix similarity index 100% rename from system/hosts/ooksphone/modules/theme.nix rename to outputs/nixos/ooksphone/modules/theme.nix diff --git a/system/hosts/ookst480s/default.nix b/outputs/nixos/ookst480s/default.nix similarity index 100% rename from system/hosts/ookst480s/default.nix rename to outputs/nixos/ookst480s/default.nix diff --git a/system/hosts/ookst480s/hardware-configuration.nix b/outputs/nixos/ookst480s/hardware-configuration.nix similarity index 100% rename from system/hosts/ookst480s/hardware-configuration.nix rename to outputs/nixos/ookst480s/hardware-configuration.nix diff --git a/overlays/default.nix b/outputs/overlays/default.nix similarity index 100% rename from overlays/default.nix rename to outputs/overlays/default.nix diff --git a/outputs/pkgs/default.nix b/outputs/pkgs/default.nix new file mode 100644 index 0000000..b0dfda6 --- /dev/null +++ b/outputs/pkgs/default.nix @@ -0,0 +1,7 @@ +{ + perSystem = { system, pkgs, inputs, ... }: { + packages = { + live-buds-cli = pkgs.callPackage ./live-buds-cli {}; + }; + }; +} diff --git a/pkgs/live-buds-cli/default.nix b/outputs/pkgs/live-buds-cli/default.nix similarity index 100% rename from pkgs/live-buds-cli/default.nix rename to outputs/pkgs/live-buds-cli/default.nix diff --git a/shell.nix b/outputs/shell.nix similarity index 100% rename from shell.nix rename to outputs/shell.nix diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 407610c..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs ? import {} }: rec { - - live-buds-cli = pkgs.callPackage ./live-buds-cli { }; -}