From 1740c76c158b7e81e0f0fa907783311c2a440a6d Mon Sep 17 00:00:00 2001
From: Uyanide <pywang0608@foxmail.com>
Date: Mon, 29 Dec 2025 16:29:21 +0100
Subject: [PATCH] fish: update

---
 config/niri/.config/niri/config/misc.kdl      |  2 +-
 .../fish/conf.d/fish_frozen_key_bindings.fish | 14 ++++++
 .../fish/conf.d/fish_frozen_theme.fish        | 48 +++++++++++++++++++
 config/shell/.config/fish/prev.d/theme.fish   | 14 ++++--
 4 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 config/shell/.config/fish/conf.d/fish_frozen_key_bindings.fish
 create mode 100644 config/shell/.config/fish/conf.d/fish_frozen_theme.fish

diff --git a/config/niri/.config/niri/config/misc.kdl b/config/niri/.config/niri/config/misc.kdl
index cccfe86..b6a5dca 100644
--- a/config/niri/.config/niri/config/misc.kdl
+++ b/config/niri/.config/niri/config/misc.kdl
@@ -1,7 +1,7 @@
 screenshot-path "~/Pictures/Screenshots/niri_screenshot_%Y-%m-%d_%H-%M-%S.png"
 
 debug {
-    render-drm-device "/dev/dri/card0"
+    render-drm-device "/dev/dri/card2"
 }
 
 // gestures {
diff --git a/config/shell/.config/fish/conf.d/fish_frozen_key_bindings.fish b/config/shell/.config/fish/conf.d/fish_frozen_key_bindings.fish
new file mode 100644
index 0000000..495aee9
--- /dev/null
+++ b/config/shell/.config/fish/conf.d/fish_frozen_key_bindings.fish
@@ -0,0 +1,14 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# the 'fish_key_bindings' variable from its old default scope (universal)
+# to its new default scope (global).  We recommend you delete this file
+# and configure key bindings in ~/.config/fish/config.fish if needed.
+
+# set --global fish_key_bindings fish_default_key_bindings
+
+# Prior to version 4.3, fish shipped an event handler that runs
+# `set --universal fish_key_bindings fish_default_key_bindings`
+# whenever the fish_key_bindings variable is erased.
+# This means that as long as any fish < 4.3 is still running on this system,
+# we cannot complete the migration.
+# As a workaround, erase the universal variable at every shell startup.
+set --erase --universal fish_key_bindings
diff --git a/config/shell/.config/fish/conf.d/fish_frozen_theme.fish b/config/shell/.config/fish/conf.d/fish_frozen_theme.fish
new file mode 100644
index 0000000..46e818e
--- /dev/null
+++ b/config/shell/.config/fish/conf.d/fish_frozen_theme.fish
@@ -0,0 +1,48 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# theme variables from universal to global scope.
+# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
+# To customize your theme, delete this file and see
+#     help interactive#syntax-highlighting
+# or
+#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
+# for appropriate commands to add to ~/.config/fish/config.fish instead.
+# See also the release notes for fish 4.3.0 (run `help relnotes`).
+
+set --global fish_color_autosuggestion 6c7086
+set --global fish_color_cancel f38ba8
+set --global fish_color_command 89b4fa
+set --global fish_color_comment 7f849c
+set --global fish_color_cwd f9e2af
+set --global fish_color_cwd_root red
+set --global fish_color_end fab387
+set --global fish_color_error f38ba8
+set --global fish_color_escape eba0ac
+set --global fish_color_gray 6c7086
+set --global fish_color_history_current --bold
+set --global fish_color_host 89b4fa
+set --global fish_color_host_remote a6e3a1
+set --global fish_color_keyword f38ba8
+set --global fish_color_normal cdd6f4
+set --global fish_color_operator f5c2e7
+set --global fish_color_option a6e3a1
+set --global fish_color_param f2cdcd
+set --global fish_color_quote a6e3a1
+set --global fish_color_redirection f5c2e7
+set --global fish_color_search_match --background=313244
+set --global fish_color_selection --background=313244
+set --global fish_color_status f38ba8
+set --global fish_color_user 94e2d5
+set --global fish_color_valid_path --underline
+set --global fish_pager_color_background
+set --global fish_pager_color_completion cdd6f4
+set --global fish_pager_color_description 6c7086
+set --global fish_pager_color_prefix f5c2e7
+set --global fish_pager_color_progress 6c7086
+set --global fish_pager_color_secondary_background
+set --global fish_pager_color_secondary_completion
+set --global fish_pager_color_secondary_description
+set --global fish_pager_color_secondary_prefix
+set --global fish_pager_color_selected_background
+set --global fish_pager_color_selected_completion
+set --global fish_pager_color_selected_description
+set --global fish_pager_color_selected_prefix
diff --git a/config/shell/.config/fish/prev.d/theme.fish b/config/shell/.config/fish/prev.d/theme.fish
index 05ea426..f42febd 100644
--- a/config/shell/.config/fish/prev.d/theme.fish
+++ b/config/shell/.config/fish/prev.d/theme.fish
@@ -1,6 +1,10 @@
-set -l theme 'Catppuccin Mocha'
+set -l target_ver 3.4.0
 
-if not set -q fish_current_theme; or not string match -q "$theme" "$fish_current_theme"
-    set -U fish_current_theme "$theme"
-    fish_config theme save "$theme"
-end
\ No newline at end of file
+if test (string join \n $FISH_VERSION $target_ver | sort -V | head -n 1) = $target_ver
+    set -l theme 'Catppuccin Mocha'
+
+    if not set -q fish_current_theme; or not string match -q "$theme" "$fish_current_theme"
+        set -U fish_current_theme "$theme"
+        fish_config theme save "$theme"
+    end
+end