From a798b1f596aa7c037f32f45371525331a3e773b2 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Mon, 17 May 2021 23:03:09 -0400 Subject: [PATCH] zsh and rc file abstract --- .bashrc | 101 +----------------------------------- .config/shell/commonprofile | 91 ++++++++++++++++++++++++++++++++ .config/shell/commonrc | 27 ++++++++++ .config/zsh/.zsh_history | 58 +++++++++++++++++++++ .config/zsh/.zshrc | 33 ++++++++++++ .zprofile | 5 ++ 6 files changed, 215 insertions(+), 100 deletions(-) create mode 100644 .config/shell/commonprofile create mode 100644 .config/shell/commonrc create mode 100644 .config/zsh/.zsh_history create mode 100644 .config/zsh/.zshrc create mode 100644 .zprofile diff --git a/.bashrc b/.bashrc index d555c58..6af1de6 100644 --- a/.bashrc +++ b/.bashrc @@ -15,107 +15,8 @@ PS2='\[\033[01;37m\]> \[\033[00m\]' #set vi mode set -o vi -# ibus -export GTK_IM_MODULE=ibus -export XMODIFIERS=@im=ibus -export QT_IM_MODULE=ibus -#ibus-daemon -drx - -# Enivormentals -export PATH=$HOME/.local/bin:$HOME/Scripts:$HOME/Scripts/dmenu:$HOME/Scripts/statusbar:$HOME/Scripts/acpi:$PATH -export NINEIT_USERNAME=pinosaur - -export XDG_CONFIG_HOME=$HOME/.config -export EDITOR="vim" -export READER="zathura" -export TERMINAL="st" -export BROWSER="brave" -export WM="dwm" - -# aliaseseses -alias ls='ls --color=auto' -alias grep='grep--color=auto' -alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' -alias suckless-clean='make clean && rm -rf config.h && git reset --hard home/master' -alias musicdl="youtube-dl -f bestaudio" -alias mpv="mpv --no-input-default-bindings" -alias darkmpv='mpv --vf=sub,lavfi="negate"' -alias nmaplocal='nmap -sn 192.168.1.0/24' -alias refreshusb='udevadm control --reload-rules' -alias vpnup='nmcli connection up pinovpn' -alias drill-srs='drill-srs 2>/dev/null' - -alias v="$EDITOR" -alias z="$READER" -alias b="$BROWSER" - -# connect to wifi -# nmcli device wifi connect WIFI_NAME password PASSWORD -# record -# ffmpeg -y -f x11grab -s 1600x900 -i :0.0 -f alsa -i default -c:v libx264 -r 30 -c:a flac $filename - - -source fzfutil +source ~/.config/shell/commonrc # startup stuff ufetch-arch -export LF_ICONS="\ -di=:\ -fi=:\ -ln=:\ -or=:\ -ex=:\ -*.c=:\ -*.cc=:\ -*.cpp=:\ -*.go=:\ -*.hs=:\ -*.java=:\ -*.html=:\ -*.css=:\ -*.js=:\ -*.ts=:\ -*.json=:\ -*.jsx=:\ -*.tsx=:\ -*.vue=﵂:\ -*.php=:\ -*.py=:\ -*.rkt=λ:\ -*.tex=:\ -*.md=:\ -*.vim=:\ -*.vimrc=:\ -*.viminfo=:\ -*.gitignore=:\ -*.cmd=:\ -*.sh=:\ -*.bash=:\ -*.zsh=:\ -*.fish=:\ -*.diff=繁:\ -*.bashrc= -*.tar=:\ -*.zip=:\ -*.jar=:\ -*.rar=:\ -*.7z=:\ -*.gz=:\ -*.zst=:\ -*.jpg=:\ -*.jpeg=:\ -*.gif=:\ -*.bmp=:\ -*.png=:\ -*.svg=:\ -*.mov=:\ -*.webm=:\ -*.mp4=:\ -*.mid=:\ -*.midi=:\ -*.mp3=:\ -*.ogg=:\ -*.wav=:\ -*.pdf=:\ -" diff --git a/.config/shell/commonprofile b/.config/shell/commonprofile new file mode 100644 index 0000000..37d178f --- /dev/null +++ b/.config/shell/commonprofile @@ -0,0 +1,91 @@ + +export PATH=$HOME/.local/bin:$HOME/Scripts:$HOME/Scripts/dmenu:$HOME/Scripts/statusbar:$HOME/Scripts/acpi:$PATH +export NINEIT_USERNAME=pinosaur +export XDG_CONFIG_HOME=$HOME/.config + +# programs +export EDITOR="vim" +export READER="zathura" +export VIEWER="sxiv" # non-standard +export PLAYER="mpv" # non-standard +export TERMINAL="st" +export BROWSER="brave" +export WM="dwm" + +# ibus +export GTK_IM_MODULE=ibus +export XMODIFIERS=@im=ibus +export QT_IM_MODULE=ibus +#ibus-daemon -drx + +# colors for less +export LESS_TERMCAP_md=$'\e[1;33m' +export LESS_TERMCAP_mb=$'\e[1;33m' +export LESS_TERMCAP_me=$'\e[0m' +export LESS_TERMCAP_so=$'\e[01;36m' +export LESS_TERMCAP_se=$'\e[0m' +export LESS_TERMCAP_us=$'\e[1;4;36m' +export LESS_TERMCAP_ue=$'\e[0m' + +export ZDOTDIR="$HOME/.config/zsh" + +export LF_ICONS="\ +di=:\ +fi=:\ +ln=:\ +or=:\ +ex=:\ +*.c=:\ +*.cc=:\ +*.cpp=:\ +*.go=:\ +*.hs=:\ +*.java=:\ +*.html=:\ +*.css=:\ +*.js=:\ +*.ts=:\ +*.json=:\ +*.jsx=:\ +*.tsx=:\ +*.vue=﵂:\ +*.php=:\ +*.py=:\ +*.rkt=λ:\ +*.tex=:\ +*.md=:\ +*.vim=:\ +*.vimrc=:\ +*.viminfo=:\ +*.gitignore=:\ +*.cmd=:\ +*.sh=:\ +*.bash=:\ +*.zsh=:\ +*.fish=:\ +*.diff=繁:\ +*.bashrc= +*.tar=:\ +*.zip=:\ +*.jar=:\ +*.rar=:\ +*.7z=:\ +*.gz=:\ +*.zst=:\ +*.jpg=:\ +*.jpeg=:\ +*.gif=:\ +*.bmp=:\ +*.png=:\ +*.svg=:\ +*.mov=:\ +*.webm=:\ +*.mp4=:\ +*.mid=:\ +*.midi=:\ +*.mp3=:\ +*.ogg=:\ +*.wav=:\ +*.pdf=:\ +" + diff --git a/.config/shell/commonrc b/.config/shell/commonrc new file mode 100644 index 0000000..d0851da --- /dev/null +++ b/.config/shell/commonrc @@ -0,0 +1,27 @@ + +# alias +alias ls='ls --color=auto' +alias grep='grep --color=auto' +alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +alias suckless-clean='make clean && rm -rf config.h && git reset --hard home/master' +alias musicdl="youtube-dl -f bestaudio" +alias mpv="mpv --no-input-default-bindings" +alias darkmpv='mpv --vf=sub,lavfi="negate"' +alias nmaplocal='nmap -sn 192.168.1.0/24' +alias refreshusb='udevadm control --reload-rules' +alias vpnup='nmcli connection up pinovpn' +alias drill-srs='drill-srs 2>/dev/null' + +alias v="$EDITOR" +alias z="$READER" +alias b="$BROWSER" +alias s="$VIEWER" +alias m="$PLAYER" + +# connect to wifi +# nmcli device wifi connect WIFI_NAME password PASSWORD +# record +# ffmpeg -y -f x11grab -s 1600x900 -i :0.0 -f alsa -i default -c:v libx264 -r 30 -c:a flac $filename + +source fzfutil + diff --git a/.config/zsh/.zsh_history b/.config/zsh/.zsh_history new file mode 100644 index 0000000..fed5c6b --- /dev/null +++ b/.config/zsh/.zsh_history @@ -0,0 +1,58 @@ +clear +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +la +ls +ls +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +ls +source ~/.config/zsh/.zshrc +ls +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +source ~/.config/zsh/.zshrc +ls +ls +cd +ls +ls +cd Data +ls +ls +cd Anime +ls +ls +ls +ls -a +ls +v .vimrc +v .config/shell/commonrc +fcd +ls +ls +ls +v .config/shell/commonrc +dotfiles add .config/shell +ls +dotfiles status +ls +ls +exit diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc new file mode 100644 index 0000000..857db44 --- /dev/null +++ b/.config/zsh/.zshrc @@ -0,0 +1,33 @@ +# _ +# _______| |__ _ __ ___ +# |_ / __| '_ \| '__/ __| +# _ / /\__ \ | | | | | (__ +# (_)___|___/_| |_|_| \___| +# + +autoload -U colors && colors + +PS1=" %B%{$fg[yellow]%}Z_%{$fg[white]%} %1~ %{$fg[yellow]%}>>>%{$reset_color%}%b " + +## tab completion grid +autoload -U compinit +zstyle ':completion:*' menu select +zmodload zsh/complist +compinit +_comp_options+=(globdots) + +## Enable history +HISTSIZE=10000 +SAVEHIST=10000 +HISTFILE=~/.config/zsh/.zsh_history + +## Vi mode +bindkey -v +export KEYTIMEOUT=1 + +source ~/.config/shell/commonrc + +ufetch-arch + +# Syntax highlight +# source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh diff --git a/.zprofile b/.zprofile new file mode 100644 index 0000000..d54fc62 --- /dev/null +++ b/.zprofile @@ -0,0 +1,5 @@ + +source ~/.config/shell/commonprofile + +[ -f "$ZDOTDIR/.zshrc" ] && source "$ZDOTDIR/.zshrc" + -- 2.20.1