From be83fcb38e44a220fe405442c4ac477a96b5ffb7 Mon Sep 17 00:00:00 2001 From: Pass Automated Testing Suite Date: Tue, 28 Sep 2021 11:36:23 +0200 Subject: [PATCH] git config change excludeDir to excludeFile; zsh now using global plugins --- .config/alacritty/alacritty.yml | 10 ++++--- .config/git/config | 6 ++-- .config/shell/aliasrc | 1 + .config/zsh/.zshrc | 52 +++++++++++++++++++++------------ 4 files changed, 44 insertions(+), 25 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b4ce228..0d06624 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -20,10 +20,12 @@ font: style: Italic size: 6 -# shell: -# program: /usr/bin/tmux -# args: -# - -u +shell: + program: /usr/bin/bash + args: + - -l + - -c + - "ta" # import: # - ~/.config/alacritty/dracula.yml diff --git a/.config/git/config b/.config/git/config index 0859d00..8104f6a 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,13 +1,13 @@ [user] - email = ma@beaudet.xyz - name = ma + email = Pass-Automated-Testing-Suite@zx2c4.com + name = Pass Automated Testing Suite signingkey = ma@beaudet.xyz [pull] rebase = false [core] editor = vim autocrlf = input - excludesdir = ~/.config/git/ignore + excludesFile = ~/.config/git/ignore [init] templatedir = ~/.config/git/template defaultBranch = main diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index d9e9333..6efa056 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -14,3 +14,4 @@ alias l="exa" alias la="exa -a" alias ll="exa -lah" alias ls="exa --color=auto" +alias tssh="alacritty -e '/home/ma/.local/bin/tssh.sh'" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 6a423de..9de24b5 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,9 +1,10 @@ +# zmodload zsh/zprof # Source alias [ -f $XDG_CONFIG_HOME/shell/aliasrc ] && . $XDG_CONFIG_HOME/shell/aliasrc -# Enable colors and change prompt: -autoload -U colors && colors # Load colors -PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " +# # Enable colors and change prompt: +# autoload -U colors && colors # Load colors +# PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " stty stop undef # Disable ctrl-s to freeze terminal. @@ -31,12 +32,22 @@ bindkey '^D' exit_zsh # Basic auto/tab complete: -autoload -U compinit +autoload -Uz compinit +for dump in $ZDOTDIR/.zcompdump(N.mh+24); do + compinit +done +compinit -C zstyle ':completion:*' menu select -zmodload zsh/complist -compinit +# zmodload zsh/complist _comp_options+=(globdots) # Include hidden files. +# # Basic auto/tab complete: +# autoload -U compinit +# zstyle ':completion:*' menu select +# zmodload zsh/complist +# compinit +# _comp_options+=(globdots) # Include hidden files. + # vi mode # bindkey -v # export KEYTIMEOUT=1 @@ -70,14 +81,14 @@ _comp_options+=(globdots) # Include hidden files. # preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. -# Git prompt -autoload -Uz vcs_info -precmd_vcs_info() { vcs_info } -precmd_functions+=( precmd_vcs_info ) -setopt prompt_subst -RPROMPT=\$vcs_info_msg_0_ -zstyle ':vcs_info:git:*' formats '%b' -# zstyle ':vcs_info:*' enable git +# # Git prompt +# autoload -Uz vcs_info +# precmd_vcs_info() { vcs_info } +# precmd_functions+=( precmd_vcs_info ) +# setopt prompt_subst +# RPROMPT=\$vcs_info_msg_0_ +# zstyle ':vcs_info:git:*' formats '%b' +# # zstyle ':vcs_info:*' enable git # https://github.com/softmoth/zsh-vim-mode # . $ZDOTDIR/plugins/zsh-vim-mode.plugin.zsh @@ -91,10 +102,15 @@ gpg-connect-agent updatestartuptty /bye >/dev/null export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent +. /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +bindkey '^ ' autosuggest-accept + # Should be last -. $ZDOTDIR/zsh-vi-mode/zsh-vi-mode.plugin.zsh -. /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh +# . $ZDOTDIR/zsh-vi-mode/zsh-vi-mode.plugin.zsh +. /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +. /usr/share/zsh/plugins/zsh-vi-mode/zsh-vi-mode.zsh -fpath=($ZDOTDIR/zsh-completions/src $fpath) +# fpath=($ZDOTDIR/zsh-completions/src $fpath) -# eval "$(starship init zsh)" +eval "$(starship init zsh)" +# zprof -- 2.20.1