From 1bf0c3029bd3c9e3eb4516e2e7a33a25344e358d Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 24 Dec 2024 23:05:14 +0100 Subject: [PATCH 1/3] Cleanup fish config --- dot_config/fish/conf.d/fish-ssh-agent.fish | 7 - dot_config/fish/config.fish.tmpl | 5 +- dot_config/fish/fish_plugins | 4 - dot_config/fish/fish_variables | 62 ----- .../functions/__ssh_agent_is_started.fish | 14 - .../fish/functions/__ssh_agent_start.fish | 5 - .../_fzf_configure_bindings_help.fish | 43 ---- .../fish/functions/_fzf_extract_var_info.fish | 15 -- .../functions/_fzf_preview_changed_file.fish | 49 ---- .../fish/functions/_fzf_preview_file.fish | 43 ---- .../fish/functions/_fzf_report_diff_type.fish | 18 -- .../fish/functions/_fzf_report_file_type.fish | 6 - .../fish/functions/_fzf_search_directory.fish | 33 --- .../fish/functions/_fzf_search_git_log.fish | 36 --- .../functions/_fzf_search_git_status.fish | 41 --- .../fish/functions/_fzf_search_history.fish | 39 --- .../fish/functions/_fzf_search_processes.fish | 32 --- .../fish/functions/_fzf_search_variables.fish | 47 ---- dot_config/fish/functions/_fzf_wrapper.fish | 21 -- dot_config/fish/functions/br.fish | 19 -- dot_config/fish/functions/eza_git.fish | 7 - dot_config/fish/functions/fisher.fish | 240 ------------------ .../functions/fzf_configure_bindings.fish | 46 ---- dot_config/fish/functions/l.fish | 4 - dot_config/fish/functions/la.fish | 4 - dot_config/fish/functions/laa.fish | 4 - dot_config/fish/functions/laad.fish | 4 - dot_config/fish/functions/laai.fish | 4 - dot_config/fish/functions/laaid.fish | 4 - dot_config/fish/functions/lad.fish | 4 - dot_config/fish/functions/lai.fish | 4 - dot_config/fish/functions/laid.fish | 4 - dot_config/fish/functions/lc.fish | 4 - dot_config/fish/functions/lca.fish | 4 - dot_config/fish/functions/lcaa.fish | 4 - dot_config/fish/functions/lcaad.fish | 4 - dot_config/fish/functions/lcaai.fish | 4 - dot_config/fish/functions/lcaaid.fish | 4 - dot_config/fish/functions/lcad.fish | 4 - dot_config/fish/functions/lcai.fish | 4 - dot_config/fish/functions/lcaid.fish | 4 - dot_config/fish/functions/lcd.fish | 4 - dot_config/fish/functions/lci.fish | 4 - dot_config/fish/functions/lcid.fish | 4 - dot_config/fish/functions/ld.fish | 4 - dot_config/fish/functions/le.fish | 4 - dot_config/fish/functions/lea.fish | 4 - dot_config/fish/functions/leaa.fish | 4 - dot_config/fish/functions/leaad.fish | 4 - dot_config/fish/functions/leaai.fish | 4 - dot_config/fish/functions/leaaid.fish | 4 - dot_config/fish/functions/lead.fish | 4 - dot_config/fish/functions/leai.fish | 4 - dot_config/fish/functions/leaid.fish | 4 - dot_config/fish/functions/led.fish | 4 - dot_config/fish/functions/lei.fish | 4 - dot_config/fish/functions/leid.fish | 4 - dot_config/fish/functions/lg.fish | 4 - dot_config/fish/functions/lga.fish | 4 - dot_config/fish/functions/lgaa.fish | 4 - dot_config/fish/functions/lgaad.fish | 4 - dot_config/fish/functions/lgaai.fish | 4 - dot_config/fish/functions/lgaaid.fish | 4 - dot_config/fish/functions/lgad.fish | 4 - dot_config/fish/functions/lgai.fish | 4 - dot_config/fish/functions/lgaid.fish | 4 - dot_config/fish/functions/lgd.fish | 4 - dot_config/fish/functions/lgi.fish | 4 - dot_config/fish/functions/lgid.fish | 4 - dot_config/fish/functions/li.fish | 4 - dot_config/fish/functions/lid.fish | 4 - dot_config/fish/functions/ll.fish | 4 - dot_config/fish/functions/lla.fish | 4 - dot_config/fish/functions/llaa.fish | 4 - dot_config/fish/functions/llaad.fish | 4 - dot_config/fish/functions/llaai.fish | 4 - dot_config/fish/functions/llaaid.fish | 4 - dot_config/fish/functions/llad.fish | 4 - dot_config/fish/functions/llai.fish | 4 - dot_config/fish/functions/llaid.fish | 4 - dot_config/fish/functions/lld.fish | 4 - dot_config/fish/functions/lli.fish | 4 - dot_config/fish/functions/llid.fish | 4 - dot_config/fish/functions/lo.fish | 4 - dot_config/fish/functions/loa.fish | 4 - dot_config/fish/functions/loaa.fish | 4 - dot_config/fish/functions/loaad.fish | 4 - dot_config/fish/functions/loaai.fish | 4 - dot_config/fish/functions/loaaid.fish | 4 - dot_config/fish/functions/load.fish | 4 - dot_config/fish/functions/loai.fish | 4 - dot_config/fish/functions/loaid.fish | 4 - dot_config/fish/functions/lod.fish | 4 - dot_config/fish/functions/loi.fish | 4 - dot_config/fish/functions/loid.fish | 4 - dot_config/fish/functions/lt.fish | 4 - dot_config/fish/functions/lta.fish | 4 - dot_config/fish/functions/ltaad.fish | 4 - dot_config/fish/functions/ltaai.fish | 4 - dot_config/fish/functions/ltaaid.fish | 4 - dot_config/fish/functions/ltad.fish | 4 - dot_config/fish/functions/ltai.fish | 4 - dot_config/fish/functions/ltaid.fish | 4 - dot_config/fish/functions/ltd.fish | 4 - dot_config/fish/functions/lti.fish | 4 - dot_config/fish/functions/ltid.fish | 4 - dot_config/fish/themes/.keep | 0 107 files changed, 1 insertion(+), 1163 deletions(-) delete mode 100644 dot_config/fish/conf.d/fish-ssh-agent.fish delete mode 100644 dot_config/fish/fish_plugins delete mode 100644 dot_config/fish/fish_variables delete mode 100644 dot_config/fish/functions/__ssh_agent_is_started.fish delete mode 100644 dot_config/fish/functions/__ssh_agent_start.fish delete mode 100644 dot_config/fish/functions/_fzf_configure_bindings_help.fish delete mode 100644 dot_config/fish/functions/_fzf_extract_var_info.fish delete mode 100644 dot_config/fish/functions/_fzf_preview_changed_file.fish delete mode 100644 dot_config/fish/functions/_fzf_preview_file.fish delete mode 100644 dot_config/fish/functions/_fzf_report_diff_type.fish delete mode 100644 dot_config/fish/functions/_fzf_report_file_type.fish delete mode 100644 dot_config/fish/functions/_fzf_search_directory.fish delete mode 100644 dot_config/fish/functions/_fzf_search_git_log.fish delete mode 100644 dot_config/fish/functions/_fzf_search_git_status.fish delete mode 100644 dot_config/fish/functions/_fzf_search_history.fish delete mode 100644 dot_config/fish/functions/_fzf_search_processes.fish delete mode 100644 dot_config/fish/functions/_fzf_search_variables.fish delete mode 100644 dot_config/fish/functions/_fzf_wrapper.fish delete mode 100644 dot_config/fish/functions/br.fish delete mode 100644 dot_config/fish/functions/eza_git.fish delete mode 100644 dot_config/fish/functions/fisher.fish delete mode 100644 dot_config/fish/functions/fzf_configure_bindings.fish delete mode 100644 dot_config/fish/functions/l.fish delete mode 100644 dot_config/fish/functions/la.fish delete mode 100644 dot_config/fish/functions/laa.fish delete mode 100644 dot_config/fish/functions/laad.fish delete mode 100644 dot_config/fish/functions/laai.fish delete mode 100644 dot_config/fish/functions/laaid.fish delete mode 100644 dot_config/fish/functions/lad.fish delete mode 100644 dot_config/fish/functions/lai.fish delete mode 100644 dot_config/fish/functions/laid.fish delete mode 100644 dot_config/fish/functions/lc.fish delete mode 100644 dot_config/fish/functions/lca.fish delete mode 100644 dot_config/fish/functions/lcaa.fish delete mode 100644 dot_config/fish/functions/lcaad.fish delete mode 100644 dot_config/fish/functions/lcaai.fish delete mode 100644 dot_config/fish/functions/lcaaid.fish delete mode 100644 dot_config/fish/functions/lcad.fish delete mode 100644 dot_config/fish/functions/lcai.fish delete mode 100644 dot_config/fish/functions/lcaid.fish delete mode 100644 dot_config/fish/functions/lcd.fish delete mode 100644 dot_config/fish/functions/lci.fish delete mode 100644 dot_config/fish/functions/lcid.fish delete mode 100644 dot_config/fish/functions/ld.fish delete mode 100644 dot_config/fish/functions/le.fish delete mode 100644 dot_config/fish/functions/lea.fish delete mode 100644 dot_config/fish/functions/leaa.fish delete mode 100644 dot_config/fish/functions/leaad.fish delete mode 100644 dot_config/fish/functions/leaai.fish delete mode 100644 dot_config/fish/functions/leaaid.fish delete mode 100644 dot_config/fish/functions/lead.fish delete mode 100644 dot_config/fish/functions/leai.fish delete mode 100644 dot_config/fish/functions/leaid.fish delete mode 100644 dot_config/fish/functions/led.fish delete mode 100644 dot_config/fish/functions/lei.fish delete mode 100644 dot_config/fish/functions/leid.fish delete mode 100644 dot_config/fish/functions/lg.fish delete mode 100644 dot_config/fish/functions/lga.fish delete mode 100644 dot_config/fish/functions/lgaa.fish delete mode 100644 dot_config/fish/functions/lgaad.fish delete mode 100644 dot_config/fish/functions/lgaai.fish delete mode 100644 dot_config/fish/functions/lgaaid.fish delete mode 100644 dot_config/fish/functions/lgad.fish delete mode 100644 dot_config/fish/functions/lgai.fish delete mode 100644 dot_config/fish/functions/lgaid.fish delete mode 100644 dot_config/fish/functions/lgd.fish delete mode 100644 dot_config/fish/functions/lgi.fish delete mode 100644 dot_config/fish/functions/lgid.fish delete mode 100644 dot_config/fish/functions/li.fish delete mode 100644 dot_config/fish/functions/lid.fish delete mode 100644 dot_config/fish/functions/ll.fish delete mode 100644 dot_config/fish/functions/lla.fish delete mode 100644 dot_config/fish/functions/llaa.fish delete mode 100644 dot_config/fish/functions/llaad.fish delete mode 100644 dot_config/fish/functions/llaai.fish delete mode 100644 dot_config/fish/functions/llaaid.fish delete mode 100644 dot_config/fish/functions/llad.fish delete mode 100644 dot_config/fish/functions/llai.fish delete mode 100644 dot_config/fish/functions/llaid.fish delete mode 100644 dot_config/fish/functions/lld.fish delete mode 100644 dot_config/fish/functions/lli.fish delete mode 100644 dot_config/fish/functions/llid.fish delete mode 100644 dot_config/fish/functions/lo.fish delete mode 100644 dot_config/fish/functions/loa.fish delete mode 100644 dot_config/fish/functions/loaa.fish delete mode 100644 dot_config/fish/functions/loaad.fish delete mode 100644 dot_config/fish/functions/loaai.fish delete mode 100644 dot_config/fish/functions/loaaid.fish delete mode 100644 dot_config/fish/functions/load.fish delete mode 100644 dot_config/fish/functions/loai.fish delete mode 100644 dot_config/fish/functions/loaid.fish delete mode 100644 dot_config/fish/functions/lod.fish delete mode 100644 dot_config/fish/functions/loi.fish delete mode 100644 dot_config/fish/functions/loid.fish delete mode 100644 dot_config/fish/functions/lt.fish delete mode 100644 dot_config/fish/functions/lta.fish delete mode 100644 dot_config/fish/functions/ltaad.fish delete mode 100644 dot_config/fish/functions/ltaai.fish delete mode 100644 dot_config/fish/functions/ltaaid.fish delete mode 100644 dot_config/fish/functions/ltad.fish delete mode 100644 dot_config/fish/functions/ltai.fish delete mode 100644 dot_config/fish/functions/ltaid.fish delete mode 100644 dot_config/fish/functions/ltd.fish delete mode 100644 dot_config/fish/functions/lti.fish delete mode 100644 dot_config/fish/functions/ltid.fish delete mode 100644 dot_config/fish/themes/.keep diff --git a/dot_config/fish/conf.d/fish-ssh-agent.fish b/dot_config/fish/conf.d/fish-ssh-agent.fish deleted file mode 100644 index 719087a..0000000 --- a/dot_config/fish/conf.d/fish-ssh-agent.fish +++ /dev/null @@ -1,7 +0,0 @@ -if test -z "$SSH_ENV" - set -xg SSH_ENV $HOME/.ssh/environment -end - -if not __ssh_agent_is_started - __ssh_agent_start -end diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index 238535b..b25c17b 100644 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -6,10 +6,7 @@ if status is-interactive set -gx GOPATH $HOME/go set -gx GPG_TTY $(tty) set -gx CC clang - set -g PERL5LIB $HOME/perl5/lib/perl5 - set -g PERL_LOCAL_LIB_ROOT $HOME/perl5 - set -g PERL_MB_OPT '--install_base "/home/jan/perl5"' - set -g PERL_MM_OPT 'INSTALL_BASE=/home/jan/perl5' + set -gx ZK_NOTEBOOK_DIR doc/notebook/ set -U fish_greeting fish_add_path -g {{ .path }} diff --git a/dot_config/fish/fish_plugins b/dot_config/fish/fish_plugins deleted file mode 100644 index 3cf61bf..0000000 --- a/dot_config/fish/fish_plugins +++ /dev/null @@ -1,4 +0,0 @@ -danhper/fish-ssh-agent -plttn/fish-eza -patrickf1/fzf.fish -jorgebucaran/fisher diff --git a/dot_config/fish/fish_variables b/dot_config/fish/fish_variables deleted file mode 100644 index 3d87168..0000000 --- a/dot_config/fish/fish_variables +++ /dev/null @@ -1,62 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR --export EZA_LAAD_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAAID_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAAI_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons -SETUVAR --export EZA_LAA_OPTIONS:\x2d\x2dall\x1e\x2d\x2dall\x1e\x2d\x2dbinary -SETUVAR --export EZA_LAD_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAID_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LAI_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary\x1e\x2d\x2dicons -SETUVAR --export EZA_LA_OPTIONS:\x2d\x2dall\x1e\x2d\x2dbinary -SETUVAR --export EZA_LC_OPTIONS:\x2d\x2dacross -SETUVAR --export EZA_LD_OPTIONS:\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LE_OPTIONS:\x2d\x2dextended\x1e\x2d\x2dlong -SETUVAR --export EZA_LG_OPTIONS:\x2d\x2dgit\x1e\x2d\x2dgit\x2dignore\x1e\x2d\x2dlong -SETUVAR --export EZA_LID_OPTIONS:\x2d\x2dicons\x1e\x2d\x2donly\x2ddirs -SETUVAR --export EZA_LI_OPTIONS:\x2d\x2dicons -SETUVAR --export EZA_LL_OPTIONS:\x2d\x2dlong -SETUVAR --export EZA_LO_OPTIONS:\x2d\x2doneline -SETUVAR --export EZA_LT_OPTIONS:\x2d\x2dtree\x1e\x2d\x2dlevel -SETUVAR --export EZA_L_OPTIONS:\x1d -SETUVAR --export EZA_STANDARD_OPTIONS:\x2d\x2dgroup\x1e\x2d\x2dheader\x1e\x2d\x2dgroup\x2ddirectories\x2dfirst -SETUVAR --export __FISH_EZA_ALIASES:l\x1ela\x1eld\x1eli\x1elid\x1elaa\x1elad\x1elai\x1elaid\x1elaad\x1elaai\x1elaaid\x1ell\x1ella\x1elld\x1elli\x1ellid\x1ellaa\x1ellad\x1ellai\x1ellaid\x1ellaad\x1ellaai\x1ellaaid\x1elg\x1elga\x1elgd\x1elgi\x1elgid\x1elgaa\x1elgad\x1elgai\x1elgaid\x1elgaad\x1elgaai\x1elgaaid\x1ele\x1elea\x1eled\x1elei\x1eleid\x1eleaa\x1elead\x1eleai\x1eleaid\x1eleaad\x1eleaai\x1eleaaid\x1elt\x1elta\x1eltd\x1elti\x1eltid\x1eltad\x1eltai\x1eltaid\x1eltaad\x1eltaai\x1eltaaid\x1elc\x1elca\x1elcd\x1elci\x1elcid\x1elcaa\x1elcad\x1elcai\x1elcaid\x1elcaad\x1elcaai\x1elcaaid\x1elo\x1eloa\x1elod\x1eloi\x1eloid\x1eloaa\x1eload\x1eloai\x1eloaid\x1eloaad\x1eloaai\x1eloaaid -SETUVAR --export __FISH_EZA_BASE_ALIASES:l\x1ell\x1elg\x1ele\x1elt\x1elc\x1elo -SETUVAR --export __FISH_EZA_EXPANDED:a\x1ed\x1ei\x1eid\x1eaa\x1ead\x1eai\x1eaid\x1eaad\x1eaai\x1eaaid -SETUVAR --export __FISH_EZA_EXPANDED_OPT_NAME:LA\x1eLD\x1eLI\x1eLID\x1eLAA\x1eLAD\x1eLAI\x1eLAID\x1eLAAD\x1eLAAI\x1eLAAID -SETUVAR --export __FISH_EZA_OPT_NAMES:EZA_L_OPTIONS\x1eEZA_LA_OPTIONS\x1eEZA_LD_OPTIONS\x1eEZA_LI_OPTIONS\x1eEZA_LID_OPTIONS\x1eEZA_LAA_OPTIONS\x1eEZA_LAD_OPTIONS\x1eEZA_LAI_OPTIONS\x1eEZA_LAID_OPTIONS\x1eEZA_LAAD_OPTIONS\x1eEZA_LAAI_OPTIONS\x1eEZA_LAAID_OPTIONS\x1eEZA_LL_OPTIONS\x1eEZA_LG_OPTIONS\x1eEZA_LE_OPTIONS\x1eEZA_LT_OPTIONS\x1eEZA_LC_OPTIONS\x1eEZA_LO_OPTIONS -SETUVAR --export __FISH_EZA_SORT_OPTIONS:name\x1e\x2ename\x1esize\x1eext\x1emod\x1eold\x1eacc\x1ecr\x1einode -SETUVAR __fish_initialized:3400 -SETUVAR _fisher_danhper_2F_fish_2D_ssh_2D_agent_files:\x7e/\x2econfig/fish/functions/__ssh_agent_is_started\x2efish\x1e\x7e/\x2econfig/fish/functions/__ssh_agent_start\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fish\x2dssh\x2dagent\x2efish -SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish -SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish -SETUVAR _fisher_plttn_2F_fish_2D_eza_files:\x7e/\x2econfig/fish/functions/eza_git\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fish\x2deza\x2efish -SETUVAR _fisher_plugins:danhper/fish\x2dssh\x2dagent\x1eplttn/fish\x2deza\x1epatrickf1/fzf\x2efish\x1ejorgebucaran/fisher -SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:blue -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:yellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/dot_config/fish/functions/__ssh_agent_is_started.fish b/dot_config/fish/functions/__ssh_agent_is_started.fish deleted file mode 100644 index 7d481ee..0000000 --- a/dot_config/fish/functions/__ssh_agent_is_started.fish +++ /dev/null @@ -1,14 +0,0 @@ -function __ssh_agent_is_started -d "check if ssh agent is already started" - if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end - source $SSH_ENV > /dev/null - end - - if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end - return 1 - end - - ssh-add -l > /dev/null 2>&1 - if test $status -eq 2 - return 1 - end -end diff --git a/dot_config/fish/functions/__ssh_agent_start.fish b/dot_config/fish/functions/__ssh_agent_start.fish deleted file mode 100644 index 3766fe4..0000000 --- a/dot_config/fish/functions/__ssh_agent_start.fish +++ /dev/null @@ -1,5 +0,0 @@ -function __ssh_agent_start -d "start a new ssh agent" - ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV - chmod 600 $SSH_ENV - source $SSH_ENV > /dev/null -end diff --git a/dot_config/fish/functions/_fzf_configure_bindings_help.fish b/dot_config/fish/functions/_fzf_configure_bindings_help.fish deleted file mode 100644 index ecfe68e..0000000 --- a/dot_config/fish/functions/_fzf_configure_bindings_help.fish +++ /dev/null @@ -1,43 +0,0 @@ -function _fzf_configure_bindings_help --description "Prints the help message for fzf_configure_bindings." - echo "\ -USAGE: - fzf_configure_bindings [--COMMAND=[KEY_SEQUENCE]...] - -DESCRIPTION - fzf_configure_bindings installs key bindings for fzf.fish's commands and erases any bindings it - previously installed. It installs bindings for both default and insert modes. fzf.fish executes - it without options on fish startup to install the out-of-the-box key bindings. - - By default, commands are bound to a mnemonic key sequence, shown below. Each command's binding - can be configured using a namesake corresponding option: - COMMAND | DEFAULT KEY SEQUENCE | CORRESPONDING OPTION - Search Directory | Ctrl+Alt+F (F for file) | --directory - Search Git Log | Ctrl+Alt+L (L for log) | --git_log - Search Git Status | Ctrl+Alt+S (S for status) | --git_status - Search History | Ctrl+R (R for reverse) | --history - Search Processes | Ctrl+Alt+P (P for process) | --processes - Search Variables | Ctrl+V (V for variable) | --variables - Override a command's binding by specifying its corresponding option with the desired key - sequence. Disable a command's binding by specifying its corresponding option with no value. - - Because fzf_configure_bindings erases bindings it previously installed, it can be cleanly - executed multiple times. Once the desired fzf_configure_bindings command has been found, add it - to your config.fish in order to persist the customized bindings. - - In terms of validation, fzf_configure_bindings fails if passed unknown options. It expects an - equals sign between an option's name and value. However, it does not validate key sequences. - - Pass -h or --help to print this help message and exit. - -EXAMPLES - Default bindings but bind Search Directory to Ctrl+F and Search Variables to Ctrl+Alt+V - \$ fzf_configure_bindings --directory=\cf --variables=\e\cv - Default bindings but disable Search History - \$ fzf_configure_bindings --history= - An agglomeration of different options - \$ fzf_configure_bindings --git_status=\cg --history=\ch --variables= --processes= - -SEE Also - To learn more about fish key bindings, see bind(1) and fish_key_reader(1). -" -end diff --git a/dot_config/fish/functions/_fzf_extract_var_info.fish b/dot_config/fish/functions/_fzf_extract_var_info.fish deleted file mode 100644 index dd4e952..0000000 --- a/dot_config/fish/functions/_fzf_extract_var_info.fish +++ /dev/null @@ -1,15 +0,0 @@ -# helper function for _fzf_search_variables -function _fzf_extract_var_info --argument-names variable_name set_show_output --description "Extract and reformat lines pertaining to \$variable_name from \$set_show_output." - # Extract only the lines about the variable, all of which begin with either - # $variable_name: ...or... $variable_name[ - string match --regex "^\\\$$variable_name(?::|\[).*" <$set_show_output | - - # Strip the variable name prefix, including ": " for scope info lines - string replace --regex "^\\\$$variable_name(?:: )?" '' | - - # Distill the lines of values, replacing... - # [1]: |value| - # ...with... - # [1] value - string replace --regex ": \|(.*)\|" ' $1' -end diff --git a/dot_config/fish/functions/_fzf_preview_changed_file.fish b/dot_config/fish/functions/_fzf_preview_changed_file.fish deleted file mode 100644 index 78dd561..0000000 --- a/dot_config/fish/functions/_fzf_preview_changed_file.fish +++ /dev/null @@ -1,49 +0,0 @@ -# helper for _fzf_search_git_status -# arg should be a line from git status --short, e.g. -# MM functions/_fzf_preview_changed_file.fish -# D README.md -# R LICENSE -> "New License" -function _fzf_preview_changed_file --argument-names path_status --description "Show the git diff of the given file." - # remove quotes because they'll be interpreted literally by git diff - # no need to requote when referencing $path because fish does not perform word splitting - # https://fishshell.com/docs/current/fish_for_bash_users.html - set -f path (string unescape (string sub --start 4 $path_status)) - # first letter of short format shows index, second letter shows working tree - # https://git-scm.com/docs/git-status/2.35.0#_short_format - set -f index_status (string sub --length 1 $path_status) - set -f working_tree_status (string sub --start 2 --length 1 $path_status) - - set -f diff_opts --color=always - - if test $index_status = '?' - _fzf_report_diff_type Untracked - _fzf_preview_file $path - else if contains {$index_status}$working_tree_status DD AU UD UA DU AA UU - # Unmerged statuses taken directly from git status help's short format table - # Unmerged statuses are mutually exclusive with other statuses, so if we see - # these, then safe to assume the path is unmerged - _fzf_report_diff_type Unmerged - git diff $diff_opts -- $path - else - if test $index_status != ' ' - _fzf_report_diff_type Staged - - # renames are only detected in the index, never working tree, so only need to test for it here - # https://stackoverflow.com/questions/73954214 - if test $index_status = R - # diff the post-rename path with the original path, otherwise the diff will show the entire file as being added - set -f orig_and_new_path (string split --max 1 -- ' -> ' $path) - git diff --staged $diff_opts -- $orig_and_new_path[1] $orig_and_new_path[2] - # path currently has the form of "original -> current", so we need to correct it before it's used below - set path $orig_and_new_path[2] - else - git diff --staged $diff_opts -- $path - end - end - - if test $working_tree_status != ' ' - _fzf_report_diff_type Unstaged - git diff $diff_opts -- $path - end - end -end diff --git a/dot_config/fish/functions/_fzf_preview_file.fish b/dot_config/fish/functions/_fzf_preview_file.fish deleted file mode 100644 index c926475..0000000 --- a/dot_config/fish/functions/_fzf_preview_file.fish +++ /dev/null @@ -1,43 +0,0 @@ -# helper function for _fzf_search_directory and _fzf_search_git_status -function _fzf_preview_file --description "Print a preview for the given file based on its file type." - # because there's no way to guarantee that _fzf_search_directory passes the path to _fzf_preview_file - # as one argument, we collect all the arguments into one single variable and treat that as the path - set -f file_path $argv - - if test -L "$file_path" # symlink - # notify user and recurse on the target of the symlink, which can be any of these file types - set -l target_path (realpath "$file_path") - - set_color yellow - echo "'$file_path' is a symlink to '$target_path'." - set_color normal - - _fzf_preview_file "$target_path" - else if test -f "$file_path" # regular file - if set --query fzf_preview_file_cmd - # need to escape quotes to make sure eval receives file_path as a single arg - eval "$fzf_preview_file_cmd '$file_path'" - else - bat --style=numbers --color=always "$file_path" - end - else if test -d "$file_path" # directory - if set --query fzf_preview_dir_cmd - # see above - eval "$fzf_preview_dir_cmd '$file_path'" - else - # -A list hidden files as well, except for . and .. - # -F helps classify files by appending symbols after the file name - command ls -A -F "$file_path" - end - else if test -c "$file_path" - _fzf_report_file_type "$file_path" "character device file" - else if test -b "$file_path" - _fzf_report_file_type "$file_path" "block device file" - else if test -S "$file_path" - _fzf_report_file_type "$file_path" socket - else if test -p "$file_path" - _fzf_report_file_type "$file_path" "named pipe" - else - echo "$file_path doesn't exist." >&2 - end -end diff --git a/dot_config/fish/functions/_fzf_report_diff_type.fish b/dot_config/fish/functions/_fzf_report_diff_type.fish deleted file mode 100644 index cc26fb3..0000000 --- a/dot_config/fish/functions/_fzf_report_diff_type.fish +++ /dev/null @@ -1,18 +0,0 @@ -# helper for _fzf_preview_changed_file -# prints out something like -# ╭────────╮ -# │ Staged │ -# ╰────────╯ -function _fzf_report_diff_type --argument-names diff_type --description "Print a distinct colored header meant to preface a git patch." - # number of "-" to draw is the length of the string to box + 2 for padding - set -f repeat_count (math 2 + (string length $diff_type)) - set -f line (string repeat --count $repeat_count ─) - set -f top_border ╭$line╮ - set -f btm_border ╰$line╯ - - set_color yellow - echo $top_border - echo "│ $diff_type │" - echo $btm_border - set_color normal -end diff --git a/dot_config/fish/functions/_fzf_report_file_type.fish b/dot_config/fish/functions/_fzf_report_file_type.fish deleted file mode 100644 index 49e02e1..0000000 --- a/dot_config/fish/functions/_fzf_report_file_type.fish +++ /dev/null @@ -1,6 +0,0 @@ -# helper function for _fzf_preview_file -function _fzf_report_file_type --argument-names file_path file_type --description "Explain the file type for a file." - set_color red - echo "Cannot preview '$file_path': it is a $file_type." - set_color normal -end diff --git a/dot_config/fish/functions/_fzf_search_directory.fish b/dot_config/fish/functions/_fzf_search_directory.fish deleted file mode 100644 index 4541eec..0000000 --- a/dot_config/fish/functions/_fzf_search_directory.fish +++ /dev/null @@ -1,33 +0,0 @@ -function _fzf_search_directory --description "Search the current directory. Replace the current token with the selected file paths." - # Directly use fd binary to avoid output buffering delay caused by a fd alias, if any. - # Debian-based distros install fd as fdfind and the fd package is something else, so - # check for fdfind first. Fall back to "fd" for a clear error message. - set -f fd_cmd (command -v fdfind || command -v fd || echo "fd") - set -f --append fd_cmd --color=always $fzf_fd_opts - - set -f fzf_arguments --multi --ansi $fzf_directory_opts - set -f token (commandline --current-token) - # expand any variables or leading tilde (~) in the token - set -f expanded_token (eval echo -- $token) - # unescape token because it's already quoted so backslashes will mess up the path - set -f unescaped_exp_token (string unescape -- $expanded_token) - - # If the current token is a directory and has a trailing slash, - # then use it as fd's base directory. - if string match --quiet -- "*/" $unescaped_exp_token && test -d "$unescaped_exp_token" - set --append fd_cmd --base-directory=$unescaped_exp_token - # use the directory name as fzf's prompt to indicate the search is limited to that directory - set --prepend fzf_arguments --prompt="Directory $unescaped_exp_token> " --preview="_fzf_preview_file $expanded_token{}" - set -f file_paths_selected $unescaped_exp_token($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) - else - set --prepend fzf_arguments --prompt="Directory> " --query="$unescaped_exp_token" --preview='_fzf_preview_file {}' - set -f file_paths_selected ($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) - end - - - if test $status -eq 0 - commandline --current-token --replace -- (string escape -- $file_paths_selected | string join ' ') - end - - commandline --function repaint -end diff --git a/dot_config/fish/functions/_fzf_search_git_log.fish b/dot_config/fish/functions/_fzf_search_git_log.fish deleted file mode 100644 index aa54724..0000000 --- a/dot_config/fish/functions/_fzf_search_git_log.fish +++ /dev/null @@ -1,36 +0,0 @@ -function _fzf_search_git_log --description "Search the output of git log and preview commits. Replace the current token with the selected commit hash." - if not git rev-parse --git-dir >/dev/null 2>&1 - echo '_fzf_search_git_log: Not in a git repository.' >&2 - else - if not set --query fzf_git_log_format - # %h gives you the abbreviated commit hash, which is useful for saving screen space, but we will have to expand it later below - set -f fzf_git_log_format '%C(bold blue)%h%C(reset) - %C(cyan)%ad%C(reset) %C(yellow)%d%C(reset) %C(normal)%s%C(reset) %C(dim normal)[%an]%C(reset)' - end - - set -f preview_cmd 'git show --color=always --stat --patch {1}' - if set --query fzf_diff_highlighter - set preview_cmd "$preview_cmd | $fzf_diff_highlighter" - end - - set -f selected_log_lines ( - git log --no-show-signature --color=always --format=format:$fzf_git_log_format --date=short | \ - _fzf_wrapper --ansi \ - --multi \ - --scheme=history \ - --prompt="Git Log> " \ - --preview=$preview_cmd \ - --query=(commandline --current-token) \ - $fzf_git_log_opts - ) - if test $status -eq 0 - for line in $selected_log_lines - set -f abbreviated_commit_hash (string split --field 1 " " $line) - set -f full_commit_hash (git rev-parse $abbreviated_commit_hash) - set -f --append commit_hashes $full_commit_hash - end - commandline --current-token --replace (string join ' ' $commit_hashes) - end - end - - commandline --function repaint -end diff --git a/dot_config/fish/functions/_fzf_search_git_status.fish b/dot_config/fish/functions/_fzf_search_git_status.fish deleted file mode 100644 index 358f88c..0000000 --- a/dot_config/fish/functions/_fzf_search_git_status.fish +++ /dev/null @@ -1,41 +0,0 @@ -function _fzf_search_git_status --description "Search the output of git status. Replace the current token with the selected file paths." - if not git rev-parse --git-dir >/dev/null 2>&1 - echo '_fzf_search_git_status: Not in a git repository.' >&2 - else - set -f preview_cmd '_fzf_preview_changed_file {}' - if set --query fzf_diff_highlighter - set preview_cmd "$preview_cmd | $fzf_diff_highlighter" - end - - set -f selected_paths ( - # Pass configuration color.status=always to force status to use colors even though output is sent to a pipe - git -c color.status=always status --short | - _fzf_wrapper --ansi \ - --multi \ - --prompt="Git Status> " \ - --query=(commandline --current-token) \ - --preview=$preview_cmd \ - --nth="2.." \ - $fzf_git_status_opts - ) - if test $status -eq 0 - # git status --short automatically escapes the paths of most files for us so not going to bother trying to handle - # the few edges cases of weird file names that should be extremely rare (e.g. "this;needs;escaping") - set -f cleaned_paths - - for path in $selected_paths - if test (string sub --length 1 $path) = R - # path has been renamed and looks like "R LICENSE -> LICENSE.md" - # extract the path to use from after the arrow - set --append cleaned_paths (string split -- "-> " $path)[-1] - else - set --append cleaned_paths (string sub --start=4 $path) - end - end - - commandline --current-token --replace -- (string join ' ' $cleaned_paths) - end - end - - commandline --function repaint -end diff --git a/dot_config/fish/functions/_fzf_search_history.fish b/dot_config/fish/functions/_fzf_search_history.fish deleted file mode 100644 index cafbce9..0000000 --- a/dot_config/fish/functions/_fzf_search_history.fish +++ /dev/null @@ -1,39 +0,0 @@ -function _fzf_search_history --description "Search command history. Replace the command line with the selected command." - # history merge incorporates history changes from other fish sessions - # it errors out if called in private mode - if test -z "$fish_private_mode" - builtin history merge - end - - if not set --query fzf_history_time_format - # Reference https://devhints.io/strftime to understand strftime format symbols - set -f fzf_history_time_format "%m-%d %H:%M:%S" - end - - # Delinate time from command in history entries using the vertical box drawing char (U+2502). - # Then, to get raw command from history entries, delete everything up to it. The ? on regex is - # necessary to make regex non-greedy so it won't match into commands containing the char. - set -f time_prefix_regex '^.*? │ ' - # Delinate commands throughout pipeline using null rather than newlines because commands can be multi-line - set -f commands_selected ( - builtin history --null --show-time="$fzf_history_time_format │ " | - _fzf_wrapper --read0 \ - --print0 \ - --multi \ - --scheme=history \ - --prompt="History> " \ - --query=(commandline) \ - --preview="string replace --regex '$time_prefix_regex' '' -- {} | fish_indent --ansi" \ - --preview-window="bottom:3:wrap" \ - $fzf_history_opts | - string split0 | - # remove timestamps from commands selected - string replace --regex $time_prefix_regex '' - ) - - if test $status -eq 0 - commandline --replace -- $commands_selected - end - - commandline --function repaint -end diff --git a/dot_config/fish/functions/_fzf_search_processes.fish b/dot_config/fish/functions/_fzf_search_processes.fish deleted file mode 100644 index 133a880..0000000 --- a/dot_config/fish/functions/_fzf_search_processes.fish +++ /dev/null @@ -1,32 +0,0 @@ -function _fzf_search_processes --description "Search all running processes. Replace the current token with the pid of the selected process." - # Directly use ps command because it is often aliased to a different command entirely - # or with options that dirty the search results and preview output - set -f ps_cmd (command -v ps || echo "ps") - # use all caps to be consistent with ps default format - # snake_case because ps doesn't seem to allow spaces in the field names - set -f ps_preview_fmt (string join ',' 'pid' 'ppid=PARENT' 'user' '%cpu' 'rss=RSS_IN_KB' 'start=START_TIME' 'command') - set -f processes_selected ( - $ps_cmd -A -opid,command | \ - _fzf_wrapper --multi \ - --prompt="Processes> " \ - --query (commandline --current-token) \ - --ansi \ - # first line outputted by ps is a header, so we need to mark it as so - --header-lines=1 \ - # ps uses exit code 1 if the process was not found, in which case show an message explaining so - --preview="$ps_cmd -o '$ps_preview_fmt' -p {1} || echo 'Cannot preview {1} because it exited.'" \ - --preview-window="bottom:4:wrap" \ - $fzf_processes_opts - ) - - if test $status -eq 0 - for process in $processes_selected - set -f --append pids_selected (string split --no-empty --field=1 -- " " $process) - end - - # string join to replace the newlines outputted by string split with spaces - commandline --current-token --replace -- (string join ' ' $pids_selected) - end - - commandline --function repaint -end diff --git a/dot_config/fish/functions/_fzf_search_variables.fish b/dot_config/fish/functions/_fzf_search_variables.fish deleted file mode 100644 index 52a7c70..0000000 --- a/dot_config/fish/functions/_fzf_search_variables.fish +++ /dev/null @@ -1,47 +0,0 @@ -# This function expects the following two arguments: -# argument 1 = output of (set --show | psub), i.e. a file with the scope info and values of all variables -# argument 2 = output of (set --names | psub), i.e. a file with all variable names -function _fzf_search_variables --argument-names set_show_output set_names_output --description "Search and preview shell variables. Replace the current token with the selected variable." - if test -z "$set_names_output" - printf '%s\n' '_fzf_search_variables requires 2 arguments.' >&2 - - commandline --function repaint - return 22 # 22 means invalid argument in POSIX - end - - # Exclude the history variable from being piped into fzf because - # 1. it's not included in $set_names_output - # 2. it tends to be a very large value => increases computation time - # 3._fzf_search_history is a much better way to examine history anyway - set -f all_variable_names (string match --invert history <$set_names_output) - - set -f current_token (commandline --current-token) - # Use the current token to pre-populate fzf's query. If the current token begins - # with a $, remove it from the query so that it will better match the variable names - set -f cleaned_curr_token (string replace -- '$' '' $current_token) - - set -f variable_names_selected ( - printf '%s\n' $all_variable_names | - _fzf_wrapper --preview "_fzf_extract_var_info {} $set_show_output" \ - --prompt="Variables> " \ - --preview-window="wrap" \ - --multi \ - --query=$cleaned_curr_token \ - $fzf_variables_opts - ) - - if test $status -eq 0 - # If the current token begins with a $, do not overwrite the $ when - # replacing the current token with the selected variable. - # Uses brace expansion to prepend $ to each variable name. - commandline --current-token --replace ( - if string match --quiet -- '$*' $current_token - string join " " \${$variable_names_selected} - else - string join " " $variable_names_selected - end - ) - end - - commandline --function repaint -end diff --git a/dot_config/fish/functions/_fzf_wrapper.fish b/dot_config/fish/functions/_fzf_wrapper.fish deleted file mode 100644 index 486e36c..0000000 --- a/dot_config/fish/functions/_fzf_wrapper.fish +++ /dev/null @@ -1,21 +0,0 @@ -function _fzf_wrapper --description "Prepares some environment variables before executing fzf." - # Make sure fzf uses fish to execute preview commands, some of which - # are autoloaded fish functions so don't exist in other shells. - # Use --function so that it doesn't clobber SHELL outside this function. - set -f --export SHELL (command --search fish) - - # If neither FZF_DEFAULT_OPTS nor FZF_DEFAULT_OPTS_FILE are set, then set some sane defaults. - # See https://github.com/junegunn/fzf#environment-variables - set --query FZF_DEFAULT_OPTS FZF_DEFAULT_OPTS_FILE - if test $status -eq 2 - # cycle allows jumping between the first and last results, making scrolling faster - # layout=reverse lists results top to bottom, mimicking the familiar layouts of git log, history, and env - # border shows where the fzf window begins and ends - # height=90% leaves space to see the current command and some scrollback, maintaining context of work - # preview-window=wrap wraps long lines in the preview window, making reading easier - # marker=* makes the multi-select marker more distinguishable from the pointer (since both default to >) - set --export FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"' - end - - fzf $argv -end diff --git a/dot_config/fish/functions/br.fish b/dot_config/fish/functions/br.fish deleted file mode 100644 index d815b33..0000000 --- a/dot_config/fish/functions/br.fish +++ /dev/null @@ -1,19 +0,0 @@ - -# This script was automatically generated by the broot program -# More information can be found in https://github.com/Canop/broot -# This function starts broot and executes the command -# it produces, if any. -# It's needed because some shell commands, like `cd`, -# have no useful effect if executed in a subshell. -function br --wraps=broot - set -l cmd_file (mktemp) - if broot --outcmd $cmd_file $argv - read --local --null cmd < $cmd_file - rm -f $cmd_file - eval $cmd - else - set -l code $status - rm -f $cmd_file - return $code - end -end diff --git a/dot_config/fish/functions/eza_git.fish b/dot_config/fish/functions/eza_git.fish deleted file mode 100644 index 881039b..0000000 --- a/dot_config/fish/functions/eza_git.fish +++ /dev/null @@ -1,7 +0,0 @@ -function eza_git -d "Use exa and its git options if in a git repo" - if git rev-parse --is-inside-work-tree &>/dev/null - eza $EZA_STANDARD_OPTIONS {$EZA_LL_OPTIONS} --git $argv - else - eza $EZA_STANDARD_OPTIONS {$EZA_LL_OPTIONS} $argv - end -end diff --git a/dot_config/fish/functions/fisher.fish b/dot_config/fish/functions/fisher.fish deleted file mode 100644 index e915cb8..0000000 --- a/dot_config/fish/functions/fisher.fish +++ /dev/null @@ -1,240 +0,0 @@ -function fisher --argument-names cmd --description "A plugin manager for Fish" - set --query fisher_path || set --local fisher_path $__fish_config_dir - set --local fisher_version 4.4.5 - set --local fish_plugins $__fish_config_dir/fish_plugins - - switch "$cmd" - case -v --version - echo "fisher, version $fisher_version" - case "" -h --help - echo "Usage: fisher install Install plugins" - echo " fisher remove Remove installed plugins" - echo " fisher update Update installed plugins" - echo " fisher update Update all installed plugins" - echo " fisher list [] List installed plugins matching regex" - echo "Options:" - echo " -v, --version Print version" - echo " -h, --help Print this help message" - echo "Variables:" - echo " \$fisher_path Plugin installation path. Default: $__fish_config_dir" | string replace --regex -- $HOME \~ - case ls list - string match --entire --regex -- "$argv[2]" $_fisher_plugins - case install update remove - isatty || read --local --null --array stdin && set --append argv $stdin - - set --local install_plugins - set --local update_plugins - set --local remove_plugins - set --local arg_plugins $argv[2..-1] - set --local old_plugins $_fisher_plugins - set --local new_plugins - - test -e $fish_plugins && set --local file_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins | string replace -- \~ ~) - - if ! set --query argv[2] - if test "$cmd" != update - echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1 - else if ! set --query file_plugins - echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1 - end - set arg_plugins $file_plugins - end - - for plugin in $arg_plugins - set plugin (test -e "$plugin" && realpath $plugin || string lower -- $plugin) - contains -- "$plugin" $new_plugins || set --append new_plugins $plugin - end - - if set --query argv[2] - for plugin in $new_plugins - if contains -- "$plugin" $old_plugins - test "$cmd" = remove && - set --append remove_plugins $plugin || - set --append update_plugins $plugin - else if test "$cmd" = install - set --append install_plugins $plugin - else - echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1 - end - end - else - for plugin in $new_plugins - contains -- "$plugin" $old_plugins && - set --append update_plugins $plugin || - set --append install_plugins $plugin - end - - for plugin in $old_plugins - contains -- "$plugin" $new_plugins || set --append remove_plugins $plugin - end - end - - set --local pid_list - set --local source_plugins - set --local fetch_plugins $update_plugins $install_plugins - set --local fish_path (status fish-path) - - echo (set_color --bold)fisher $cmd version $fisher_version(set_color normal) - - for plugin in $fetch_plugins - set --local source (command mktemp -d) - set --append source_plugins $source - - command mkdir -p $source/{completions,conf.d,themes,functions} - - $fish_path --command " - if test -e $plugin - command cp -Rf $plugin/* $source - else - set temp (command mktemp -d) - set repo (string split -- \@ $plugin) || set repo[2] HEAD - - if set path (string replace --regex -- '^(https://)?gitlab.com/' '' \$repo[1]) - set name (string split -- / \$path)[-1] - set url https://gitlab.com/\$path/-/archive/\$repo[2]/\$name-\$repo[2].tar.gz - else - set url https://api.github.com/repos/\$repo[1]/tarball/\$repo[2] - end - - echo Fetching (set_color --underline)\$url(set_color normal) - - if command curl -q --silent -L \$url | command tar -xzC \$temp -f - 2>/dev/null - command cp -Rf \$temp/*/* $source - else - echo fisher: Invalid plugin name or host unavailable: \\\"$plugin\\\" >&2 - command rm -rf $source - end - - command rm -rf \$temp - end - - set files $source/* && string match --quiet --regex -- .+\.fish\\\$ \$files - " & - - set --append pid_list (jobs --last --pid) - end - - wait $pid_list 2>/dev/null - - for plugin in $fetch_plugins - if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source - if set --local index (contains --index -- "$plugin" $install_plugins) - set --erase install_plugins[$index] - else - set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)] - end - end - end - - for plugin in $update_plugins $remove_plugins - if set --local index (contains --index -- "$plugin" $_fisher_plugins) - set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files - - if contains -- "$plugin" $remove_plugins - for name in (string replace --filter --regex -- '.+/conf\.d/([^/]+)\.fish$' '$1' $$plugin_files_var) - emit {$name}_uninstall - end - printf "%s\n" Removing\ (set_color red --bold)$plugin(set_color normal) " "$$plugin_files_var | string replace -- \~ ~ - set --erase _fisher_plugins[$index] - end - - command rm -rf (string replace -- \~ ~ $$plugin_files_var) - - functions --erase (string replace --filter --regex -- '.+/functions/([^/]+)\.fish$' '$1' $$plugin_files_var) - - for name in (string replace --filter --regex -- '.+/completions/([^/]+)\.fish$' '$1' $$plugin_files_var) - complete --erase --command $name - end - - set --erase $plugin_files_var - end - end - - if set --query update_plugins[1] || set --query install_plugins[1] - command mkdir -p $fisher_path/{functions,themes,conf.d,completions} - end - - for plugin in $update_plugins $install_plugins - set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] - set --local files $source/{functions,themes,conf.d,completions}/* - - if set --local index (contains --index -- $plugin $install_plugins) - set --local user_files $fisher_path/{functions,themes,conf.d,completions}/* - set --local conflict_files - - for file in (string replace -- $source/ $fisher_path/ $files) - contains -- $file $user_files && set --append conflict_files $file - end - - if set --query conflict_files[1] && set --erase install_plugins[$index] - echo -s "fisher: Cannot install \"$plugin\": please remove or move conflicting files first:" \n" "$conflict_files >&2 - continue - end - end - - for file in (string replace -- $source/ "" $files) - command cp -RLf $source/$file $fisher_path/$file - end - - set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files - - set --query files[1] && set --universal $plugin_files_var (string replace -- $source $fisher_path $files | string replace -- ~ \~) - - contains -- $plugin $_fisher_plugins || set --universal --append _fisher_plugins $plugin - contains -- $plugin $install_plugins && set --local event install || set --local event update - - printf "%s\n" Installing\ (set_color --bold)$plugin(set_color normal) " "$$plugin_files_var | string replace -- \~ ~ - - for file in (string match --regex -- '.+/[^/]+\.fish$' $$plugin_files_var | string replace -- \~ ~) - source $file - if set --local name (string replace --regex -- '.+conf\.d/([^/]+)\.fish$' '$1' $file) - emit {$name}_$event - end - end - end - - command rm -rf $source_plugins - - if set --query _fisher_plugins[1] - set --local commit_plugins - - for plugin in $file_plugins - contains -- (string lower -- $plugin) (string lower -- $_fisher_plugins) && set --append commit_plugins $plugin - end - - for plugin in $_fisher_plugins - contains -- (string lower -- $plugin) (string lower -- $commit_plugins) || set --append commit_plugins $plugin - end - - string replace --regex -- $HOME \~ $commit_plugins >$fish_plugins - else - set --erase _fisher_plugins - command rm -f $fish_plugins - end - - set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins) - - test "$total" != "0 0 0" && echo (string join ", " ( - test $total[1] = 0 || echo "Installed $total[1]") ( - test $total[2] = 0 || echo "Updated $total[2]") ( - test $total[3] = 0 || echo "Removed $total[3]") - ) plugin/s - case \* - echo "fisher: Unknown command: \"$cmd\"" >&2 && return 1 - end -end - -if ! set --query _fisher_upgraded_to_4_4 - set --universal _fisher_upgraded_to_4_4 - if functions --query _fisher_list - set --query XDG_DATA_HOME[1] || set --local XDG_DATA_HOME ~/.local/share - command rm -rf $XDG_DATA_HOME/fisher - functions --erase _fisher_{list,plugin_parse} - fisher update >/dev/null 2>/dev/null - else - for var in (set --names | string match --entire --regex '^_fisher_.+_files$') - set $var (string replace -- ~ \~ $$var) - end - functions --erase _fisher_fish_postexec - end -end diff --git a/dot_config/fish/functions/fzf_configure_bindings.fish b/dot_config/fish/functions/fzf_configure_bindings.fish deleted file mode 100644 index 4b4e7a2..0000000 --- a/dot_config/fish/functions/fzf_configure_bindings.fish +++ /dev/null @@ -1,46 +0,0 @@ -# Always installs bindings for insert and default mode for simplicity and b/c it has almost no side-effect -# https://gitter.im/fish-shell/fish-shell?at=60a55915ee77a74d685fa6b1 -function fzf_configure_bindings --description "Installs the default key bindings for fzf.fish with user overrides passed as options." - # no need to install bindings if not in interactive mode or running tests - status is-interactive || test "$CI" = true; or return - - set -f options_spec h/help 'directory=?' 'git_log=?' 'git_status=?' 'history=?' 'processes=?' 'variables=?' - argparse --max-args=0 --ignore-unknown $options_spec -- $argv 2>/dev/null - if test $status -ne 0 - echo "Invalid option or a positional argument was provided." >&2 - _fzf_configure_bindings_help - return 22 - else if set --query _flag_help - _fzf_configure_bindings_help - return - else - # Initialize with default key sequences and then override or disable them based on flags - # index 1 = directory, 2 = git_log, 3 = git_status, 4 = history, 5 = processes, 6 = variables - set -f key_sequences \e\cf \e\cl \e\cs \cr \e\cp \cv # \c = control, \e = escape - set --query _flag_directory && set key_sequences[1] "$_flag_directory" - set --query _flag_git_log && set key_sequences[2] "$_flag_git_log" - set --query _flag_git_status && set key_sequences[3] "$_flag_git_status" - set --query _flag_history && set key_sequences[4] "$_flag_history" - set --query _flag_processes && set key_sequences[5] "$_flag_processes" - set --query _flag_variables && set key_sequences[6] "$_flag_variables" - - # If fzf bindings already exists, uninstall it first for a clean slate - if functions --query _fzf_uninstall_bindings - _fzf_uninstall_bindings - end - - for mode in default insert - test -n $key_sequences[1] && bind --mode $mode $key_sequences[1] _fzf_search_directory - test -n $key_sequences[2] && bind --mode $mode $key_sequences[2] _fzf_search_git_log - test -n $key_sequences[3] && bind --mode $mode $key_sequences[3] _fzf_search_git_status - test -n $key_sequences[4] && bind --mode $mode $key_sequences[4] _fzf_search_history - test -n $key_sequences[5] && bind --mode $mode $key_sequences[5] _fzf_search_processes - test -n $key_sequences[6] && bind --mode $mode $key_sequences[6] "$_fzf_search_vars_command" - end - - function _fzf_uninstall_bindings --inherit-variable key_sequences - bind --erase -- $key_sequences - bind --erase --mode insert -- $key_sequences - end - end -end diff --git a/dot_config/fish/functions/l.fish b/dot_config/fish/functions/l.fish deleted file mode 100644 index 110212d..0000000 --- a/dot_config/fish/functions/l.fish +++ /dev/null @@ -1,4 +0,0 @@ -function l --wraps='eza $EZA_STANDARD_OPTIONS $EZA_L_OPTIONS' --description 'alias l eza $EZA_STANDARD_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/la.fish b/dot_config/fish/functions/la.fish deleted file mode 100644 index 9c63021..0000000 --- a/dot_config/fish/functions/la.fish +++ /dev/null @@ -1,4 +0,0 @@ -function la --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_L_OPTIONS' --description 'alias la eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/laa.fish b/dot_config/fish/functions/laa.fish deleted file mode 100644 index 111b584..0000000 --- a/dot_config/fish/functions/laa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function laa --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_L_OPTIONS' --description 'alias laa eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/laad.fish b/dot_config/fish/functions/laad.fish deleted file mode 100644 index 4ba2306..0000000 --- a/dot_config/fish/functions/laad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function laad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_L_OPTIONS' --description 'alias laad eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/laai.fish b/dot_config/fish/functions/laai.fish deleted file mode 100644 index 8bc8463..0000000 --- a/dot_config/fish/functions/laai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function laai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_L_OPTIONS' --description 'alias laai eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/laaid.fish b/dot_config/fish/functions/laaid.fish deleted file mode 100644 index 61f9388..0000000 --- a/dot_config/fish/functions/laaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function laaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_L_OPTIONS' --description 'alias laaid eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lad.fish b/dot_config/fish/functions/lad.fish deleted file mode 100644 index 7ab9591..0000000 --- a/dot_config/fish/functions/lad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_L_OPTIONS' --description 'alias lad eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lai.fish b/dot_config/fish/functions/lai.fish deleted file mode 100644 index 9157092..0000000 --- a/dot_config/fish/functions/lai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_L_OPTIONS' --description 'alias lai eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/laid.fish b/dot_config/fish/functions/laid.fish deleted file mode 100644 index 147960d..0000000 --- a/dot_config/fish/functions/laid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function laid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_L_OPTIONS' --description 'alias laid eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lc.fish b/dot_config/fish/functions/lc.fish deleted file mode 100644 index 40bfaaf..0000000 --- a/dot_config/fish/functions/lc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lc --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LC_OPTIONS' --description 'alias lc eza $EZA_STANDARD_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lca.fish b/dot_config/fish/functions/lca.fish deleted file mode 100644 index 790361a..0000000 --- a/dot_config/fish/functions/lca.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lca --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LC_OPTIONS' --description 'alias lca eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcaa.fish b/dot_config/fish/functions/lcaa.fish deleted file mode 100644 index 01bf276..0000000 --- a/dot_config/fish/functions/lcaa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcaa --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcaa eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcaad.fish b/dot_config/fish/functions/lcaad.fish deleted file mode 100644 index fdc5c00..0000000 --- a/dot_config/fish/functions/lcaad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcaad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcaad eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcaai.fish b/dot_config/fish/functions/lcaai.fish deleted file mode 100644 index 9795ae4..0000000 --- a/dot_config/fish/functions/lcaai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcaai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcaai eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcaaid.fish b/dot_config/fish/functions/lcaaid.fish deleted file mode 100644 index 5f92bc1..0000000 --- a/dot_config/fish/functions/lcaaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcaaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcaaid eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcad.fish b/dot_config/fish/functions/lcad.fish deleted file mode 100644 index 0437cbc..0000000 --- a/dot_config/fish/functions/lcad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcad eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcai.fish b/dot_config/fish/functions/lcai.fish deleted file mode 100644 index b01f565..0000000 --- a/dot_config/fish/functions/lcai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcai eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcaid.fish b/dot_config/fish/functions/lcaid.fish deleted file mode 100644 index ecd3049..0000000 --- a/dot_config/fish/functions/lcaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcaid eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcd.fish b/dot_config/fish/functions/lcd.fish deleted file mode 100644 index b70e118..0000000 --- a/dot_config/fish/functions/lcd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcd --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcd eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lci.fish b/dot_config/fish/functions/lci.fish deleted file mode 100644 index a256365..0000000 --- a/dot_config/fish/functions/lci.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lci --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LC_OPTIONS' --description 'alias lci eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lcid.fish b/dot_config/fish/functions/lcid.fish deleted file mode 100644 index d4f9037..0000000 --- a/dot_config/fish/functions/lcid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lcid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LC_OPTIONS' --description 'alias lcid eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LC_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LC_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ld.fish b/dot_config/fish/functions/ld.fish deleted file mode 100644 index 98d5cff..0000000 --- a/dot_config/fish/functions/ld.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ld --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_L_OPTIONS' --description 'alias ld eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/le.fish b/dot_config/fish/functions/le.fish deleted file mode 100644 index 5466d6d..0000000 --- a/dot_config/fish/functions/le.fish +++ /dev/null @@ -1,4 +0,0 @@ -function le --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LE_OPTIONS' --description 'alias le eza $EZA_STANDARD_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lea.fish b/dot_config/fish/functions/lea.fish deleted file mode 100644 index e420c97..0000000 --- a/dot_config/fish/functions/lea.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lea --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LE_OPTIONS' --description 'alias lea eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leaa.fish b/dot_config/fish/functions/leaa.fish deleted file mode 100644 index 0efd6a4..0000000 --- a/dot_config/fish/functions/leaa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leaa --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LE_OPTIONS' --description 'alias leaa eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leaad.fish b/dot_config/fish/functions/leaad.fish deleted file mode 100644 index 97c11de..0000000 --- a/dot_config/fish/functions/leaad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leaad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LE_OPTIONS' --description 'alias leaad eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leaai.fish b/dot_config/fish/functions/leaai.fish deleted file mode 100644 index 165b450..0000000 --- a/dot_config/fish/functions/leaai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leaai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LE_OPTIONS' --description 'alias leaai eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leaaid.fish b/dot_config/fish/functions/leaaid.fish deleted file mode 100644 index bfd8ba8..0000000 --- a/dot_config/fish/functions/leaaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leaaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LE_OPTIONS' --description 'alias leaaid eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lead.fish b/dot_config/fish/functions/lead.fish deleted file mode 100644 index 634a16d..0000000 --- a/dot_config/fish/functions/lead.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lead --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LE_OPTIONS' --description 'alias lead eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leai.fish b/dot_config/fish/functions/leai.fish deleted file mode 100644 index 26333e5..0000000 --- a/dot_config/fish/functions/leai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LE_OPTIONS' --description 'alias leai eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leaid.fish b/dot_config/fish/functions/leaid.fish deleted file mode 100644 index b98bd10..0000000 --- a/dot_config/fish/functions/leaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LE_OPTIONS' --description 'alias leaid eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/led.fish b/dot_config/fish/functions/led.fish deleted file mode 100644 index c95e800..0000000 --- a/dot_config/fish/functions/led.fish +++ /dev/null @@ -1,4 +0,0 @@ -function led --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LE_OPTIONS' --description 'alias led eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lei.fish b/dot_config/fish/functions/lei.fish deleted file mode 100644 index 85d12fc..0000000 --- a/dot_config/fish/functions/lei.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lei --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LE_OPTIONS' --description 'alias lei eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/leid.fish b/dot_config/fish/functions/leid.fish deleted file mode 100644 index 3e7ac68..0000000 --- a/dot_config/fish/functions/leid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function leid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LE_OPTIONS' --description 'alias leid eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LE_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LE_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lg.fish b/dot_config/fish/functions/lg.fish deleted file mode 100644 index 27afc08..0000000 --- a/dot_config/fish/functions/lg.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lg --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LG_OPTIONS' --description 'alias lg eza $EZA_STANDARD_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lga.fish b/dot_config/fish/functions/lga.fish deleted file mode 100644 index 787a627..0000000 --- a/dot_config/fish/functions/lga.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lga --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LG_OPTIONS' --description 'alias lga eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgaa.fish b/dot_config/fish/functions/lgaa.fish deleted file mode 100644 index f60bc8d..0000000 --- a/dot_config/fish/functions/lgaa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgaa --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgaa eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgaad.fish b/dot_config/fish/functions/lgaad.fish deleted file mode 100644 index 493954d..0000000 --- a/dot_config/fish/functions/lgaad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgaad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgaad eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgaai.fish b/dot_config/fish/functions/lgaai.fish deleted file mode 100644 index 53e5cd6..0000000 --- a/dot_config/fish/functions/lgaai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgaai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgaai eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgaaid.fish b/dot_config/fish/functions/lgaaid.fish deleted file mode 100644 index 413f7fc..0000000 --- a/dot_config/fish/functions/lgaaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgaaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgaaid eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgad.fish b/dot_config/fish/functions/lgad.fish deleted file mode 100644 index 7b83594..0000000 --- a/dot_config/fish/functions/lgad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgad eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgai.fish b/dot_config/fish/functions/lgai.fish deleted file mode 100644 index abbe1fd..0000000 --- a/dot_config/fish/functions/lgai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgai eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgaid.fish b/dot_config/fish/functions/lgaid.fish deleted file mode 100644 index e0dd347..0000000 --- a/dot_config/fish/functions/lgaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgaid eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgd.fish b/dot_config/fish/functions/lgd.fish deleted file mode 100644 index 6ec6772..0000000 --- a/dot_config/fish/functions/lgd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgd --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgd eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgi.fish b/dot_config/fish/functions/lgi.fish deleted file mode 100644 index f1fcde2..0000000 --- a/dot_config/fish/functions/lgi.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgi --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgi eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lgid.fish b/dot_config/fish/functions/lgid.fish deleted file mode 100644 index 9cd0818..0000000 --- a/dot_config/fish/functions/lgid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lgid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LG_OPTIONS' --description 'alias lgid eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LG_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LG_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/li.fish b/dot_config/fish/functions/li.fish deleted file mode 100644 index b72a072..0000000 --- a/dot_config/fish/functions/li.fish +++ /dev/null @@ -1,4 +0,0 @@ -function li --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_L_OPTIONS' --description 'alias li eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lid.fish b/dot_config/fish/functions/lid.fish deleted file mode 100644 index 9af6102..0000000 --- a/dot_config/fish/functions/lid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_L_OPTIONS' --description 'alias lid eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_L_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_L_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ll.fish b/dot_config/fish/functions/ll.fish deleted file mode 100644 index 80df346..0000000 --- a/dot_config/fish/functions/ll.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ll --wraps=eza_git --description 'alias ll eza_git' - eza_git $argv - -end diff --git a/dot_config/fish/functions/lla.fish b/dot_config/fish/functions/lla.fish deleted file mode 100644 index c21107e..0000000 --- a/dot_config/fish/functions/lla.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lla --wraps='eza_git $EZA_LA_OPTIONS' --description 'alias lla eza_git $EZA_LA_OPTIONS' - eza_git $EZA_LA_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llaa.fish b/dot_config/fish/functions/llaa.fish deleted file mode 100644 index f31e123..0000000 --- a/dot_config/fish/functions/llaa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llaa --wraps='eza_git $EZA_LAA_OPTIONS' --description 'alias llaa eza_git $EZA_LAA_OPTIONS' - eza_git $EZA_LAA_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llaad.fish b/dot_config/fish/functions/llaad.fish deleted file mode 100644 index 48bc72d..0000000 --- a/dot_config/fish/functions/llaad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llaad --wraps='eza_git $EZA_LAAD_OPTIONS' --description 'alias llaad eza_git $EZA_LAAD_OPTIONS' - eza_git $EZA_LAAD_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llaai.fish b/dot_config/fish/functions/llaai.fish deleted file mode 100644 index 4fe7d9d..0000000 --- a/dot_config/fish/functions/llaai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llaai --wraps='eza_git $EZA_LAAI_OPTIONS' --description 'alias llaai eza_git $EZA_LAAI_OPTIONS' - eza_git $EZA_LAAI_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llaaid.fish b/dot_config/fish/functions/llaaid.fish deleted file mode 100644 index d207f82..0000000 --- a/dot_config/fish/functions/llaaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llaaid --wraps='eza_git $EZA_LAAID_OPTIONS' --description 'alias llaaid eza_git $EZA_LAAID_OPTIONS' - eza_git $EZA_LAAID_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llad.fish b/dot_config/fish/functions/llad.fish deleted file mode 100644 index f263797..0000000 --- a/dot_config/fish/functions/llad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llad --wraps='eza_git $EZA_LAD_OPTIONS' --description 'alias llad eza_git $EZA_LAD_OPTIONS' - eza_git $EZA_LAD_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llai.fish b/dot_config/fish/functions/llai.fish deleted file mode 100644 index a2fd140..0000000 --- a/dot_config/fish/functions/llai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llai --wraps='eza_git $EZA_LAI_OPTIONS' --description 'alias llai eza_git $EZA_LAI_OPTIONS' - eza_git $EZA_LAI_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llaid.fish b/dot_config/fish/functions/llaid.fish deleted file mode 100644 index 81539d7..0000000 --- a/dot_config/fish/functions/llaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llaid --wraps='eza_git $EZA_LAID_OPTIONS' --description 'alias llaid eza_git $EZA_LAID_OPTIONS' - eza_git $EZA_LAID_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lld.fish b/dot_config/fish/functions/lld.fish deleted file mode 100644 index ff35776..0000000 --- a/dot_config/fish/functions/lld.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lld --wraps='eza_git $EZA_LD_OPTIONS' --description 'alias lld eza_git $EZA_LD_OPTIONS' - eza_git $EZA_LD_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lli.fish b/dot_config/fish/functions/lli.fish deleted file mode 100644 index 7ce50c8..0000000 --- a/dot_config/fish/functions/lli.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lli --wraps='eza_git $EZA_LI_OPTIONS' --description 'alias lli eza_git $EZA_LI_OPTIONS' - eza_git $EZA_LI_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/llid.fish b/dot_config/fish/functions/llid.fish deleted file mode 100644 index c5ac800..0000000 --- a/dot_config/fish/functions/llid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function llid --wraps='eza_git $EZA_LID_OPTIONS' --description 'alias llid eza_git $EZA_LID_OPTIONS' - eza_git $EZA_LID_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lo.fish b/dot_config/fish/functions/lo.fish deleted file mode 100644 index fd14a97..0000000 --- a/dot_config/fish/functions/lo.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lo --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LO_OPTIONS' --description 'alias lo eza $EZA_STANDARD_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loa.fish b/dot_config/fish/functions/loa.fish deleted file mode 100644 index 2f04e5f..0000000 --- a/dot_config/fish/functions/loa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loa --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LO_OPTIONS' --description 'alias loa eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loaa.fish b/dot_config/fish/functions/loaa.fish deleted file mode 100644 index 8aab5af..0000000 --- a/dot_config/fish/functions/loaa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loaa --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LO_OPTIONS' --description 'alias loaa eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAA_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loaad.fish b/dot_config/fish/functions/loaad.fish deleted file mode 100644 index c447ca4..0000000 --- a/dot_config/fish/functions/loaad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loaad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LO_OPTIONS' --description 'alias loaad eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loaai.fish b/dot_config/fish/functions/loaai.fish deleted file mode 100644 index bc97184..0000000 --- a/dot_config/fish/functions/loaai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loaai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LO_OPTIONS' --description 'alias loaai eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loaaid.fish b/dot_config/fish/functions/loaaid.fish deleted file mode 100644 index 140ae18..0000000 --- a/dot_config/fish/functions/loaaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loaaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LO_OPTIONS' --description 'alias loaaid eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/load.fish b/dot_config/fish/functions/load.fish deleted file mode 100644 index a31d878..0000000 --- a/dot_config/fish/functions/load.fish +++ /dev/null @@ -1,4 +0,0 @@ -function load --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LO_OPTIONS' --description 'alias load eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loai.fish b/dot_config/fish/functions/loai.fish deleted file mode 100644 index ee79219..0000000 --- a/dot_config/fish/functions/loai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LO_OPTIONS' --description 'alias loai eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loaid.fish b/dot_config/fish/functions/loaid.fish deleted file mode 100644 index 2e623b6..0000000 --- a/dot_config/fish/functions/loaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LO_OPTIONS' --description 'alias loaid eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lod.fish b/dot_config/fish/functions/lod.fish deleted file mode 100644 index 7edecb8..0000000 --- a/dot_config/fish/functions/lod.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lod --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LO_OPTIONS' --description 'alias lod eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loi.fish b/dot_config/fish/functions/loi.fish deleted file mode 100644 index bd72cf4..0000000 --- a/dot_config/fish/functions/loi.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loi --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LO_OPTIONS' --description 'alias loi eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/loid.fish b/dot_config/fish/functions/loid.fish deleted file mode 100644 index 6c28297..0000000 --- a/dot_config/fish/functions/loid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function loid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LO_OPTIONS' --description 'alias loid eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LO_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LO_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lt.fish b/dot_config/fish/functions/lt.fish deleted file mode 100644 index 4a26a9f..0000000 --- a/dot_config/fish/functions/lt.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lt --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LT_OPTIONS' --description 'alias lt eza $EZA_STANDARD_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lta.fish b/dot_config/fish/functions/lta.fish deleted file mode 100644 index 6fbcc3b..0000000 --- a/dot_config/fish/functions/lta.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lta --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LT_OPTIONS' --description 'alias lta eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LA_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltaad.fish b/dot_config/fish/functions/ltaad.fish deleted file mode 100644 index 2630c40..0000000 --- a/dot_config/fish/functions/ltaad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltaad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltaad eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAD_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltaai.fish b/dot_config/fish/functions/ltaai.fish deleted file mode 100644 index 40318e1..0000000 --- a/dot_config/fish/functions/ltaai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltaai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltaai eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAI_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltaaid.fish b/dot_config/fish/functions/ltaaid.fish deleted file mode 100644 index 10ae260..0000000 --- a/dot_config/fish/functions/ltaaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltaaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltaaid eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAAID_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltad.fish b/dot_config/fish/functions/ltad.fish deleted file mode 100644 index a645014..0000000 --- a/dot_config/fish/functions/ltad.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltad --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltad eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAD_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltai.fish b/dot_config/fish/functions/ltai.fish deleted file mode 100644 index 1b546b6..0000000 --- a/dot_config/fish/functions/ltai.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltai --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltai eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAI_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltaid.fish b/dot_config/fish/functions/ltaid.fish deleted file mode 100644 index b6c6bc2..0000000 --- a/dot_config/fish/functions/ltaid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltaid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltaid eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LAID_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltd.fish b/dot_config/fish/functions/ltd.fish deleted file mode 100644 index 84875b0..0000000 --- a/dot_config/fish/functions/ltd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltd --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltd eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LD_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/lti.fish b/dot_config/fish/functions/lti.fish deleted file mode 100644 index 06ecfb3..0000000 --- a/dot_config/fish/functions/lti.fish +++ /dev/null @@ -1,4 +0,0 @@ -function lti --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LT_OPTIONS' --description 'alias lti eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LI_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/functions/ltid.fish b/dot_config/fish/functions/ltid.fish deleted file mode 100644 index 8b9182e..0000000 --- a/dot_config/fish/functions/ltid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ltid --wraps='eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LT_OPTIONS' --description 'alias ltid eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LT_OPTIONS' - eza $EZA_STANDARD_OPTIONS $EZA_LID_OPTIONS $EZA_LT_OPTIONS $argv - -end diff --git a/dot_config/fish/themes/.keep b/dot_config/fish/themes/.keep deleted file mode 100644 index e69de29..0000000 From 8dab7cb3a625a16a888125a17b459495d0b0f9a5 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 24 Dec 2024 23:07:16 +0100 Subject: [PATCH 2/3] Update nvim config --- .chezmoiignore | 5 +- dot_config/kitty/kitty.conf.tmpl | 5 +- dot_config/nvim/lua/config/autocmds.lua | 36 ++++++ dot_config/nvim/lua/config/keymaps.lua | 14 +++ dot_config/nvim/lua/config/lazy.lua | 24 ++-- dot_config/nvim/lua/config/options.lua | 2 + dot_config/nvim/lua/plugins/coding.lua | 10 -- dot_config/nvim/lua/plugins/colorscheme.lua | 13 --- dot_config/nvim/lua/plugins/notes.lua | 27 +++++ dot_config/nvim/lua/plugins/notes.lua.tmpl | 83 ------------- dot_config/nvim/lua/plugins/ui.lua | 122 +------------------- 11 files changed, 91 insertions(+), 250 deletions(-) delete mode 100644 dot_config/nvim/lua/plugins/colorscheme.lua create mode 100644 dot_config/nvim/lua/plugins/notes.lua delete mode 100644 dot_config/nvim/lua/plugins/notes.lua.tmpl diff --git a/.chezmoiignore b/.chezmoiignore index 0f270d5..e1229d6 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -11,7 +11,6 @@ LICENSE .xsession .config/openbox/* .config/nvim/lua/plugins/lsp.lua -{{ else }} -.config/fish/conf.d/fish-ssh-agent.fish -.config/fish/functions/__ssh_agent_* +.config/nvim/lazy-lock.json +.config/nvim/lazyvim.json {{ end }} diff --git a/dot_config/kitty/kitty.conf.tmpl b/dot_config/kitty/kitty.conf.tmpl index b8f55ed..29a3f75 100644 --- a/dot_config/kitty/kitty.conf.tmpl +++ b/dot_config/kitty/kitty.conf.tmpl @@ -180,8 +180,6 @@ enabled_layouts Horizontal,Stack tab_bar_edge top tab_bar_style separator tab_separator "" -tab_title_template " {index} {title} " -tab_bar_background #434C5E shell {{ .shell }} editor nvim @@ -603,7 +601,8 @@ map kitty_mod+R set_tab_title # BEGIN_KITTY_THEME -include Nord.conf +# Catppuccin-Mocha +include current-theme.conf # END_KITTY_THEME # BEGIN_KITTY_FONTS diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua index af027fb..4b3202c 100644 --- a/dot_config/nvim/lua/config/autocmds.lua +++ b/dot_config/nvim/lua/config/autocmds.lua @@ -11,5 +11,41 @@ vim.api.nvim_create_autocmd("FileType", { vim.opt_local.softtabstop = 2 vim.opt_local.shiftwidth = 2 vim.opt_local.expandtab = true + + -- Add the key mappings only for Markdown files in a zk notebook. + if require("zk.util").notebook_root(vim.fn.expand("%:p")) ~= nil then + local function map(...) + vim.api.nvim_buf_set_keymap(0, ...) + end + local opts = { noremap = true, silent = false } + + -- Open the link under the caret. + map("n", "", "lua vim.lsp.buf.definition()", opts) + + -- Create a new note after asking for its title. + -- This overrides the global `zn` mapping to create the note in the same directory as the current buffer. + map("n", "zn", "ZkNew { dir = vim.fn.expand('%:p:h'), title = vim.fn.input('Title: ') }", opts) + -- Create a new note in the same directory as the current buffer, using the current selection for title. + map("v", "znt", ":'<,'>ZkNewFromTitleSelection { dir = vim.fn.expand('%:p:h') }", opts) + -- Create a new note in the same directory as the current buffer, using the current selection for note content and asking for its title. + map( + "v", + "znc", + ":'<,'>ZkNewFromContentSelection { dir = vim.fn.expand('%:p:h'), title = vim.fn.input('Title: ') }", + opts + ) + + -- Open notes linking to the current buffer. + map("n", "zb", "ZkBacklinks", opts) + -- Alternative for backlinks using pure LSP and showing the source context. + --map('n', 'zb', 'lua vim.lsp.buf.references()', opts) + -- Open notes linked by the current buffer. + map("n", "zl", "ZkLinks", opts) + + -- Preview a linked note. + map("n", "K", "lua vim.lsp.buf.hover()", opts) + -- Open the code actions for a visual selection. + map("v", "za", ":'<,'>lua vim.lsp.buf.range_code_action()", opts) + end end, }) diff --git a/dot_config/nvim/lua/config/keymaps.lua b/dot_config/nvim/lua/config/keymaps.lua index edb8f6a..c93df70 100644 --- a/dot_config/nvim/lua/config/keymaps.lua +++ b/dot_config/nvim/lua/config/keymaps.lua @@ -19,3 +19,17 @@ map("n", "td", "require('dap-go').debug_test()") map("n", "to", "require('neotest').output.open({enter = true})") map("n", "tS", "require('neotest').run.stop()") map("n", "ts", "require('neotest').summary.toggle()") + +-- zk +-- Create a new note after asking for its title. +map("n", "zn", "ZkNew { title = vim.fn.input('Title: ') }") + +-- Open notes. +map("n", "zo", "ZkNotes { sort = { 'modified' } }") +-- Open notes associated with the selected tags. +map("n", "zt", "ZkTags") + +-- Search for the notes matching a given query. +map("n", "zf", "ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }") +-- Search for the notes matching the current visual selection. +map("v", "zf", ":'<,'>ZkMatch") diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index d73bfa1..ec08493 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -1,23 +1,16 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end +if not vim.loop.fs_stat(lazypath) then + -- bootstrap lazy.nvim + -- stylua: ignore + vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) end -vim.opt.rtp:prepend(lazypath) +vim.opt.rtp:prepend(vim.env.LAZY or lazypath) require("lazy").setup({ spec = { -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import any extras modules here -- import/override with your plugins { import = "plugins" }, }, @@ -31,10 +24,7 @@ require("lazy").setup({ -- version = "*", -- try installing the latest stable version for plugins that support semver }, install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { - enabled = true, -- check for plugin updates periodically - notify = false, -- notify on update - }, -- automatically check for plugin updates + checker = { enabled = true, notify = false, frequency = 259200 }, -- automatically check for plugin updates performance = { rtp = { -- disable some rtp plugins diff --git a/dot_config/nvim/lua/config/options.lua b/dot_config/nvim/lua/config/options.lua index 3ea1454..9cc496a 100644 --- a/dot_config/nvim/lua/config/options.lua +++ b/dot_config/nvim/lua/config/options.lua @@ -1,3 +1,5 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here + +vim.g.snacks_animate = false diff --git a/dot_config/nvim/lua/plugins/coding.lua b/dot_config/nvim/lua/plugins/coding.lua index 57b09e3..cd50c1d 100644 --- a/dot_config/nvim/lua/plugins/coding.lua +++ b/dot_config/nvim/lua/plugins/coding.lua @@ -1,14 +1,4 @@ return { - { - "kylechui/nvim-surround", - version = "*", -- Use for stability; omit to use `main` branch for the latest features - event = "VeryLazy", - config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) - end, - }, { "windwp/nvim-autopairs", event = "InsertEnter", diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua b/dot_config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index ac0584d..0000000 --- a/dot_config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - "shaunsingh/nord.nvim", - lazy = false, - priority = 1000, - }, - { - "LazyVim/LazyVim", - opts = { - colorscheme = "nord", - }, - }, -} diff --git a/dot_config/nvim/lua/plugins/notes.lua b/dot_config/nvim/lua/plugins/notes.lua new file mode 100644 index 0000000..9b1fa21 --- /dev/null +++ b/dot_config/nvim/lua/plugins/notes.lua @@ -0,0 +1,27 @@ +return { + { + { + "zk-org/zk-nvim", + config = function() + require("zk").setup({ + picker = "fzf_lua", + + lsp = { + config = { + cmd = { "zk", "lsp" }, + name = "zk", + -- on_attach = ... + -- etc, see `:h vim.lsp.start_client()` + }, + + -- automatically attach buffers in a zk notebook that match the given filetypes + auto_attach = { + enabled = true, + filetypes = { "markdown" }, + }, + }, + }) + end, + }, + }, +} diff --git a/dot_config/nvim/lua/plugins/notes.lua.tmpl b/dot_config/nvim/lua/plugins/notes.lua.tmpl deleted file mode 100644 index 811d07d..0000000 --- a/dot_config/nvim/lua/plugins/notes.lua.tmpl +++ /dev/null @@ -1,83 +0,0 @@ -return { - { - "renerocksai/telekasten.nvim", - lazy = true, - dependencies = { - "nvim-telescope/telescope.nvim", - "renerocksai/calendar-vim", - }, - opts = { - take_over_my_home = true, - auto_set_filetype = false, - home = "{{ .home }}/doc/zettelkasten", - dailies = "{{ .home }}/doc/zettelkasten/daily", - weeklies = "{{ .home }}/doc/zettelkasten/weekly", - templates = "{{ .home }}/doc/zettelkasten/templates", - image_subdir = "img", - extension = ".md", - new_note_filename = "uuid-title", - uuid_type = "%Y%m%d%H%M", - uuid_sep = "-", - follow_creates_nonexisting = true, - dailies_create_nonexisting = true, - weeklies_create_nonexisting = true, - journal_auto_open = false, - - -- template for new notes (new_note, follow_link) - -- set to `nil` or do not specify if you do not want a template - template_new_note = "{{ .home }}/doc/zettelkasten/templates/new_note.md", - - -- template for newly created daily notes (goto_today) - -- set to `nil` or do not specify if you do not want a template - template_new_daily = "{{ .home }}/doc/zettelkasten/templates/daily.md", - - -- template for newly created weekly notes (goto_thisweek) - -- set to `nil` or do not specify if you do not want a template - template_new_weekly = "{{ .home }}/doc/zettelkasten/templates/weekly.md", - - -- image link style - -- wiki: ![[image name]] - -- markdown: ![](image_subdir/xxxxx.png) - image_link_style = "wiki", - - -- default sort option: 'filename', 'modified' - sort = "filename", - - -- integrate with calendar-vim - plug_into_calendar = true, - calendar_opts = { - weeknm = 4, - calendar_monday = 1, - calendar_mark = "left-fit", - }, - - close_after_yanking = false, - insert_after_inserting = true, - tag_notation = "#tag", - command_palette_theme = "dropdown", - show_tags_theme = "ivy", - subdirs_in_links = true, - template_handling = "smart", - new_note_location = "smart", - rename_update_links = true, - follow_url_fallback = nil, - }, - keys = { - { "zf", "Telekasten find_notes" }, - { "zd", "Telekasten find_daily_notes" }, - { "zg", "Telekasten search_notes" }, - { "zz", "Telekasten follow_link" }, - { "zn", "Telekasten new_note" }, - { "zr", "Telekasten rename_note" }, - { "zc", "Telekasten show_calendar" }, - { "zb", "Telekasten show_backlinks" }, - { "z[", "Telekasten insert_link" }, - { "#", "Telekasten show_tags" }, - { "z", "Telekasten panel" }, - }, - init = function() - vim.api.nvim_set_hl(0, "tklink", { fg = "#689d6a", bg = "" }) - vim.api.nvim_set_hl(0, "tkBrackets", { fg = "gray", bg = "gray" }) - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/ui.lua b/dot_config/nvim/lua/plugins/ui.lua index 60539b6..1de2c89 100644 --- a/dot_config/nvim/lua/plugins/ui.lua +++ b/dot_config/nvim/lua/plugins/ui.lua @@ -5,6 +5,7 @@ return { colorscheme = "catppuccin-mocha", }, }, + { "nvim-lualine/lualine.nvim", event = "VeryLazy", @@ -13,16 +14,6 @@ return { end, }, - { - "RRethy/vim-illuminate", - config = function() - -- change the highlight style - vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "Visual" }) - vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "Visual" }) - vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "Visual" }) - end, - }, - { "snacks.nvim", opts = { @@ -41,117 +32,6 @@ return { }, }, - { - "NvChad/nvim-colorizer.lua", - opts = function(_, opts) - opts.filetypes = { - "html", - "css", - "scss", - "javascript", - "typescript", - "typescriptreact", - "javascriptreact", - "lua", - } - opts.user_default_options = { - mode = "background", - tailwind = false, -- Enable tailwind colors - } - end, - }, - { - "nvimdev/dashboard-nvim", - event = "VimEnter", - opts = function() - vim.api.nvim_set_hl(0, "DashboardHeader", { fg = "#79b8ff" }) - vim.api.nvim_set_hl(0, "DashboardIcon", { fg = "#39c5cf" }) - vim.api.nvim_set_hl(0, "DashboardKey", { fg = "#39c5cf" }) - vim.api.nvim_set_hl(0, "DashboardFooter", { fg = "#959da5" }) - local logo = [[ - _ _ _ _ - | | (_) | | | | - _ __ ___ ___ ___| |__ _ _ _ ___| |__ __ _ _ __ __| | -| '_ ` _ \ / _ \ / _ \ '_ \| | | | / __| '_ \ / _` | '_ \ / _` | -| | | | | | (_) | __/ |_) | | |_| \__ \ |_) | (_| | | | | (_| | -|_| |_| |_|\___/ \___|_.__/|_|\__,_|___/_.__/ \__,_|_| |_|\__,_| ]] - - logo = string.rep("\n", 8) .. logo .. "\n\n" - - local opts = { - theme = "doom", - hide = { - statusline = false, - }, - config = { - header = vim.split(logo, "\n"), - center = { - { - action = "lua LazyVim.pick()()", - desc = " Find file", - icon = " ", - key = "f", - }, - { - action = "Telescope oldfiles", - desc = " Recent files", - icon = " ", - key = "r", - }, - { - action = 'lua LazyVim.pick("live_grep")()', - desc = " Find text", - icon = " ", - key = "g", - }, - { - action = "lua LazyVim.pick.config_files()()", - desc = " Config", - icon = " ", - key = "c", - }, - { - action = "Telekasten find_notes", - desc = " Find notes", - icon = " ", - key = "n", - }, - { - action = "Lazy", - desc = " Lazy", - icon = "󰒲 ", - key = "l", - }, - { action = "qa", desc = " Quit", icon = " ", key = "q" }, - }, - footer = function() - local stats = require("lazy").stats() - local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) - return { "⚡ Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" } - end, - }, - } - - for _, button in ipairs(opts.config.center) do - button.desc = button.desc .. string.rep(" ", 43 - #button.desc) - button.key_format = " %s" - end - - -- close Lazy and re-open when the dashboard is ready - if vim.o.filetype == "lazy" then - vim.cmd.close() - vim.api.nvim_create_autocmd("User", { - pattern = "DashboardLoaded", - callback = function() - require("lazy").show() - end, - }) - end - - return opts - end, - }, - { "stevearc/oil.nvim", opts = {}, From adcc5d5e25032550275da3ed135df6ad173bc7a8 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 24 Dec 2024 23:36:57 +0100 Subject: [PATCH 3/3] Add perl formatter --- dot_config/nvim/lua/plugins/format.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dot_config/nvim/lua/plugins/format.lua diff --git a/dot_config/nvim/lua/plugins/format.lua b/dot_config/nvim/lua/plugins/format.lua new file mode 100644 index 0000000..2489094 --- /dev/null +++ b/dot_config/nvim/lua/plugins/format.lua @@ -0,0 +1,11 @@ +return { + { + "stevearc/conform.nvim", + optional = true, + opts = { + formatters_by_ft = { + perl = { "perltidy" }, + }, + }, + }, +}