config

commit d2108b966d84ec59877987074a2b59f93a8b6235
parent ffd60b4508be7fffa948802d9d3864be1061ce11
Author: jacob <jacobdoeslinux@protonmail.com>
Date:   Fri,  1 Nov 2019 01:59:06 -0700

Merge branch 'master' of https://github.com/jacobsGit/dotfiles

Diffstat:
M
bash/.bashrc
 | 
7
+++++++
M
bash/.bashrc-alias
 | 
17
+++++++++++++----
A
zsh/.zshrc
 | 
93
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

3 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/bash/.bashrc b/bash/.bashrc
@@ -5,6 +5,13 @@
 export HISTCONTROL=ignoreboth:erasedups
 
 
+cd ~/dotfiles
+git="$(git pull)"
+if [[ "$git" != 'Already up to date.' ]]; then
+	printf "git: dotfiles updated"
+fi
+
+cd
 
 PS1="[\e[1;36m\u\e[0;1m@\e[1;36m\h\e[0;0m] [\e[1;34m\w\e[0;0m]\n: "
 
diff --git a/bash/.bashrc-alias b/bash/.bashrc-alias
@@ -5,6 +5,7 @@ alias hibernate='systemctl hibernate'
 
 # auto sudo
 alias pacman='sudo pacman'
+alias pkg='sudo pkg'
 
 #	cURLS
 alias ip-pub='curl ifconfig.io'
@@ -15,10 +16,18 @@ function cdict() { curl "dict://dict.org/d:$1"; }
 
 
 #	lsd aliases
-alias ls='lsd --group-dirs last'
-alias la='lsd --group-dirs last -A'
-alias ll='lsd --group-dirs last  -l'
-alias lr='lsd --group-dirs last  -R'
+if [[ "$(uname)" == 'Linux' ]]; then
+	alias ls='lsd --group-dirs last'
+	alias la='lsd --group-dirs last -A'
+	alias ll='lsd --group-dirs last -l'
+	alias lr='lsd --group-dirs last -R'
+
+else
+	alias ls='ls --color=always'
+	alias la='ls -A --color=always'
+	alias ll='ls -l --color=always'
+	alias lr='ls -R --color=always'
+fi
 
 
 #	other
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -0,0 +1,93 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+ZSH=/usr/share/oh-my-zsh/
+
+ZSH_THEME="af-magic"
+#ZSH_THEME="refined"
+#ZSH_THEME="agnoster"
+
+
+# CASE_SENSITIVE="true"
+# HYPHEN_INSENSITIVE="true"
+
+DISABLE_AUTO_UPDATE="true"
+DISABLE_UPDATE_PROMPT="false"
+
+# export UPDATE_ZSH_DAYS=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"
+
+COMPLETION_WAITING_DOTS="true"
+
+
+plugins=(git)
+
+
+
+#	system
+alias startx='clear && startx && clear'
+alias suspend='systemctl suspend'
+alias hibernate='systemctl hibernate'
+
+# auto sudo
+alias pacman='sudo pacman'
+alias pkg='sudo pkg'
+
+#	cURLS
+alias ip-pub='curl ifconfig.io'
+alias cweather='curl wttr.in/Los_Angels'
+alias clocale='curl ifconfig.co/country && curl ifconfig.co/city'
+alias cip='curl ifconfig.me'
+function cdict() { curl "dict://dict.org/d:$1"; }
+
+
+#	lsd aliases
+if [[ "$(uname)" == 'Linux' ]]; then
+	alias ls='lsd --group-dirs last'
+	alias la='lsd --group-dirs last -A'
+	alias ll='lsd --group-dirs last -l'
+	alias lr='lsd --group-dirs last -R'
+
+else
+	alias ls='ls --color=always'
+	alias la='ls -A --color=always'
+	alias ll='ls -l --color=always'
+	alias lr='ls -R --color=always'
+fi
+
+
+#	other
+alias cmatrix='cmatrix -Ba -u 1'
+function icat() { kitty +kitten icat "$@";}
+function dp() { xrandr --output DP-4 --brightness .$1;}
+
+
+
+if [[ -n $SSH_CONNECTION ]]; then
+   export EDITOR='vim'
+else
+   export EDITOR='vim'
+fi
+
+
+
+PATH="$HOME/bin/:$PATH"
+export PATH
+
+
+ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh
+if [[ ! -d $ZSH_CACHE_DIR ]]; then
+  mkdir $ZSH_CACHE_DIR
+fi
+
+source $ZSH/oh-my-zsh.sh