modules/fish: Init

17 files changed, 649 insertions, 14 deletions

diff --git a/modules/by-name/fi/fish/config/01_show-task.fish b/modules/by-name/fi/fish/config/01_show-task.fish
new file mode 100644
index 00000000..7287f885
--- /dev/null
+++ b/modules/by-name/fi/fish/config/01_show-task.fish
@@ -0,0 +1,14 @@
+#!/usr/bin/env fish
+
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+
+# Display current tasks
+test -z "$NVIM"; and task next
diff --git a/modules/by-name/fi/fish/config/keybindings/00__start.fish b/modules/by-name/fi/fish/config/keybindings/00__start.fish
new file mode 100644
index 00000000..75227ef1
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/00__start.fish
@@ -0,0 +1 @@
+bind --erase --all
diff --git a/modules/by-name/fi/fish/config/keybindings/01_insert.fish b/modules/by-name/fi/fish/config/keybindings/01_insert.fish
new file mode 100644
index 00000000..738b5272
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/01_insert.fish
@@ -0,0 +1,85 @@
+bind --preset --mode insert ctrl-y yank
+bind --preset --mode insert alt-y yank-pop
+bind --preset --mode insert right forward-char
+bind --preset --mode insert left backward-char
+bind --preset --mode insert ctrl-right forward-token
+bind --preset --mode insert ctrl-left backward-token
+bind --preset --mode insert pageup beginning-of-history
+bind --preset --mode insert pagedown end-of-history
+bind --preset --mode insert ctrl-x fish_clipboard_copy
+bind --preset --mode insert ctrl-v fish_clipboard_paste
+bind --preset --mode insert tab complete
+bind --preset --mode insert ctrl-i complete
+bind --preset --mode insert ctrl-s pager-toggle-search
+bind --preset --mode insert shift-tab complete-and-search
+bind --preset --mode insert shift-delete history-delete or backward-delete-char
+bind --preset --mode insert down down-or-search
+bind --preset --mode insert up up-or-search
+bind --preset --mode insert shift-right forward-bigword
+bind --preset --mode insert shift-left backward-bigword
+bind --preset --mode insert alt-b prevd-or-backward-word
+bind --preset --mode insert alt-f nextd-or-forward-word
+bind --preset --mode insert alt-right nextd-or-forward-word
+bind --preset --mode insert \e\[1\;9C nextd-or-forward-word
+bind --preset --mode insert alt-left prevd-or-backward-word
+bind --preset --mode insert \e\[1\;9D prevd-or-backward-word
+bind --preset --mode insert alt-up history-token-search-backward
+bind --preset --mode insert alt-down history-token-search-forward
+bind --preset --mode insert \e\[1\;9A history-token-search-backward
+bind --preset --mode insert \e\[1\;9B history-token-search-forward
+bind --preset --mode insert alt-. history-token-search-backward
+bind --preset --mode insert alt-l __fish_list_current_token
+bind --preset --mode insert alt-o __fish_preview_current_file
+bind --preset --mode insert alt-w __fish_whatis_current_token
+bind --preset --mode insert ctrl-l 'status test-terminal-feature scroll-content-up && commandline -f scrollback-push' clear-screen
+bind --preset --mode insert ctrl-c clear-commandline
+bind --preset --mode insert ctrl-u backward-kill-line
+bind --preset --mode insert ctrl-k kill-line
+bind --preset --mode insert ctrl-w backward-kill-path-component
+bind --preset --mode insert end end-of-line
+bind --preset --mode insert home beginning-of-line
+bind --preset --mode insert alt-d 'if test "$(commandline; printf .)" = \\n.; __fish_echo dirh; else; commandline -f kill-word; end'
+bind --preset --mode insert ctrl-d delete-or-exit
+bind --preset --mode insert alt-s 'for cmd in sudo doas please run0; if command -q $cmd; fish_commandline_prepend $cmd; break; end; end'
+bind --preset --mode insert f1 __fish_man_page
+bind --preset --mode insert alt-h __fish_man_page
+bind --preset --mode insert alt-p __fish_paginate
+bind --preset --mode insert alt-# __fish_toggle_comment_commandline
+bind --preset --mode insert alt-e edit_command_buffer
+bind --preset --mode insert alt-v edit_command_buffer
+bind --preset --mode insert '' self-insert
+bind --preset --mode insert space self-insert expand-abbr
+bind --preset --mode insert \; self-insert expand-abbr
+bind --preset --mode insert \| self-insert expand-abbr
+bind --preset --mode insert \& self-insert expand-abbr
+bind --preset --mode insert \> self-insert expand-abbr
+bind --preset --mode insert \< self-insert expand-abbr
+bind --preset --mode insert shift-enter 'commandline -i \\n (commandline --search-field >/dev/null && echo --search-field)' expand-abbr
+bind --preset --mode insert alt-enter 'commandline -i \\n (commandline --search-field >/dev/null && echo --search-field)' expand-abbr
+bind --preset --mode insert \) self-insert expand-abbr
+bind --preset --mode insert ctrl-space 'test -n "$(commandline)" && commandline -i " " (commandline --search-field >/dev/null && echo --search-field)'
+bind --preset --mode insert shift-space 'commandline -i " " (commandline --search-field >/dev/null && echo --search-field)' expand-abbr
+bind --preset --mode insert enter execute
+bind --preset --mode insert ctrl-j execute
+bind --preset --mode insert ctrl-m execute
+bind --preset --mode insert ctrl-enter execute
+
+bind --preset --mode insert ctrl-n accept-autosuggestion
+bind --preset --mode insert delete delete-char
+bind --preset --mode insert backspace backward-delete-char
+bind --preset --mode insert shift-backspace backward-delete-char
+bind --preset --mode insert ctrl-h backward-delete-char
+
+function _bind_insert_escape
+        if commandline -P
+            commandline -f cancel
+        else
+            set fish_bind_mode default
+            if test (count (commandline --cut-at-cursor | tail -c2)) != 2
+                commandline -f backward-char
+            end
+            commandline -f repaint-mode
+        end
+end
+bind --preset --mode insert escape _bind_insert_escape
+bind --preset --mode insert ctrl-\[ _bind_insert_escape
diff --git a/modules/by-name/fi/fish/config/keybindings/02_command.fish b/modules/by-name/fi/fish/config/keybindings/02_command.fish
new file mode 100644
index 00000000..56f64b32
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/02_command.fish
@@ -0,0 +1,178 @@
+bind --preset --mode default ctrl-y yank
+bind --preset --mode default alt-y yank-pop
+bind --preset --mode default right forward-char
+bind --preset --mode default left backward-char
+bind --preset --mode default ctrl-right forward-token
+bind --preset --mode default ctrl-left backward-token
+bind --preset --mode default pageup beginning-of-history
+bind --preset --mode default pagedown end-of-history
+bind --preset --mode default ctrl-x fish_vi_dec
+bind --preset --mode default ctrl-v fish_clipboard_paste
+bind --preset --mode default escape 'set -g __fish_vi_count'
+bind --preset --mode default ctrl-\[ 'set -g __fish_vi_count'
+bind --preset --mode default tab complete
+bind --preset --mode default ctrl-i complete
+bind --preset --mode default ctrl-s pager-toggle-search
+bind --preset --mode default shift-tab complete-and-search
+bind --preset --mode default shift-delete history-delete or backward-delete-char
+bind --preset --mode default down down-or-search
+bind --preset --mode default up up-or-search
+bind --preset --mode default shift-right forward-bigword
+bind --preset --mode default shift-left backward-bigword
+bind --preset --mode default alt-b prevd-or-backward-word
+bind --preset --mode default alt-f nextd-or-forward-word
+bind --preset --mode default alt-right nextd-or-forward-word
+bind --preset --mode default \e\[1\;9C nextd-or-forward-word
+bind --preset --mode default alt-left prevd-or-backward-word
+bind --preset --mode default \e\[1\;9D prevd-or-backward-word
+bind --preset --mode default alt-up history-token-search-backward
+bind --preset --mode default alt-down history-token-search-forward
+bind --preset --mode default \e\[1\;9A history-token-search-backward
+bind --preset --mode default \e\[1\;9B history-token-search-forward
+bind --preset --mode default alt-. history-token-search-backward
+bind --preset --mode default alt-l __fish_list_current_token
+bind --preset --mode default alt-o __fish_preview_current_file
+bind --preset --mode default alt-w __fish_whatis_current_token
+bind --preset --mode default ctrl-l 'status test-terminal-feature scroll-content-up && commandline -f scrollback-push' clear-screen
+bind --preset --mode default --sets-mode insert ctrl-c clear-commandline repaint-mode
+bind --preset --mode default ctrl-u backward-kill-line
+bind --preset --mode default ctrl-k kill-line
+bind --preset --mode default ctrl-w backward-kill-path-component
+bind --preset --mode default end end-of-line
+bind --preset --mode default home beginning-of-line
+bind --preset --mode default alt-d 'if test "$(commandline; printf .)" = \\n.; __fish_echo dirh; else; commandline -f kill-word; end'
+bind --preset --mode default ctrl-d delete-or-exit
+bind --preset --mode default alt-s 'for cmd in sudo doas please run0; if command -q $cmd; fish_commandline_prepend $cmd; break; end; end'
+bind --preset --mode default f1 __fish_man_page
+bind --preset --mode default alt-h __fish_man_page
+bind --preset --mode default alt-p __fish_paginate
+bind --preset --mode default alt-# __fish_toggle_comment_commandline
+bind --preset --mode default alt-e edit_command_buffer
+bind --preset --mode default alt-v edit_command_buffer
+bind --preset --mode default :,q exit
+bind --preset --mode default 1 'fish_vi_arg_digit 1'
+bind --preset --mode default 2 'fish_vi_arg_digit 2'
+bind --preset --mode default 3 'fish_vi_arg_digit 3'
+bind --preset --mode default 4 'fish_vi_arg_digit 4'
+bind --preset --mode default 5 'fish_vi_arg_digit 5'
+bind --preset --mode default 6 'fish_vi_arg_digit 6'
+bind --preset --mode default 7 'fish_vi_arg_digit 7'
+bind --preset --mode default 8 'fish_vi_arg_digit 8'
+bind --preset --mode default 9 'fish_vi_arg_digit 9'
+bind --preset --mode default 0 'if test -n "$__fish_vi_count"; fish_vi_arg_digit 0; else; commandline -f beginning-of-line; end'
+bind --preset --mode default h 'fish_vi_run_count backward-char'
+bind --preset --mode default l 'fish_vi_run_count forward-char'
+bind --preset --mode default k 'fish_vi_run_count up-or-search'
+bind --preset --mode default j 'fish_vi_run_count down-or-search'
+bind --preset --mode default b 'fish_vi_run_count backward-word'
+bind --preset --mode default B 'fish_vi_run_count backward-bigword'
+bind --preset --mode default g,e 'fish_vi_run_count backward-word-end'
+bind --preset --mode default g,E 'fish_vi_run_count backward-bigword-end'
+bind --preset --mode default w 'fish_vi_run_count forward-word-vi'
+bind --preset --mode default W 'fish_vi_run_count forward-bigword-vi'
+bind --preset --mode default e 'fish_vi_run_count forward-word-end'
+bind --preset --mode default E 'fish_vi_run_count forward-bigword-end'
+bind --preset --mode default x __fish_vi_delete_char
+bind --preset --mode default X __fish_vi_backward_delete_char
+
+bind --preset --mode default --sets-mode insert enter execute
+bind --preset --mode default --sets-mode insert ctrl-j execute
+bind --preset --mode default --sets-mode insert ctrl-m execute
+bind --preset --mode default --sets-mode insert o 'set fish_cursor_end_mode exclusive' insert-line-under repaint-mode
+bind --preset --mode default --sets-mode insert O 'set fish_cursor_end_mode exclusive' insert-line-over repaint-mode
+bind --preset --mode default --sets-mode insert i repaint-mode
+bind --preset --mode default --sets-mode insert I beginning-of-line repaint-mode
+bind --preset --mode default --sets-mode insert a 'set fish_cursor_end_mode exclusive' forward-single-char repaint-mode
+bind --preset --mode default --sets-mode insert A 'set fish_cursor_end_mode exclusive' end-of-line repaint-mode
+bind --preset --mode default --sets-mode visual v begin-selection repaint-mode
+bind --preset --mode default g,g beginning-of-buffer
+bind --preset --mode default G end-of-buffer
+bind --preset --mode default \$ end-of-line
+bind --preset --mode default g,\$ end-of-line
+bind --preset --mode default ^ beginning-of-line
+bind --preset --mode default g,^ beginning-of-line
+bind --preset --mode default _ beginning-of-line
+bind --preset --mode default u undo
+bind --preset --mode default ctrl-r redo
+bind --preset --mode default \[ history-token-search-backward
+bind --preset --mode default \] history-token-search-forward
+bind --preset --mode default --sets-mode insert / history-pager repaint-mode
+
+bind --preset --mode default delete delete-char
+bind --preset --mode default backspace backward-char
+bind --preset --mode default ctrl-h backward-char
+bind --preset --mode default d 'fish_vi_start_operator delete'
+bind --preset --mode default c 'fish_vi_start_operator change'
+bind --preset --mode default y 'fish_vi_start_operator yank'
+bind --preset --mode default g,\~ 'fish_vi_start_operator swap-case'
+
+bind --preset --mode default D kill-line
+bind --preset --mode default d,\$ kill-line
+bind --preset --mode default d,^ backward-kill-line
+bind --preset --mode default d,0 backward-kill-line
+bind --preset --mode default d,i,w kill-inner-word
+bind --preset --mode default d,i,W kill-inner-bigword
+bind --preset --mode default d,a,w kill-a-word
+bind --preset --mode default d,a,W kill-a-bigword
+bind --preset --mode default d,i,b jump-till-matching-bracket and jump-till-matching-bracket and begin-selection jump-till-matching-bracket kill-selection end-selection
+bind --preset --mode default d,a,b jump-to-matching-bracket and jump-to-matching-bracket and begin-selection jump-to-matching-bracket kill-selection end-selection
+bind --preset --mode default d,i backward-jump-till and repeat-jump-reverse and begin-selection repeat-jump kill-selection end-selection
+bind --preset --mode default d,a backward-jump and repeat-jump-reverse and begin-selection repeat-jump kill-selection end-selection
+bind --preset --mode default d,\; begin-selection repeat-jump kill-selection end-selection
+bind --preset --mode default d,comma begin-selection repeat-jump-reverse kill-selection end-selection
+bind --preset --mode default \~ togglecase-char forward-single-char
+bind --preset --mode default g,u downcase-word
+bind --preset --mode default g,U upcase-word
+bind --preset --mode default J end-of-line delete-char
+bind --preset --mode default K 'man (commandline -t) 2>/dev/null; or echo -n \\a'
+bind --preset --mode default \",\*,y,y fish_clipboard_copy
+bind --preset --mode default \",\*,Y fish_clipboard_copy
+bind --preset --mode default \",+,y,y fish_clipboard_copy
+bind --preset --mode default \",+,Y fish_clipboard_copy
+bind --preset --mode default Y kill-whole-line yank
+bind --preset --mode default y,\$ kill-line yank
+bind --preset --mode default y,^ backward-kill-line yank
+bind --preset --mode default y,0 backward-kill-line yank
+bind --preset --mode default y,i,w kill-inner-word yank
+bind --preset --mode default y,i,W kill-inner-bigword yank
+bind --preset --mode default y,a,w kill-a-word yank
+bind --preset --mode default y,a,W kill-a-bigword yank
+bind --preset --mode default y,i,b jump-till-matching-bracket and jump-till-matching-bracket and begin-selection jump-till-matching-bracket fish_vi_yank_selection end-selection
+bind --preset --mode default y,a,b jump-to-matching-bracket and jump-to-matching-bracket and begin-selection jump-to-matching-bracket fish_vi_yank_selection end-selection
+bind --preset --mode default y,i backward-jump-till and repeat-jump-reverse and begin-selection repeat-jump fish_vi_yank_selection end-selection
+bind --preset --mode default y,a backward-jump and repeat-jump-reverse and begin-selection repeat-jump fish_vi_yank_selection end-selection
+bind --preset --mode default % jump-to-matching-bracket
+bind --preset --mode default f forward-jump
+bind --preset --mode default F backward-jump
+bind --preset --mode default t forward-jump-till
+bind --preset --mode default T backward-jump-till
+bind --preset --mode default \; repeat-jump
+bind --preset --mode default comma repeat-jump-reverse
+bind --preset --mode default p 'set -g fish_cursor_end_mode exclusive' forward-char 'set -g fish_cursor_end_mode inclusive' yank
+bind --preset --mode default P yank
+bind --preset --mode default g,p yank-pop
+bind --preset --mode default \",\*,p 'set -g fish_cursor_end_mode exclusive' forward-char 'set -g fish_cursor_end_mode inclusive' fish_clipboard_paste
+bind --preset --mode default \",\*,P fish_clipboard_paste
+bind --preset --mode default \",+,p 'set -g fish_cursor_end_mode exclusive' forward-char 'set -g fish_cursor_end_mode inclusive' fish_clipboard_paste
+bind --preset --mode default \",+,P fish_clipboard_paste
+
+bind --preset --mode default --sets-mode replace_one r repaint-mode
+bind --preset --mode default --sets-mode replace R repaint-mode
+
+bind --preset --mode default ctrl-a fish_vi_inc
+bind --preset --mode default \# __fish_toggle_comment_commandline
+
+bind --preset --mode default --sets-mode insert s delete-char repaint-mode
+bind --preset --mode default --sets-mode insert S kill-inner-line repaint-mode
+bind --preset --mode default --sets-mode insert C kill-line repaint-mode
+bind --preset --mode default --sets-mode insert c,\$ kill-line repaint-mode
+bind --preset --mode default --sets-mode insert c,^ backward-kill-line repaint-mode
+bind --preset --mode default --sets-mode insert c,0 backward-kill-line repaint-mode
+bind --preset --mode default --sets-mode insert c,i,w kill-inner-word repaint-mode
+bind --preset --mode default --sets-mode insert c,i,W kill-inner-bigword repaint-mode
+bind --preset --mode default --sets-mode insert c,a,w kill-a-word repaint-mode
+bind --preset --mode default --sets-mode insert c,a,W kill-a-bigword repaint-mode
+bind --preset --mode default --sets-mode insert c,i,b jump-till-matching-bracket and jump-till-matching-bracket and begin-selection jump-till-matching-bracket kill-selection end-selection
+bind --preset --mode default --sets-mode insert c,a,b jump-to-matching-bracket and jump-to-matching-bracket and begin-selection jump-to-matching-bracket kill-selection end-selection
+bind --preset --mode default --sets-mode insert c,i backward-jump-till and repeat-jump-reverse and begin-selection repeat-jump kill-selection end-selection repaint-mode
+bind --preset --mode default --sets-mode insert c,a backward-jump and repeat-jump-reverse and begin-selection repeat-jump kill-selection end-selection repaint-mode
diff --git a/modules/by-name/fi/fish/config/keybindings/03_visual.fish b/modules/by-name/fi/fish/config/keybindings/03_visual.fish
new file mode 100644
index 00000000..3996549b
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/03_visual.fish
@@ -0,0 +1,94 @@
+bind --preset --mode visual ctrl-y yank
+bind --preset --mode visual alt-y yank-pop
+bind --preset --mode visual right forward-char
+bind --preset --mode visual left backward-char
+bind --preset --mode visual ctrl-right forward-token
+bind --preset --mode visual ctrl-left backward-token
+bind --preset --mode visual pageup beginning-of-history
+bind --preset --mode visual pagedown end-of-history
+bind --preset --mode visual ctrl-x fish_clipboard_copy
+bind --preset --mode visual ctrl-v fish_clipboard_paste
+bind --preset --mode visual --sets-mode default escape end-selection repaint-mode
+bind --preset --mode visual --sets-mode default ctrl-\[ end-selection repaint-mode
+bind --preset --mode visual tab complete
+bind --preset --mode visual ctrl-i complete
+bind --preset --mode visual ctrl-s pager-toggle-search
+bind --preset --mode visual shift-tab complete-and-search
+bind --preset --mode visual shift-delete history-delete or backward-delete-char
+bind --preset --mode visual down down-or-search
+bind --preset --mode visual up up-or-search
+bind --preset --mode visual shift-right forward-bigword
+bind --preset --mode visual shift-left backward-bigword
+bind --preset --mode visual alt-b prevd-or-backward-word
+bind --preset --mode visual alt-f nextd-or-forward-word
+bind --preset --mode visual alt-right nextd-or-forward-word
+bind --preset --mode visual \e\[1\;9C nextd-or-forward-word
+bind --preset --mode visual alt-left prevd-or-backward-word
+bind --preset --mode visual \e\[1\;9D prevd-or-backward-word
+bind --preset --mode visual alt-up history-token-search-backward
+bind --preset --mode visual alt-down history-token-search-forward
+bind --preset --mode visual \e\[1\;9A history-token-search-backward
+bind --preset --mode visual \e\[1\;9B history-token-search-forward
+bind --preset --mode visual alt-. history-token-search-backward
+bind --preset --mode visual alt-l __fish_list_current_token
+bind --preset --mode visual alt-o __fish_preview_current_file
+bind --preset --mode visual alt-w __fish_whatis_current_token
+bind --preset --mode visual ctrl-l 'status test-terminal-feature scroll-content-up && commandline -f scrollback-push' clear-screen
+bind --preset --mode visual --sets-mode default ctrl-c end-selection repaint-mode
+bind --preset --mode visual ctrl-u backward-kill-line
+bind --preset --mode visual ctrl-k kill-line
+bind --preset --mode visual ctrl-w backward-kill-path-component
+bind --preset --mode visual end end-of-line
+bind --preset --mode visual home beginning-of-line
+bind --preset --mode visual alt-d 'if test "$(commandline; printf .)" = \\n.; __fish_echo dirh; else; commandline -f kill-word; end'
+bind --preset --mode visual ctrl-d delete-or-exit
+bind --preset --mode visual alt-s 'for cmd in sudo doas please run0; if command -q $cmd; fish_commandline_prepend $cmd; break; end; end'
+bind --preset --mode visual f1 __fish_man_page
+bind --preset --mode visual alt-h __fish_man_page
+bind --preset --mode visual alt-p __fish_paginate
+bind --preset --mode visual alt-# __fish_toggle_comment_commandline
+bind --preset --mode visual alt-e edit_command_buffer
+bind --preset --mode visual alt-v edit_command_buffer
+
+bind --preset --mode visual h backward-char
+bind --preset --mode visual l forward-char
+bind --preset --mode visual k up-line
+bind --preset --mode visual j down-line
+bind --preset --mode visual b backward-word
+bind --preset --mode visual B backward-bigword
+bind --preset --mode visual g,e backward-word-end
+bind --preset --mode visual g,E backward-bigword-end
+bind --preset --mode visual w forward-word-vi
+bind --preset --mode visual W forward-bigword-vi
+bind --preset --mode visual e forward-word-end
+bind --preset --mode visual E forward-bigword-end
+bind --preset --mode visual o swap-selection-start-stop repaint-mode
+bind --preset --mode visual % jump-to-matching-bracket
+bind --preset --mode visual f forward-jump
+bind --preset --mode visual t forward-jump-till
+bind --preset --mode visual F backward-jump
+bind --preset --mode visual T backward-jump-till
+bind --preset --mode visual \; repeat-jump
+bind --preset --mode visual comma repeat-jump-reverse
+bind --preset --mode visual \$ end-of-line
+bind --preset --mode visual g,\$ end-of-line
+bind --preset --mode visual ^ beginning-of-line
+bind --preset --mode visual 0 beginning-of-line
+bind --preset --mode visual g,^ beginning-of-line
+bind --preset --mode visual _ beginning-of-line
+
+bind --preset --mode visual --sets-mode default v end-selection repaint-mode
+bind --preset --mode visual --sets-mode insert i end-selection repaint-mode
+bind --preset --mode visual --sets-mode insert I end-selection beginning-of-line repaint-mode
+bind --preset --mode visual --sets-mode insert c kill-selection end-selection repaint-mode
+bind --preset --mode visual --sets-mode insert s kill-selection end-selection repaint-mode
+bind --preset --mode visual --sets-mode default d kill-selection end-selection backward-char repaint-mode
+bind --preset --mode visual --sets-mode default x kill-selection end-selection repaint-mode
+bind --preset --mode visual --sets-mode default X kill-whole-line end-selection repaint-mode
+bind --preset --mode visual --sets-mode default y fish_vi_yank_selection end-selection repaint-mode
+bind --preset --mode visual --sets-mode default \",\*,y 'fish_clipboard_copy; commandline -f end-selection repaint-mode'
+bind --preset --mode visual --sets-mode default \",+,y 'fish_clipboard_copy; commandline -f end-selection repaint-mode'
+bind --preset --mode visual --sets-mode default \~ togglecase-selection end-selection repaint-mode
+bind --preset --mode visual --sets-mode default g,u downcase-selection end-selection repaint-mode
+bind --preset --mode visual --sets-mode default g,U upcase-selection end-selection repaint-mode
+bind --preset --mode visual \# __fish_toggle_comment_commandline
diff --git a/modules/by-name/fi/fish/config/keybindings/04_replace.fish b/modules/by-name/fi/fish/config/keybindings/04_replace.fish
new file mode 100644
index 00000000..95de4cc0
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/04_replace.fish
@@ -0,0 +1,9 @@
+bind --preset --mode replace '' delete-char self-insert
+bind --preset --mode replace --sets-mode insert enter execute repaint-mode
+bind --preset --mode replace --sets-mode insert ctrl-j execute repaint-mode
+bind --preset --mode replace --sets-mode insert ctrl-m execute repaint-mode
+bind --preset --mode replace --sets-mode default escape cancel repaint-mode
+bind --preset --mode replace --sets-mode default ctrl-\[ cancel repaint-mode
+bind --preset --mode replace backspace backward-char
+bind --preset --mode replace shift-backspace backward-char
+bind --preset --mode replace \# __fish_toggle_comment_commandline
diff --git a/modules/by-name/fi/fish/config/keybindings/05_operator.fish b/modules/by-name/fi/fish/config/keybindings/05_operator.fish
new file mode 100644
index 00000000..67f84d82
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/05_operator.fish
@@ -0,0 +1,33 @@
+bind --preset --mode operator \; 'fish_vi_exec_motion repeat-jump'
+bind --preset --mode operator comma 'fish_vi_exec_motion repeat-jump-reverse'
+bind --preset --mode operator d 'fish_vi_exec_motion --linewise'
+bind --preset --mode operator c 'fish_vi_exec_motion --linewise'
+bind --preset --mode operator y 'fish_vi_exec_motion --linewise'
+bind --preset --mode operator \~ 'fish_vi_exec_motion --linewise'
+
+bind --preset --mode operator escape fish_vi_operator_cancel
+bind --preset --mode operator ctrl-\[ fish_vi_operator_cancel
+bind --preset --mode operator 1 'fish_vi_arg_digit 1'
+bind --preset --mode operator 2 'fish_vi_arg_digit 2'
+bind --preset --mode operator 3 'fish_vi_arg_digit 3'
+bind --preset --mode operator 4 'fish_vi_arg_digit 4'
+bind --preset --mode operator 5 'fish_vi_arg_digit 5'
+bind --preset --mode operator 6 'fish_vi_arg_digit 6'
+bind --preset --mode operator 7 'fish_vi_arg_digit 7'
+bind --preset --mode operator 8 'fish_vi_arg_digit 8'
+bind --preset --mode operator 9 'fish_vi_arg_digit 9'
+bind --preset --mode operator 0 'fish_vi_exec_motion beginning-of-line'
+bind --preset --mode operator h 'fish_vi_exec_motion backward-char'
+bind --preset --mode operator l 'fish_vi_exec_motion forward-char'
+bind --preset --mode operator k 'fish_vi_exec_motion up-line'
+bind --preset --mode operator j 'fish_vi_exec_motion down-line'
+bind --preset --mode operator b 'fish_vi_exec_motion backward-word'
+bind --preset --mode operator B 'fish_vi_exec_motion backward-bigword'
+bind --preset --mode operator g,e 'fish_vi_exec_motion backward-word-end'
+bind --preset --mode operator g,E 'fish_vi_exec_motion backward-bigword-end'
+bind --preset --mode operator w 'fish_vi_exec_motion forward-word-vi'
+bind --preset --mode operator W 'fish_vi_exec_motion forward-bigword-vi'
+bind --preset --mode operator e 'fish_vi_exec_motion forward-word-end'
+bind --preset --mode operator E 'fish_vi_exec_motion forward-bigword-end'
+bind --preset --mode operator ^ 'fish_vi_exec_motion beginning-of-line'
+bind --preset --mode operator \$ 'fish_vi_exec_motion end-of-line'
diff --git a/modules/by-name/fi/fish/config/keybindings/06_replace_one.fish b/modules/by-name/fi/fish/config/keybindings/06_replace_one.fish
new file mode 100644
index 00000000..0d2672b4
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/06_replace_one.fish
@@ -0,0 +1,7 @@
+bind --preset --mode replace_one --sets-mode default '' 'set -g fish_cursor_end_mode exclusive' delete-char self-insert backward-char repaint-mode 'set -g fish_cursor_end_mode inclusive'
+bind --preset --mode replace_one --sets-mode default enter 'set -g fish_cursor_end_mode exclusive' 'commandline -f delete-char; commandline -i \\n; commandline -f backward-char' repaint-mode 'set -g fish_cursor_end_mode inclusive'
+bind --preset --mode replace_one --sets-mode default ctrl-j 'set -g fish_cursor_end_mode exclusive' 'commandline -f delete-char; commandline -i \\n; commandline -f backward-char' repaint-mode 'set -g fish_cursor_end_mode inclusive'
+bind --preset --mode replace_one --sets-mode default ctrl-m 'set -g fish_cursor_end_mode exclusive' 'commandline -f delete-char; commandline -i \\n; commandline -f backward-char' repaint-mode 'set -g fish_cursor_end_mode inclusive'
+bind --preset --mode replace_one --sets-mode default escape cancel repaint-mode
+bind --preset --mode replace_one --sets-mode default ctrl-\[ cancel repaint-mode
+
diff --git a/modules/by-name/fi/fish/config/keybindings/07_others.fish b/modules/by-name/fi/fish/config/keybindings/07_others.fish
new file mode 100644
index 00000000..99679857
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/07_others.fish
@@ -0,0 +1,9 @@
+bind --preset --mode operator --sets-mode f f ''
+bind --preset --mode operator --sets-mode F F ''
+bind --preset --mode operator --sets-mode t t ''
+bind --preset --mode operator --sets-mode T T ''
+
+bind --preset --mode f '' get-key 'fish_vi_exec_motion commandline --forward-jump=$fish_key' 'set -eg fish_key'
+bind --preset --mode F '' get-key 'fish_vi_exec_motion commandline --backward-jump=$fish_key' 'set -eg fish_key'
+bind --preset --mode t '' get-key 'fish_vi_exec_motion commandline --forward-jump-till=$fish_key' 'set -eg fish_key'
+bind --preset --mode T '' get-key 'fish_vi_exec_motion commandline --backward-jump-till=$fish_key' 'set -eg fish_key'
diff --git a/modules/by-name/fi/fish/config/keybindings/08__end.fish b/modules/by-name/fi/fish/config/keybindings/08__end.fish
new file mode 100644
index 00000000..20efad65
--- /dev/null
+++ b/modules/by-name/fi/fish/config/keybindings/08__end.fish
@@ -0,0 +1 @@
+fish_vi_key_bindings
diff --git a/modules/by-name/fi/fish/module.nix b/modules/by-name/fi/fish/module.nix
new file mode 100644
index 00000000..4e68cb9c
--- /dev/null
+++ b/modules/by-name/fi/fish/module.nix
@@ -0,0 +1,76 @@
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.soispha.programs.zsh;
+
+  sourceFile = path: "source ${path}\n";
+
+  extraFiles = builtins.concatStringsSep "\n" (
+    builtins.map (value:
+      if builtins.isPath value
+      then (sourceFile value)
+      else value) (
+      builtins.attrValues cfg.integrations
+    )
+  );
+in {
+  options.soispha.programs.fish = {
+    enable = lib.mkEnableOption "fish";
+
+    integrations = lib.mkOption {
+      type = lib.types.attrsOf (lib.types.either lib.types.path lib.types.str);
+      example = ''
+        {
+          atuin = ./integrations/atuin.fish;
+        }
+      '';
+      default = {};
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home-manager.users.soispha = {
+      home.sessionPath = lib.mkForce [];
+
+      programs.fish = {
+        enable = true;
+
+        shellInit = let
+          start = lib.modules.mkBefore (
+            sourceFile ./config/01_show-task.fish
+          );
+          end = lib.modules.mkAfter (
+            sourceFile ./config/keybindings/00__start.fish
+            + sourceFile ./config/keybindings/01_insert.fish
+            + sourceFile ./config/keybindings/02_command.fish
+            + sourceFile ./config/keybindings/03_visual.fish
+            + sourceFile ./config/keybindings/04_replace.fish
+            + sourceFile ./config/keybindings/05_operator.fish
+            + sourceFile ./config/keybindings/06_replace_one.fish
+            + sourceFile ./config/keybindings/07_others.fish
+            + sourceFile ./config/keybindings/08__end.fish
+          );
+        in
+          lib.modules.mkMerge
+          [
+            start
+
+            extraFiles
+
+            end
+          ];
+      };
+    };
+  };
+}
diff --git a/modules/by-name/gp/gpg/module.nix b/modules/by-name/gp/gpg/module.nix
index 769bcab6..28615adc 100644
--- a/modules/by-name/gp/gpg/module.nix
+++ b/modules/by-name/gp/gpg/module.nix
@@ -26,20 +26,31 @@ in {
       programs = {
         qutebrowser.key = "8321 ED3A 8DB9 99A5 1F3B  F80F F268 2914 EA42 DE26";
 
-        zsh.integrations.gpg = ''
-          export GPG_TTY=$(tty)
+        fish.integrations.gpg =
+          # fish
+          ''
+            set --export --global GPG_TTY $(tty)
 
-          # Magic copied from the gpg-agent manual
-          unset SSH_AGENT_PID
-          if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-              export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-          fi
+            # Ensure that get gpg agent is started (necessary because ssh does not start it
+            # automatically and has it's tty updated)
+            gpg-connect-agent updatestartuptty /bye
+          '';
+        zsh.integrations.gpg =
+          # bash
+          ''
+            export GPG_TTY=$(tty)
 
+            # Magic copied from the gpg-agent manual
+            unset SSH_AGENT_PID
+            if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+                export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+            fi
 
-          # Ensure that get gpg agent is started (necessary because ssh does not start it
-          # automatically and has it's tty updated)
-          gpg-connect-agent /bye
-        '';
+
+            # Ensure that get gpg agent is started (necessary because ssh does not start it
+            # automatically and has it's tty updated)
+            gpg-connect-agent /bye
+          '';
       };
 
       services.unison.pathsToIgnore = [
diff --git a/modules/by-name/ni/nix-index/command_not_found.fish b/modules/by-name/ni/nix-index/command_not_found.fish
new file mode 100644
index 00000000..bbdb2230
--- /dev/null
+++ b/modules/by-name/ni/nix-index/command_not_found.fish
@@ -0,0 +1,111 @@
+#!/usr/bin/env fish
+
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+
+# This was taken from the
+# `${pkgs.nix-index}/etc/profile.d/command-not-found.sh` file on 2024-02-28
+
+function _log
+    printf $argv >&2
+end
+
+function _bail
+    __fish_default_command_not_found_handler $argv
+    return "$status"
+end
+
+function _common_prefix
+    set --function prefix
+
+    for str in $argv
+        set position 1
+        for c in (string split '' "$str")
+            if test -z $prefix[$position]
+                set prefix[$position] "$c"
+            else if test $prefix[$position] != "$c"
+                if test $position = 1
+                    # The first letter of the prefix mis-matched.
+                    # As such there is no shared prefix, and we can simple bail early.
+                    echo ""
+                    return
+                else
+                    set prefix $prefix[1..(math $position - 1)]
+                end
+                break
+            end
+
+            set position (math $position + 1)
+        end
+    end
+
+    echo "$(string join "" $prefix)"
+end
+
+function fish_command_not_found
+    # Only run if it's an interactive shell
+    if not status is-interactive
+        return (_bail $argv)
+    end
+
+    # The nixpkgs flake should always be available on NixOS
+    set --local toplevel nixpkgs
+    set --local cmd "$argv[1]"
+
+    set --local attrs "$(nix-locate --minimal --no-group --type x --type s --whole-name --at-root "/bin/$cmd")"
+
+    if test -n "$attrs"
+        set --function len "$(echo "$attrs" | count)"
+    else
+        set --function len 0
+    end
+
+    switch "$len"
+    case 0
+    case 1 or '*'
+        _log "The program '%s' is currently not installed.\n" "$cmd"
+    end
+
+    switch "$len"
+    case 0
+        return (_bail $argv)
+    case 1
+        # If only one package provides this, then we can invoke it
+        # without asking the user.
+
+        # These will not return 127 if they worked correctly.
+
+        _log "A shell will be opened with it.\n"
+
+        if nix build "$toplevel#$attrs" --no-link
+            nix shell "$toplevel#$attrs"
+            return "$status"
+        else
+            _log "Failed to build: '%s#%s'\n" "$toplevel" "$attrs"
+            return (_bail $argv)
+        end
+    case '*'
+        _log "It is provided by several packages. You can run it load it with:\n"
+
+        set --local counter 0
+        set --local attrs $(echo $attrs)
+        for attr in $attrs
+            _log "%3s)" "$counter"
+            _log " nix shell %s#%s\n" "$toplevel" "$attr";
+
+            set counter "$(math "$counter" + 1)"
+        end
+
+        commandline "nix shell $toplevel#$(_common_prefix $attrs)"
+    end
+
+    # command not found should always exit with 127
+    return 127
+end
diff --git a/modules/by-name/ni/nix-index/command_not_found.sh b/modules/by-name/ni/nix-index/command_not_found.zsh
index 579f9db4..579f9db4 100644
--- a/modules/by-name/ni/nix-index/command_not_found.sh
+++ b/modules/by-name/ni/nix-index/command_not_found.zsh
diff --git a/modules/by-name/ni/nix-index/module.nix b/modules/by-name/ni/nix-index/module.nix
index 5ddaece3..72be6b52 100644
--- a/modules/by-name/ni/nix-index/module.nix
+++ b/modules/by-name/ni/nix-index/module.nix
@@ -20,7 +20,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    soispha.programs.zsh.integrations.nix-index = ./command_not_found.sh;
+    soispha.programs = {
+      zsh.integrations.nix-index = ./command_not_found.zsh;
+      fish.integrations.nix-index = ./command_not_found.fish;
+    };
+
     home-manager.users.soispha = {
       imports = [
         modules.nix-index-database.homeModules.nix-index
diff --git a/modules/by-name/st/starship/module.nix b/modules/by-name/st/starship/module.nix
index c649381f..9c0ef7ba 100644
--- a/modules/by-name/st/starship/module.nix
+++ b/modules/by-name/st/starship/module.nix
@@ -30,6 +30,7 @@ in {
     programs.starship = {
       enable = true;
       enableZshIntegration = true;
+      enableFishIntegration = true;
 
       settings = {
         add_newline = false;
@@ -123,14 +124,14 @@ in {
           in_nixos_shell = {
             symbol = "VM ";
             style = "bold white";
-            when = ''test "$IN_NIXOS_SHELL" = true '';
+            when = ''test "$IN_NIXOS_SHELL" = true'';
             shell = ["${lib.getExe pkgs.dash}"];
             description = "Show if a shell is run in a vm";
           };
         };
 
         battery = {
-          # '󰁹 '
+          #   '󰁹 '
           #   '󰂄 '
           #   '󰂃 '
           #   '󰁽 '
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 87716725..4855c7ab 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -220,6 +220,7 @@
       yt.enable = true;
       zathura.enable = true;
       zsh.enable = true;
+      fish.enable = true;
     };
 
     version.enable = true;