diff --git a/flake.lock b/flake.lock index 6976ee2..7be6848 100644 --- a/flake.lock +++ b/flake.lock @@ -1,41 +1,24 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738087375, - "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", - "owner": "aylur", - "repo": "ags", - "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ + "hyprland-plugins", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ + "hyprland-plugins", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -54,47 +37,6 @@ "type": "github" } }, - "astal": { - "inputs": { - "nixpkgs": [ - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737670815, - "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=", - "owner": "aylur", - "repo": "astal", - "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "astal_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", - "owner": "aylur", - "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -234,24 +176,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1741352980, "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", @@ -266,7 +190,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -288,24 +212,9 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1723604017, - "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", - "owner": "srid", - "repo": "flake-root", - "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -342,24 +251,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -405,6 +296,7 @@ "gitignore": { "inputs": { "nixpkgs": [ + "hyprland-plugins", "hyprland", "pre-commit-hooks", "nixpkgs" @@ -525,14 +417,17 @@ "hyprcursor": { "inputs": { "hyprlang": [ + "hyprland-plugins", "hyprland", "hyprlang" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -554,14 +449,17 @@ "hyprgraphics": { "inputs": { "hyprutils": [ + "hyprland-plugins", "hyprland", "hyprutils" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -580,35 +478,6 @@ "type": "github" } }, - "hyprgraphics_2": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -625,11 +494,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1743370092, - "narHash": "sha256-T4+iHpexTGPPZ9LD+IkjaLoZZcmKi6UsgTSZPNsxNWw=", + "lastModified": 1743547897, + "narHash": "sha256-14VSGZy+0D/zVRxZl/0ZiAcTSd+R6Cw87TsmsdU1clM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "075bbecabd6d41c02ebb823d91774a95cc9d50da", + "rev": "a4e6c5d678e8dd27ab07a6d6eb4ba2834fab81d1", "type": "github" }, "original": { @@ -640,9 +509,7 @@ }, "hyprland-plugins": { "inputs": { - "hyprland": [ - "hyprland" - ], + "hyprland": "hyprland", "nixpkgs": [ "hyprland-plugins", "hyprland", @@ -671,10 +538,12 @@ "hyprland-protocols": { "inputs": { "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -696,16 +565,19 @@ "hyprland-qt-support": { "inputs": { "hyprlang": [ + "hyprland-plugins", "hyprland", "hyprland-qtutils", "hyprlang" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "hyprland-qtutils", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "hyprland-qtutils", "systems" @@ -729,20 +601,24 @@ "inputs": { "hyprland-qt-support": "hyprland-qt-support", "hyprlang": [ + "hyprland-plugins", "hyprland", "hyprlang" ], "hyprutils": [ + "hyprland-plugins", "hyprland", "hyprland-qtutils", "hyprlang", "hyprutils" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -764,14 +640,17 @@ "hyprlang": { "inputs": { "hyprutils": [ + "hyprland-plugins", "hyprland", "hyprutils" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -790,58 +669,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprlock", - "hyprutils" - ], - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1743294814, - "narHash": "sha256-HqzVTylWZA0+cf4cpMGQOgcidJuCogjv51fJShrGxlI=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "1ebbc35c55ba9e43d53c4f1038c897be7239c903", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, "hyprshaders": { "flake": false, "locked": { @@ -861,10 +688,12 @@ "hyprutils": { "inputs": { "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -883,38 +712,15 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1737978343, - "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -933,31 +739,6 @@ "type": "github" } }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -1034,27 +815,6 @@ "type": "github" } }, - "nixd": { - "inputs": { - "flake-parts": "flake-parts", - "flake-root": "flake-root", - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1742568248, - "narHash": "sha256-DLy7a13K73Se+UaRdFJa5QfPmnFvO2yoeg02c8ioR4k=", - "owner": "nix-community", - "repo": "nixd", - "rev": "590eccaa079929daa58316f5386dbcc150e2d50d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixd", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1743167577, @@ -1087,18 +847,6 @@ } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1740877520, "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", @@ -1113,22 +861,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1737003892, - "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1742669843, @@ -1147,11 +879,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -1163,15 +895,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1734435836, - "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", - "owner": "NixOS", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "4989a246d7a390a859852baddb1013f825435cee", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -1179,53 +911,21 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { - "locked": { - "lastModified": 1743076231, - "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6c5963357f3c1c840201eda129a99d455074db04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1743076231, - "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6c5963357f3c1c840201eda129a99d455074db04", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -1241,7 +941,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -1259,12 +959,12 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1741693509, @@ -1282,12 +982,12 @@ }, "nvf": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_6", - "systems": "systems_4" + "nixpkgs": "nixpkgs_4", + "systems": "systems_3" }, "locked": { "lastModified": 1743568014, @@ -1309,6 +1009,7 @@ "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ] @@ -1329,25 +1030,19 @@ }, "root": { "inputs": { - "ags": "ags", - "astal": "astal_2", "disko": "disko", "home-manager": "home-manager", "hyprcloser": "hyprcloser", - "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "hyprlock": "hyprlock", "hyprshaders": "hyprshaders", "impermanence": "impermanence", "nix-index-database": "nix-index-database", - "nixd": "nixd", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nvf": "nvf", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", - "stylix": "stylix", - "yazi": "yazi" + "stylix": "stylix" } }, "rust-overlay": { @@ -1372,30 +1067,9 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "yazi", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737080704, - "narHash": "sha256-n+J2h9GM9ZpFOQUmtZoCr1+DFF/iO5UlmLJeHIxbZGY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f9953fe89f8b65401fc4d4a288940bc2cb072949", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1743305778, @@ -1413,8 +1087,8 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", - "systems": "systems_5" + "nixpkgs": "nixpkgs_6", + "systems": "systems_4" }, "locked": { "lastModified": 1743308176, @@ -1442,9 +1116,9 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_7", "nur": "nur", - "systems": "systems_6", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1482,16 +1156,16 @@ }, "systems_2": { "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" } }, @@ -1540,36 +1214,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1653,27 +1297,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", @@ -1698,26 +1321,32 @@ "xdph": { "inputs": { "hyprland-protocols": [ + "hyprland-plugins", "hyprland", "hyprland-protocols" ], "hyprlang": [ + "hyprland-plugins", "hyprland", "hyprlang" ], "hyprutils": [ + "hyprland-plugins", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ + "hyprland-plugins", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ + "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ + "hyprland-plugins", "hyprland", "systems" ] @@ -1735,26 +1364,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "yazi": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_10", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1743344227, - "narHash": "sha256-Lp1JUMrhvAmCzftOSQ2Sr0+svemxSxcLeZ4HkmdLXbE=", - "owner": "sxyazi", - "repo": "yazi", - "rev": "1765aba68440f73c590cedac14ece6778fe88ff5", - "type": "github" - }, - "original": { - "owner": "sxyazi", - "repo": "yazi", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8afb34e..9ebd525 100644 --- a/flake.nix +++ b/flake.nix @@ -21,34 +21,30 @@ inherit (inputs.nixpkgs) lib; commonModules = [ ./modules/boot.nix - ./modules/bootloaders/systemd-boot.nix ./modules/networking.nix ./modules/nix-config.nix ./modules/security.nix - ./modules/shell.nix ./modules/users.nix ]; - graphicalModules = [ + desktopModules = [ ./modules/graphical.nix + ./modules/shell.nix ]; in inputs.nixpkgs.lib.nixosSystem { specialArgs = args; modules = commonModules - ++ lib.optionals (type == "graphical") graphicalModules - ++ - # Options for specific hostnames. - (lib.optionals (hostname == "nemesis") [ - ./modules/filesystems/hw-nemesis.nix - ./modules/hardware/cpu_amd.nix - ./modules/hardware/nvidia.nix - ]) - ++ (lib.optionals (hostname == "mellinoe") [ - ./modules/filesystems/impermanence.nix - ./modules/hardware/cpu_intel.nix + ++ lib.optionals (type == "desktop") desktopModules + # Options for specific hostnames. + ++ (lib.optionals (hostname == "nemesis") [ + ./modules/bootloaders/systemd-boot.nix + ./modules/filesystems/hw-nemesis.nix + ./modules/hardware/cpu_amd.nix + ./modules/hardware/nvidia.nix ]) - ++ (lib.optionals (hostname == "apollo") [ + ++ (lib.optionals (hostname == "mellinoe" || hostname == "apollo") [ + ./modules/bootloaders/systemd-boot.nix ./modules/filesystems/impermanence.nix ./modules/hardware/cpu_intel.nix ]); @@ -57,39 +53,30 @@ in { nixosConfigurations = builtins.listToAttrs [ - (mkSystem "graphical" "nemesis" + (mkSystem "desktop" "nemesis" "nvme-nvme.c0a9-323332354536453737343334-435432303030503353534438-00000001" ) - (mkSystem "graphical" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab") + (mkSystem "desktop" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab") (mkSystem "headless" "apollo" "/dev/disk/by-id/nvme-eui.002538d221b47b01") ]; }; inputs = { - ags.inputs.nixpkgs.follows = "nixpkgs"; - ags.url = "github:aylur/ags"; - astal.inputs.nixpkgs.follows = "nixpkgs"; - astal.url = "github:aylur/astal"; disko.inputs.nixpkgs.follows = "nixpkgs"; disko.url = "github:nix-community/disko/latest"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; hyprcloser.url = "github:rrvsh/hyprcloser"; - hyprland-plugins.inputs.hyprland.follows = "hyprland"; hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; - hyprland.url = "github:hyprwm/Hyprland"; - hyprlock.url = "github:hyprwm/hyprlock"; hyprshaders.flake = false; hyprshaders.url = "github:0x15BA88FF/hyprshaders"; impermanence.url = "github:nix-community/impermanence"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:nix-community/nix-index-database"; - nixd.url = "github:nix-community/nixd"; nixos-hardware.url = "github:nixos/nixos-hardware"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nvf.url = "github:rrvsh/nvf/fix/pylsp-pkgs"; sops-nix.url = "github:Mic92/sops-nix"; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; stylix.url = "github:danth/stylix"; - yazi.url = "github:sxyazi/yazi"; }; } diff --git a/modules/graphical.nix b/modules/graphical.nix index b624c0d..d4ff399 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -2,7 +2,6 @@ with pkgs; { imports = [ - ./programs/ags.nix ./programs/clipse.nix ./programs/dunst.nix ./programs/firefox.nix diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index 2bb831d..c53de99 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -24,7 +24,6 @@ nvidia-container-toolkit.enable = true; graphics = { enable = true; - package = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}.mesa; extraPackages = with pkgs; [ nvidia-vaapi-driver # hardware acceleration ]; diff --git a/modules/nix-config.nix b/modules/nix-config.nix index 5eda29f..dd05bb8 100644 --- a/modules/nix-config.nix +++ b/modules/nix-config.nix @@ -2,33 +2,18 @@ system.stateVersion = "24.11"; nixpkgs.config.allowUnfree = true; - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - "pipe-operators" - ]; - trusted-users = [ - "@wheel" - ]; + nix.settings = { + experimental-features = [ + "nix-command" + "flakes" + "pipe-operators" + ]; - # Add binary caches to avoid having to compile them - substituters = [ - "https://hyprland.cachix.org" - "https://nix-community.cachix.org" - "https://nvf.cachix.org" - "https://yazi.cachix.org" - "https://devenv.cachix.org" - ]; - trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nvf.cachix.org-1:GMQWiUhZ6ux9D5CvFFMwnc2nFrUHTeGaXRlVBXo+naI=" - "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k=" - "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw= nixpkgs-python.c││achix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU=" - ]; - }; + trusted-users = [ "@wheel" ]; + + # Add binary caches to avoid having to compile them + substituters = [ "https://nix-community.cachix.org" ]; + trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; } diff --git a/modules/programs/ags.nix b/modules/programs/ags.nix deleted file mode 100644 index 294addf..0000000 --- a/modules/programs/ags.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ inputs, pkgs, ... }: -{ - home-manager.users.rafiq = { - imports = [ inputs.ags.homeManagerModules.default ]; - - # Expose the cli tools to the home environment - home.packages = [ inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.io ]; - - programs.ags = { - enable = true; - configDir = ./ags; # ~/.config/ags - systemd.enable = false; - - # The module only includes the core astal3, astal4 and astal-io libraries - extraPackages = with pkgs; [ - # add packages to runtime - # inputs.ags.packages.${pkgs.system}.battery - # fzf - ]; - }; - }; -} diff --git a/modules/programs/ags/.gitignore b/modules/programs/ags/.gitignore deleted file mode 100644 index 298eb4d..0000000 --- a/modules/programs/ags/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules/ -@girs/ diff --git a/modules/programs/ags/app.ts b/modules/programs/ags/app.ts deleted file mode 100644 index 7e8cc7c..0000000 --- a/modules/programs/ags/app.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { App } from "astal/gtk4" -import style from "./style.scss" -import Bar from "./widget/Bar" - -App.start({ - css: style, - main() { - App.get_monitors().map(Bar) - }, -}) diff --git a/modules/programs/ags/env.d.ts b/modules/programs/ags/env.d.ts deleted file mode 100644 index 467c0a4..0000000 --- a/modules/programs/ags/env.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -declare const SRC: string - -declare module "inline:*" { - const content: string - export default content -} - -declare module "*.scss" { - const content: string - export default content -} - -declare module "*.blp" { - const content: string - export default content -} - -declare module "*.css" { - const content: string - export default content -} diff --git a/modules/programs/ags/package.json b/modules/programs/ags/package.json deleted file mode 100644 index 8647b83..0000000 --- a/modules/programs/ags/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "astal-shell", - "dependencies": { - "astal": "/home/rafiq/.local/share/ags" - } -} diff --git a/modules/programs/ags/style.scss b/modules/programs/ags/style.scss deleted file mode 100644 index 1d0d3a9..0000000 --- a/modules/programs/ags/style.scss +++ /dev/null @@ -1,20 +0,0 @@ -// https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss -$fg-color: #{"@theme_fg_color"}; -$bg-color: #{"@theme_bg_color"}; - -window.Bar { - background: transparent; - color: $fg-color; - font-weight: bold; - - >centerbox { - background: $bg-color; - border-radius: 10px; - margin: 8px; - } - - button { - border-radius: 8px; - margin: 2px; - } -} diff --git a/modules/programs/ags/test b/modules/programs/ags/test deleted file mode 100644 index e69de29..0000000 diff --git a/modules/programs/ags/tsconfig.json b/modules/programs/ags/tsconfig.json deleted file mode 100644 index a92bc43..0000000 --- a/modules/programs/ags/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "compilerOptions": { - "experimentalDecorators": true, - "strict": true, - "target": "ES2022", - "module": "ES2022", - "moduleResolution": "Bundler", - // "checkJs": true, - // "allowJs": true, - "jsx": "react-jsx", - "jsxImportSource": "astal/gtk4", - } -} diff --git a/modules/programs/ags/widget/Bar.tsx b/modules/programs/ags/widget/Bar.tsx deleted file mode 100644 index c2db8c5..0000000 --- a/modules/programs/ags/widget/Bar.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { App, Astal, Gtk, Gdk } from "astal/gtk4" -import { Variable } from "astal" - -const time = Variable("").poll(1000, "date") - -export default function Bar(gdkmonitor: Gdk.Monitor) { - const { TOP, LEFT, RIGHT } = Astal.WindowAnchor - - return - - - - - - - -} diff --git a/modules/programs/hyprland.nix b/modules/programs/hyprland.nix index 98e10eb..fc596a3 100644 --- a/modules/programs/hyprland.nix +++ b/modules/programs/hyprland.nix @@ -12,9 +12,6 @@ ''; programs.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; home-manager.users.rafiq = { diff --git a/modules/programs/hyprlock.nix b/modules/programs/hyprlock.nix index 87c050d..af421e5 100644 --- a/modules/programs/hyprlock.nix +++ b/modules/programs/hyprlock.nix @@ -20,7 +20,6 @@ in home-manager.users.rafiq = { programs.hyprlock = { enable = true; - package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock; settings = { general = { diff --git a/modules/programs/nvf.nix b/modules/programs/nvf.nix index d3f4e5d..e52c962 100644 --- a/modules/programs/nvf.nix +++ b/modules/programs/nvf.nix @@ -1,5 +1,10 @@ { inputs, pkgs, ... }: { + nix.settings.substituters = [ "https://nvf.cachix.org" ]; + nix.settings.trusted-public-keys = [ + "nvf.cachix.org-1:GMQWiUhZ6ux9D5CvFFMwnc2nFrUHTeGaXRlVBXo+naI=" + ]; + home-manager.users.rafiq = { imports = [ inputs.nvf.homeManagerModules.default diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix index 7e8a73a..e0a5cfc 100644 --- a/modules/programs/yazi.nix +++ b/modules/programs/yazi.nix @@ -15,7 +15,6 @@ in home-manager.users.rafiq = { programs.yazi = { enable = true; - package = inputs.yazi.packages.${pkgs.system}.default; shellWrapperName = "y"; # yazi.toml settings = {