diff options
| -rw-r--r-- | .config/fish/config.fish | 20 | ||||
| -rw-r--r-- | .config/fish/fish_variables | 33 | ||||
| -rwxr-xr-x | .config/fish/functions/fish_prompt.fish | 40 | ||||
| -rw-r--r-- | .zshrc | 63 | ||||
| -rw-r--r-- | arch/mainline | 4 | ||||
| -rwxr-xr-x | build | 4 | ||||
| -rw-r--r-- | st/config.h | 51 |
7 files changed, 85 insertions, 130 deletions
diff --git a/.config/fish/config.fish b/.config/fish/config.fish deleted file mode 100644 index 38413a4..0000000 --- a/.config/fish/config.fish +++ /dev/null @@ -1,20 +0,0 @@ -set PATH \ - /home/tom/bin \ - /bin /sbin /usr/bin /usr/games \ - /usr/local/bin /usr/local/games \ - /usr/local/sbin /usr/sbin \ - /home/tom/.cargo/bin \ - /home/tom/.local/bin - -set GOPATH /home/tom/src/go - -function fish_user_key_bindings - for mode in insert default visual - bind -M $mode \cf forward-char - end -end - -gpg-connect-agent updatestartuptty /bye > /dev/null - -function fish_mode_prompt -end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables deleted file mode 100644 index ae9139e..0000000 --- a/.config/fish/fish_variables +++ /dev/null @@ -1,33 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR EDITOR:nvim -SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:585858 -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:a1b56c -SETUVAR fish_color_comment:f7ca88 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:ba8baf -SETUVAR fish_color_error:ab4642 -SETUVAR fish_color_escape:86c1b9 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:7cafc2 -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:7cafc2 -SETUVAR fish_color_param:d8d8d8 -SETUVAR fish_color_quote:f7ca88 -SETUVAR fish_color_redirection:d8d8d8 -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: -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_completion:normal -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 diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish deleted file mode 100755 index 6b1195f..0000000 --- a/.config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,40 +0,0 @@ -function fish_prompt --description 'Write out the prompt' - if test "$TERM" = "linux" - set error_color red - set good_color green - set path_color yellow - set user_color green - set host_color blue - set white_color white - else - set good_color f7ca88 - set error_color ab4642 - set path_color ba8baf - set user_color a1b56c - set host_color 7cafc2 - set white_color d8d8d8 - end - - if set -l branch_name (command git symbolic-ref HEAD 2>/dev/null | string replace refs/heads/ '') - set git_info (set_color $white_color)"|" - if command git diff-index --quiet HEAD -- - set git_info $git_info(set_color $good_color) - else - set git_info $git_info(set_color $error_color) - end - set git_info $git_info"$branch_name" - end - - # Disable PWD shortening by default. - set -q fish_prompt_pwd_dir_length - or set -lx fish_prompt_pwd_dir_length 0 - - printf '%s' (set_color -o $white_color) '<' - printf '%s' (set_color $user_color) $USER - printf '%s' (set_color $white_color) '@' - printf '%s' (set_color $host_color) (prompt_hostname) - printf '%s' (set_color $white_color) '|' - printf '%s' (set_color $path_color) (prompt_pwd) - printf '%s' $git_info - printf '%s' (set_color $white_color) '>' -end @@ -0,0 +1,63 @@ +typeset -U PATH path +path=( "$HOME/bin" + "$HOME/.local/bin" + "$HOME/.cargo/bin" + "/bin" + "/usr/bin" + "/usr/games" + "/usr/local/games" + "/usr/local/bin" + "/usr/local/sbin" +) +export PATH + +autoload -Uz compinit +compinit +zmodload zsh/complist +zstyle ':completion:*' menu select + +bindkey -v +bindkey -M menuselect 'h' vi-backward-char +bindkey -M menuselect 'k' vi-up-line-or-history +bindkey -M menuselect 'l' vi-forward-char +bindkey -M menuselect 'j' vi-down-line-or-history +bindkey -v '^?' backward-delete-char + +function zle-keymap-select () { + case $KEYMAP in + vicmd) echo -ne '\e[1 q';; + viins|main) echo -ne '\e[5 q';; + esac +} +zle -N zle-keymap-select + +zle-line-init() { + zle -K viins + echo -ne "\e[5 q" +} +zle -N zle-line-init + +autoload -Uz edit-command-line +zle -N edit-command-line +bindkey '^e' edit-command-line + +alias ls='ls --color' +alias la='ls -la --color' +alias vim='nvim' + +setopt auto_cd + +HISTSIZE=999999999 +SAVEHIST=999999999 +HISTFILE=~/.history + +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +bindkey '^f' end-of-line + +autoload -Uz vcs_info +precmd() { vcs_info } +zstyle ':vcs_info:git:*' formats '|%F{3}%b%f' + +setopt PROMPT_SUBST +PROMPT='<%F{2}%n%f@%F{6}%m%f|%F{5}%~%f${vcs_info_msg_0_}%f> ' diff --git a/arch/mainline b/arch/mainline index e2b998f..638cdce 100644 --- a/arch/mainline +++ b/arch/mainline @@ -11,7 +11,6 @@ efibootmgr element-desktop fakeroot feh -fish gcc git gnu-netcat @@ -57,3 +56,6 @@ xdg-utils xorg-server xorg-xinit xscreensaver +zsh +zsh-autosuggestions +zsh-syntax-highlighting @@ -40,8 +40,8 @@ ln -s $ST_DIR/st $HOME/bin mkdir -p $HOME'/.config/' -# fish setup -ln -s $RC_DIR'/.config/fish' $HOME'/.config/' +# zsh setup +ln -s $RC_DIR'/.zshrc' $HOME # freedesktop setup ln -s $RC_DIR'/.config/user-dirs.dirs' $HOME'/.config/' diff --git a/st/config.h b/st/config.h index 9714554..7819325 100644 --- a/st/config.h +++ b/st/config.h @@ -95,40 +95,23 @@ unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - "#181818", // Background - "#ab4642", // Git red & chmod u+s Background - "#a1b56c", // Git green & Exectable Directory Background - "#f8f8f8", // chmod g+s Background - "#a1b56c", // Sticky Directory Background, Executable Directory Foreground - "#f8f8f8", // nothing - "#86c1b9", // Music - "#f8f8f8", // Normal Text - "#f8f8f8", // nothing - "#ab4642", // Compressed - "#a1b56c", // Executables - "#dc9656", // Character Files - "#7cafc2", // Directories - "#ba8baf", // Pictures & Videos - "#f7ca88", // Symbolic Links - "#f8f8f8", // Cursor - - - //"#ab4642", // Red - //"#a1b56c", // Green - //"#7cafc2", // Blue - //"#f7ca88", // Yellow - //"#ba8baf", // Purple - //"#86c1b9", // Cyan - //"#dc9656", // Orange - //"#a16946", // Brown - //"#f8f8f8", // White - //"#e8e8e8", // Grey0 - //"#d8d8d8", // Grey1 - //"#b8b8b8", // Grey2 - //"#585858", // Grey3 - //"#383838", // Grey4 - //"#282828", // Grey5 - //"#181818", // Black + "#181818", // Black + "#ab4642", // Red + "#a1b56c", // Green + "#f7ca88", // Yellow + "#7cafc2", // Blue + "#ba8baf", // Purple + "#86c1b9", // Cyan + "#e8e8e8", // Grey0 + + "#b8b8b8", // Grey2 + "#ab4642", // Red + "#a1b56c", // Green + "#f7ca88", // Yellow + "#7cafc2", // Blue + "#ba8baf", // Purple + "#86c1b9", // Cyan + "#f8f8f8", // White }; |