feat: 0501 update

README.md

@@ -53,6 +53,7 @@ And more...
 - `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details
 - `flake.nix` - flake entry
 
+<!--
 ## Deployment Guide
 
 Since this repository is **heavily** based on my **own** daily use,
@@ -75,3 +76,4 @@ Then, you can follow the guide to deploy:
 3. clone the repository (if you don't have `git` installed, `nix-shell -p git` will do the trick)
 4. rename one of the folders in the `config/hosts` folder
 5. 
+-->

config/hosts/imxyy-nix/home.nix

@@ -53,6 +53,7 @@
     };
 
     programs.niri.settings = {
+      environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
       outputs = {
         DP-2 = {
           enable = true;

flake.lock

@@ -5,15 +5,15 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1745452037,
+        "lastModified": 1745523430,
         "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
-        "owner": "awwpotato",
+        "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "985d704b4ff9f75627f279ef091b2899f8456690",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
         "type": "github"
       },
       "original": {
-        "owner": "awwpotato",
+        "owner": "SenchoPens",
         "repo": "base16.nix",
         "type": "github"
       }
@@ -148,11 +148,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1745563104,
+        "lastModified": 1745995211,
-        "narHash": "sha256-YXpJiegajPiUooLCmKtaA3x63oUXTw/C/9c80Vd6Czw=",
+        "narHash": "sha256-hf6Xu3KS06WyE/3dqV96iLGx3jIYQq9e68iCEFHrt04=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "b4a3938f8161678897983c6fa2461eb5ce54371b",
+        "rev": "0db04339c4e4c0fd42dbbaebe3590a67cbd12aa3",
         "type": "github"
       },
       "original": {
@@ -544,11 +544,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745555634,
+        "lastModified": 1746040799,
-        "narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=",
+        "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "98f4fef7fd7b4a77245db12e33616023162bc6d9",
+        "rev": "5f217e5a319f6c186283b530f8c975e66c028433",
         "type": "github"
       },
       "original": {
@@ -566,11 +566,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745439012,
+        "lastModified": 1746040799,
-        "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=",
+        "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8",
+        "rev": "5f217e5a319f6c186283b530f8c975e66c028433",
         "type": "github"
       },
       "original": {
@@ -654,11 +654,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1745574553,
+        "lastModified": 1746039648,
-        "narHash": "sha256-37OqQMWyDSxWFY47H3RkgJUDwJA0GHvhcGhfIaFZPHs=",
+        "narHash": "sha256-9qSmRXu902L1Ad6L6lujOsp2LkwCV3TW6XdVpvpT2kA=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "e8061cdf94d63de0951f95942c5b0dcd2780eec6",
+        "rev": "d21e04836830680650bf44fa3d8ab80d7ea762bd",
         "type": "github"
       },
       "original": {
@@ -687,11 +687,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1745571618,
+        "lastModified": 1746034376,
-        "narHash": "sha256-yim78eRKNJOvnEDjRAd5iGwulXNpoMJQqcyLmwZ8Ejo=",
+        "narHash": "sha256-Bw6QTIVO8bDnqvwr9l2gBNY+s+7FnTe+2Krn25uNgQI=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "85cd64e83017459f0a6edfd7b91ba31d70b0ef17",
+        "rev": "9fb02b9571a7d84c9e6a93b75e5352c411113640",
         "type": "github"
       },
       "original": {
@@ -810,11 +810,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1745576537,
+        "lastModified": 1746064326,
-        "narHash": "sha256-MIVNv/9UGgYQ1EgqxLkEn2EGF9EKMnVpId5xzgxYMs4=",
+        "narHash": "sha256-r7IZkN9NhK/IO9/J6D9ih2P1OXb67nr5HaQ1YAte18w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fae9d6673d6dd968debf5903435a36d96ebb1bdd",
+        "rev": "91bf6dffa21c7709607c9fdbf9a6acb44e7a0a5d",
         "type": "github"
       },
       "original": {
@@ -826,11 +826,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1745572700,
+        "lastModified": 1746055187,
-        "narHash": "sha256-/+wrrMADU3npToGO8Fq1n3zBNTHtk90xgVF2ROdqy/I=",
+        "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3c7c3ee51b8f74a901e9f86d8a2cb6d020a788c0",
+        "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5",
         "type": "github"
       },
       "original": {
@@ -842,11 +842,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1745557573,
+        "lastModified": 1746035341,
-        "narHash": "sha256-W09rY1EmNLtQU0gb5VIvcGZv+i1QOtCFurw35sGqzFQ=",
+        "narHash": "sha256-ujnL4MZnFdtGHSLX0knm9XYCgWlvTkxedTp+2JbSmOI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f6b308c2f2fa73649a21d7a56e97138c8c205505",
+        "rev": "ab08953dd2f1d468331895e8b1f876a4095ad9e3",
         "type": "github"
       },
       "original": {
@@ -890,11 +890,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1745391562,
+        "lastModified": 1745930157,
-        "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
@@ -911,11 +911,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745571195,
+        "lastModified": 1746056780,
-        "narHash": "sha256-CmCG8vgurVDLLddf5CtAbWw2OgsTe3aFsFKaaAWV8r8=",
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7b4b52c8a1f1a8920b033ce9885df3e1ddcbd0d6",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
         "type": "github"
       },
       "original": {
@@ -934,11 +934,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1745459908,
+        "lastModified": 1746056780,
-        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
         "type": "github"
       },
       "original": {
@@ -976,11 +976,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743928855,
+        "lastModified": 1745709547,
-        "narHash": "sha256-6skFnvfLbslUOieffviT+XNH/M1HOQDQJhJLsG0UM2o=",
+        "narHash": "sha256-xfP/NVZomh+L2ka0omPkhA9mB+4PJXGPMCv/bh+G4YA=",
         "ref": "refs/heads/master",
-        "rev": "ed528268e0c0a2f6be2b5aca7089ebc3e214d446",
+        "rev": "67524f9d8e4ac5e09ea4427e11f2284e6a6f93fe",
-        "revCount": 505,
+        "revCount": 506,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -1014,11 +1014,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1745499382,
+        "lastModified": 1745949276,
-        "narHash": "sha256-YqhoUWJuWlS7GFvbvu9rzpniNfL738vV+L2cuodhcyU=",
+        "narHash": "sha256-9ZK31t2HUiGdLLnDafrRnSrrO12JwqcAFbrJ9nRwh0Y=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "dd41cda70ecf05308d7a3d418be00f351b2b0619",
+        "rev": "78a488dd5e7e4f17162001519665795e6e68b6f8",
         "type": "github"
       },
       "original": {
@@ -1072,11 +1072,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1745541960,
+        "lastModified": 1746064688,
-        "narHash": "sha256-CnkPq3sjuxB2HC93JVSotfMCF3dDrdKo3e4JOImKiLs=",
+        "narHash": "sha256-VzlHPu6HU4qd/xfX1WiUpvsAwH858jTNJ4S/8ww8OkU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "4846adbc2a0334687c024aed0ca77ecd93ccdb0d",
+        "rev": "51cc5640d9532874274f754c64c2ef32ada1a703",
         "type": "github"
       },
       "original": {
@@ -1275,11 +1275,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1745372360,
+        "lastModified": 1745730655,
-        "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=",
+        "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3",
+        "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
         "type": "github"
       },
       "original": {

modules/desktop/wm/niri/config.nix

@@ -5,11 +5,6 @@
   ...
 }:
 {
-  my.home.systemd.user.services.swaync = {
-    Unit.After = [ "graphical-session.target" ];
-    Service.ExecStart = [ "swaync" ];
-  };
-
   my.home.programs.niri.settings = {
     input = {
       focus-follows-mouse = {
@@ -86,7 +81,6 @@
       XDG_CURRENT_DESKTOP = "niri";
       XDG_SESSION_DESKTOP = "niri";
       QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-      STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
       DISPLAY = ":0";
     };
 
@@ -96,6 +90,7 @@
         "--daemon"
       ]
       [ "${lib.getExe pkgs.xwayland-satellite-unstable}" ]
+      [ "${lib.getExe' pkgs.swaynotificationcenter "swaync"}" ]
       [
         "${lib.getExe pkgs.swaybg}"
         "-i"
@@ -247,10 +242,13 @@
         "Mod+Shift+Equal".action.set-window-height = "+10%";
 
         "Ctrl+Alt+A".action = screenshot;
-        # "Print".action = screenshot-screen;
+        "Print".action.screenshot-screen = [ ];
         "Alt+Print".action = screenshot-window;
 
         "Mod+Shift+E".action = quit;
+
+        "Mod+O".action = toggle-overview;
+        "Super+Tab".action = toggle-overview;
       }
       // lib.attrsets.mergeAttrsList (
         map (n: {

modules/desktop/wm/niri/default.nix

@@ -52,11 +52,11 @@ in
         };
       };
     };
-    programs.niri = {
-      enable = true;
-      package = pkg;
-    };
     my.home = {
+      programs.niri = {
+        enable = true;
+        package = pkg;
+      };
       home.packages = with pkgs; [
         wlr-randr
         wl-clipboard

modules/i18n/fcitx5.nix

@@ -45,60 +45,59 @@ lib.my.makeSwitch {
               "Name" = "pinyin";
               "Layout" = "";
             };
-            /*
-              "Groups/0/Items/2" = {
-                "Name" = "mozc";
-                "Layout" = "";
-              };
-            */
             "GroupOrder"."0" = "Default";
           };
-          addons = {
+          addons =
-            classicui.globalSection = {
+            let
-              WheelForPaging = true;
+              true = "True";
-              Font = "sans-serif 10";
+              false = "False";
-              MenuFont = "Noto Sans CJK SC 10";
+            in
-              TrayFont = "Noto Sans CJK SC Bold 10";
+            {
-              Theme = "lightly";
+              classicui.globalSection = {
-              PerScreenDPI = true;
+                WheelForPaging = true;
-              EnableFractionalScale = true;
+                Font = "sans-serif 10";
-            };
+                MenuFont = "Noto Sans CJK SC 10";
-            punctuation.globalSection = {
+                TrayFont = "Noto Sans CJK SC Bold 10";
-              HalfWidthPuncAfterLetterOrNumber = true;
+                Theme = "lightly";
-              TypePairedPunctuationsTogether = false;
+                PerScreenDPI = true;
-              Enabled = true;
+                EnableFractionalScale = true;
-            };
-            pinyin = {
-              globalSection = {
-                PageSize = 9;
-                EmojiEnabled = false;
-                ChaiziEnabled = true;
-                ExtBEnabled = true;
-                CloudPinyinEnabled = true;
-                CloudPinyinIndex = 2;
-                PreeditInApplication = true;
               };
-              sections = {
+              punctuation.globalSection = {
-                Fuzzy = {
+                HalfWidthPuncAfterLetterOrNumber = true;
-                  VE_UE = true;
+                TypePairedPunctuationsTogether = false;
-                  NG_GN = true;
+                Enabled = true;
-                  Inner = true;
+              };
-                  InnerShort = true;
+              pinyin = {
-                  PartialFinal = false;
+                globalSection = {
-                  V_U = true;
+                  PageSize = 9;
-                  IN_ING = true;
+                  EmojiEnabled = false;
-                  U_OU = true;
+                  ChaiziEnabled = true;
+                  ExtBEnabled = true;
+                  CloudPinyinEnabled = true;
+                  CloudPinyinIndex = 2;
+                  PreeditInApplication = true;
+                };
+                sections = {
+                  Fuzzy = {
+                    VE_UE = true;
+                    NG_GN = true;
+                    Inner = true;
+                    InnerShort = true;
+                    PartialFinal = false;
+                    V_U = true;
+                    IN_ING = true;
+                    U_OU = true;
+                  };
                 };
               };
+              cloudpinyin.globalSection = {
+                Backend = "Baidu";
+                MinimumPinyinLength = 4;
+              };
+              clipboard.globalSection = {
+                TriggerKey = "";
+              };
             };
-            cloudpinyin.globalSection = {
-              Backend = "Baidu";
-              MinimumPinyinLength = 4;
-            };
-            clipboard.globalSection = {
-              TriggerKey = "";
-            };
-          };
         };
         ignoreUserConfig = true;
       };