From 8806d7d37cea25d02b976830cd9e9902f8d2831d Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 15 Apr 2025 19:14:16 +0800 Subject: [PATCH 1/9] update flake inputs --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index a2f19e9..d7b7f45 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1744647042, - "narHash": "sha256-QVfymxcal71Eus9bDob+L2aocWngrd0SxJudml3YPkc=", + "lastModified": 1744704639, + "narHash": "sha256-HA0ssQVAqPtnSEbwlsG8McuGj4feqVogmCWz4Ft944k=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "c8f564ce38a41f9cf42dd384ac0f8ee6ef5a2891", + "rev": "bdfa5e92568a5f654ea5046ff7742f153482af45", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1744655344, - "narHash": "sha256-FMn7XnSvaKMXMHhoI1bdhAMcDohzblHnL0Fwd5Pgzm8=", + "lastModified": 1744671375, + "narHash": "sha256-flGMRT7E4URVCj0o4bMfQlehJNrD/1mZy4OobfEwvq8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "8bab8f7d648fe654f52a99f2bed6d4247296a22e", + "rev": "4aa875bbf641d9c31619217b3dc373d734986247", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744592850, - "narHash": "sha256-t/vPNGc/xqB/vm8Yjd+nxbqtbyunACbJNpeY3SLmDmM=", + "lastModified": 1744694176, + "narHash": "sha256-SX+g2qTtI1QE4/E3nY2iHBd+JtY3Dq5cDDa4+Ee8YQA=", "owner": "jj-vcs", "repo": "jj", - "rev": "26ffaf4ac2fefad6b789908cd0c127ce4c96d287", + "rev": "f6e3f38b94d7a861aed0fe912c85a9a57323e948", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744480072, - "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=", + "lastModified": 1744705923, + "narHash": "sha256-ch+j1T4FDMuj3Jm0ALOSS4vpyQZsHQmWO8hkVXOL+nY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9", + "rev": "1e6d8e177cfc614c35252bd57f0ad7a64833aaa3", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1744628957, - "narHash": "sha256-g1lGl2j5b6sjAdfLXHyIQh8gvKBKnDuwYTR4EMexdP0=", + "lastModified": 1744715315, + "narHash": "sha256-EY7Yd6ns+ihaM2dCK6+/45gaTKnhmHbK/Vb0Vr9+hSs=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e9da1352e4b3ad6778ae3166fbe10c6a3a879c21", + "rev": "1093e56c36baabdbb2643aad583edbdafb7aa5a1", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -734,11 +734,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1744660304, - "narHash": "sha256-F1+LEM7+v6jxosXETYPPmM/qpmTQsSy0K/s4exMBxQk=", + "lastModified": 1744689812, + "narHash": "sha256-JTlOHSH7SsVJOccu932syyO4Jcqm5wOk6W5oGMtMq5o=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d49b80147f0869b39bad3f74d85a4d2b92cdb0cb", + "rev": "92e485c8b01995f96573ff891e9175c466bed51d", "type": "gitlab" }, "original": { @@ -838,11 +838,11 @@ ] }, "locked": { - "lastModified": 1744599145, - "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=", + "lastModified": 1744684506, + "narHash": "sha256-pDPDMT1rdkTWi8MIoZ67gT3L817R7P0Jo+PP+BrnyJI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4", + "rev": "47beae969336c05e892e1e4a9dbaac9593de34ab", "type": "github" }, "original": { @@ -858,11 +858,11 @@ ] }, "locked": { - "lastModified": 1744518500, - "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", + "lastModified": 1744669848, + "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", + "rev": "61154300d945f0b147b30d24ddcafa159148026a", "type": "github" }, "original": { @@ -899,11 +899,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744572782, - "narHash": "sha256-CFNluxLqxmDPQYxi37nBd4wrpB0lI4Os8nRA7UWAJK0=", + "lastModified": 1744668092, + "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", "owner": "danth", "repo": "stylix", - "rev": "042db377bccc99b1a724b076c89ba803e411d889", + "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1743346993, - "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "lastModified": 1744685222, + "narHash": "sha256-ocJQcrr0IQuumaTd9HHH6gtLYmQvJioxFs+dmnySnlw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "rev": "45185b7f142c153ce3ab50bbc196b2112e0797c2", "type": "github" }, "original": { From ff0cd1aec4f31a36e651251d3d5efc708271df84 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 17 Apr 2025 12:39:34 +0800 Subject: [PATCH 2/9] use helix theme instead of stylix --- home/modules/programs/helix/config.toml | 2 +- home/modules/programs/helix/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/modules/programs/helix/config.toml b/home/modules/programs/helix/config.toml index b2f176a..0f1705e 100644 --- a/home/modules/programs/helix/config.toml +++ b/home/modules/programs/helix/config.toml @@ -1,4 +1,4 @@ -# theme = "ayu_evolve" # avoid conflicting with stylix +theme = "ayu_dark" [editor] line-number = "relative" diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index 9c9c855..eeafe47 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -29,6 +29,7 @@ cfg = config.youthlic.programs.helix; in { + stylix.targets.helix.enable = false; programs.helix = lib.mkIf cfg.enable { enable = true; package = outputs.packages."${pkgs.system}".helix; From 97bb957d786d6fdcd4aace50f60c37c9486d9633 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 17 Apr 2025 12:39:34 +0800 Subject: [PATCH 3/9] remove comment in waybar config --- home/modules/programs/waybar.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/programs/waybar.nix b/home/modules/programs/waybar.nix index e3d8287..eb07712 100644 --- a/home/modules/programs/waybar.nix +++ b/home/modules/programs/waybar.nix @@ -37,7 +37,6 @@ in "custom/notification" ]; "wlr/taskbar" = { - # on-click = "${lib.getExe pkgs.niri-unstable} msg action focus-window --id {app_id}"; on-click = "activate"; }; From c1dd700f20f017b5092bc6eb61be9f819d2919bc Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 17 Apr 2025 12:39:34 +0800 Subject: [PATCH 4/9] make sure niri homeModule use os-level package --- home/modules/programs/niri.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/home/modules/programs/niri.nix b/home/modules/programs/niri.nix index d80faa6..c6f8757 100644 --- a/home/modules/programs/niri.nix +++ b/home/modules/programs/niri.nix @@ -2,10 +2,12 @@ pkgs, config, lib, + osConfig ? null, ... }: let cfg = config.youthlic.programs.niri; + niri = osConfig.programs.niri.package; in { options = { @@ -21,24 +23,24 @@ in }; }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ - swaynotificationcenter - swaybg - xwayland-satellite - niri-unstable - kdePackages.polkit-kde-agent-1 - wl-clipboard - cliphist - ]; + home.packages = + (with pkgs; [ + swaynotificationcenter + swaybg + xwayland-satellite + kdePackages.polkit-kde-agent-1 + wl-clipboard + cliphist + ]) + ++ [ niri ]; qt = { enable = true; }; xdg.portal = { - configPackages = [ pkgs.niri-unstable ]; + configPackages = [ niri ]; enable = true; extraPortals = lib.mkIf ( - !pkgs.niri-unstable.cargoBuildNoDefaultFeatures - || builtins.elem "xdp-gnome-screencast" pkgs.niri-unstable.cargoBuildFeatures + !niri.cargoBuildNoDefaultFeatures || builtins.elem "xdp-gnome-screencast" niri.cargoBuildFeatures ) [ pkgs.xdg-desktop-portal-gnome ]; }; xdg.configFile = @@ -69,7 +71,7 @@ in }; programs.niri = { config = builtins.readFile cfg.config; - package = pkgs.niri-unstable; + package = niri; }; }; } From b7eeaaa07240e14dd0c7cdf8f7d80c9f0de52680 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 17 Apr 2025 12:39:34 +0800 Subject: [PATCH 5/9] use niri with overview pr --- flake.lock | 172 +++++++++++++++++++++++--------- flake.nix | 7 ++ nixos/modules/gui/niri.nix | 2 +- overlays/modifications/niri.nix | 12 ++- 4 files changed, 142 insertions(+), 51 deletions(-) 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; +} From a7e77f09f0cd8c7008761316e0ebae1721a49579 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 17 Apr 2025 12:39:34 +0800 Subject: [PATCH 6/9] update pkgs --- pkgs/_sources/generated.json | 8 ++++---- pkgs/_sources/generated.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index b29ad1d..9d19eb1 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -92,7 +92,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-04-06", + "date": "2025-04-16", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,12 +104,12 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "51777daedbe4783c3b79f0246d775e4b6d978cbc", - "sha256": "sha256-cFaFgChhpgEiJw+dHl3Hr3T2UQF+Vy6u36JWY+cYBNo=", + "rev": "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683", + "sha256": "sha256-7DodE2/bcYSVoXCyJ9YAeYH80lARIG7XJ9AImh75Kcc=", "sparseCheckout": [], "type": "github" }, - "version": "51777daedbe4783c3b79f0246d775e4b6d978cbc" + "version": "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index d563e20..6126f7c 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -65,15 +65,15 @@ }; rime-ice = { pname = "rime-ice"; - version = "51777daedbe4783c3b79f0246d775e4b6d978cbc"; + version = "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "51777daedbe4783c3b79f0246d775e4b6d978cbc"; + rev = "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683"; fetchSubmodules = false; - sha256 = "sha256-cFaFgChhpgEiJw+dHl3Hr3T2UQF+Vy6u36JWY+cYBNo="; + sha256 = "sha256-7DodE2/bcYSVoXCyJ9YAeYH80lARIG7XJ9AImh75Kcc="; }; - date = "2025-04-06"; + date = "2025-04-16"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; From 6136a7d0a53dedc2b5c18a902fc2156aa8ea7e7b Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 24 Apr 2025 11:55:11 +0800 Subject: [PATCH 7/9] update flake inputs and pkgs, switch to niri-flake --- flake.lock | 226 +++++++------------- flake.nix | 7 - home/david/modules/programs/niri/config.kdl | 3 + nixos/modules/gui/niri.nix | 2 +- overlays/modifications/niri.nix | 12 +- pkgs/_sources/generated.json | 8 +- pkgs/_sources/generated.nix | 8 +- 7 files changed, 89 insertions(+), 177 deletions(-) diff --git a/flake.lock b/flake.lock index a3e0c6f..a33522a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1745165448, - "narHash": "sha256-oKPMqpmSR40/q31hp2oUoBOWv10SCx8rdBjYpI3Q+/M=", + "lastModified": 1745626201, + "narHash": "sha256-t9Yx+nFn/QDBXNrupOu6ra/lLzRuKbWy5GACZ60VL6E=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "a3e7a853560c2e4b9ac94cbf96fa0a0a94b3642d", + "rev": "67ea41f55741132f02e3f099f05e7ff5bc1fe13f", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1744940522, - "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1745071599, - "narHash": "sha256-6VCYCOLfSKzbUHCaZTe7mHuOfDIM63jLreHMzJJco9Q=", + "lastModified": 1745607661, + "narHash": "sha256-72OO+/vP4h7uiZ1gdGmFf1z+17NxCt8dhrRD+mltW44=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "4e10f972df556ecdf5b97090ef605f83188a23d7", + "rev": "38445dca2ac2af176c7f3b205d88d697cf8c89c8", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1744988393, - "narHash": "sha256-ZUGH3xkkQ8WRM2s1wRduJnPDnv/sIW1QwnPuyvVN5lg=", + "lastModified": 1745302248, + "narHash": "sha256-MEEYZaOYmU2SlgzAKRFjF4vtODRx/AUG33nRJ+nKy78=", "owner": "helix-editor", "repo": "helix", - "rev": "523e8aa7816cde5f0dc38593737b50527e3348fe", + "rev": "0815b52e0959e21ec792ea41d508a050b552f850", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1745190356, - "narHash": "sha256-2tOi3l1E1qwG3P5dzTN4yJ52SSENNXAWZMyPwcPx9gw=", + "lastModified": 1745627989, + "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=", "owner": "nix-community", "repo": "home-manager", - "rev": "496fa9c054d3a212c8bcb3ac80ab310841eed361", + "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745131440, - "narHash": "sha256-XrJyjt4zxUz1ArVMpbsL20yQbY909fVP5HOe3RY1L9c=", + "lastModified": 1745634143, + "narHash": "sha256-9MopKYFjE+4URe/ZmBt4i3g9cvdAJ6MJ4LM21DDXqzc=", "owner": "jj-vcs", "repo": "jj", - "rev": "3c84a23b1344eb6aa2890255f8d0b77628b6e1e1", + "rev": "13477940af42a74a58caaaaeafdbd322cfebb81d", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744991948, - "narHash": "sha256-f4xKjzY64l6e28YExcf/V8aLYzBzDdjNI7ZZJGBBz3Y=", + "lastModified": 1745596313, + "narHash": "sha256-O2LDLX2F3lnOAMikTufR9NvaXbbg5KzjlwRLMcA3vzE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a70acecb35de8941bac791c82d8e214d4be70567", + "rev": "927e9f1e05ceeacdc66e9b23f92a7ccfec8a130a", "type": "github" }, "original": { @@ -543,27 +543,6 @@ "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": { @@ -584,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744878694, - "narHash": "sha256-e3jPdRQmlgeWwDTC/wnvKgIy4Ga8KZYoxUPQ8PCNktM=", + "lastModified": 1745592977, + "narHash": "sha256-XhfYYefs/97yWcyNKEarStaSL4t4M+yR6ZD4PQbO5Lo=", "owner": "YaLTeR", "repo": "niri", - "rev": "7884d3bfea810740fe2ca7021b102af0f049ccae", + "rev": "501ea471283a3ac7b94593e271c9d4ae6af8859f", "type": "github" }, "original": { @@ -597,34 +576,19 @@ "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_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable_3", - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1745147300, - "narHash": "sha256-PvzBVmB8qRxGnccAaBxPKG9oElAQxac2HbFOGyQuuJU=", + "lastModified": 1745579354, + "narHash": "sha256-+Yf7JrKIKMgKDi+zHvuTOJ8Raf7NNZINgBzFaOzYD3U=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "5a4d2109cf5a3eb18a0afa361a017643a57f9454", + "rev": "41a1bf337bbd69e304ffbd7390293082336e8ebb", "type": "github" }, "original": { @@ -635,11 +599,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -651,16 +615,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742707865, - "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd613136ee91f67e5dba3f3f41ac99ae89c5406b", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -698,11 +662,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -714,11 +678,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -730,27 +694,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "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", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -770,11 +718,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1745459908, + "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", "type": "github" }, "original": { @@ -786,11 +734,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1744974023, - "narHash": "sha256-7P4gZOxx5hmHNW++vtsWILxuPO1RB+8kyKDDQ7Ij10Q=", + "lastModified": 1745419403, + "narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d53de206d64dd4581b5d5bbc7dcb2e8c5a1d836a", + "rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72", "type": "gitlab" }, "original": { @@ -831,10 +779,9 @@ "jj": "jj", "lix-module": "lix-module", "niri-flake": "niri-flake", - "niri-overview": "niri-overview", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nur-rycee": "nur-rycee", "oskars-dotfiles": "oskars-dotfiles", "sops-nix": "sops-nix", @@ -884,27 +831,6 @@ } }, "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", @@ -912,11 +838,11 @@ ] }, "locked": { - "lastModified": 1745116541, - "narHash": "sha256-5xzA6dTfqCfTTDCo3ipPZzrg3wp01xmcr73y4cTNMP8=", + "lastModified": 1745548521, + "narHash": "sha256-xyliq8oS5OnzXjHRGr92RtmrtYI/dflf2gSEo0wMFjc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e2142ef330a61c02f274ac9a9cb6f8487a5d0080", + "rev": "eb0afb4ac0720d55c29e88eb29432103d73ae11d", "type": "github" }, "original": { @@ -932,11 +858,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -973,11 +899,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745156230, - "narHash": "sha256-8Oeww77z62PVy4xmyH6UHFxRoZfKgXkSSyKQpIWMTyQ=", + "lastModified": 1745618823, + "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=", "owner": "danth", "repo": "stylix", - "rev": "758fe63490093650075ec7587b7a6eb38614a4dd", + "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126", "type": "github" }, "original": { @@ -1053,11 +979,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -1069,11 +995,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -1140,11 +1066,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1744860839, - "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", + "lastModified": 1745372360, + "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", + "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c71962..1b08915 100644 --- a/flake.nix +++ b/flake.nix @@ -43,13 +43,6 @@ flake = false; }; - niri-overview = { - type = "github"; - owner = "YaLTeR"; - repo = "niri"; - ref = "pull/1440/head"; - }; - niri-flake = { type = "github"; owner = "sodiboo"; diff --git a/home/david/modules/programs/niri/config.kdl b/home/david/modules/programs/niri/config.kdl index 3cd3a74..925a577 100644 --- a/home/david/modules/programs/niri/config.kdl +++ b/home/david/modules/programs/niri/config.kdl @@ -221,6 +221,9 @@ binds { Mod+Q { close-window } + Mod+O { + toggle-overview + } Mod+Left { focus-column-left } diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index 8aefbbe..77e1aa7 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-overview; + package = pkgs.niri-unstable; }; }; } diff --git a/overlays/modifications/niri.nix b/overlays/modifications/niri.nix index d19e7c6..5ba2cf6 100644 --- a/overlays/modifications/niri.nix +++ b/overlays/modifications/niri.nix @@ -1,11 +1 @@ -{ 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; -} +{ inputs, ... }: inputs.niri-flake.overlays.niri diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 9d19eb1..7cb57b5 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -92,7 +92,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-04-16", + "date": "2025-04-22", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,12 +104,12 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683", - "sha256": "sha256-7DodE2/bcYSVoXCyJ9YAeYH80lARIG7XJ9AImh75Kcc=", + "rev": "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2", + "sha256": "sha256-N7EDvQX598jxNILzwTwAeu/BY9wWVBRUuTApamf4nAY=", "sparseCheckout": [], "type": "github" }, - "version": "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683" + "version": "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 6126f7c..e8936d6 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -65,15 +65,15 @@ }; rime-ice = { pname = "rime-ice"; - version = "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683"; + version = "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "5b1999c3c3bc1bfd84bffacd7ff5c5e0879ea683"; + rev = "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2"; fetchSubmodules = false; - sha256 = "sha256-7DodE2/bcYSVoXCyJ9YAeYH80lARIG7XJ9AImh75Kcc="; + sha256 = "sha256-N7EDvQX598jxNILzwTwAeu/BY9wWVBRUuTApamf4nAY="; }; - date = "2025-04-16"; + date = "2025-04-22"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; From 950a7ff2ca8cc239048c433860d2650605de3d49 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 26 Apr 2025 17:46:38 +0800 Subject: [PATCH 8/9] add showmethekey to show key in the screen --- flake.lock | 42 ++++++++++----------- home/david/modules/default.nix | 1 + home/david/modules/programs/niri/config.kdl | 26 +++++++++++++ 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index a33522a..f012739 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1745626201, - "narHash": "sha256-t9Yx+nFn/QDBXNrupOu6ra/lLzRuKbWy5GACZ60VL6E=", + "lastModified": 1745683860, + "narHash": "sha256-WYvZhHXVZuinCiLuYzPvSqMJ96SkATjinC9Ifs/0jfY=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "67ea41f55741132f02e3f099f05e7ff5bc1fe13f", + "rev": "fd8a43e0cffe6aef96de5c5041cf499ce0e4c67e", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745302248, - "narHash": "sha256-MEEYZaOYmU2SlgzAKRFjF4vtODRx/AUG33nRJ+nKy78=", + "lastModified": 1745684178, + "narHash": "sha256-SnYTNyXGRng1qHmRtbOG9K31c5h6p77hlGPZK5oKgqE=", "owner": "helix-editor", "repo": "helix", - "rev": "0815b52e0959e21ec792ea41d508a050b552f850", + "rev": "2ec59f8ff6d43f5ac72e745ec614c26de192aedd", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745596313, - "narHash": "sha256-O2LDLX2F3lnOAMikTufR9NvaXbbg5KzjlwRLMcA3vzE=", + "lastModified": 1745668007, + "narHash": "sha256-xYf6xz8WOW9ztBi356dHdqLsTCoxVS8Iapfpwosrn7Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "927e9f1e05ceeacdc66e9b23f92a7ccfec8a130a", + "rev": "8fdaf610c455d0b5b70374a21392a717be513b0f", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745592977, - "narHash": "sha256-XhfYYefs/97yWcyNKEarStaSL4t4M+yR6ZD4PQbO5Lo=", + "lastModified": 1745663376, + "narHash": "sha256-mGQyB+Epl87ZCZZCcBkjUrdR1aJt8Ybiqr4h0yUkgQI=", "owner": "YaLTeR", "repo": "niri", - "rev": "501ea471283a3ac7b94593e271c9d4ae6af8859f", + "rev": "78e3daf5f82b5870e998faf0e1efeaa048730976", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1745579354, - "narHash": "sha256-+Yf7JrKIKMgKDi+zHvuTOJ8Raf7NNZINgBzFaOzYD3U=", + "lastModified": 1745665695, + "narHash": "sha256-oUFoPmT2/ww1bIU0Vmifx9BdarVqlv9MyEIxUTqYJnM=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "41a1bf337bbd69e304ffbd7390293082336e8ebb", + "rev": "48280c3737fee2db3a1226c297c86428417f552d", "type": "github" }, "original": { @@ -615,11 +615,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -838,11 +838,11 @@ ] }, "locked": { - "lastModified": 1745548521, - "narHash": "sha256-xyliq8oS5OnzXjHRGr92RtmrtYI/dflf2gSEo0wMFjc=", + "lastModified": 1745634793, + "narHash": "sha256-8AuOyfLNlcbLy0AqERSNUUoDdY+3THZI7+9VrXUfGqg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb0afb4ac0720d55c29e88eb29432103d73ae11d", + "rev": "f1aeaeb91ba9c88f235ab82bd23d7a4931fe736c", "type": "github" }, "original": { diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix index 07b1b99..49c46bb 100644 --- a/home/david/modules/default.nix +++ b/home/david/modules/default.nix @@ -10,6 +10,7 @@ spacer devenv just + showmethekey ]; }; } diff --git a/home/david/modules/programs/niri/config.kdl b/home/david/modules/programs/niri/config.kdl index 925a577..ffb1ba5 100644 --- a/home/david/modules/programs/niri/config.kdl +++ b/home/david/modules/programs/niri/config.kdl @@ -139,6 +139,32 @@ window-rule { geometry-corner-radius 12 clip-to-geometry true } +window-rule { + match app-id="^showmethekey-gtk$" + geometry-corner-radius 0 + clip-to-geometry false + open-floating true + open-focused false + default-column-width { + fixed 300 + } + default-window-height { + fixed 70 + } + draw-border-with-background false + default-floating-position x=20 y=20 relative-to="bottom-right" + focus-ring { + off + } + border { + off + } + shadow { + off + } + tiled-state false + baba-is-float true +} window-rule { match app-id="^org\\.keepassxc\\.KeePassXC$" match app-id="^org\\.gnome\\.World\\.Secrets$" From f62f1c58c6fc600fb54c632971072715f8836ac2 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sun, 27 Apr 2025 11:58:17 +0800 Subject: [PATCH 9/9] add betterfox for firefox --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 9 +++++++++ home/modules/default.nix | 1 + home/modules/programs/firefox.nix | 7 +++++++ 4 files changed, 38 insertions(+) diff --git a/flake.lock b/flake.lock index f012739..2474791 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,26 @@ "type": "github" } }, + "betterfox-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745154287, + "narHash": "sha256-kOYbNDnaP/1rQxeRu7e71yap4+aQFeObr29GFJou/jo=", + "owner": "HeitorAugustoLN", + "repo": "betterfox-nix", + "rev": "f76d3767f46c0d5536b911d3453ef76e186b344a", + "type": "github" + }, + "original": { + "owner": "HeitorAugustoLN", + "repo": "betterfox-nix", + "type": "github" + } + }, "bt-tracker": { "flake": false, "locked": { @@ -767,6 +787,7 @@ }, "root": { "inputs": { + "betterfox-nix": "betterfox-nix", "bt-tracker": "bt-tracker", "dae": "dae", "deploy-rs": "deploy-rs", diff --git a/flake.nix b/flake.nix index 1b08915..7f262c5 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,15 @@ flake = false; }; + betterfox-nix = { + type = "github"; + owner = "HeitorAugustoLN"; + repo = "betterfox-nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; + niri-flake = { type = "github"; owner = "sodiboo"; diff --git a/home/modules/default.nix b/home/modules/default.nix index d4fca85..f817748 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -6,6 +6,7 @@ imports = (with inputs; [ sops-nix.homeManagerModules.sops + betterfox-nix.homeManagerModules.betterfox ]) ++ [ ./programs diff --git a/home/modules/programs/firefox.nix b/home/modules/programs/firefox.nix index 269fac4..79d7e24 100644 --- a/home/modules/programs/firefox.nix +++ b/home/modules/programs/firefox.nix @@ -21,11 +21,18 @@ in ]; programs.firefox = { enable = true; + betterfox = { + enable = true; + }; languagePacks = [ "zh-CN" "en-US" ]; profiles.default = { + betterfox = { + enable = true; + enableAllSections = true; + }; name = "default"; isDefault = true; extensions.packages = with outputs.packages."${system}"; [