From fd60c6c7265aa118e1840d59fd716b9f275ddc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 11:35:22 +0800 Subject: [PATCH 1/8] npins: pin home-manager to 25.11 --- npins/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 31edf218..8deaa305 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -112,11 +112,11 @@ "owner": "nix-community", "repo": "home-manager" }, - "branch": "master", + "branch": "release-25.11", "submodules": false, - "revision": "295d90e22d557ccc3049dc92460b82f372cd3892", - "url": "https://github.com/nix-community/home-manager/archive/295d90e22d557ccc3049dc92460b82f372cd3892.tar.gz", - "hash": "1bg6p94gn7rzs43asb1njvhl242kd09ka2dbq3jyzhs140f0i099" + "revision": "2217780c39169a9c77915200137550c2ef0fa974", + "url": "https://github.com/nix-community/home-manager/archive/2217780c39169a9c77915200137550c2ef0fa974.tar.gz", + "hash": "1p4j622rkpymnjggmqxwsngss4fpw21pf6khdzdfbiann5lzc5bn" }, "infuse": { "type": "GitRelease", From 9174bda378bcf5c366543de2baf44f9add35722b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 18:42:17 +0800 Subject: [PATCH 2/8] home/{firefox,zen-browser}: turn of AI search in brave --- nix/homeModules/common/firefox.nix | 2 +- nix/homeModules/common/zen-browser.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 853888c9..1b0faa95 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -34,7 +34,7 @@ in { Name = "Brave"; Alias = "@br"; - URLTemplate = "https://search.brave.com/search?q={searchTerms}&source=web"; + URLTemplate = "https://search.brave.com/search?&summary=0&q={searchTerms}&source=web"; SuggestURLTemplate = "https://suggestqueries.google.com/complete/search?q={searchTerms}"; } ]; diff --git a/nix/homeModules/common/zen-browser.nix b/nix/homeModules/common/zen-browser.nix index 993b1175..9d7ea3ac 100644 --- a/nix/homeModules/common/zen-browser.nix +++ b/nix/homeModules/common/zen-browser.nix @@ -34,7 +34,7 @@ in { Name = "Brave"; Alias = "@br"; - URLTemplate = "https://search.brave.com/search?q={searchTerms}&source=web"; + URLTemplate = "https://search.brave.com/search?&summary=0&q={searchTerms}&source=web"; SuggestURLTemplate = "https://suggestqueries.google.com/complete/search?q={searchTerms}"; } ]; From c96b65bea71e871ebc102b7cc940c60ad11092f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 19:14:28 +0800 Subject: [PATCH 3/8] home/fcitx5: use only one ime group https://github.com/fcitx/fcitx5/issues/1459 --- nix/homeModules/common/fcitx5/fcitx/config | 7 +------ nix/homeModules/common/fcitx5/fcitx/profile | 17 +++++------------ .../common/fcitx5/fcitx/table/cangjie3.conf | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/nix/homeModules/common/fcitx5/fcitx/config b/nix/homeModules/common/fcitx5/fcitx/config index 3c6a8023..53fcbc42 100644 --- a/nix/homeModules/common/fcitx5/fcitx/config +++ b/nix/homeModules/common/fcitx5/fcitx/config @@ -27,12 +27,6 @@ EnumerateWithTriggerKeys=true [Hotkey/AltTriggerKeys] 0=Shift_L -[Hotkey/EnumerateGroupBackwardKeys] -0=Control+Shift+space - -[Hotkey/EnumerateGroupForwardKeys] -0=Control+space - [Hotkey/NextCandidate] 0=Tab @@ -46,3 +40,4 @@ EnumerateWithTriggerKeys=true 0=Up [Hotkey/TriggerKeys] +0=Control+space diff --git a/nix/homeModules/common/fcitx5/fcitx/profile b/nix/homeModules/common/fcitx5/fcitx/profile index 9f258564..cbb6da73 100644 --- a/nix/homeModules/common/fcitx5/fcitx/profile +++ b/nix/homeModules/common/fcitx5/fcitx/profile @@ -1,23 +1,16 @@ # vim:ft=ini - [GroupOrder] -0=gDvorak -1=gCangjie +0="Group 1" [Groups/0] +Name="Group 1" Default Layout=us-dvorak DefaultIM=keyboard-us-dvorak -Name=gDvorak [Groups/0/Items/0] -Layout= Name=keyboard-us-dvorak +Layout=us-dvorak -[Groups/1] -Default Layout=us -DefaultIM=cangjie3 -Name=gCangjie - -[Groups/1/Items/0] -Layout= +[Groups/0/Items/1] Name=cangjie3 +Layout=us diff --git a/nix/homeModules/common/fcitx5/fcitx/table/cangjie3.conf b/nix/homeModules/common/fcitx5/fcitx/table/cangjie3.conf index 072933e0..75639c18 100644 --- a/nix/homeModules/common/fcitx5/fcitx/table/cangjie3.conf +++ b/nix/homeModules/common/fcitx5/fcitx/table/cangjie3.conf @@ -3,7 +3,7 @@ SecondCandidate= # Select Third Candidate ThirdCandidate= -# Page size +# Candidates Per Page PageSize=10 # Commit after auto select candidates CommitAfterSelect=True From c6d39532a66a5275745423ab1b822a69337208b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 19:15:55 +0800 Subject: [PATCH 4/8] home/git: enable patdiff integration for git by default --- nix/homeModules/common/git.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nix/homeModules/common/git.nix b/nix/homeModules/common/git.nix index 99aef957..9b694bb4 100644 --- a/nix/homeModules/common/git.nix +++ b/nix/homeModules/common/git.nix @@ -8,7 +8,10 @@ programs.git = { lfs.enable = true; }; - programs.patdiff.enable = lib.mkDefault true; + programs.patdiff = { + enable = lib.mkDefault true; + enableGitIntegration = lib.mkDefault true; + }; # 懶惰鬼賴皮 programs.lazygit = From fdc88e415f2ec3a5b592be26a945d197d68fc15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 19:56:44 +0800 Subject: [PATCH 5/8] home/git: disable git-lfs --- nix/homeModules/common/git.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nix/homeModules/common/git.nix b/nix/homeModules/common/git.nix index 9b694bb4..9074ce48 100644 --- a/nix/homeModules/common/git.nix +++ b/nix/homeModules/common/git.nix @@ -5,9 +5,6 @@ }: { # git plugins - programs.git = { - lfs.enable = true; - }; programs.patdiff = { enable = lib.mkDefault true; enableGitIntegration = lib.mkDefault true; From 4adfe435df6094799e8286227cdc4d66194e6052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 20:01:32 +0800 Subject: [PATCH 6/8] vanadium/xmonad: export MOZ_USE_XINPUT2=1 --- nix/configurations/vanadium/home/xmonad/xmonad.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 76182ee5..dcb62ea6 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -225,9 +225,7 @@ myStartupHook = do -- - setting `home.sessionVariable` (home-manager) would only effect shells, probably due to the order of launched processes blah blah -- - setting `environment.sessionVariables` (NixOS) would make my set up less portable putEnv "GLFW_IM_MODULE=ibus" -- Make sure kitty knows how to talk to fcitx - - -- TODO: doesn't work for firefox nor for zen since 145.0 - -- putEnv "MOZ_USE_XINPUT2=1" -- Force touchpad for firefox + putEnv "MOZ_USE_XINPUT2=1" -- Force touchpad for firefox removedKeybinds :: [(KeyMask, KeySym)] removedKeybinds = From 434ce5437c4492eff3c8d950121f95f658680b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 28 Nov 2025 20:08:11 +0800 Subject: [PATCH 7/8] home/zen-browrser: disable smooth scrolling --- nix/homeModules/common/zen-browser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/homeModules/common/zen-browser.nix b/nix/homeModules/common/zen-browser.nix index 9d7ea3ac..ff8d6702 100644 --- a/nix/homeModules/common/zen-browser.nix +++ b/nix/homeModules/common/zen-browser.nix @@ -68,6 +68,7 @@ in "browser.startup.page" = 1; "browser.translations.automaticallyPopup" = false; "browser.tabs.closeWindowWithLastTab" = true; + "general.smoothScroll" = false; # open links in new window # this works a lot better with xmonad where I have a bunch of windows From b293776da0fcdf017d4385453e8077828a641106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 29 Nov 2025 18:51:25 +0800 Subject: [PATCH 8/8] vanadium/xmonad: improve matching on Nautilus className --- nix/configurations/vanadium/home/xmonad/xmonad.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index dcb62ea6..73d13b92 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -125,10 +125,10 @@ isFeh :: Query Bool isFeh = className =? "feh" isNautilus :: Query Bool -isNautilus = className ~? "Nautilus" +isNautilus = className $? "Nautilus" isNautilusPreviewer :: Query Bool -isNautilusPreviewer = className ~? "NautilusPreviewer" +isNautilusPreviewer = className $? "NautilusPreviewer" isMinder :: Query Bool isMinder = className =? "Minder" <&&> (not <$> title ~? "Pick a Color")