diff --git a/.config/bash/gil_specific.sh b/.config/bash/gil_specific.sh index 495a22a..0334a05 100644 --- a/.config/bash/gil_specific.sh +++ b/.config/bash/gil_specific.sh @@ -1,5 +1,6 @@ export EDITOR=~/.local/bin/nvim.appimage export TERMINAL=/usr/bin/st +export SHELL=/usr/bin/bash export PATH=$PATH:~/.local/bin alias vi="$EDITOR" @@ -37,31 +38,3 @@ reboot_to_windows () sudo grub-reboot "$windows_title" && sudo reboot } alias windows='reboot_to_windows' - - -##### oh my zsh config overload - -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="macovsky" -zstyle ':omz:update' mode auto # update automatically without asking - -# Uncomment the following line to enable command auto-correction. -ENABLE_CORRECTION="false" -COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Which plugins would you like to load? -# Standard plugins can br found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(git docker kube-ps1 kubectx kubectl) - -source $HOME/.oh-my-zsh/oh-my-zsh.sh -source $HOME/.sdkman/bin/sdkman-init.sh - -PROMPT='$(kube_ps1)'$PROMPT diff --git a/.config/fish/completions/fisher.fish b/.config/fish/completions/fisher.fish deleted file mode 100644 index 6d23ce4..0000000 --- a/.config/fish/completions/fisher.fish +++ /dev/null @@ -1,7 +0,0 @@ -complete --command fisher --exclusive --long help --description "Print help" -complete --command fisher --exclusive --long version --description "Print version" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments install --description "Install plugins" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments update --description "Update installed plugins" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments remove --description "Remove installed plugins" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments list --description "List installed plugins matching regex" -complete --command fisher --exclusive --condition "__fish_seen_subcommand_from update remove" --arguments "(fisher list)" diff --git a/.config/fish/completions/sdk.fish b/.config/fish/completions/sdk.fish deleted file mode 100644 index 7908dc8..0000000 --- a/.config/fish/completions/sdk.fish +++ /dev/null @@ -1,243 +0,0 @@ -# Defines autocompletion for SDKMAN! - -# Copyright (c) 2018-2023 Raphael Reitzig -# MIT License (MIT) -# https://github.com/reitzig/sdkman-for-fish - -# Guard: SDKMAN! needs to be installed -if not test -f "$SDKMAN_DIR/bin/sdkman-init.sh" - exit 0 -end - -# # # # # # -# Completion trigger predicates -# # # # # # - -# Test if there is no command -function __fish_sdkman_no_command - set cmd (commandline -opc) - - if [ (count $cmd) -eq 1 ] - return 0 - end - return 1 -end - -# Test if the main command matches one of the parameters -function __fish_sdkman_using_command - set cmd (commandline -opc) - - if [ (count $cmd) -eq 2 ] - if contains $cmd[2] $argv - return 0 - end - end - return 1 -end - -function __fish_sdkman_specifying_candidate - set cmd (commandline -opc) - - if [ (count $cmd) -eq 3 ] # currently, sdk does not support multiple versions - if contains $cmd[2] $argv - return 0 - end - end - return 1 -end - -function __fish_sdkman_command_has_enough_parameters - set cmd (commandline -opc) - - if [ (count $cmd) -ge (math $argv[1] + 2) ]; and contains $cmd[2] $argv[2..-1] - return 0 - end - return 1 -end - -# # # # # # -# Data collectors -# # # # # # - -function __fish_sdkman_candidates - cat "$HOME"/.sdkman/var/candidates | tr ',' '\n' -end - -function __fish_sdkman_candidates_with_versions - set regexpHome (string replace -a '/' '\\/' "$HOME/") - - find "$HOME"/.sdkman/candidates/ -mindepth 2 -maxdepth 2 -name '*current' \ - | awk -F '/' '{ print $(NF-1) }' \ - | sort -u -end - -function __fish_sdkman_installed_versions - set cmd (commandline -opc) - if [ -d "$HOME"/.sdkman/candidates/$cmd[3]/current ] - ls -v1 "$HOME"/.sdkman/candidates/$cmd[3] | grep -v current - end -end - -# # # # # # -# Completion specification -# # # # # # - -# install -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'i install' \ - -d 'Install new version' -complete -c sdk -f -n '__fish_sdkman_using_command i install' \ - -a "(__fish_sdkman_candidates)" -# TODO complete available versions --> issue #4 -complete -c sdk -f -n '__fish_sdkman_specifying_candidate i install' \ - -a 'a.b.c' \ - -d "version list unavailable" -complete -c sdk -f -n '__fish_sdkman_specifying_candidate i install' \ - -a 'x.y.z' \ - -d "Specify path to install custom version." -# Implicit: complete files as fourth parameter -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 3 i install' - # block - -# uninstall -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'rm uninstall' -d 'Uninstall version' -complete -c sdk -f -n '__fish_sdkman_using_command rm uninstall' \ - -a "(__fish_sdkman_candidates_with_versions)" -complete -c sdk -f -n '__fish_sdkman_specifying_candidate rm uninstall' \ - -a "(__fish_sdkman_installed_versions)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 2 rm uninstall' - # block - -# list -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'ls list' \ - -d 'List versions' -complete -c sdk -f -n '__fish_sdkman_using_command ls list' \ - -a "(__fish_sdkman_candidates)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 ls list' - # block - -# use -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'u use' \ - -d 'Use specific version' -complete -c sdk -f -n '__fish_sdkman_using_command u use' \ - -a "(__fish_sdkman_candidates_with_versions)" -complete -c sdk -f -n '__fish_sdkman_specifying_candidate u use' \ - -a "(__fish_sdkman_installed_versions)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 2 u use' - # block - -# default -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'd default' \ - -d 'Set default version' -complete -c sdk -f -n '__fish_sdkman_using_command d default' \ - -a "(__fish_sdkman_candidates_with_versions)" -complete -c sdk -f -n '__fish_sdkman_specifying_candidate d default' \ - -a "(__fish_sdkman_installed_versions)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 2 d default' - # block - -# current -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'c current' \ - -d 'Display current version' -complete -c sdk -f -n '__fish_sdkman_using_command c current' \ - -a "(__fish_sdkman_candidates)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 c current' - # block - -# upgrade -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'ug upgrade' \ - -d 'Display what is outdated' -complete -c sdk -f -n '__fish_sdkman_using_command ug upgrade' \ - -a "(__fish_sdkman_candidates_with_versions)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 ug upgrade' - # block - -# version -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'v version' \ - -d 'Display version' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 0 v version' - # block - -# help -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'help' \ - -d 'Display help message' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 0 h help' - # block - -# offline -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'offline' \ - -d 'Set offline status' -complete -c sdk -f -n '__fish_sdkman_using_command offline' \ - -a 'enable' \ - -d 'Make sdk work while offline' -complete -c sdk -f -n '__fish_sdkman_using_command offline' \ - -a 'disable' \ - -d 'Turn on all features' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 offline' - # block - -# selfupdate -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'selfupdate' \ - -d 'Update sdk' -complete -c sdk -f -n '__fish_sdkman_using_command selfupdate' \ - -a 'force' \ - -d 'Force re-install of current version' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 selfupdate' - # block - -# update -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'update' \ - -d 'Reload the candidate list' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 0 update' - # block - -# flush -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'flush' \ - -d 'Clear out archives and temporary storage folders' -complete -c sdk -f -n '__fish_sdkman_using_command flush' \ - -a 'temp' \ - -d 'Clear out staging work folder' -complete -c sdk -f -n '__fish_sdkman_using_command flush' \ - -a 'version' \ - -d 'Flush version file' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 flush' - # block - -# env -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'e env' \ - -d 'Load environment from .sdkmanrc file' -complete -c sdk -f -n '__fish_sdkman_using_command e env' \ - -a 'init' \ - -d 'Initialize .sdkmanrc file' -complete -c sdk -f -n '__fish_sdkman_using_command e env' \ - -a 'install' \ - -d 'Install all candidate versions listed in .sdkmanrc' -complete -c sdk -f -n '__fish_sdkman_using_command e env' \ - -a 'clear' \ - -d 'Unload currently loaded environment' -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 1 e env' - # block - -# home -complete -c sdk -f -n '__fish_sdkman_no_command' \ - -a 'h home' \ - -d 'Show installation folder of given candidate' -complete -c sdk -f -n '__fish_sdkman_using_command h home' \ - -a "(__fish_sdkman_candidates_with_versions)" -complete -c sdk -f -n '__fish_sdkman_specifying_candidate h home' \ - -a "(__fish_sdkman_installed_versions)" -complete -c sdk -f -n '__fish_sdkman_command_has_enough_parameters 2 h home' - # block diff --git a/.config/fish/conf.d/sdk.fish b/.config/fish/conf.d/sdk.fish deleted file mode 100644 index 91677cb..0000000 --- a/.config/fish/conf.d/sdk.fish +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/fish - -# Makes command and binaries from SDKMAN! available in fish. -# Delegates to bash for the `sdk` command. - -# Copyright (c) 2018-2023 Raphael Reitzig -# MIT License (MIT) -# https://github.com/reitzig/sdkman-for-fish - -# Account for custom install locations -if set -q __sdkman_custom_dir - set -gx SDKMAN_DIR "$__sdkman_custom_dir" -else - # This is the default location: - set -gx SDKMAN_DIR "$HOME/.sdkman" -end - -set __fish_sdkman_init "$SDKMAN_DIR/bin/sdkman-init.sh" - -# Copied from https://github.com/jorgebucaran/fisher/blob/main/functions/fisher.fish to be consistent: -set --query fisher_path || set --local fisher_path $__fish_config_dir -set __fish_sdkman_noexport_init "$fisher_path/functions/__sdkman-noexport-init.sh" - -# Guard: SDKMAN! needs to be installed -if not test -f "$__fish_sdkman_init" - exit 0 -end - -# Hack for issue #19: -# Create version of sdkman-init that doesn't export any environment variables. -# Refresh if sdkman-init changed. -if begin not test -f "$__fish_sdkman_noexport_init"; - or env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init" - end - mkdir -p (dirname $__fish_sdkman_noexport_init) - sed -E -e 's/^(\s*).*(export|to_path).*$/\1:/g' "$__fish_sdkman_init" \ - > "$__fish_sdkman_noexport_init" -end - -# Runs the given command in bash, capturing some side effects -# and repeating them on the current fish shell. -# Returns the same status code as the given command. -function __fish_sdkman_run_in_bash - # We need to leave stdin and stdout of sdk free for user interaction. - # So, pipe relevant environment variables (which might have changed) - # through a file. - # But since now getting the exit code of sdk itself is a hassle, - # pipe it as well. - # - # TODO: Can somebody get this to work without the overhead of a file? - set pipe (mktemp) - bash -c "$argv[1]; - echo -e \"\$?\" > $pipe; - env | grep -e '^SDKMAN_\|^PATH' >> $pipe; - env | grep -i -E \"^(`echo \${SDKMAN_CANDIDATES_CSV} | sed 's/,/|/g'`)_HOME\" >> $pipe; - echo \"SDKMAN_OFFLINE_MODE=\${SDKMAN_OFFLINE_MODE}\" >> $pipe; - echo \"SDKMAN_ENV=\${SDKMAN_ENV}\" >> $pipe" # it's not an environment variable! - set bashDump (cat $pipe; rm $pipe) - - set sdkStatus $bashDump[1] - set bashEnv $bashDump[2..-1] - - # If SDKMAN! succeeded, copy relevant environment variables - # to the current shell (they might have changed) - if [ $sdkStatus = 0 ] - for line in $bashEnv - set parts (string split "=" $line) - set var $parts[1] - set value (string join "=" $parts[2..-1]) - - switch "$var" - case "PATH" - # Special treatment: need fish list instead - # of colon-separated list. - set value (string split : "$value") - end - - if test -n value - set -gx $var $value - # Note: This makes SDKMAN_{OFFLINE_MODE,ENV} environment variables. - # That gives it the behaviour we _want_! - end - end - end - - return $sdkStatus -end - -# If this is a subshell of a(n initialized) fish owned by the same user, -# no initialization necessary. -# Otherwise: -if not set -q SDKMAN_CANDIDATES_DIR; or test (ls -ld "$SDKMAN_CANDIDATES_DIR" | awk '{print $3}') != (whoami) - __fish_sdkman_run_in_bash "source $__fish_sdkman_init" -end - -# Set up auto_env -if grep -q "^sdkman_auto_env=true" "$SDKMAN_DIR/etc/config" - function __fish_sdkman_autoenv --on-variable PWD - # Run the (modified) init script, which performs the checks and calls for us! - __fish_sdkman_run_in_bash "source \"$__fish_sdkman_noexport_init\"" - - set -x SDKMAN_OLD_PWD "$PWD" # needed by the Bash implementation - end -end diff --git a/.config/fish/config.fish b/.config/fish/config.fish deleted file mode 100644 index d714361..0000000 --- a/.config/fish/config.fish +++ /dev/null @@ -1,3 +0,0 @@ -if status is-interactive - # Commands to run in interactive sessions can go here -end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables deleted file mode 100644 index 407fe5a..0000000 --- a/.config/fish/fish_variables +++ /dev/null @@ -1,41 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR --export ABBR_TIPS_PROMPT:\x5cn\U0001f4a1\x20\x5ce\x5b1m\x7b\x7b\x20\x2eabbr\x20\x7d\x7d\x5ce\x5b0m\x20\x3d\x3e\x20\x7b\x7b\x20\x2ecmd\x20\x7d\x7d -SETUVAR --export ABBR_TIPS_REGEXES:\x28\x5e\x28\x5cw\x2b\x5cs\x2b\x29\x2b\x28\x2d\x7b1\x2c2\x7d\x29\x5cw\x2b\x29\x28\x5cs\x5cS\x2b\x29\x1e\x28\x5e\x28\x5cs\x3f\x28\x5cw\x2d\x3f\x29\x2b\x29\x7b3\x7d\x29\x2e\x2a\x1e\x28\x5e\x28\x5cs\x3f\x28\x5cw\x2d\x3f\x29\x2b\x29\x7b2\x7d\x29\x2e\x2a\x1e\x28\x5e\x28\x5cs\x3f\x28\x5cw\x2d\x3f\x29\x2b\x29\x7b1\x7d\x29\x2e\x2a -SETUVAR --export TERMINAL:/usr/bin/st -SETUVAR --export __ABBR_TIPS_KEYS:a__\x2e\x2e\x2e\x1ea__fd\x1ea__fluxUp\x1ea__ga\x1ea__gb\x1ea__gba\x1ea__gbd\x1ea__gc\x1ea__gcb\x1ea__gco\x1ea__gcp\x1ea__gcpa\x1ea__gcpc\x1ea__gd\x1ea__gdca\x1ea__gds\x1ea__gf\x1ea__gfa\x1ea__ggpush\x1ea__gr\x1ea__gra\x1ea__grb\x1ea__grba\x1ea__grbc\x1ea__grbi\x1ea__grbs\x1ea__grep\x1ea__grh\x1ea__grhh\x1ea__grhs\x1ea__grm\x1ea__grmc\x1ea__gst\x1ea__gsta\x1ea__gstaa\x1ea__gstd\x1ea__gstl\x1ea__gstp\x1ea__gsts\x1ea__gupa\x1ea__k\x1ea__kaf\x1ea__kctx\x1ea__kns\x1ea__l\x1ea__la\x1ea__ls\x1ea__md\x1ea__rd\x1ea__reducePdf\x1ea__resetTestDb\x1ea__sysup\x1ea__testIntegOFbiz\x1ea__testRfid\x1ea__tn\x1ea__todo\x1ea__tp\x1ea__vi\x1ea__windows\x1ea__ya\x1ea__yc\x1ea__yd\x1ea__yp\x1ea__ys\x1ea__yup -SETUVAR --export __ABBR_TIPS_VALUES:\x2e\x2e/\x2e\x2e\x1efdfind\x1eflux\x20reconcile\x20source\x20git\x20flux\x2dsystem\x1egit\x20add\x1egit\x20branch\x1egit\x20branch\x20\x2d\x2dall\x1egit\x20branch\x20\x2d\x2ddelete\x1egit\x20commit\x20\x2d\x2dverbose\x1egit\x20checkout\x20\x2db\x1egit\x20checkout\x1egit\x20cherry\x2dpick\x1egit\x20cherry\x2dpick\x20\x2d\x2dabort\x1egit\x20cherry\x2dpick\x20\x2d\x2dcontinue\x1egit\x20diff\x1egit\x20diff\x20\x2d\x2dcached\x1egit\x20diff\x20\x2d\x2dstaged\x1egit\x20fetch\x1egit\x20fetch\x20\x2d\x2dall\x20\x2d\x2dprune\x20\x2d\x2djobs\x3d10\x1egit\x20push\x20origin\x20\x22\x24\x28git_current_branch\x29\x22\x1egit\x20remote\x1egit\x20remote\x20add\x1egit\x20rebase\x1egit\x20rebase\x20\x2d\x2dabort\x1egit\x20rebase\x20\x2d\x2dcontinue\x1egit\x20rebase\x20\x2d\x2dinteractive\x1egit\x20rebase\x20\x2d\x2dskip\x1egrep\x20\x2d\x2dcolor\x3dauto\x20\x2d\x2dexclude\x2ddir\x3d\x7b\x2ebzr\x2cCVS\x2c\x2egit\x2c\x2ehg\x2c\x2esvn\x2c\x2eidea\x2c\x2etox\x7d\x1egit\x20reset\x1egit\x20reset\x20\x2d\x2dhard\x1egit\x20reset\x20\x2d\x2dsoft\x1egit\x20rm\x1egit\x20rm\x20\x2d\x2dcached\x1egit\x20status\x1egit\x20stash\x20push\x1egit\x20stash\x20apply\x1egit\x20stash\x20drop\x1egit\x20stash\x20list\x1egit\x20stash\x20pop\x1egit\x20stash\x20show\x20\x2d\x2dpatch\x1egit\x20pull\x20\x2d\x2drebase\x20\x2d\x2dautostash\x20\x2dv\x1ekubectl\x1ekubectl\x20apply\x20\x2df\x1ekubectx\x1ekubens\x1els\x20\x2dlah\x1els\x20\x2dlAh\x1els\x20\x2d\x2dcolor\x3dtty\x1emkdir\x20\x2dp\x1ermdir\x1egs\x20\x2dsDEVICE\x3dpdfwrite\x20\x2ddCompatibilityLevel\x3d1\x2e4\x20\x2ddPDFSETTINGS\x3d/screen\x20\x2ddNOPAUSE\x20\x2ddBATCH\x20\x2ddColorImageResolution\x3d150\x20\x2dsOutputFile\x3doutput\x2epdf\x1edropdb\x20ofbiz\x20\x26\x26\x20createdb\x20ofbiz\x20\x26\x26\x20\x2e/gradlew\x20\x22ofbiz\x20\x2dl\x20readers\x3dseed\x2cseed\x2dinitial\x20\x2dl\x20delegator\x3dtest\x22\x1esudo\x20apt\x20update\x20\x26\x26\x20sudo\x20apt\x20upgrade\x20\x2dy\x1e\x2e/gradlew\x20cleanAll\x20loadAll\x20testIntegration\x1e\x2e/gradlew\x20\x22ofbiz\x20\x2d\x2dtest\x20component\x3drfid\x20\x2d\x2dtest\x20delegator\x3dtest\x22\x1essh\x20\x2dL\x20localhost\x3a5488\x3aemb\x2dofbiz\x2dnereide\x2dofbiz2\x2drds\x2eckerltpo0vvy\x2eeu\x2dwest\x2d1\x2erds\x2eamazonaws\x2ecom\x3a5432\x20bastion\x2edecathlon\x1evi\x20\x7e/Nextcloud/TODO/todo\x2etxt\x1essh\x20\x2dL\x20localhost\x3a5488\x3aemb\x2dofbiz\x2dprep\x2dofbiz2\x2drds\x2dencrypted\x2eckerltpo0vvy\x2eeu\x2dwest\x2d1\x2erds\x2eamazonaws\x2ecom\x3a5432\x20bastion\x2edecathlon\x1e/home/gil/\x2elocal/bin/nvim\x2eappimage\x1ereboot_to_windows\x1eyadm\x20add\x1eyadm\x20commit\x20\x2dv\x1eyadm\x20diff\x1eyadm\x20push\x1eyadm\x20status\x1eyadm\x20pull\x20\x2d\x2drebase -SETUVAR __fish_initialized:3400 -SETUVAR _fisher_gazorby_2F_fish_2D_abbreviation_2D_tips_files:\x7e/\x2econfig/fish/functions/__abbr_tips_bind_newline\x2efish\x1e\x7e/\x2econfig/fish/functions/__abbr_tips_bind_space\x2efish\x1e\x7e/\x2econfig/fish/functions/__abbr_tips_clean\x2efish\x1e\x7e/\x2econfig/fish/functions/__abbr_tips_init\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/abbr_tips\x2efish -SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ereitzig/sdkman\x2dfor\x2dfish\x40v2\x2e0\x2e0\x1egazorby/fish\x2dabbreviation\x2dtips -SETUVAR _fisher_reitzig_2F_sdkman_2D_for_2D_fish_40_v2_2E_30_2E_30__files:\x7e/\x2econfig/fish/functions/sdk\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/sdk\x2efish\x1e\x7e/\x2econfig/fish/completions/sdk\x2efish -SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:555\x1ebrblack -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_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D\x1eyellow\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/.config/fish/functions/....fish b/.config/fish/functions/....fish deleted file mode 100644 index 8098747..0000000 --- a/.config/fish/functions/....fish +++ /dev/null @@ -1,4 +0,0 @@ -function ... --wraps=../.. --description 'alias ...=../..' - ../.. $argv - -end diff --git a/.config/fish/functions/__sdkman-noexport-init.sh b/.config/fish/functions/__sdkman-noexport-init.sh deleted file mode 100644 index a86652c..0000000 --- a/.config/fish/functions/__sdkman-noexport-init.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/env bash - -# -# Copyright 2021 Marco Vermeulen -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# set env vars if not set -if [ -z "$SDKMAN_CANDIDATES_API" ]; then - : -fi - -if [ -z "$SDKMAN_DIR" ]; then - : -fi - -# Load the sdkman config if it exists. -if [ -f "${SDKMAN_DIR}/etc/config" ]; then - source "${SDKMAN_DIR}/etc/config" -fi - -# Read the platform file -SDKMAN_PLATFORM="$(cat "${SDKMAN_DIR}/var/platform")" -: - -# OS specific support (must be 'true' or 'false'). -cygwin=false -darwin=false -solaris=false -freebsd=false -SDKMAN_KERNEL="$(uname -s)" -case "${SDKMAN_KERNEL}" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - SunOS*) - solaris=true - ;; - FreeBSD*) - freebsd=true -esac - -# Determine shell -zsh_shell=false -bash_shell=false - -if [[ -n "$ZSH_VERSION" ]]; then - zsh_shell=true -elif [[ -n "$BASH_VERSION" ]]; then - bash_shell=true -fi - -# Source sdkman module scripts and extension files. -# -# Extension files are prefixed with 'sdkman-' and found in the ext/ folder. -# Use this if extensions are written with the functional approach and want -# to use functions in the main sdkman script. For more details, refer to -# . -OLD_IFS="$IFS" -IFS=$'\n' -scripts=($(find "${SDKMAN_DIR}/src" "${SDKMAN_DIR}/ext" -type f -name 'sdkman-*.sh')) -for f in "${scripts[@]}"; do - source "$f" -done -IFS="$OLD_IFS" -unset OLD_IFS scripts f - -# Create upgrade delay file if it doesn't exist -if [[ ! -f "${SDKMAN_DIR}/var/delay_upgrade" ]]; then - touch "${SDKMAN_DIR}/var/delay_upgrade" -fi - -# set curl connect-timeout and max-time -if [[ -z "$sdkman_curl_connect_timeout" ]]; then sdkman_curl_connect_timeout=7; fi -if [[ -z "$sdkman_curl_max_time" ]]; then sdkman_curl_max_time=10; fi - -# set curl retry -if [[ -z "${sdkman_curl_retry}" ]]; then sdkman_curl_retry=0; fi - -# set curl retry max time in seconds -if [[ -z "${sdkman_curl_retry_max_time}" ]]; then sdkman_curl_retry_max_time=60; fi - -# set curl to continue downloading automatically -if [[ -z "${sdkman_curl_continue}" ]]; then sdkman_curl_continue=true; fi - -# read list of candidates and set array -SDKMAN_CANDIDATES_CACHE="${SDKMAN_DIR}/var/candidates" -SDKMAN_CANDIDATES_CSV=$(<"$SDKMAN_CANDIDATES_CACHE") -__sdkman_echo_debug "Setting candidates csv: $SDKMAN_CANDIDATES_CSV" -if [[ "$zsh_shell" == 'true' ]]; then - SDKMAN_CANDIDATES=(${(s:,:)SDKMAN_CANDIDATES_CSV}) -else - IFS=',' read -a SDKMAN_CANDIDATES <<< "${SDKMAN_CANDIDATES_CSV}" -fi - -: - -for candidate_name in "${SDKMAN_CANDIDATES[@]}"; do - candidate_dir="${SDKMAN_CANDIDATES_DIR}/${candidate_name}/current" - if [[ -h "$candidate_dir" || -d "${candidate_dir}" ]]; then - : - : - fi -done -unset candidate_name candidate_dir -: - -# source completion scripts -if [[ "$sdkman_auto_complete" == 'true' ]]; then - if [[ "$zsh_shell" == 'true' ]]; then - # initialize zsh completions (if not already done) - if ! (( $+functions[compdef] )) ; then - autoload -Uz compinit - if [[ $ZSH_DISABLE_COMPFIX == 'true' ]]; then - compinit -u -C - else - compinit - fi - fi - autoload -U bashcompinit - bashcompinit - source "${SDKMAN_DIR}/contrib/completion/bash/sdk" - __sdkman_echo_debug "ZSH completion script loaded..." - elif [[ "$bash_shell" == 'true' ]]; then - source "${SDKMAN_DIR}/contrib/completion/bash/sdk" - __sdkman_echo_debug "Bash completion script loaded..." - else - __sdkman_echo_debug "No completion scripts found for $SHELL" - fi -fi - -if [[ "$sdkman_auto_env" == "true" ]]; then - if [[ "$zsh_shell" == "true" ]]; then - function sdkman_auto_env() { - if [[ -n $SDKMAN_ENV ]] && [[ ! $PWD =~ ^$SDKMAN_ENV ]]; then - sdk env clear - fi - if [[ -f .sdkmanrc ]]; then - sdk env - fi - } - - chpwd_functions+=(sdkman_auto_env) - else - function sdkman_auto_env() { - if [[ -n $SDKMAN_ENV ]] && [[ ! $PWD =~ ^$SDKMAN_ENV ]]; then - sdk env clear - fi - if [[ "$SDKMAN_OLD_PWD" != "$PWD" ]] && [[ -f ".sdkmanrc" ]]; then - sdk env - fi - - : - } - - trimmed_prompt_command="${PROMPT_COMMAND%"${PROMPT_COMMAND##*[![:space:]]}"}" - [[ -z "$trimmed_prompt_command" ]] && PROMPT_COMMAND="sdkman_auto_env" || PROMPT_COMMAND="${trimmed_prompt_command%\;};sdkman_auto_env" - fi - - sdkman_auto_env -fi diff --git a/.config/fish/functions/fd.fish b/.config/fish/functions/fd.fish deleted file mode 100644 index a47deb3..0000000 --- a/.config/fish/functions/fd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function fd --wraps=fdfind --description 'alias fd=fdfind' - fdfind $argv - -end diff --git a/.config/fish/functions/fisher.fish b/.config/fish/functions/fisher.fish deleted file mode 100644 index b1513d3..0000000 --- a/.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.4 - 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) - - 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 - - printf "%s\n" $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/.config/fish/functions/fluxUp.fish b/.config/fish/functions/fluxUp.fish deleted file mode 100644 index 559abff..0000000 --- a/.config/fish/functions/fluxUp.fish +++ /dev/null @@ -1,4 +0,0 @@ -function fluxUp --wraps='flux reconcile source git flux-system' --description 'alias fluxUp=flux reconcile source git flux-system' - flux reconcile source git flux-system $argv - -end diff --git a/.config/fish/functions/ga.fish b/.config/fish/functions/ga.fish deleted file mode 100644 index 6661b8c..0000000 --- a/.config/fish/functions/ga.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ga --wraps='git add' --description 'alias ga=git add' - git add $argv - -end diff --git a/.config/fish/functions/gb.fish b/.config/fish/functions/gb.fish deleted file mode 100644 index 94a3913..0000000 --- a/.config/fish/functions/gb.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gb --wraps='git branch' --description 'alias gb=git branch' - git branch $argv - -end diff --git a/.config/fish/functions/gba.fish b/.config/fish/functions/gba.fish deleted file mode 100644 index 2694db5..0000000 --- a/.config/fish/functions/gba.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gba --wraps='git branch --all' --description 'alias gba=git branch --all' - git branch --all $argv - -end diff --git a/.config/fish/functions/gbd.fish b/.config/fish/functions/gbd.fish deleted file mode 100644 index e0294e3..0000000 --- a/.config/fish/functions/gbd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gbd --wraps='git branch --delete' --description 'alias gbd=git branch --delete' - git branch --delete $argv - -end diff --git a/.config/fish/functions/gc.fish b/.config/fish/functions/gc.fish deleted file mode 100644 index daaeb93..0000000 --- a/.config/fish/functions/gc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gc --wraps='git commit --verbose' --description 'alias gc=git commit --verbose' - git commit --verbose $argv - -end diff --git a/.config/fish/functions/gcb.fish b/.config/fish/functions/gcb.fish deleted file mode 100644 index 21c11b7..0000000 --- a/.config/fish/functions/gcb.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gcb --wraps='git checkout -b' --description 'alias gcb=git checkout -b' - git checkout -b $argv - -end diff --git a/.config/fish/functions/gco.fish b/.config/fish/functions/gco.fish deleted file mode 100644 index ac512e9..0000000 --- a/.config/fish/functions/gco.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gco --wraps='git checkout' --description 'alias gco=git checkout' - git checkout $argv - -end diff --git a/.config/fish/functions/gcp.fish b/.config/fish/functions/gcp.fish deleted file mode 100644 index 5957fef..0000000 --- a/.config/fish/functions/gcp.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gcp --wraps='git cherry-pick' --description 'alias gcp=git cherry-pick' - git cherry-pick $argv - -end diff --git a/.config/fish/functions/gcpa.fish b/.config/fish/functions/gcpa.fish deleted file mode 100644 index 8bb3d5d..0000000 --- a/.config/fish/functions/gcpa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gcpa --wraps='git cherry-pick --abort' --description 'alias gcpa=git cherry-pick --abort' - git cherry-pick --abort $argv - -end diff --git a/.config/fish/functions/gcpc.fish b/.config/fish/functions/gcpc.fish deleted file mode 100644 index 82d939e..0000000 --- a/.config/fish/functions/gcpc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gcpc --wraps='git cherry-pick --continue' --description 'alias gcpc=git cherry-pick --continue' - git cherry-pick --continue $argv - -end diff --git a/.config/fish/functions/gd.fish b/.config/fish/functions/gd.fish deleted file mode 100644 index f92b89c..0000000 --- a/.config/fish/functions/gd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gd --wraps='git diff' --description 'alias gd=git diff' - git diff $argv - -end diff --git a/.config/fish/functions/gdca.fish b/.config/fish/functions/gdca.fish deleted file mode 100644 index c8c9102..0000000 --- a/.config/fish/functions/gdca.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gdca --wraps='git diff --cached' --description 'alias gdca=git diff --cached' - git diff --cached $argv - -end diff --git a/.config/fish/functions/gds.fish b/.config/fish/functions/gds.fish deleted file mode 100644 index 98d6f44..0000000 --- a/.config/fish/functions/gds.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gds --wraps='git diff --staged' --description 'alias gds=git diff --staged' - git diff --staged $argv - -end diff --git a/.config/fish/functions/gf.fish b/.config/fish/functions/gf.fish deleted file mode 100644 index 3867274..0000000 --- a/.config/fish/functions/gf.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gf --wraps='git fetch' --description 'alias gf=git fetch' - git fetch $argv - -end diff --git a/.config/fish/functions/gfa.fish b/.config/fish/functions/gfa.fish deleted file mode 100644 index 7b696c9..0000000 --- a/.config/fish/functions/gfa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gfa --wraps='git fetch --all --prune --jobs=10' --description 'alias gfa=git fetch --all --prune --jobs=10' - git fetch --all --prune --jobs=10 $argv - -end diff --git a/.config/fish/functions/ggpush.fish b/.config/fish/functions/ggpush.fish deleted file mode 100644 index d1147c8..0000000 --- a/.config/fish/functions/ggpush.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ggpush --wraps='git push origin "$(git_current_branch)"' --description 'alias ggpush=git push origin "$(git_current_branch)"' - git push origin (command git symbolic-ref --short HEAD 2>/dev/null) -end diff --git a/.config/fish/functions/gr.fish b/.config/fish/functions/gr.fish deleted file mode 100644 index f01ab4f..0000000 --- a/.config/fish/functions/gr.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gr --wraps='git remote' --description 'alias gr=git remote' - git remote $argv - -end diff --git a/.config/fish/functions/gra.fish b/.config/fish/functions/gra.fish deleted file mode 100644 index 637b610..0000000 --- a/.config/fish/functions/gra.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gra --wraps='git remote add' --description 'alias gra=git remote add' - git remote add $argv - -end diff --git a/.config/fish/functions/grb.fish b/.config/fish/functions/grb.fish deleted file mode 100644 index 75fd630..0000000 --- a/.config/fish/functions/grb.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grb --wraps='git rebase' --description 'alias grb=git rebase' - git rebase $argv - -end diff --git a/.config/fish/functions/grba.fish b/.config/fish/functions/grba.fish deleted file mode 100644 index c46b222..0000000 --- a/.config/fish/functions/grba.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grba --wraps='git rebase --abort' --description 'alias grba=git rebase --abort' - git rebase --abort $argv - -end diff --git a/.config/fish/functions/grbc.fish b/.config/fish/functions/grbc.fish deleted file mode 100644 index 21cf677..0000000 --- a/.config/fish/functions/grbc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grbc --wraps='git rebase --continue' --description 'alias grbc=git rebase --continue' - git rebase --continue $argv - -end diff --git a/.config/fish/functions/grbi.fish b/.config/fish/functions/grbi.fish deleted file mode 100644 index 5198b94..0000000 --- a/.config/fish/functions/grbi.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grbi --wraps='git rebase --interactive' --description 'alias grbi=git rebase --interactive' - git rebase --interactive $argv - -end diff --git a/.config/fish/functions/grbs.fish b/.config/fish/functions/grbs.fish deleted file mode 100644 index 8c6230f..0000000 --- a/.config/fish/functions/grbs.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grbs --wraps='git rebase --skip' --description 'alias grbs=git rebase --skip' - git rebase --skip $argv - -end diff --git a/.config/fish/functions/grep.fish b/.config/fish/functions/grep.fish deleted file mode 100644 index adaf5e6..0000000 --- a/.config/fish/functions/grep.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grep --description 'alias grep=grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}' - command grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox} $argv - -end diff --git a/.config/fish/functions/grh.fish b/.config/fish/functions/grh.fish deleted file mode 100644 index 3ceb016..0000000 --- a/.config/fish/functions/grh.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grh --wraps='git reset' --description 'alias grh=git reset' - git reset $argv - -end diff --git a/.config/fish/functions/grhh.fish b/.config/fish/functions/grhh.fish deleted file mode 100644 index b47fd3c..0000000 --- a/.config/fish/functions/grhh.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grhh --wraps='git reset --hard' --description 'alias grhh=git reset --hard' - git reset --hard $argv - -end diff --git a/.config/fish/functions/grhs.fish b/.config/fish/functions/grhs.fish deleted file mode 100644 index 375e6f3..0000000 --- a/.config/fish/functions/grhs.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grhs --wraps='git reset --soft' --description 'alias grhs=git reset --soft' - git reset --soft $argv - -end diff --git a/.config/fish/functions/grm.fish b/.config/fish/functions/grm.fish deleted file mode 100644 index ae02b03..0000000 --- a/.config/fish/functions/grm.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grm --wraps='git rm' --description 'alias grm=git rm' - git rm $argv - -end diff --git a/.config/fish/functions/grmc.fish b/.config/fish/functions/grmc.fish deleted file mode 100644 index da1fcbe..0000000 --- a/.config/fish/functions/grmc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function grmc --wraps='git rm --cached' --description 'alias grmc=git rm --cached' - git rm --cached $argv - -end diff --git a/.config/fish/functions/gst.fish b/.config/fish/functions/gst.fish deleted file mode 100644 index 1822c5c..0000000 --- a/.config/fish/functions/gst.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gst --wraps='git status' --description 'alias gst=git status' - git status $argv - -end diff --git a/.config/fish/functions/gsta.fish b/.config/fish/functions/gsta.fish deleted file mode 100644 index 2554611..0000000 --- a/.config/fish/functions/gsta.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gsta --wraps='git stash push' --description 'alias gsta=git stash push' - git stash push $argv - -end diff --git a/.config/fish/functions/gstaa.fish b/.config/fish/functions/gstaa.fish deleted file mode 100644 index c66a012..0000000 --- a/.config/fish/functions/gstaa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gstaa --wraps='git stash apply' --description 'alias gstaa=git stash apply' - git stash apply $argv - -end diff --git a/.config/fish/functions/gstd.fish b/.config/fish/functions/gstd.fish deleted file mode 100644 index 85b5725..0000000 --- a/.config/fish/functions/gstd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gstd --wraps='git stash drop' --description 'alias gstd=git stash drop' - git stash drop $argv - -end diff --git a/.config/fish/functions/gstl.fish b/.config/fish/functions/gstl.fish deleted file mode 100644 index d104f42..0000000 --- a/.config/fish/functions/gstl.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gstl --wraps='git stash list' --description 'alias gstl=git stash list' - git stash list $argv - -end diff --git a/.config/fish/functions/gstp.fish b/.config/fish/functions/gstp.fish deleted file mode 100644 index 9ae7c2a..0000000 --- a/.config/fish/functions/gstp.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gstp --wraps='git stash pop' --description 'alias gstp=git stash pop' - git stash pop $argv - -end diff --git a/.config/fish/functions/gsts.fish b/.config/fish/functions/gsts.fish deleted file mode 100644 index 28844ff..0000000 --- a/.config/fish/functions/gsts.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gsts --wraps='git stash show --patch' --description 'alias gsts=git stash show --patch' - git stash show --patch $argv - -end diff --git a/.config/fish/functions/gupa.fish b/.config/fish/functions/gupa.fish deleted file mode 100644 index 9ad942c..0000000 --- a/.config/fish/functions/gupa.fish +++ /dev/null @@ -1,4 +0,0 @@ -function gupa --wraps='git pull --rebase --autostash -v' --description 'alias gupa=git pull --rebase --autostash -v' - git pull --rebase --autostash -v $argv - -end diff --git a/.config/fish/functions/k.fish b/.config/fish/functions/k.fish deleted file mode 100644 index 72d8f1e..0000000 --- a/.config/fish/functions/k.fish +++ /dev/null @@ -1,4 +0,0 @@ -function k --wraps=kubectl --description 'alias k=kubectl' - kubectl $argv - -end diff --git a/.config/fish/functions/kaf.fish b/.config/fish/functions/kaf.fish deleted file mode 100644 index a68fbb5..0000000 --- a/.config/fish/functions/kaf.fish +++ /dev/null @@ -1,4 +0,0 @@ -function kaf --wraps='kubectl apply -f' --description 'alias kaf=kubectl apply -f' - kubectl apply -f $argv - -end diff --git a/.config/fish/functions/kctx.fish b/.config/fish/functions/kctx.fish deleted file mode 100644 index 21fb7dd..0000000 --- a/.config/fish/functions/kctx.fish +++ /dev/null @@ -1,4 +0,0 @@ -function kctx --wraps=kubectx --description 'alias kctx=kubectx' - kubectx $argv - -end diff --git a/.config/fish/functions/kns.fish b/.config/fish/functions/kns.fish deleted file mode 100644 index 6e83cbf..0000000 --- a/.config/fish/functions/kns.fish +++ /dev/null @@ -1,4 +0,0 @@ -function kns --wraps=kubens --description 'alias kns=kubens' - kubens $argv - -end diff --git a/.config/fish/functions/ksh.fish b/.config/fish/functions/ksh.fish deleted file mode 100644 index e7f9240..0000000 --- a/.config/fish/functions/ksh.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ksh --description 'se connecte au pod en param' - kubectl exec -it $argv /bin/bash -end diff --git a/.config/fish/functions/l.fish b/.config/fish/functions/l.fish deleted file mode 100644 index b4393d2..0000000 --- a/.config/fish/functions/l.fish +++ /dev/null @@ -1,4 +0,0 @@ -function l --wraps='ls -lah' --description 'alias l=ls -lah' - ls -lah $argv - -end diff --git a/.config/fish/functions/la.fish b/.config/fish/functions/la.fish deleted file mode 100644 index 095f7da..0000000 --- a/.config/fish/functions/la.fish +++ /dev/null @@ -1,4 +0,0 @@ -function la --wraps=ls --wraps='ls -lAh' --description 'alias la=ls -lAh' - ls -lAh $argv - -end diff --git a/.config/fish/functions/ls.fish b/.config/fish/functions/ls.fish deleted file mode 100644 index 818ae7c..0000000 --- a/.config/fish/functions/ls.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ls --description 'alias ls=ls --color=tty' - command ls --color=tty $argv - -end diff --git a/.config/fish/functions/md.fish b/.config/fish/functions/md.fish deleted file mode 100644 index 7f0f681..0000000 --- a/.config/fish/functions/md.fish +++ /dev/null @@ -1,4 +0,0 @@ -function md --wraps='mkdir -p' --description 'alias md=mkdir -p' - mkdir -p $argv - -end diff --git a/.config/fish/functions/rd.fish b/.config/fish/functions/rd.fish deleted file mode 100644 index 259921d..0000000 --- a/.config/fish/functions/rd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function rd --wraps=rmdir --description 'alias rd=rmdir' - rmdir $argv - -end diff --git a/.config/fish/functions/reducePdf.fish b/.config/fish/functions/reducePdf.fish deleted file mode 100644 index 05149c1..0000000 --- a/.config/fish/functions/reducePdf.fish +++ /dev/null @@ -1,4 +0,0 @@ -function reducePdf --wraps='gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/screen -dNOPAUSE -dBATCH -dColorImageResolution=150 -sOutputFile=output.pdf' --description 'alias reducePdf=gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/screen -dNOPAUSE -dBATCH -dColorImageResolution=150 -sOutputFile=output.pdf' - gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/screen -dNOPAUSE -dBATCH -dColorImageResolution=150 -sOutputFile=output.pdf $argv - -end diff --git a/.config/fish/functions/resetTestDb.fish b/.config/fish/functions/resetTestDb.fish deleted file mode 100644 index 021a2f8..0000000 --- a/.config/fish/functions/resetTestDb.fish +++ /dev/null @@ -1,3 +0,0 @@ -function resetTestDb --wraps='dropdb ofbiz && createdb ofbiz && ./gradlew "ofbiz -l readers=seed,seed-initial -l delegator=test"' --description 'alias resetTestDb=dropdb ofbiz && createdb ofbiz && ./gradlew "ofbiz -l readers=seed,seed-initial -l delegator=test"' - dropdb ofbiz && createdb -O ofbiz ofbiz && ./gradlew "ofbiz -l readers=seed,seed-initial -l delegator=test" $argv -end diff --git a/.config/fish/functions/sdk.fish b/.config/fish/functions/sdk.fish deleted file mode 100644 index 25def1f..0000000 --- a/.config/fish/functions/sdk.fish +++ /dev/null @@ -1,42 +0,0 @@ -# Wrapper function for SDKMAN! - -# Copyright (c) 2018-2023 Raphael Reitzig -# MIT License (MIT) -# https://github.com/reitzig/sdkman-for-fish - -function sdk -d "Manage SDKs" - # Guard: SDKMAN! needs to be installed - if not test -f "$__fish_sdkman_init" - # Propose to install SDKMAN! - - function read_confirm - while true - read -l -P "$argv[1] [y/N] " confirm - - switch $confirm - case Y y - return 0 - case '' N n - return 1 - end - end - end - - if read_confirm "You don't seem to have SDKMAN! installed. Install now?" - if not which curl > /dev/null - echo "curl required" - return 1 - end - if not which bash > /dev/null - echo "bash required" - return 1 - end - - curl -s "https://get.sdkman.io" | bash | sed '/All done!/q' - echo "Please open a new terminal/shell to load SDKMAN!" - end - else - # Declare the _actual_ sdk command for fish - __fish_sdkman_run_in_bash "source \"$__fish_sdkman_noexport_init\" && sdk $argv" - end -end diff --git a/.config/fish/functions/sysup.fish b/.config/fish/functions/sysup.fish deleted file mode 100644 index f59a64f..0000000 --- a/.config/fish/functions/sysup.fish +++ /dev/null @@ -1,4 +0,0 @@ -function sysup --wraps='sudo apt update && sudo apt upgrade -y' --description 'alias sysup=sudo apt update && sudo apt upgrade -y' - sudo apt update && sudo apt upgrade -y $argv - -end diff --git a/.config/fish/functions/testIntegOFbiz.fish b/.config/fish/functions/testIntegOFbiz.fish deleted file mode 100644 index 6a2e530..0000000 --- a/.config/fish/functions/testIntegOFbiz.fish +++ /dev/null @@ -1,4 +0,0 @@ -function testIntegOFbiz --wraps='./gradlew cleanAll loadAll testIntegration' --description 'alias testIntegOFbiz=./gradlew cleanAll loadAll testIntegration' - ./gradlew cleanAll loadAll testIntegration $argv - -end diff --git a/.config/fish/functions/testRfid.fish b/.config/fish/functions/testRfid.fish deleted file mode 100644 index 5266ea7..0000000 --- a/.config/fish/functions/testRfid.fish +++ /dev/null @@ -1,4 +0,0 @@ -function testRfid --wraps='./gradlew "ofbiz --test component=rfid --test delegator=test"' --description 'alias testRfid=./gradlew "ofbiz --test component=rfid --test delegator=test"' - ./gradlew "ofbiz --test component=rfid --test delegator=test" $argv - -end diff --git a/.config/fish/functions/tn.fish b/.config/fish/functions/tn.fish deleted file mode 100644 index 151da7b..0000000 --- a/.config/fish/functions/tn.fish +++ /dev/null @@ -1,4 +0,0 @@ -function tn --wraps='ssh -L localhost:5488:emb-ofbiz-nereide-ofbiz2-rds.ckerltpo0vvy.eu-west-1.rds.amazonaws.com:5432 bastion.decathlon' --description 'alias tn=ssh -L localhost:5488:emb-ofbiz-nereide-ofbiz2-rds.ckerltpo0vvy.eu-west-1.rds.amazonaws.com:5432 bastion.decathlon' - ssh -L localhost:5488:emb-ofbiz-nereide-ofbiz2-rds.ckerltpo0vvy.eu-west-1.rds.amazonaws.com:5432 bastion.decathlon $argv - -end diff --git a/.config/fish/functions/todo.fish b/.config/fish/functions/todo.fish deleted file mode 100644 index d1fa315..0000000 --- a/.config/fish/functions/todo.fish +++ /dev/null @@ -1,4 +0,0 @@ -function todo --wraps='vi ~/Nextcloud/TODO/todo.txt' --description 'alias todo=vi ~/Nextcloud/TODO/todo.txt' - vi ~/Nextcloud/TODO/todo.txt $argv - -end diff --git a/.config/fish/functions/tp.fish b/.config/fish/functions/tp.fish deleted file mode 100644 index 5ba3149..0000000 --- a/.config/fish/functions/tp.fish +++ /dev/null @@ -1,4 +0,0 @@ -function tp --wraps='ssh -L localhost:5488:emb-ofbiz-prep-ofbiz2-rds-encrypted.ckerltpo0vvy.eu-west-1.rds.amazonaws.com:5432 bastion.decathlon' --description 'alias tp=ssh -L localhost:5488:emb-ofbiz-prep-ofbiz2-rds-encrypted.ckerltpo0vvy.eu-west-1.rds.amazonaws.com:5432 bastion.decathlon' - ssh -L localhost:5488:emb-ofbiz-prep-ofbiz2-rds-encrypted.ckerltpo0vvy.eu-west-1.rds.amazonaws.com:5432 bastion.decathlon $argv - -end diff --git a/.config/fish/functions/vi.fish b/.config/fish/functions/vi.fish deleted file mode 100644 index 36bea74..0000000 --- a/.config/fish/functions/vi.fish +++ /dev/null @@ -1,3 +0,0 @@ -function vi --wraps=vim --description 'my personal text editor :)' - $HOME/.local/bin/nvim.appimage $argv -end diff --git a/.config/fish/functions/windows.fish b/.config/fish/functions/windows.fish deleted file mode 100644 index edb0741..0000000 --- a/.config/fish/functions/windows.fish +++ /dev/null @@ -1,4 +0,0 @@ -function windows --wraps=reboot_to_windows --description 'alias windows=reboot_to_windows' - reboot_to_windows $argv - -end diff --git a/.config/fish/functions/ya.fish b/.config/fish/functions/ya.fish deleted file mode 100644 index c774778..0000000 --- a/.config/fish/functions/ya.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ya --wraps='yadm add' --description 'alias ya=yadm add' - yadm add $argv - -end diff --git a/.config/fish/functions/yc.fish b/.config/fish/functions/yc.fish deleted file mode 100644 index bc32bed..0000000 --- a/.config/fish/functions/yc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function yc --wraps='yadm commit -v' --description 'alias yc=yadm commit -v' - yadm commit -v $argv - -end diff --git a/.config/fish/functions/yd.fish b/.config/fish/functions/yd.fish deleted file mode 100644 index 444ff67..0000000 --- a/.config/fish/functions/yd.fish +++ /dev/null @@ -1,4 +0,0 @@ -function yd --wraps='yadm diff' --description 'alias yd=yadm diff' - yadm diff $argv - -end diff --git a/.config/fish/functions/yp.fish b/.config/fish/functions/yp.fish deleted file mode 100644 index 4be95b7..0000000 --- a/.config/fish/functions/yp.fish +++ /dev/null @@ -1,4 +0,0 @@ -function yp --wraps='yadm push' --description 'alias yp=yadm push' - yadm push $argv - -end diff --git a/.config/fish/functions/ys.fish b/.config/fish/functions/ys.fish deleted file mode 100644 index 8439bf9..0000000 --- a/.config/fish/functions/ys.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ys --wraps='yadm status' --description 'alias ys=yadm status' - yadm status $argv - -end diff --git a/.config/fish/functions/yup.fish b/.config/fish/functions/yup.fish deleted file mode 100644 index 163171d..0000000 --- a/.config/fish/functions/yup.fish +++ /dev/null @@ -1,4 +0,0 @@ -function yup --wraps='yadm pull --rebase' --description 'alias yup=yadm pull --rebase' - yadm pull --rebase $argv - -end diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 84ca347..7657300 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -2,7 +2,7 @@ set-option -g mouse off bind-key v copy-mode -set-option -g default-shell $SHELL +set-option -g default-shell /bin/bash setw -g mode-keys vi set-option -s set-clipboard off diff --git a/installSystem.sh b/installSystem.sh index 6619480..712b628 100644 --- a/installSystem.sh +++ b/installSystem.sh @@ -5,7 +5,7 @@ groups | grep -q sudo || echo "Please add $(whoami) to sudo group with : sudo us groups | grep -q sudo || return # sudo usermod -aG sudo $user # pour passer sudoers, puis reboot -sudo apt install -y vim-gtk3 vim vim-nox zsh fzf cmake python3-tldextract uuid-runtime webext-browserpass webext-ublock-origin-firefox curl pass python3 ripgrep fonts-firacode fd-find tmux postgresql rsync nextcloud-desktop tig locate htop libx11-dev libxinerama-dev libxft-dev libx11-xcb-dev libxcb-res0-dev arandr make gcc pulsemixer unclutter libnotify-bin ncal dmenu brightnessctl brightness-udev feh autorandr inkscape neomutt isync msmtp lynx notmuch abook urlview pulseaudio-utils mailsync slock bash-completion dunst kubectx imagemagick +sudo apt install -y openjdk-17-jdk maven vim-gtk3 vim vim-nox zsh fzf cmake python3-tldextract uuid-runtime webext-browserpass webext-ublock-origin-firefox curl pass python3 ripgrep fonts-firacode fd-find tmux postgresql rsync nextcloud-desktop tig locate htop libx11-dev libxinerama-dev libxft-dev libx11-xcb-dev libxcb-res0-dev arandr make gcc pulsemixer unclutter libnotify-bin ncal dmenu brightnessctl brightness-udev feh autorandr inkscape neomutt isync msmtp lynx notmuch abook urlview pulseaudio-utils mailsync slock bash-completion dunst kubectx imagemagick sudo apt autoremove [ ! -f "$HOME/.local/bin/fd" ] && ln -s $(which fdfind) ~/.local/bin/fd @@ -15,10 +15,10 @@ sudo apt autoremove sudo sed -i '/"PDF"/s/none/read|write/' /etc/ImageMagick-6/policy.xml # Installation oh my bash -#[ ! -d "$HOME/.oh-my-bash/" ] && bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)" || echo "oh-my-bash installed" +[ ! -d "$HOME/.oh-my-bash/" ] && bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)" || echo "oh-my-bash installed" # Installation config specif bash + aliases -#grep -q "gil_specific" "$HOME/.bashrc" && echo "Bash configured" || sed -i -e '$asource "$HOME/.config/bash/gil_specific.sh"\' $HOME/.bashrc +grep -q "gil_specific" "$HOME/.bashrc" && echo "Bash configured" || sed -i -e '$asource "$HOME/.config/bash/gil_specific.sh"\' $HOME/.bashrc # Installation oh my zsh #[ ! -d "$HOME/.oh-my-zsh/" ] && bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" || echo "oh-my-zsh installed"