diff options
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/conf.d/fish_frozen_key_bindings.fish | 14 | ||||
| -rw-r--r-- | fish/conf.d/fish_frozen_theme.fish | 48 | ||||
| -rw-r--r-- | fish/config.fish | 23 | ||||
| -rw-r--r-- | fish/functions/cat.fish | 3 | ||||
| -rw-r--r-- | fish/functions/rm.fish | 3 |
5 files changed, 73 insertions, 18 deletions
diff --git a/fish/conf.d/fish_frozen_key_bindings.fish b/fish/conf.d/fish_frozen_key_bindings.fish new file mode 100644 index 0000000..495aee9 --- /dev/null +++ b/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/fish/conf.d/fish_frozen_theme.fish b/fish/conf.d/fish_frozen_theme.fish new file mode 100644 index 0000000..59c07df --- /dev/null +++ b/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 brblack +set --global fish_color_cancel --reverse +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_keyword normal +set --global fish_color_match --background=brblue +set --global fish_color_normal normal +set --global fish_color_operator brcyan +set --global fish_color_option cyan +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 bryellow --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_background +set --global fish_pager_color_completion normal +set --global fish_pager_color_description yellow --italics +set --global fish_pager_color_prefix normal --bold --underline +set --global fish_pager_color_progress brwhite --background=cyan +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 --reverse +set --global fish_pager_color_selected_completion +set --global fish_pager_color_selected_description +set --global fish_pager_color_selected_prefix diff --git a/fish/config.fish b/fish/config.fish index 50941d1..731f042 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -8,28 +8,15 @@ function fish_prompt end) \ (set_color $fish_color_cwd) (prompt_pwd --full-length-dirs 5) (set_color normal) end -function start_niri - if systemctl --user -q is-active niri.service - echo 'A Niri session is already running.' - exit 1 - end - systemctl --user reset-failed - dbus-update-activation-environment --all - systemctl --user --wait start niri.service - systemctl --user start --job-mode=replace-irreversibly niri-shutdown.target - systemctl --user unset-environment WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP NIRI_SOCKET -end - fish_add_path -p ~/.cargo/bin ~/.ghcup/bin set -U fish_greeting set EDITOR "neovim" -export DISPLAY=:0 if status is-login - start_niri - kill $fish_pid + killall ssh-agent 1> /dev/null 2>&1 + eval (ssh-agent -c) 1> /dev/null 2>&1 + ssh-add ~/.ssh/zenbook 1> /dev/null 2>&1 + exec niri-session -l 1> /dev/null 2>&1 end - -# Created by `pipx` on 2025-05-03 19:57:49 -set PATH $PATH /home/eric.marin/.local/bin +zoxide init fish | source diff --git a/fish/functions/cat.fish b/fish/functions/cat.fish new file mode 100644 index 0000000..73b5541 --- /dev/null +++ b/fish/functions/cat.fish @@ -0,0 +1,3 @@ +function cat --wraps=bat --description 'alias cat bat' + bat $argv +end diff --git a/fish/functions/rm.fish b/fish/functions/rm.fish new file mode 100644 index 0000000..7d8fe20 --- /dev/null +++ b/fish/functions/rm.fish @@ -0,0 +1,3 @@ +function rm --wraps=trash --description 'alias rm trash' + trash $argv +end |