Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix fish

Browse source
This commit is contained in:
DashieTM 2024-08-24 23:37:08 +02:00
parent caafd3e3c1
commit bf465d56fa
2 changed files with 120 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

240
modules/programs/fish.nix
View file

@ -8,144 +8,144 @@
}; };
}; };
config = lib.mkIf config.mods.fish.enable config = lib.mkIf config.mods.fish.enable
(lib.optionalAttrs (options ? programs.fish) { programs.fish = { enable = true; }; } (lib.optionalAttrs (options ? programs.fish) {
// lib.optionalAttrs (options ? xdg.configFile) { programs.fish = {
xdg.configFile."fish/config.fish" = { enable = true;
text = '' shellInit = ''
if status is-interactive if status is-interactive
# Commands to run in interactive sessions can go here # Commands to run in interactive sessions can go here
end end
# ============================================================================= # =============================================================================
# #
# Utility functions for zoxide. # Utility functions for zoxide.
# #
export NIX_PATH="$NIX_PATH:${config.conf.nixos-config-path}" export NIX_PATH="$NIX_PATH:${config.conf.nixos-config-path}"
set EDITOR "neovide --no-fork" set EDITOR "neovide --no-fork"
alias rebuild='sudo nixos-rebuild switch --flake ${config.conf.nixos-config-path}' alias rebuild='sudo nixos-rebuild switch --flake ${config.conf.nixos-config-path}'
abbr --add ls 'lsd' abbr --add ls 'lsd'
abbr --add :q 'exit' abbr --add :q 'exit'
abbr --add gh 'git push origin' abbr --add gh 'git push origin'
abbr --add gl 'git pull origin' abbr --add gl 'git pull origin'
abbr --add gm 'git commit -m' abbr --add gm 'git commit -m'
abbr --add ga "git add -A" abbr --add ga "git add -A"
abbr --add g+ 'bear -- g++ -Wextra -Werror -std=c++20' abbr --add g+ 'bear -- g++ -Wextra -Werror -std=c++20'
abbr --add s "kitty +kitten ssh" abbr --add s "kitty +kitten ssh"
abbr --add zl 'z "" ' abbr --add zl 'z "" '
abbr --add nv 'neovide' abbr --add nv 'neovide'
abbr --add cr 'cargo run' abbr --add cr 'cargo run'
abbr --add grep 'rg' abbr --add grep 'rg'
abbr --add cat 'bat' abbr --add cat 'bat'
abbr --add find 'fd' abbr --add find 'fd'
abbr --add rm 'rip' abbr --add rm 'rip'
set fish_greeting set fish_greeting
# pwd based on the value of _ZO_RESOLVE_SYMLINKS. # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
function __zoxide_pwd function __zoxide_pwd
builtin pwd -L builtin pwd -L
end end
# A copy of fish's internal cd function. This makes it possible to use # A copy of fish's internal cd function. This makes it possible to use
# `alias cd=z` without causing an infinite loop. # `alias cd=z` without causing an infinite loop.
if ! builtin functions --query __zoxide_cd_internal if ! builtin functions --query __zoxide_cd_internal
if builtin functions --query cd if builtin functions --query cd
builtin functions --copy cd __zoxide_cd_internal builtin functions --copy cd __zoxide_cd_internal
else else
alias __zoxide_cd_internal='builtin cd' alias __zoxide_cd_internal='builtin cd'
end end
end end
# cd + custom logic based on the value of _ZO_ECHO. # cd + custom logic based on the value of _ZO_ECHO.
function __zoxide_cd function __zoxide_cd
__zoxide_cd_internal $argv __zoxide_cd_internal $argv
end end
# ============================================================================= # =============================================================================
# #
# Hook configuration for zoxide. # Hook configuration for zoxide.
# #
# Initialize hook to add new entries to the database. # Initialize hook to add new entries to the database.
function __zoxide_hook --on-variable PWD function __zoxide_hook --on-variable PWD
test -z "$fish_private_mode" test -z "$fish_private_mode"
and command zoxide add -- (__zoxide_pwd) and command zoxide add -- (__zoxide_pwd)
end end
# ============================================================================= # =============================================================================
# #
# When using zoxide with --no-cmd, alias these internal functions as desired. # When using zoxide with --no-cmd, alias these internal functions as desired.
# #
if test -z $__zoxide_z_prefix if test -z $__zoxide_z_prefix
set __zoxide_z_prefix 'z!' set __zoxide_z_prefix 'z!'
end end
set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix) set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix)
# Jump to a directory using only keywords. # Jump to a directory using only keywords.
function __zoxide_z function __zoxide_z
set -l argc (count $argv) set -l argc (count $argv)
if test $argc -eq 0 if test $argc -eq 0
__zoxide_cd $HOME __zoxide_cd $HOME
else if test "$argv" = - else if test "$argv" = -
__zoxide_cd - __zoxide_cd -
else if test $argc -eq 1 -a -d $argv[1] else if test $argc -eq 1 -a -d $argv[1]
__zoxide_cd $argv[1] __zoxide_cd $argv[1]
else if set -l result (string replace --regex $__zoxide_z_prefix_regex \'\' $argv[-1]); and test -n $result else if set -l result (string replace --regex $__zoxide_z_prefix_regex \'\' $argv[-1]); and test -n $result
__zoxide_cd $result __zoxide_cd $result
else else
set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv) set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv)
and __zoxide_cd $result and __zoxide_cd $result
end end
end end
# Completions. # Completions.
function __zoxide_z_complete function __zoxide_z_complete
set -l tokens (commandline --current-process --tokenize) set -l tokens (commandline --current-process --tokenize)
set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize) set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize)
if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1 if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1
# If there are < 2 arguments, use `cd` completions. # If there are < 2 arguments, use `cd` completions.
complete --do-complete "\'\' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$' complete --do-complete "\'\' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$'
else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1] else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1]
# If the last argument is empty and the one before doesn't start with # If the last argument is empty and the one before doesn't start with
# $__zoxide_z_prefix, use interactive selection. # $__zoxide_z_prefix, use interactive selection.
set -l query $tokens[2..-1] set -l query $tokens[2..-1]
set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query) set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
and echo $__zoxide_z_prefix$result and echo $__zoxide_z_prefix$result
commandline --function repaint commandline --function repaint
end end
end end
complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)' complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'
# Jump to a directory using interactive search. # Jump to a directory using interactive search.
function __zoxide_zi function __zoxide_zi
set -l result (command zoxide query --interactive -- $argv) set -l result (command zoxide query --interactive -- $argv)
and __zoxide_cd $result and __zoxide_cd $result
end end
# ============================================================================= # =============================================================================
# #
# Commands for zoxide. Disable these using --no-cmd. # Commands for zoxide. Disable these using --no-cmd.
# #
abbr --erase z &>/dev/null abbr --erase z &>/dev/null
alias z=__zoxide_z alias z=__zoxide_z
abbr --erase zi &>/dev/null abbr --erase zi &>/dev/null
alias zi=__zoxide_zi alias zi=__zoxide_zi
# ============================================================================= # =============================================================================
# #
# To initialize zoxide, add this to your configuration (usually # To initialize zoxide, add this to your configuration (usually
# ~/.config/fish/config.fish): # ~/.config/fish/config.fish):
# #
# zoxide init fish | source # zoxide init fish | source
direnv hook fish | source direnv hook fish | source
''; '';
}; };
}); });
} }

1
modules/programs/home_packages.nix
View file

@ -26,7 +26,6 @@
xournalpp xournalpp
vesktop vesktop
kitty kitty
fish
ripgrep ripgrep
# TODO add fcp once fixed.... # TODO add fcp once fixed....
rm-improved rm-improved