From 1ff4475a8ff196645ea83de0423d74a37c30864a Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Thu, 1 May 2025 10:49:14 +0800 Subject: [PATCH] feat: 0501 update --- README.md | 2 + config/hosts/imxyy-nix/home.nix | 1 + flake.lock | 100 ++++++++++++++-------------- modules/desktop/wm/niri/config.nix | 12 ++-- modules/desktop/wm/niri/default.nix | 8 +-- modules/i18n/fcitx5.nix | 95 +++++++++++++------------- secrets/dae-imxyy-nix.dae | 8 +-- 7 files changed, 113 insertions(+), 113 deletions(-) diff --git a/README.md b/README.md index b4fdc07..e0606bc 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ And more... - `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details - `flake.nix` - flake entry + diff --git a/config/hosts/imxyy-nix/home.nix b/config/hosts/imxyy-nix/home.nix index c226f48..7fe74fe 100644 --- a/config/hosts/imxyy-nix/home.nix +++ b/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; diff --git a/flake.lock b/flake.lock index efe56ae..8d82c4d 100644 --- a/flake.lock +++ b/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, - "narHash": "sha256-YXpJiegajPiUooLCmKtaA3x63oUXTw/C/9c80Vd6Czw=", + "lastModified": 1745995211, + "narHash": "sha256-hf6Xu3KS06WyE/3dqV96iLGx3jIYQq9e68iCEFHrt04=", "owner": "nix-community", "repo": "fenix", - "rev": "b4a3938f8161678897983c6fa2461eb5ce54371b", + "rev": "0db04339c4e4c0fd42dbbaebe3590a67cbd12aa3", "type": "github" }, "original": { @@ -544,11 +544,11 @@ ] }, "locked": { - "lastModified": 1745555634, - "narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=", + "lastModified": 1746040799, + "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, - "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=", + "lastModified": 1746040799, + "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, - "narHash": "sha256-37OqQMWyDSxWFY47H3RkgJUDwJA0GHvhcGhfIaFZPHs=", + "lastModified": 1746039648, + "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, - "narHash": "sha256-yim78eRKNJOvnEDjRAd5iGwulXNpoMJQqcyLmwZ8Ejo=", + "lastModified": 1746034376, + "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, - "narHash": "sha256-MIVNv/9UGgYQ1EgqxLkEn2EGF9EKMnVpId5xzgxYMs4=", + "lastModified": 1746064326, + "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, - "narHash": "sha256-/+wrrMADU3npToGO8Fq1n3zBNTHtk90xgVF2ROdqy/I=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c7c3ee51b8f74a901e9f86d8a2cb6d020a788c0", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -842,11 +842,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745557573, - "narHash": "sha256-W09rY1EmNLtQU0gb5VIvcGZv+i1QOtCFurw35sGqzFQ=", + "lastModified": 1746035341, + "narHash": "sha256-ujnL4MZnFdtGHSLX0knm9XYCgWlvTkxedTp+2JbSmOI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f6b308c2f2fa73649a21d7a56e97138c8c205505", + "rev": "ab08953dd2f1d468331895e8b1f876a4095ad9e3", "type": "github" }, "original": { @@ -890,11 +890,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745930157, + "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, - "narHash": "sha256-CmCG8vgurVDLLddf5CtAbWw2OgsTe3aFsFKaaAWV8r8=", + "lastModified": 1746056780, + "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, - "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -976,11 +976,11 @@ ] }, "locked": { - "lastModified": 1743928855, - "narHash": "sha256-6skFnvfLbslUOieffviT+XNH/M1HOQDQJhJLsG0UM2o=", + "lastModified": 1745709547, + "narHash": "sha256-xfP/NVZomh+L2ka0omPkhA9mB+4PJXGPMCv/bh+G4YA=", "ref": "refs/heads/master", - "rev": "ed528268e0c0a2f6be2b5aca7089ebc3e214d446", - "revCount": 505, + "rev": "67524f9d8e4ac5e09ea4427e11f2284e6a6f93fe", + "revCount": 506, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -1014,11 +1014,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1745499382, - "narHash": "sha256-YqhoUWJuWlS7GFvbvu9rzpniNfL738vV+L2cuodhcyU=", + "lastModified": 1745949276, + "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, - "narHash": "sha256-CnkPq3sjuxB2HC93JVSotfMCF3dDrdKo3e4JOImKiLs=", + "lastModified": 1746064688, + "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, - "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=", + "lastModified": 1745730655, + "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3", + "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153", "type": "github" }, "original": { diff --git a/modules/desktop/wm/niri/config.nix b/modules/desktop/wm/niri/config.nix index 0b3a5eb..8c4e46b 100644 --- a/modules/desktop/wm/niri/config.nix +++ b/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: { diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index cb51922..6c3e8f5 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/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 diff --git a/modules/i18n/fcitx5.nix b/modules/i18n/fcitx5.nix index df64f34..037ece8 100644 --- a/modules/i18n/fcitx5.nix +++ b/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 = { - classicui.globalSection = { - WheelForPaging = true; - Font = "sans-serif 10"; - MenuFont = "Noto Sans CJK SC 10"; - TrayFont = "Noto Sans CJK SC Bold 10"; - Theme = "lightly"; - PerScreenDPI = true; - EnableFractionalScale = true; - }; - punctuation.globalSection = { - HalfWidthPuncAfterLetterOrNumber = true; - TypePairedPunctuationsTogether = false; - Enabled = true; - }; - pinyin = { - globalSection = { - PageSize = 9; - EmojiEnabled = false; - ChaiziEnabled = true; - ExtBEnabled = true; - CloudPinyinEnabled = true; - CloudPinyinIndex = 2; - PreeditInApplication = true; + addons = + let + true = "True"; + false = "False"; + in + { + classicui.globalSection = { + WheelForPaging = true; + Font = "sans-serif 10"; + MenuFont = "Noto Sans CJK SC 10"; + TrayFont = "Noto Sans CJK SC Bold 10"; + Theme = "lightly"; + PerScreenDPI = true; + EnableFractionalScale = true; }; - sections = { - Fuzzy = { - VE_UE = true; - NG_GN = true; - Inner = true; - InnerShort = true; - PartialFinal = false; - V_U = true; - IN_ING = true; - U_OU = true; + punctuation.globalSection = { + HalfWidthPuncAfterLetterOrNumber = true; + TypePairedPunctuationsTogether = false; + Enabled = true; + }; + pinyin = { + globalSection = { + PageSize = 9; + EmojiEnabled = false; + 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; }; diff --git a/secrets/dae-imxyy-nix.dae b/secrets/dae-imxyy-nix.dae index aa14930..cc43c50 100644 --- a/secrets/dae-imxyy-nix.dae +++ b/secrets/dae-imxyy-nix.dae @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data: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,iv:3IaiR37d5TerXzSWoclNfiE6B5g8WV9dofx3uFS3CRs=,tag:s90ko19cdocIUoqCR0JIcg==,type:str]", + "data": "ENC[AES256_GCM,data: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,iv:lYHomMrjLOZGZe49NfqbFa3wGTKqln08Vv+afDGzNdU=,tag:YTS9UBpJg73YTzz+vM3/sg==,type:str]", "sops": { "age": [ { @@ -15,9 +15,9 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFdHRjVkZKWUtPMzhnMXpx\nY1k4MXVBSmpKV1pCaWIvNzdHNWhxTm4vZzJRCkJYd01UNU5JclYzd2tOOWxpTzla\nZHkxM3l4eU43cW9sc08vRmhRc1RRbU0KLS0tIHNaYnJhelZBNi9sSW16aUpCUytJ\neEFyczYvRjJMdk9DRDl4MVVDTHM1OWcKQjS2lAu/32rpvkzyGPxQyglB/g0MDnjZ\nyJvzad1eoKMwFcGuc6aahXgmMY1SJUSXlV7BaSB+r6PQbpQcNzrdPw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-04-05T04:26:25Z", - "mac": "ENC[AES256_GCM,data:iqbpnwKckPsIKAZrZNPpuYA+lst4t/Uq5tXOIzM9+Pt66YXET3WX8QEkG1lXBq4vK+49oFu4xaGyEp7tyezDns5t4IrgND195nPkRX9P6Joi+fYXhQ9RY4+ogpaGQ0qYqrAo2fgbsZS6V3/QfpKYrs0z0xdY4spcvHfqeLARjY0=,iv:xkCwZ7hSvDA9I5cSl5jF1Zx/ULPQi3W9OGJsoqGJuWI=,tag:yeZi2UXu17fmqdUpeLAs5Q==,type:str]", + "lastmodified": "2025-04-26T03:59:39Z", + "mac": "ENC[AES256_GCM,data:07Bo2u//Wzl9RXNOfVs3pnEsR517HOypg1QqgqtX5WrvdNnxVbDrXsy45t08NC7EPvLx3Km7A2QqdVzJC7tz1jZJRW7kmR5d/bBM2o8qGKNbeDHRS7dFJXci6X+ef7fZ4EGhOSIEQ474QIyGjTq1/s4Zi28zuHUHPyEb6fmR4l8=,iv:MnsAjmOLMqrf008qFyinAyX8wQyypIXGIbcWx+5Dt7Y=,tag:2ESTPk4Zt6/tdIdXeLF4eQ==,type:str]", "unencrypted_suffix": "_unencrypted", - "version": "3.10.1" + "version": "3.10.2" } }