diff --git a/home/dot_config/nvim/ftplugin/tex.lua b/home/dot_config/nvim/ftplugin/tex.lua index 61cb828..d0aeafc 100644 --- a/home/dot_config/nvim/ftplugin/tex.lua +++ b/home/dot_config/nvim/ftplugin/tex.lua @@ -1,15 +1,15 @@ local bufmap = { - { mode = "x", keys = "i", cmd = 'c\\textit{"}', opt = { desc = "Add italic to selected text" } }, - { mode = "x", keys = "b", cmd = 'c\\textbf{"}', opt = { desc = "Add bold to selected text" } }, + { mode = "x", keys = "i", cmd = 'c\\textit{"}', opt = { desc = "Add italic to selected text" } }, + { mode = "x", keys = "b", cmd = 'c\\textbf{"}', opt = { desc = "Add bold to selected text" } }, { mode = "x", - keys = "c", + keys = "c", cmd = 'c\\begin{verbatim}"\\end{verbatim}', opt = { desc = "Add code block to selected text" }, }, - { mode = "x", keys = "d", cmd = 'c\\sout{"}', opt = { desc = "Add strikethrough to selected text" } }, - { mode = "x", keys = "h", cmd = 'c\\hl{"}', opt = { desc = "Add highlight to selected text" } }, - -- { mode = "n", keys = "cc", cmd = "w", opt = { desc = "Save and compile tex file" } }, + { mode = "x", keys = "d", cmd = 'c\\sout{"}', opt = { desc = "Add strikethrough to selected text" } }, + { mode = "x", keys = "h", cmd = 'c\\hl{"}', opt = { desc = "Add highlight to selected text" } }, + { mode = "n", keys = "cc", cmd = "w", opt = { desc = "Save and compile tex file" } }, } local set_buf_keymaps = require("keymaps.utils").set_buf_keymaps diff --git a/home/dot_config/nvim/lua/config/colorscheme.lua b/home/dot_config/nvim/lua/config/colorscheme.lua index 6131999..816067c 100644 --- a/home/dot_config/nvim/lua/config/colorscheme.lua +++ b/home/dot_config/nvim/lua/config/colorscheme.lua @@ -41,7 +41,7 @@ local function get_system_theme() return background end -vim.cmd.colorscheme("catppuccin") +vim.cmd.colorscheme("gruvbox-material") -- if get_system_theme() == 'dark' then -- vim.o.background = 'dark' diff --git a/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc b/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc index fff1eaa..6b5cf96 100644 --- a/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc +++ b/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc @@ -1,8 +1,10 @@ - - - - - + + + + + &File + + @@ -19,8 +21,25 @@ + + + + - + + &Edit + + + + + + + + + + + + @@ -35,7 +54,13 @@ - + + &View + + + + + @@ -55,19 +80,35 @@ - - Location Bar + + Location Bar - + + &Go + + + + + - + + + + + + + + + + + &Tools @@ -75,8 +116,30 @@ - - + + &Settings + + + + + + + + + + + + &Help + + + + + + + + + + @@ -117,30 +180,33 @@ - - - - - - - - - - - - - - + - - + + + - + + + + + + + + + + + + + + diff --git a/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc b/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc index 8e1f1ec..4622409 100644 --- a/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc +++ b/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc @@ -1,6 +1,6 @@ - + @@ -83,10 +83,6 @@ - - Settings - - Main Toolbar @@ -105,18 +101,21 @@ - - + - - + + + + - + diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index 87e6972..f70bdbd 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1769226332, - "narHash": "sha256-JKD9M2+/J4e6nRtcY2XRfpLlOHaGXT4aUHyIG/20qlw=", + "lastModified": 1768655473, + "narHash": "sha256-iWnILPS2mP9ubbjRAhNv6Fqg1J/upxmD9OQTZQR4O2w=", "owner": "caelestia-dots", "repo": "cli", - "rev": "52a3a3c50ef55e3561057e8a74c85cf16f83039f", + "rev": "7de6c6063119a7cef27c6bd4c88f2c5ac4cbc064", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1769305032, - "narHash": "sha256-Of4+4pnT+EmAl/DM1GYkpceX6yXw+QLU30WTec0ZypQ=", + "lastModified": 1768700084, + "narHash": "sha256-G/RtxgpF4OHRWy82/MHmEClOq9sBn8tki6K6vCuPZvU=", "owner": "caelestia-dots", "repo": "shell", - "rev": "b33440684950acf0b3f089b789da370685d9396c", + "rev": "408c523d257f5e22fd95229dd36e76f4b90439a2", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769164550, - "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=", + "lastModified": 1768575137, + "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=", "owner": "catppuccin", "repo": "nix", - "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1", + "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769093894, - "narHash": "sha256-Ka1uvhSq66yp0IlNFFpx7h+NlysbN52/yUbQKvI4AiA=", + "lastModified": 1768551400, + "narHash": "sha256-mlHlHW8qLcHm42J1M34HLXLW+Rw8jsLkLdjSvIYlhjw=", "owner": "abenz1267", "repo": "elephant", - "rev": "b34dd272ab5dc60096157d7cc7ff781f359c48b1", + "rev": "f230c43ae94231c2db754f84a4f31cf76721a28a", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1769303011, - "narHash": "sha256-rz7sMVPAxofeBMxFgoGe1uaqNAkxMzWJO36QowMz+iE=", + "lastModified": 1768698116, + "narHash": "sha256-kRBsd1X5YPXT/GJR0jYs0rkgDhbkTHLi7UH8SFeY9Kc=", "owner": "petrkozorezov", "repo": "firefox-addons-nix", - "rev": "a473d91931f22836b0c91fcf02eb3eb6d2e5b21c", + "rev": "30a66171e63cbf5befd8d4b756e932540782bd87", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -396,11 +396,11 @@ ] }, "locked": { - "lastModified": 1769289524, - "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", + "lastModified": 1768707181, + "narHash": "sha256-GdwFfnwdUgABFpc4sAmX7GYx8eQs6cEjOPo6nBJ0YaI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", + "rev": "83bcb17377f0242376a327e742e9404e9a528647", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769282225, - "narHash": "sha256-5rcscjSoahWOb/xTNCLlqh/PKfNwvAwcf2hQ7XLj5RI=", + "lastModified": 1768684335, + "narHash": "sha256-YLjGGcSNE2lK+TUqDFEX6IBjPZNjLaoxAXji3mmZbvs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2efd11d9a6b5655c3b97beb666739eabcebd6171", + "rev": "c133a45b02dba5fd229532067d6a22d5209436d6", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1768764703, - "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=", + "lastModified": 1768561867, + "narHash": "sha256-prGOZ+w3pZfGTRxworKcJliCNsewF0L4HUPjgU/6eaw=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b", + "rev": "8b720b9662d4dd19048664b7e4216ce530591adc", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769284737, - "narHash": "sha256-FN6sOLBVidcmlKN+hrVuBjK/DjLCuM3qTmsRwuTYDmk=", + "lastModified": 1768610265, + "narHash": "sha256-JZgnO/gPPBgFCKsQHIT2mRcK0vkwWGfyg/6wOJkb+F8=", "owner": "kaylorben", "repo": "nixcord", - "rev": "672b0dfb216b52b6bc892d08f4f7dccd39676db8", + "rev": "02c730b57b8ef16c62624a3410ef724d014c58db", "type": "github" }, "original": { @@ -604,11 +604,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "lastModified": 1768621446, + "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", "type": "github" }, "original": { @@ -652,11 +652,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -684,11 +684,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -700,11 +700,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "lastModified": 1766885793, + "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "rev": "9ef261221d1e72399f2036786498d78c38185c46", "type": "github" }, "original": { @@ -716,11 +716,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769268028, - "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", + "lastModified": 1768661221, + "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", + "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", "type": "github" }, "original": { @@ -732,11 +732,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -764,11 +764,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1769314173, - "narHash": "sha256-as0Z5YGOzKMdrq4UyTDBeOCCzvL8NUAdlovH/z6XxHA=", + "lastModified": 1768745475, + "narHash": "sha256-6zUQPMRPJtOmsauPelehLMdJnQUfEmI+85PN5Dm/Lmo=", "owner": "nix-community", "repo": "NUR", - "rev": "523d33ab04f89289bfa9e253abfa98a945a26edf", + "rev": "70b0d6feabd750d1aaee82d1d600b5b553d1168f", "type": "github" }, "original": { @@ -853,11 +853,11 @@ ] }, "locked": { - "lastModified": 1768985439, - "narHash": "sha256-qkU4r+l+UPz4dutMMRZSin64HuVZkEv9iFpu9yMWVY0=", + "lastModified": 1768689040, + "narHash": "sha256-Tlnr5BulJcMers/cb+YvmBQW4nKHjdKo9loInJkyO2k=", "ref": "refs/heads/master", - "rev": "191085a8821b35680bba16ce5411fc9dbe912237", - "revCount": 731, + "rev": "7a427ce1979ce7447e885c4f30129b40f3d466f5", + "revCount": 729, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1769314333, - "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=", + "lastModified": 1768709255, + "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f", + "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9", "type": "github" }, "original": { @@ -929,11 +929,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769202931, - "narHash": "sha256-4IZuCMjlWEtS6rVXozVXaJG6QADHVncXC29PLZr6ZB4=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "nix-community", "repo": "stylix", - "rev": "749285c90e3e35ebe0952c86838f3089abbc7939", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1769093508, - "narHash": "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=", + "lastModified": 1767893373, + "narHash": "sha256-PYqT8GdCAsmCAgJXu88wvOU2n41iugVCph0RV+v2VAc=", "owner": "abenz1267", "repo": "walker", - "rev": "e427025bdda667712b08dd56f1a0a23667f1364c", + "rev": "3dfc75e90e7a7cbff109ffa6e1af099d4e1f3867", "type": "github" }, "original": { @@ -1178,11 +1178,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769279212, - "narHash": "sha256-LAd6DYp6bbnQqtzMm62BE/0IMy67A4CgyYVi4xvyD6s=", + "lastModified": 1768106915, + "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3af3e3ab78d0eb96fb9b5161693811e050b90991", + "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", "type": "github" }, "original": { @@ -1198,11 +1198,11 @@ ] }, "locked": { - "lastModified": 1769228180, - "narHash": "sha256-94KY0JNjdd3CcSyKlHPCPswlqmUrWT6+MfOHektsdB8=", + "lastModified": 1767618227, + "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "ef1663c14b7c3c2b84bcf140232534be5a2a0257", + "rev": "1586e49b3908b058e221f11d843eb46392dba17b", "type": "github" }, "original": { diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 2fc32ad..2e33ae3 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -16,7 +16,7 @@ ../../modules/nixos/desktop/laptop.nix # hardware drivers - ../../modules/nixos/hardware/nvidia/nvidia-enable.nix + ../../modules/nixos/hardware/nvidia/nvidia-disable.nix # udev rules ../../modules/nixos/hardware/udev/basys3.nix diff --git a/nixcfgs/modules/nixos/hardware/nvidia/nvidia-enable.nix b/nixcfgs/modules/nixos/hardware/nvidia/nvidia-enable.nix index 02322dd..d71e31d 100644 --- a/nixcfgs/modules/nixos/hardware/nvidia/nvidia-enable.nix +++ b/nixcfgs/modules/nixos/hardware/nvidia/nvidia-enable.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { hardware.nvidia = { modesetting.enable = true; powerManagement.enable = true; @@ -19,5 +15,5 @@ enable = true; enable32Bit = true; }; - services.ollama.package = pkgs.ollama-cuda; + services.ollama.acceleration = "cuda"; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 4707e3b..59f33c0 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -90,7 +90,7 @@ in { protonvpn-gui proton-pass goldendict-ng - # kdePackages.kdenlive # Cannot build on my machine + kdePackages.kdenlive gimp rustdesk remmina @@ -113,8 +113,6 @@ in { dconf-editor fsearch # Everything-like search tool kdePackages.elisa - lollypop - showmethekey # Use Wayland for Jetbrains # (jetbrains.idea-ultimate.override { diff --git a/nixcfgs/users/js0ny/programs/cherry-studio.nix b/nixcfgs/users/js0ny/programs/cherry-studio.nix deleted file mode 100644 index 0c4ebc0..0000000 --- a/nixcfgs/users/js0ny/programs/cherry-studio.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - mergetools = import ../lib/mergetools.nix {inherit pkgs lib config;}; - mkMergedJson = mergetools.mkMergedJson; - cherryStudioConfig = mkMergedJson { - name = "cherry-studio-config"; - target = ".config/cherry-studio/config.json"; - settings = { - enableDeveloperMode = true; - enableDataCollection = false; - autoUpdate = false; - language = "zh-CN"; - theme = "system"; - tray = true; - enableQuickAssistant = true; - clickTrayToShowQuickAssistant = true; - launchToTray = false; - }; - }; -in { - home.packages = [ - pkgs.cherry-studio - ]; - imports = [ - cherryStudioConfig - ]; -} diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix index 9cd64b6..99089f6 100644 --- a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix @@ -13,7 +13,6 @@ resource-monitor lunar-calendar arcmenu - run-or-raise ]; in { imports = [ @@ -83,24 +82,6 @@ in { "m" "Up" ]; - switch-to-workspace-1 = ["1"]; - switch-to-workspace-2 = ["2"]; - switch-to-workspace-3 = ["3"]; - switch-to-workspace-4 = ["4"]; - switch-to-workspace-5 = ["5"]; - switch-to-workspace-6 = ["6"]; - switch-to-workspace-7 = ["7"]; - switch-to-workspace-8 = ["8"]; - switch-to-workspace-last = ["9"]; - move-to-workspace-1 = ["1"]; - move-to-workspace-2 = ["2"]; - move-to-workspace-3 = ["3"]; - move-to-workspace-4 = ["4"]; - move-to-workspace-5 = ["5"]; - move-to-workspace-6 = ["6"]; - move-to-workspace-7 = ["7"]; - move-to-workspace-8 = ["8"]; - move-to-workspace-last = ["9"]; }; "org/gnome/mutter/keybindings" = { toggle-tiled-left = [ @@ -113,17 +94,17 @@ in { ]; }; "org/gnome/settings-daemon/plugins/media-keys" = { - # www = ["b"]; # use run-or-raise instead + www = ["b"]; help = [""]; home = ["e"]; screenreader = [""]; screensaver = [""]; }; - # "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0" = { - # name = "Open File Explorer"; - # command = "dolphin"; - # binding = "e"; - # }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0" = { + name = "Open File Explorer"; + command = "dolphin"; + binding = "e"; + }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-1" = { name = "Open Terminal via Win-CR"; command = "xdg-terminal"; @@ -134,24 +115,23 @@ in { command = "xdg-terminal"; binding = "t"; }; - # use arcmenu # "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-3" = { # name = "Open Picker"; # command = "walker"; # binding = "space"; # }; - # "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-4" = { - # name = "Open Obsidian"; - # command = "Obsidian"; - # binding = "O"; - # }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-4" = { + name = "Open Obsidian"; + command = "Obsidian"; + binding = "O"; + }; "org/gnome/settings-daemon/plugins/media-keys" = { custom-keybindings = [ # "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0/" "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-1/" "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2/" # "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-3/" - # "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-4/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-4/" ]; }; # Scanned directory in GNOME Search @@ -219,12 +199,4 @@ in { switcher-popup-tooltip-title = 3; }; }; - xdg.configFile."run-or-raise/shortcuts.conf". text = '' - b,firefox,, - o,obsidian,, - e,fsearch,, - e,xdg-terminal-exec --app-id=terminal-popup yazi - Return,neovide,, - v,kitty -o close_on_child_death=yes --app-id=terminal-popup -e edit-clipboard --minimal - ''; } diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix index 604077a..ef82f59 100644 --- a/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix @@ -7,20 +7,14 @@ ]; dconf.settings = { # Inspect window class with F2 -> `lg` - # scratch_layer: true makes the window float above others "org/gnome/shell/extensions/paperwm" = { winprops = [ ''{"wm_class":"dev.benz.walker","scratch_layer":true}'' ''{"wm_class":"org.pulseaudio.pavucontrol","scratch_layer":true}'' - ''{"wm_class":"mpv","scratch_layer":true}'' - ''{"wm_class":"terminal-popup","scratch_layer":true}'' - ''{"wm_class":"fsearch","scratch_layer":true}'' - ''{"wm_class":"QQ","title":"资料卡","scratch_layer":true}'' - ''{"wm_class":"","title":"Floating Window - Show Me The Key","scratch_layer":true}'' ]; }; "org/gnome/settings-daemon/plugins/media-keys" = { - screensaver = ["i"]; + screensaver = [""]; }; "org/gnome/shell/extensions/paperwm/keybindings" = { close-window = ["q"]; diff --git a/nixcfgs/users/js0ny/programs/edit-clipboard.nix b/nixcfgs/users/js0ny/programs/edit-clipboard.nix index a4b88e2..e45da76 100644 --- a/nixcfgs/users/js0ny/programs/edit-clipboard.nix +++ b/nixcfgs/users/js0ny/programs/edit-clipboard.nix @@ -62,7 +62,6 @@ # Read clipboard into temp file $PASTE_CMD > "$TMPFILE" || { echo "Error: Failed to read from clipboard" >&2 - notify-send --app-name "edit-clipboard" "Error: Failed to read from clipboard" rm -f "$TMPFILE" return 1 } diff --git a/nixcfgs/users/js0ny/programs/lollypop.nix b/nixcfgs/users/js0ny/programs/lollypop.nix index b11cb6e..80efbb5 100644 --- a/nixcfgs/users/js0ny/programs/lollypop.nix +++ b/nixcfgs/users/js0ny/programs/lollypop.nix @@ -5,8 +5,6 @@ }: let username = config.home.username; in { - # Note: lollypop is buggy with CJK filenames. - # 部分 CJK 文字会显示成 ??，可能和文件的编码有关？而且似乎是 GTK4 都会，GNOME 全家桶的音乐播放器也有这个问题 home.packages = with pkgs; [lollypop]; dconf.settings = { "org/gnome/Lollypop" = { diff --git a/nixcfgs/users/js0ny/programs/rime/dicts.nix b/nixcfgs/users/js0ny/programs/rime/dicts.nix index dcfca75..5c36194 100644 --- a/nixcfgs/users/js0ny/programs/rime/dicts.nix +++ b/nixcfgs/users/js0ny/programs/rime/dicts.nix @@ -267,11 +267,6 @@ in { 温都尔汗\twfduerhj\t1000 哈基米\thajimi\t1000 乌角鲨\twujcua\t1000 - 卡尔曼滤波\tkaermjlvbo\t1000 - 结社法\tjxuefa\t1000 - 胜兵必骄\tugbybijc\t1000 - 败兵必哀\tblbybiai\t1000 - 凉爽的夏夜\tlduddexwye\t1000 ''; # 词序有点问题，10 也比默认词典的高，感觉得换成 user.dict.yaml # 仏\tfo\t10