vanadium/xmonad: improve matching on Nautilus className

https://github.com/fcitx/fcitx5/issues/1459

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")
@@ -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
-
+    putEnv "MOZ_USE_XINPUT2=1"    -- Force touchpad for firefox
-    -- TODO: doesn't work for firefox nor for zen since 145.0
-    -- putEnv "MOZ_USE_XINPUT2=1"    -- Force touchpad for firefox
 
 removedKeybinds :: [(KeyMask, KeySym)]
 removedKeybinds =

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

nix/homeModules/common/fcitx5/fcitx/profile

@@ -1,23 +1,16 @@
 # vim:ft=ini
-
 [GroupOrder]
-0=gDvorak
+0="Group 1"
-1=gCangjie
 
 [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]
+[Groups/0/Items/1]
-Default Layout=us
-DefaultIM=cangjie3
-Name=gCangjie
-
-[Groups/1/Items/0]
-Layout=
 Name=cangjie3
+Layout=us

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

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}";
           }
         ];

nix/homeModules/common/git.nix

@@ -5,10 +5,10 @@
 }:
 {
   # git plugins
-  programs.git = {
+  programs.patdiff = {
-    lfs.enable = true;
+    enable = lib.mkDefault true;
+    enableGitIntegration = lib.mkDefault true;
   };
-  programs.patdiff.enable = lib.mkDefault true;
 
   # 懶惰鬼賴皮
   programs.lazygit =

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}";
           }
         ];
@@ -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

npins/sources.json

@@ -112,11 +112,11 @@
         "owner": "nix-community",
         "repo": "home-manager"
       },
-      "branch": "master",
+      "branch": "release-25.11",
       "submodules": false,
-      "revision": "295d90e22d557ccc3049dc92460b82f372cd3892",
+      "revision": "2217780c39169a9c77915200137550c2ef0fa974",
-      "url": "https://github.com/nix-community/home-manager/archive/295d90e22d557ccc3049dc92460b82f372cd3892.tar.gz",
+      "url": "https://github.com/nix-community/home-manager/archive/2217780c39169a9c77915200137550c2ef0fa974.tar.gz",
-      "hash": "1bg6p94gn7rzs43asb1njvhl242kd09ka2dbq3jyzhs140f0i099"
+      "hash": "1p4j622rkpymnjggmqxwsngss4fpw21pf6khdzdfbiann5lzc5bn"
     },
     "infuse": {
       "type": "GitRelease",