diff --git a/flake.lock b/flake.lock index d7b7f45..a3e0c6f 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1744704639, - "narHash": "sha256-HA0ssQVAqPtnSEbwlsG8McuGj4feqVogmCWz4Ft944k=", + "lastModified": 1745165448, + "narHash": "sha256-oKPMqpmSR40/q31hp2oUoBOWv10SCx8rdBjYpI3Q+/M=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "bdfa5e92568a5f654ea5046ff7742f153482af45", + "rev": "a3e7a853560c2e4b9ac94cbf96fa0a0a94b3642d", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1744940522, + "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1744671375, - "narHash": "sha256-flGMRT7E4URVCj0o4bMfQlehJNrD/1mZy4OobfEwvq8=", + "lastModified": 1745071599, + "narHash": "sha256-6VCYCOLfSKzbUHCaZTe7mHuOfDIM63jLreHMzJJco9Q=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "4aa875bbf641d9c31619217b3dc373d734986247", + "rev": "4e10f972df556ecdf5b97090ef605f83188a23d7", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1744385517, - "narHash": "sha256-pqiSmtbquoBM3cVHELcXHl8CLT8moXVkwbtc5xd5Br0=", + "lastModified": 1744988393, + "narHash": "sha256-ZUGH3xkkQ8WRM2s1wRduJnPDnv/sIW1QwnPuyvVN5lg=", "owner": "helix-editor", "repo": "helix", - "rev": "340934db92aea902a61b9f79b9e6f4bd15111044", + "rev": "523e8aa7816cde5f0dc38593737b50527e3348fe", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1744663884, - "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", + "lastModified": 1745190356, + "narHash": "sha256-2tOi3l1E1qwG3P5dzTN4yJ52SSENNXAWZMyPwcPx9gw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", + "rev": "496fa9c054d3a212c8bcb3ac80ab310841eed361", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744694176, - "narHash": "sha256-SX+g2qTtI1QE4/E3nY2iHBd+JtY3Dq5cDDa4+Ee8YQA=", + "lastModified": 1745131440, + "narHash": "sha256-XrJyjt4zxUz1ArVMpbsL20yQbY909fVP5HOe3RY1L9c=", "owner": "jj-vcs", "repo": "jj", - "rev": "f6e3f38b94d7a861aed0fe912c85a9a57323e948", + "rev": "3c84a23b1344eb6aa2890255f8d0b77628b6e1e1", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744705923, - "narHash": "sha256-ch+j1T4FDMuj3Jm0ALOSS4vpyQZsHQmWO8hkVXOL+nY=", + "lastModified": 1744991948, + "narHash": "sha256-f4xKjzY64l6e28YExcf/V8aLYzBzDdjNI7ZZJGBBz3Y=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1e6d8e177cfc614c35252bd57f0ad7a64833aaa3", + "rev": "a70acecb35de8941bac791c82d8e214d4be70567", "type": "github" }, "original": { @@ -543,6 +543,27 @@ "type": "github" } }, + "niri-overview": { + "inputs": { + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1745142326, + "narHash": "sha256-82b0rSvswXlDO41LXgBP2I5TA1KMEmFzavwq9SkqPbs=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "a11fe23cbf6ba01ae4c23679aa2f7d7d8b44baf4", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "pull/1440/head", + "repo": "niri", + "type": "github" + } + }, "niri-stable": { "flake": false, "locked": { @@ -563,11 +584,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744475937, - "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=", + "lastModified": 1744878694, + "narHash": "sha256-e3jPdRQmlgeWwDTC/wnvKgIy4Ga8KZYoxUPQ8PCNktM=", "owner": "YaLTeR", "repo": "niri", - "rev": "95eafba346a17104a9af71021011fcdc9e13776b", + "rev": "7884d3bfea810740fe2ca7021b102af0f049ccae", "type": "github" }, "original": { @@ -576,19 +597,34 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_3", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1744715315, - "narHash": "sha256-EY7Yd6ns+ihaM2dCK6+/45gaTKnhmHbK/Vb0Vr9+hSs=", + "lastModified": 1745147300, + "narHash": "sha256-PvzBVmB8qRxGnccAaBxPKG9oElAQxac2HbFOGyQuuJU=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "1093e56c36baabdbb2643aad583edbdafb7aa5a1", + "rev": "5a4d2109cf5a3eb18a0afa361a017643a57f9454", "type": "github" }, "original": { @@ -615,16 +651,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1742707865, + "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "dd613136ee91f67e5dba3f3f41ac99ae89c5406b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -694,11 +730,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -734,11 +786,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1744689812, - "narHash": "sha256-JTlOHSH7SsVJOccu932syyO4Jcqm5wOk6W5oGMtMq5o=", + "lastModified": 1744974023, + "narHash": "sha256-7P4gZOxx5hmHNW++vtsWILxuPO1RB+8kyKDDQ7Ij10Q=", "owner": "rycee", "repo": "nur-expressions", - "rev": "92e485c8b01995f96573ff891e9175c466bed51d", + "rev": "d53de206d64dd4581b5d5bbc7dcb2e8c5a1d836a", "type": "gitlab" }, "original": { @@ -779,9 +831,10 @@ "jj": "jj", "lix-module": "lix-module", "niri-flake": "niri-flake", + "niri-overview": "niri-overview", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur-rycee": "nur-rycee", "oskars-dotfiles": "oskars-dotfiles", "sops-nix": "sops-nix", @@ -831,6 +884,27 @@ } }, "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "niri-overview", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742697269, + "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "nixpkgs": [ "nixos-cosmic", @@ -838,11 +912,11 @@ ] }, "locked": { - "lastModified": 1744684506, - "narHash": "sha256-pDPDMT1rdkTWi8MIoZ67gT3L817R7P0Jo+PP+BrnyJI=", + "lastModified": 1745116541, + "narHash": "sha256-5xzA6dTfqCfTTDCo3ipPZzrg3wp01xmcr73y4cTNMP8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "47beae969336c05e892e1e4a9dbaac9593de34ab", + "rev": "e2142ef330a61c02f274ac9a9cb6f8487a5d0080", "type": "github" }, "original": { @@ -899,11 +973,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744668092, - "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", + "lastModified": 1745156230, + "narHash": "sha256-8Oeww77z62PVy4xmyH6UHFxRoZfKgXkSSyKQpIWMTyQ=", "owner": "danth", "repo": "stylix", - "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", + "rev": "758fe63490093650075ec7587b7a6eb38614a4dd", "type": "github" }, "original": { @@ -1066,11 +1140,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1744685222, - "narHash": "sha256-ocJQcrr0IQuumaTd9HHH6gtLYmQvJioxFs+dmnySnlw=", + "lastModified": 1744860839, + "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45185b7f142c153ce3ab50bbc196b2112e0797c2", + "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b08915..2c71962 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,13 @@ flake = false; }; + niri-overview = { + type = "github"; + owner = "YaLTeR"; + repo = "niri"; + ref = "pull/1440/head"; + }; + niri-flake = { type = "github"; owner = "sodiboo"; diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index 77e1aa7..8aefbbe 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -76,7 +76,7 @@ in }; programs.niri = { enable = true; - package = pkgs.niri-unstable; + package = pkgs.niri-overview; }; }; } diff --git a/overlays/modifications/niri.nix b/overlays/modifications/niri.nix index 5ba2cf6..d19e7c6 100644 --- a/overlays/modifications/niri.nix +++ b/overlays/modifications/niri.nix @@ -1 +1,11 @@ -{ inputs, ... }: inputs.niri-flake.overlays.niri +{ inputs, ... }: +final: prev: +let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in +{ + niri-unstable = inputs.niri-flake.packages."${system}".niri-unstable; + niri-overview = inputs.niri-overview.packages."${system}".niri; + niri-stable = inputs.niri-flake.packages."${system}".niri-stable; +}