From 6b6107d8d2e34430df43b93be88a12c92552c540 Mon Sep 17 00:00:00 2001
From: js0ny <contact@js0ny.net>
Date: Wed, 12 Nov 2025 13:27:37 +0000
Subject: [PATCH] update

---
 .../nvim/lua/config/colorscheme.lua           |  5 ++--
 home/dot_config/nvim/lua/keymaps/buffer.lua   |  3 ++
 .../share/kxmlgui5/dolphin/dolphinui.rc       | 13 +++++---
 .../share/kxmlgui5/gwenview/gwenviewui.rc     |  4 ++-
 nixcfgs/modules/nixos/programs/firefox.nix    |  1 +
 nixcfgs/modules/nixos/programs/libvirt.nix    |  6 +---
 nixcfgs/users/js0ny/packages/cli.nix          |  1 +
 .../{plasma.nix => plasma/default.nix}        |  4 +--
 .../desktop/wayland-wm/niri/window-rules.nix  |  2 +-
 nixcfgs/users/js0ny/programs/dolphin.nix      | 26 +++++++++++++++-
 nixcfgs/users/js0ny/programs/magick.nix       | 30 +++++++++++++++++++
 nixcfgs/users/js0ny/programs/miniserve.nix    |  2 ++
 nixcfgs/users/js0ny/zephyrus.nix              |  4 ++-
 13 files changed, 83 insertions(+), 18 deletions(-)
 rename nixcfgs/users/js0ny/programs/desktop/{plasma.nix => plasma/default.nix} (98%)
 create mode 100644 nixcfgs/users/js0ny/programs/magick.nix

diff --git a/home/dot_config/nvim/lua/config/colorscheme.lua b/home/dot_config/nvim/lua/config/colorscheme.lua
index 83d7d52..8d64750 100644
--- a/home/dot_config/nvim/lua/config/colorscheme.lua
+++ b/home/dot_config/nvim/lua/config/colorscheme.lua
@@ -35,9 +35,8 @@ end
 
 if get_system_theme() == 'dark' then
   vim.o.background = 'dark'
-  vim.cmd.colorscheme("catppuccin")
+  vim.cmd.colorscheme("rose-pine")
 else
   vim.o.background = 'light'
-  -- vim.cmd.colorscheme("rose-pine")
-  vim.cmd.colorscheme("catppuccin")
+  vim.cmd.colorscheme("rose-pine")
 end
diff --git a/home/dot_config/nvim/lua/keymaps/buffer.lua b/home/dot_config/nvim/lua/keymaps/buffer.lua
index aba8aa7..61352e2 100644
--- a/home/dot_config/nvim/lua/keymaps/buffer.lua
+++ b/home/dot_config/nvim/lua/keymaps/buffer.lua
@@ -38,6 +38,9 @@ local bufmap = {
   sh = {
     { mode = "n", keys = "<leader>mx", cmd = "<cmd>!chmod u+x %<CR>", opt = { desc = "Mark the file as executable" } },
   },
+  json = {
+    { mode = "n", keys ="<leader>mp", cmd = "<cmd>%!jq", opt = { desc = "Prettify json"} }
+  },
 }
 
 -- Shallow copy
diff --git a/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc b/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc
index da645e8..6b5cf96 100644
--- a/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc
+++ b/home/dot_local/share/kxmlgui5/dolphin/dolphinui.rc
@@ -183,17 +183,17 @@
   <Action name="go_back" priority="0"/>
   <Action name="go_forward" priority="0"/>
   <Action name="go_up" priority="0"/>
-  <Action name="go_home" priority="0"/>
+  <Action name="go_home" priority="0" shortcut="Ctrl+Backspace; Home Page"/>
   <Action name="stop" priority="0"/>
-  <Action name="icons" priority="0"/>
-  <Action name="compact" priority="0"/>
+  <Action name="icons" priority="0" shortcut="; "/>
+  <Action name="compact" priority="0" shortcut="; "/>
   <Action name="details" priority="0"/>
   <Action name="view_mode" priority="0"/>
   <Action name="view_settings" priority="0"/>
   <Action name="view_zoom_in" priority="0"/>
   <Action name="view_zoom_reset" priority="0"/>
   <Action name="view_zoom_out" priority="0"/>
-  <Action name="edit_cut" priority="0"/>
+  <Action name="edit_cut" priority="0" shortcut="Ctrl+X"/>
   <Action name="edit_copy" priority="0"/>
   <Action name="edit_paste" priority="0"/>
   <Action name="toggle_search" priority="0"/>
@@ -203,5 +203,10 @@
   <Action iconText="Location" name="copy_location"/>
   <Action icon="user_purple" iconText="sudo" name="act_as_admin"/>
   <Action name="add_to_places" priority="0"/>
+  <Action name="copy_to_inactive_split_view" shortcut="Shift+F5; Ctrl+1"/>
+  <Action name="move_to_inactive_split_view" shortcut="Shift+F6; Ctrl+2"/>
  </ActionProperties>
 </gui>
+<!--
+vim:ft=xml
+-->
diff --git a/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc b/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc
index 6cbd46c..4622409 100644
--- a/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc
+++ b/home/dot_local/share/kxmlgui5/gwenview/gwenviewui.rc
@@ -116,4 +116,6 @@
   <Action name="view_zoom_out" shortcut="Ctrl+-; -"/>
  </ActionProperties>
 </gui>
-<!-- vim:ft=xml -->
+<!--
+vim:ft=xml
+-->
diff --git a/nixcfgs/modules/nixos/programs/firefox.nix b/nixcfgs/modules/nixos/programs/firefox.nix
index 656bbdc..3039fda 100644
--- a/nixcfgs/modules/nixos/programs/firefox.nix
+++ b/nixcfgs/modules/nixos/programs/firefox.nix
@@ -33,6 +33,7 @@
           value = {
             install_url = "https://addons.mozilla.org/firefox/downloads/latest/${short}/latest.xpi";
             installation_mode = "force_installed";
+            private_browsing = true;
           };
         };
       in
diff --git a/nixcfgs/modules/nixos/programs/libvirt.nix b/nixcfgs/modules/nixos/programs/libvirt.nix
index 6dbf6ab..e4650fa 100644
--- a/nixcfgs/modules/nixos/programs/libvirt.nix
+++ b/nixcfgs/modules/nixos/programs/libvirt.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     virt-manager
     dnsmasq
diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix
index 505863e..d3c949e 100644
--- a/nixcfgs/users/js0ny/packages/cli.nix
+++ b/nixcfgs/users/js0ny/packages/cli.nix
@@ -54,5 +54,6 @@
     codex
     imagemagick
     miniserve
+    jq
   ];
 }
diff --git a/nixcfgs/users/js0ny/programs/desktop/plasma.nix b/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix
similarity index 98%
rename from nixcfgs/users/js0ny/programs/desktop/plasma.nix
rename to nixcfgs/users/js0ny/programs/desktop/plasma/default.nix
index 7a6c326..644902b 100644
--- a/nixcfgs/users/js0ny/programs/desktop/plasma.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix
@@ -4,8 +4,8 @@
   ...
 }: {
   imports = [
-    ../gwenview.nix
-    ../dolphin.nix
+    ../../gwenview.nix
+    ../../dolphin.nix
   ];
   home.packages = with pkgs; [
     # kdePackages.yakuake
diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix
index 8e3479d..cddfcbc 100644
--- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix
@@ -1,4 +1,4 @@
-# vim:foldmethod=marker,
+# vim:foldmethod=marker
 {...}: {
   programs.niri = {
     settings.window-rules = [
diff --git a/nixcfgs/users/js0ny/programs/dolphin.nix b/nixcfgs/users/js0ny/programs/dolphin.nix
index 6915f56..a107956 100644
--- a/nixcfgs/users/js0ny/programs/dolphin.nix
+++ b/nixcfgs/users/js0ny/programs/dolphin.nix
@@ -14,7 +14,7 @@
       UseTabForSwitchingSplitView = true;
     };
     VersionControl = {
-      enabledPlugins = "Subversion,Git";
+      EnabledPlugins = "Subversion,Git";
     };
   };
 
@@ -30,4 +30,28 @@
       $DRY_RUN_CMD rm -f ~/.config/dolphinrc-override
     fi
   '';
+
+  home.file.".local/share/kio/servicemenus/move-file.desktop" = {
+    enable = true;
+    executable = true;
+    text = ''
+      [Desktop Entry]
+      Type=Service
+      MimeType=all/all
+      Actions=to-inbox;to-public
+      X-KDE-Submenu=Move file to...
+      X-KDE-Submenu[CN]=将文件移动到
+      Icon=mail-move
+
+      [Desktop Action to-inbox]
+      Name=Inbox
+      Icon=inbox
+      Exec=mv "%f" $HOME/Inbox/
+
+      [Desktop Action to-public]
+      Name=Public
+      Icon=document-share
+      Exec=mv "%f" $HOME/Public/
+    '';
+  };
 }
diff --git a/nixcfgs/users/js0ny/programs/magick.nix b/nixcfgs/users/js0ny/programs/magick.nix
new file mode 100644
index 0000000..5f93ad9
--- /dev/null
+++ b/nixcfgs/users/js0ny/programs/magick.nix
@@ -0,0 +1,30 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.imagemagick];
+  home.file.".local/share/kio/servicemenus/image-format.desktop" = {
+    enable = true;
+    executable = true;
+    text = ''
+      [Desktop Entry]
+      Type=Service
+      MimeType=image/*
+      Actions=to-avif;to-webp;to-jpeg
+      X-KDE-Submenu=Image Format Conversion
+      X-KDE-Submenu[CN]=图像格式转换
+
+      [Desktop Action to-avif]
+      Name=Convert to AVIF
+      Icon=edit-image
+      Exec=magick "%f" "%f.avif"
+
+      [Desktop Action to-webp]
+      Name=Convert to WebP
+      Icon=edit-image
+      Exec=magick "%f" "%f.webp"
+
+      [Desktop Action to-jpeg]
+      Name=Convert to JPEG
+      Icon=edit-image
+      Exec=magick "%f" "%f.jpg"
+    '';
+  };
+}
diff --git a/nixcfgs/users/js0ny/programs/miniserve.nix b/nixcfgs/users/js0ny/programs/miniserve.nix
index fade1c2..26bdaf7 100644
--- a/nixcfgs/users/js0ny/programs/miniserve.nix
+++ b/nixcfgs/users/js0ny/programs/miniserve.nix
@@ -5,6 +5,8 @@
 }: {
   home.packages = [pkgs.miniserve];
   home.file.".local/share/kio/servicemenus/miniserve.desktop" = {
+    enable = true;
+    executable = true;
     text = ''
       [Desktop Entry]
       Type=Service
diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix
index c379cb8..eb2f4d7 100644
--- a/nixcfgs/users/js0ny/zephyrus.nix
+++ b/nixcfgs/users/js0ny/zephyrus.nix
@@ -39,9 +39,11 @@
     ./programs/gwenview.nix
     ./programs/yazi.nix
     ./programs/dolphin.nix
+    ./programs/magick.nix
+    ./programs/miniserve.nix
 
     # Desktop Linux
-    ./programs/desktop/plasma.nix
+    ./programs/desktop/plasma
     ./programs/desktop/wayland-wm/niri
 
     # General Program config