From d02587437df5a8782de1ef464aa40a57dfdab2fa Mon Sep 17 00:00:00 2001 From: Hannes Date: Mon, 11 May 2026 23:39:20 +0200 Subject: [PATCH] some fixes --- conf.d/fish_frozen_key_bindings.fish | 14 +++++++++++ conf.d/fish_frozen_theme.fish | 37 ++++++++++++++++++++++++++++ config.fish | 4 +++ configs/alias_useful.fish | 28 +++++++++++++++++++++ configs/arch_config.fish | 2 -- configs/env.fish | 7 ++++++ configs/uni.fish | 14 +++++------ fish_variables | 2 +- 8 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 conf.d/fish_frozen_key_bindings.fish create mode 100644 conf.d/fish_frozen_theme.fish create mode 100644 configs/env.fish diff --git a/conf.d/fish_frozen_key_bindings.fish b/conf.d/fish_frozen_key_bindings.fish new file mode 100644 index 0000000..495aee9 --- /dev/null +++ b/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/conf.d/fish_frozen_theme.fish b/conf.d/fish_frozen_theme.fish new file mode 100644 index 0000000..0caf65e --- /dev/null +++ b/conf.d/fish_frozen_theme.fish @@ -0,0 +1,37 @@ +# 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 brblack +set --global fish_color_cancel -r +set --global fish_color_command blue +set --global fish_color_comment red +set --global fish_color_cwd green +set --global fish_color_cwd_root red +set --global fish_color_end green +set --global fish_color_error brred +set --global fish_color_escape brcyan +set --global fish_color_history_current --bold +set --global fish_color_host normal +set --global fish_color_host_remote yellow +set --global fish_color_normal normal +set --global fish_color_operator brcyan +set --global fish_color_param cyan +set --global fish_color_quote yellow +set --global fish_color_redirection cyan --bold +set --global fish_color_search_match white --background=brblack +set --global fish_color_selection white --bold --background=brblack +set --global fish_color_status red +set --global fish_color_user brgreen +set --global fish_color_valid_path --underline +set --global fish_pager_color_completion normal +set --global fish_pager_color_description yellow -i +set --global fish_pager_color_prefix normal --bold --underline +set --global fish_pager_color_progress brwhite --background=cyan +set --global fish_pager_color_selected_background -r diff --git a/config.fish b/config.fish index c3f3770..e25a193 100755 --- a/config.fish +++ b/config.fish @@ -28,6 +28,10 @@ if status is-interactive source $HOME/.config/fish/configs/function_usefull.fish end + if test -f $HOME/.config/fish/configs/env.fish + source $HOME/.config/fish/configs/env.fish + end + # ~/.config/fish/config.fish # Get the distribution name and version diff --git a/configs/alias_useful.fish b/configs/alias_useful.fish index 73a8150..ecd312a 100755 --- a/configs/alias_useful.fish +++ b/configs/alias_useful.fish @@ -100,6 +100,34 @@ function mkvenv end end +function src + # Check if venv directory exists + if not test -d .venv + echo "Cannot activate: .venv directory does not exist." + return 1 + end + + if not test -d .venv/bin + echo "Cannot activate: .venv/bin directory does not exist." + return 1 + end + + # Prefer Fish activation script + if test -f .venv/bin/activate.fish + source .venv/bin/activate.fish + return 0 + end + + # Fallback to bash activation via bass + if test -f .venv/bin/activate.bash + bass source .venv/bin/activate.bash + return 0 + end + + echo "No usable activation script found in .venv/bin/" + return 1 +end + # Check if eza exists in either location if test -x /usr/bin/eza -o -x $HOME/.cargo/bin/eza function ls diff --git a/configs/arch_config.fish b/configs/arch_config.fish index 7d33d11..a245af1 100755 --- a/configs/arch_config.fish +++ b/configs/arch_config.fish @@ -77,8 +77,6 @@ function cleanup end end -set -x QT_QPA_PLATFORMTHEME qt5ct - set -x XCURSOR_THEME "DJ-FOX-C" set -x XCURSOR_SIZE 24 diff --git a/configs/env.fish b/configs/env.fish new file mode 100644 index 0000000..660ac2e --- /dev/null +++ b/configs/env.fish @@ -0,0 +1,7 @@ +# +# ~/.config/fish/configs/env.fish +# + +if test -d $HOME/.bin + set -U fish_user_paths $HOME/.bin $fish_user_paths +end diff --git a/configs/uni.fish b/configs/uni.fish index a0bbd4e..4a4fee6 100644 --- a/configs/uni.fish +++ b/configs/uni.fish @@ -1,14 +1,14 @@ if test -x /usr/bin/pacman if test -d ~/Nextcloud/UNI/26_TI/RISC-V - set -U fish_user_paths ~/mount/Storage/Nextcloud/UNI/26_TI/RISC-V/xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64/xpack-riscv-none-elf-gcc-15.2.0-1/bin $fish_user_paths - set -U fish_user_paths ~/mount/Storage/Nextcloud/UNI/26_TI/RISC-V/verible-v0.0-4053-g89d4d98a-linux-static-x86_64/verible-v0.0-4053-g89d4d98a/bin $fish_user_paths + set -U fish_user_paths ~/Nextcloud/UNI/26_TI/RISC-V/xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64/xpack-riscv-none-elf-gcc-15.2.0-1/bin $fish_user_paths + set -U fish_user_paths ~/Nextcloud/UNI/26_TI/RISC-V/verible-v0.0-4053-g89d4d98a-linux-static-x86_64/verible-v0.0-4053-g89d4d98a/bin $fish_user_paths end - if test -d ~/projects/RISC-V - set -gx XILINX_VIVADO ~/projects/RISC-V/vivado/Vivado/2022.2 - set -U fish_user_paths ~/projects/RISC-V/vivado/Vivado/2022.2/bin $fish_user_paths - set -gx LM_LICENSE_FILE ~/projects/RISC-V/intel/LR-160568_License.dat + if test -d ~/Projects/RISC-V + set -gx XILINX_VIVADO ~/Projects/RISC-V/vivado/Vivado/2022.2 + set -U fish_user_paths ~/Projects/RISC-V/vivado/Vivado/2022.2/bin $fish_user_paths + set -gx LM_LICENSE_FILE ~/Projects/RISC-V/intel/LR-160568_License.dat set -gx SALT_LICENSE_SERVER $LM_LICENSE_FILE - set -U fish_user_paths ~/projects/RISC-V/intel/questa_fse/bin $fish_user_paths + set -U fish_user_paths ~/Projects/RISC-V/intel/questa_fse/bin $fish_user_paths end end diff --git a/fish_variables b/fish_variables index a6034a1..6ddf2cd 100755 --- a/fish_variables +++ b/fish_variables @@ -4,4 +4,4 @@ SETUVAR __done_min_cmd_duration:5000 SETUVAR __done_notify_sound:1 SETUVAR __done_sway_ignore_visible:0 SETUVAR __fish_initialized:4300 -SETUVAR fish_user_paths:/home/honney/projects/RISC\x2dV/intel/questa_fse/bin\x1e/home/honney/projects/RISC\x2dV/vivado/Vivado/2022\x2e2/bin\x1e/home/honney/mount/Storage/Nextcloud/UNI/26_TI/RISC\x2dV/verible\x2dv0\x2e0\x2d4053\x2dg89d4d98a\x2dlinux\x2dstatic\x2dx86_64/verible\x2dv0\x2e0\x2d4053\x2dg89d4d98a/bin\x1e/home/honney/mount/Storage/Nextcloud/UNI/26_TI/RISC\x2dV/xpack\x2driscv\x2dnone\x2delf\x2dgcc\x2d15\x2e2\x2e0\x2d1\x2dlinux\x2dx64/xpack\x2driscv\x2dnone\x2delf\x2dgcc\x2d15\x2e2\x2e0\x2d1/bin\x1e/home/honney/projects/RISC\x2dV/intelFPGA_pro/22\x2e4/questa_fse/bin\x1e/home/honney/projects/vivado/Vivado/2022\x2e2/bin\x1e/home/honney/\x2ebin\x1e/home/honney/\x2elocal/bin\x1e/opt/rocm/bin +SETUVAR fish_user_paths:/home/honney/Projects/RISC\x2dV/intel/questa_fse/bin\x1e/home/honney/Projects/RISC\x2dV/vivado/Vivado/2022\x2e2/bin\x1e/home/honney/Nextcloud/UNI/26_TI/RISC\x2dV/verible\x2dv0\x2e0\x2d4053\x2dg89d4d98a\x2dlinux\x2dstatic\x2dx86_64/verible\x2dv0\x2e0\x2d4053\x2dg89d4d98a/bin\x1e/home/honney/Nextcloud/UNI/26_TI/RISC\x2dV/xpack\x2driscv\x2dnone\x2delf\x2dgcc\x2d15\x2e2\x2e0\x2d1\x2dlinux\x2dx64/xpack\x2driscv\x2dnone\x2delf\x2dgcc\x2d15\x2e2\x2e0\x2d1/bin\x1e/home/honney/\x2ebin\x1e/opt/rocm/bin