From 828eb3a263ec95e6ebb22498daed00b8b6cb05ee Mon Sep 17 00:00:00 2001 From: The-Repo-Club Date: Tue, 23 Aug 2022 22:33:20 +0100 Subject: [PATCH] Fixed my fish shell Signed-off-by: The-Repo-Club --- .../{commands.fish => 99_commands.fish} | 0 .../fish/aliases/{git.fish => 99_git.fish} | 0 .../fish/aliases/{lsd.fish => 99_lsd.fish} | 0 .../aliases/{pacman.fish => 99_pacman.fish} | 8 +-- .../aliases/{repos.fish => 99_repos.fish} | 6 +- .../aliases/{rsync.fish => 99_rsync.fish} | 0 .../fish/aliases/{ssh.fish => 99_ssh.fish} | 2 + .../aliases/{youtube.fish => 99_youtube.fish} | 0 fish/.config/fish/conf.d/00_profile.fish | 16 +++++ fish/.config/fish/conf.d/01_greeting.fish | 5 ++ fish/.config/fish/conf.d/01_keybinds.fish | 4 ++ fish/.config/fish/conf.d/02_paths.fish | 33 +++++++++++ .../fish/conf.d/08_minimal-mistakes.fish | 50 ++++++++++++++++ .../09_sudo_prompt.fish} | 0 fish/.config/fish/config.fish | 59 ++----------------- fish/.config/fish/fish_variables | 28 --------- .../__fish_command_not_found.fish} | 0 .../__fish_prompt.fish} | 0 .../__history_previous_command.fish | 0 .../fish/{functions => plugins}/__sudope.fish | 0 .../__sync_history.fish | 0 21 files changed, 122 insertions(+), 89 deletions(-) rename fish/.config/fish/aliases/{commands.fish => 99_commands.fish} (100%) rename fish/.config/fish/aliases/{git.fish => 99_git.fish} (100%) rename fish/.config/fish/aliases/{lsd.fish => 99_lsd.fish} (100%) rename fish/.config/fish/aliases/{pacman.fish => 99_pacman.fish} (80%) rename fish/.config/fish/aliases/{repos.fish => 99_repos.fish} (88%) rename fish/.config/fish/aliases/{rsync.fish => 99_rsync.fish} (100%) rename fish/.config/fish/aliases/{ssh.fish => 99_ssh.fish} (76%) rename fish/.config/fish/aliases/{youtube.fish => 99_youtube.fish} (100%) create mode 100644 fish/.config/fish/conf.d/00_profile.fish create mode 100644 fish/.config/fish/conf.d/01_greeting.fish create mode 100644 fish/.config/fish/conf.d/01_keybinds.fish create mode 100644 fish/.config/fish/conf.d/02_paths.fish create mode 100644 fish/.config/fish/conf.d/08_minimal-mistakes.fish rename fish/.config/fish/{plugins/sudo_prompt.fish => conf.d/09_sudo_prompt.fish} (100%) rename fish/.config/fish/{functions/fish_command_not_found.fish => plugins/__fish_command_not_found.fish} (100%) rename fish/.config/fish/{functions/fish_prompt.fish => plugins/__fish_prompt.fish} (100%) rename fish/.config/fish/{functions => plugins}/__history_previous_command.fish (100%) rename fish/.config/fish/{functions => plugins}/__sudope.fish (100%) rename fish/.config/fish/{functions => plugins}/__sync_history.fish (100%) diff --git a/fish/.config/fish/aliases/commands.fish b/fish/.config/fish/aliases/99_commands.fish similarity index 100% rename from fish/.config/fish/aliases/commands.fish rename to fish/.config/fish/aliases/99_commands.fish diff --git a/fish/.config/fish/aliases/git.fish b/fish/.config/fish/aliases/99_git.fish similarity index 100% rename from fish/.config/fish/aliases/git.fish rename to fish/.config/fish/aliases/99_git.fish diff --git a/fish/.config/fish/aliases/lsd.fish b/fish/.config/fish/aliases/99_lsd.fish similarity index 100% rename from fish/.config/fish/aliases/lsd.fish rename to fish/.config/fish/aliases/99_lsd.fish diff --git a/fish/.config/fish/aliases/pacman.fish b/fish/.config/fish/aliases/99_pacman.fish similarity index 80% rename from fish/.config/fish/aliases/pacman.fish rename to fish/.config/fish/aliases/99_pacman.fish index b12daade8..f0b336ca6 100644 --- a/fish/.config/fish/aliases/pacman.fish +++ b/fish/.config/fish/aliases/99_pacman.fish @@ -24,7 +24,7 @@ end # Update Repo function update - command pacman -Syu + command sudo pacman -Syu end function aurupdate @@ -32,16 +32,16 @@ function aurupdate end function upall - command pacman -Fy && pacman -Syu --noconfirm && aurupdate + command sudo pacman -Fy && sudo pacman -Syu --noconfirm && aurupdate end #check aur and arch packages function checkarch - command pacman -Qqen >~/package_list.txt + command sudo pacman -Qqen >~/package_list.txt end function checkaur - command pacman -Qqem >~/package_list_aur.txt + command sudo pacman -Qqem >~/package_list_aur.txt end # Pacman unlock diff --git a/fish/.config/fish/aliases/repos.fish b/fish/.config/fish/aliases/99_repos.fish similarity index 88% rename from fish/.config/fish/aliases/repos.fish rename to fish/.config/fish/aliases/99_repos.fish index 838451fab..9bd2bcd24 100644 --- a/fish/.config/fish/aliases/repos.fish +++ b/fish/.config/fish/aliases/99_repos.fish @@ -1,3 +1,5 @@ +# arch repo commands + function updaterepo while true read -l -P "Are you sure you want to update arch repo? [y/N] " confirm @@ -5,7 +7,7 @@ function updaterepo switch $confirm case Y y cd /mnt/500GB/.gitlabs/Arch.TheRepo.Club/ - ./git-v1.sh $argv + ./x86_64/updaterepo.sh $argv cd $dirprev[1] echoResponce "Arch repo has been updated." return @@ -21,7 +23,7 @@ function updatereadme switch $confirm case Y y - cd /mnt/500GB/.gitlabs/Arch.TheRepo.Club/docs/ + cd /mnt/500GB/.gitlabs/Arch.TheRepo.Club/scripts/ python updatereadme.py cd $dirprev[1] cd /mnt/500GB/.gitlabs/Arch.TheRepo.Club/x86_64/ diff --git a/fish/.config/fish/aliases/rsync.fish b/fish/.config/fish/aliases/99_rsync.fish similarity index 100% rename from fish/.config/fish/aliases/rsync.fish rename to fish/.config/fish/aliases/99_rsync.fish diff --git a/fish/.config/fish/aliases/ssh.fish b/fish/.config/fish/aliases/99_ssh.fish similarity index 76% rename from fish/.config/fish/aliases/ssh.fish rename to fish/.config/fish/aliases/99_ssh.fish index a41bc6ef3..7b297d7c3 100644 --- a/fish/.config/fish/aliases/ssh.fish +++ b/fish/.config/fish/aliases/99_ssh.fish @@ -1,3 +1,5 @@ +# ssh commands + function chris ssh linknsync@51.89.161.207 end diff --git a/fish/.config/fish/aliases/youtube.fish b/fish/.config/fish/aliases/99_youtube.fish similarity index 100% rename from fish/.config/fish/aliases/youtube.fish rename to fish/.config/fish/aliases/99_youtube.fish diff --git a/fish/.config/fish/conf.d/00_profile.fish b/fish/.config/fish/conf.d/00_profile.fish new file mode 100644 index 000000000..4c48ce2d3 --- /dev/null +++ b/fish/.config/fish/conf.d/00_profile.fish @@ -0,0 +1,16 @@ +#-*-coding:utf-8 -*- +xset b off +setxkbmap -layout gb +setxkbmap -option caps:super + +set -gx LC_ALL "en_GB.UTF-8" +set -gx PAGER "most" +set -gx AUR_PAGER "most" +set -gx EDITOR "nvim-qt" +set -gx GIT_TOKEN "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" +#QT and GTK Variables +set -gx QT_QPA_PLATFORMTHEME "qt5ct" +set -gx QT_AUTO_SCREEN_SCALE_FACTOR 0 +set -gx TDESKTOP_USE_GTK_FILE_DIALOG 1 + +set -gx GOPATH $HOME/.cache/go diff --git a/fish/.config/fish/conf.d/01_greeting.fish b/fish/.config/fish/conf.d/01_greeting.fish new file mode 100644 index 000000000..2b2be56d4 --- /dev/null +++ b/fish/.config/fish/conf.d/01_greeting.fish @@ -0,0 +1,5 @@ +# greeting for fish shell + +function fish_greeting + shellfetch +end \ No newline at end of file diff --git a/fish/.config/fish/conf.d/01_keybinds.fish b/fish/.config/fish/conf.d/01_keybinds.fish new file mode 100644 index 000000000..0dea43421 --- /dev/null +++ b/fish/.config/fish/conf.d/01_keybinds.fish @@ -0,0 +1,4 @@ +# Keybinding +bind \ec __history_previous_command +bind \e\e __sudope + diff --git a/fish/.config/fish/conf.d/02_paths.fish b/fish/.config/fish/conf.d/02_paths.fish new file mode 100644 index 000000000..3d92fb8e9 --- /dev/null +++ b/fish/.config/fish/conf.d/02_paths.fish @@ -0,0 +1,33 @@ +set PATH "$HOME/.local/bin:$PATH" + +# Adds `~/.config/composer/vendor/bin` to $PATH +# set PATH so it includes user's private bin if it exists +if test -d "$HOME/.config/composer/vendor/bin" + set PATH "$HOME/.config/composer/vendor/bin:$PATH" +end + +# Adds `~/.local/bin/repobar` to $PATH +# set PATH so it includes user's private bin if it exists +if test -d "$HOME/.local/bin/repobar" + set PATH "$HOME/.local/bin/repobar:$PATH" +end + +# Adds `~/.local/bin/lemonbar` to $PATH +# set PATH so it includes user's private bin if it exists +if test -d "$HOME/.local/bin/lemonbar" + set PATH "$HOME/.local/bin/lemonbar:$PATH" +end + +# Adds `~/.local/bin/discord_bot` to $PATH +# set PATH so it includes user's private bin if it exists +if test -d "$HOME/.local/bin/discord_bot" + set PATH "$HOME/.local/bin/discord_bot:$PATH" +end + +# Adds `~/.local/bin/clipmenu` to $PATH +# set PATH so it includes user's private bin if it exists +if test -d "$HOME/.local/bin/clipmenu" + set PATH "$HOME/.local/bin/clipmenu:$PATH" +end + +set PATH $(printf %s "$PATH" | awk -vRS=: '!a[$0]++' | paste -s -d:) diff --git a/fish/.config/fish/conf.d/08_minimal-mistakes.fish b/fish/.config/fish/conf.d/08_minimal-mistakes.fish new file mode 100644 index 000000000..0e290d0d1 --- /dev/null +++ b/fish/.config/fish/conf.d/08_minimal-mistakes.fish @@ -0,0 +1,50 @@ +# Dracula Color Palette +set -l foreground e5e9f0 +set -l selection 434c5e +set -l comment 81a1c1 +set -l red ff5959 +set -l orange ff9c59 +set -l yellow ffff59 +set -l green 59ff59 +set -l purple 9059ff +set -l cyan 59fff9 +set -l pink ff59f9 + +# Syntax Highlighting Colors +set -gx fish_color_normal $foreground +set -gx fish_color_command $cyan +set -gx fish_color_keyword $pink +set -gx fish_color_quote $yellow +set -gx fish_color_redirection $foreground +set -gx fish_color_end $orange +set -gx fish_color_error $red +set -gx fish_color_param $purple +set -gx fish_color_comment $comment +set -gx fish_color_selection --background=$selection +set -gx fish_color_search_match --background=$selection +set -gx fish_color_operator $green +set -gx fish_color_escape $pink +set -gx fish_color_autosuggestion $comment +set -gx fish_color_cancel $red --reverse +set -gx fish_color_option $orange + +# Default Prompt Colors +set -gx fish_color_cwd $green +set -gx fish_color_host $purple +set -gx fish_color_host_remote $purple +set -gx fish_color_user $cyan + +# Completion Pager Colors +set -gx fish_pager_color_progress $comment +set -gx fish_pager_color_background +set -gx fish_pager_color_prefix $cyan +set -gx fish_pager_color_completion $foreground +set -gx fish_pager_color_description $comment +set -gx fish_pager_color_selected_background --background=$selection +set -gx fish_pager_color_selected_prefix $cyan +set -gx fish_pager_color_selected_completion $foreground +set -gx fish_pager_color_selected_description $comment +set -gx fish_pager_color_secondary_background +set -gx fish_pager_color_secondary_prefix $cyan +set -gx fish_pager_color_secondary_completion $foreground +set -gx fish_pager_color_secondary_description $comment diff --git a/fish/.config/fish/plugins/sudo_prompt.fish b/fish/.config/fish/conf.d/09_sudo_prompt.fish similarity index 100% rename from fish/.config/fish/plugins/sudo_prompt.fish rename to fish/.config/fish/conf.d/09_sudo_prompt.fish diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index bc0df5bff..44337741f 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,58 +1,7 @@ -if test -f "$HOME/.config/fish/fish.profile" - source "$HOME/.config/fish/fish.profile" +for plugins in "$HOME/.config/fish/plugins/"* + source $plugins end -set PATH "$HOME/.local/bin:$PATH" - -# Adds `~/.config/composer/vendor/bin` to $PATH -# set PATH so it includes user's private bin if it exists -if test -d "$HOME/.config/composer/vendor/bin" - set PATH "$HOME/.config/composer/vendor/bin:$PATH" +for aliases in "$HOME/.config/fish/aliases/"* + source $aliases end - -# Adds `~/.local/bin/repobar` to $PATH -# set PATH so it includes user's private bin if it exists -if test -d "$HOME/.local/bin/repobar" - set PATH "$HOME/.local/bin/repobar:$PATH" -end - -# Adds `~/.local/bin/lemonbar` to $PATH -# set PATH so it includes user's private bin if it exists -if test -d "$HOME/.local/bin/lemonbar" - set PATH "$HOME/.local/bin/lemonbar:$PATH" -end - -# Adds `~/.local/bin/discord_bot` to $PATH -# set PATH so it includes user's private bin if it exists -if test -d "$HOME/.local/bin/discord_bot" - set PATH "$HOME/.local/bin/discord_bot:$PATH" -end - -# Adds `~/.local/bin/clipmenu` to $PATH -# set PATH so it includes user's private bin if it exists -if test -d "$HOME/.local/bin/clipmenu" - set PATH "$HOME/.local/bin/clipmenu:$PATH" -end - -function fish_greeting - shellfetch -end - -# Get all the files inside folder -for file in "$HOME/.config/fish/aliases/"* - source $file -end - -for file in "$HOME/.config/fish/plugins/"* - source $file -end - -# Keybinding -bind \ec __history_previous_command -bind \e\e __sudope - -# if status is-login -# if test (tty) = /dev/tty1 -# exec tbsm -# end -# end diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index 5c51655b6..acc96c14c 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -1,36 +1,8 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_init_2_39_8:\x1d -SETUVAR __fish_init_2_3_0:\x1d SETUVAR __fish_initialized:3400 -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:green -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:brmagenta -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:bryellow -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:brblue -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:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:\x1d -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_prompt_pwd_dir_length:100 diff --git a/fish/.config/fish/functions/fish_command_not_found.fish b/fish/.config/fish/plugins/__fish_command_not_found.fish similarity index 100% rename from fish/.config/fish/functions/fish_command_not_found.fish rename to fish/.config/fish/plugins/__fish_command_not_found.fish diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/plugins/__fish_prompt.fish similarity index 100% rename from fish/.config/fish/functions/fish_prompt.fish rename to fish/.config/fish/plugins/__fish_prompt.fish diff --git a/fish/.config/fish/functions/__history_previous_command.fish b/fish/.config/fish/plugins/__history_previous_command.fish similarity index 100% rename from fish/.config/fish/functions/__history_previous_command.fish rename to fish/.config/fish/plugins/__history_previous_command.fish diff --git a/fish/.config/fish/functions/__sudope.fish b/fish/.config/fish/plugins/__sudope.fish similarity index 100% rename from fish/.config/fish/functions/__sudope.fish rename to fish/.config/fish/plugins/__sudope.fish diff --git a/fish/.config/fish/functions/__sync_history.fish b/fish/.config/fish/plugins/__sync_history.fish similarity index 100% rename from fish/.config/fish/functions/__sync_history.fish rename to fish/.config/fish/plugins/__sync_history.fish