diff --git a/.bashrc b/.bashrc index b82c54d..a3e5792 100644 --- a/.bashrc +++ b/.bashrc @@ -10,7 +10,7 @@ if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]; then PATH="$HOME/.local/bin:$HOME/bin:$PATH" fi export PATH -export PS1="\e[0;34m\u\e[0m:\e[0;31m\h\e[0m \e[0;32m>\W\$ \e[0m" +export PS1="\e[0;34m\u\e[0m:\e[0;31m\h\e[0m\e[0;32m:\W> \e[0m" # Uncomment the following line if you don't like systemctl's auto-paging feature: # export SYSTEMD_PAGER= diff --git a/.do b/.do new file mode 120000 index 0000000..3f9e77b --- /dev/null +++ b/.do @@ -0,0 +1 @@ +/home/floki/.do \ No newline at end of file diff --git a/.zshrc b/.zshrc index bc75bdc..05d6591 100644 --- a/.zshrc +++ b/.zshrc @@ -10,18 +10,7 @@ export EDITOR="nvim" export PATH=~/.local/bin:$PATH source ~/.profile export SRVADMIN_ENV="$HOME/.config/srvadmin-config.ini" -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time Oh My Zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="dpoggi" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -35,47 +24,11 @@ ZSH_THEME="dpoggi" # zstyle ':omz:update' mode reminder # just remind me to update when it's time # Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - # Uncomment the following line if pasting URLs and other text is messed up. # DISABLE_MAGIC_FUNCTIONS="true" - # Uncomment the following line to disable colors in ls. # DISABLE_LS_COLORS="true" -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# 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" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be 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 tmux tmuxinator sudo history) source $ZSH/oh-my-zsh.sh @@ -84,7 +37,6 @@ source $ZSH/oh-my-zsh.sh # export MANPATH="/usr/local/man:$MANPATH" -# You may need to manually set your language environment # export LANG=en_US.UTF-8 # Preferred editor for local and remote sessions @@ -94,7 +46,6 @@ source $ZSH/oh-my-zsh.sh # export EDITOR='nvim' # fi -# Compilation flags # export ARCHFLAGS="-arch $(uname -m)" # Set personal aliases, overriding those provided by Oh My Zsh libs, @@ -132,18 +83,22 @@ _lori_completion() { compadd "$@" -- "${keys[@]}" } compdef _lori_completion lori -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" -alias vim="nvim" -alias untar="tar xvf" -alias uz="unzip" -alias yz="yazi" -alias tf="terraform" -alias ap-key="cat ~/.myconfig/id_ed25519.pub" -alias tfp="tf plan" -alias tfa="tf apply" -alias tfd="tf destroy" -alias ga="git add ." -alias gc='git commit -m' -alias gp="git push" + +myalias() { + local RED=$(tput setaf 1) + local GREEN=$(tput setaf 2) + local normal=$(tput sgr0) + echo "My custom aliases:" + printf "%-20s %s\n" "Alias" "Command" + echo "------------------------------" + for key in $(cat ~/.dotfiles/alias/zsh_aliases| awk '{print $2}' | awk -F"=" '{print $1}'); do + command=$(cat ~/.dotfiles/alias/zsh_aliases| grep "${key}" | awk -F"=" '{print $2}') + printf "%-20s %s\n" "${RED}$key${normal}" "${GREEN}$command${normal}" +done | sort +return 0 +} +compdef myalias +# Load files alias +if [ -f ~/.dotfiles/alias/zsh_aliases ]; then + . ~/.dotfiles/alias/zsh_aliases +fi diff --git a/alias/zsh_aliases b/alias/zsh_aliases index 59f55d4..527b33c 100644 --- a/alias/zsh_aliases +++ b/alias/zsh_aliases @@ -1,3 +1,4 @@ +alias add-alias="vim ~/.dotfiles/alias/zsh_aliases" alias vim="nvim" alias untar="tar xvf" alias uz="unzip"