Added my header

7 files changed, 62 insertions, 38 deletions

diff --git a/.bashrc b/.bashrc
index a7c7c06..1cdb55a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -6,6 +6,7 @@ alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias ll='ls -l'
 alias la='ls -A'
+alias v='vim'
 
 # adding superuser bin to PATH
 export PATH="/sbin:$PATH"
@@ -22,5 +23,8 @@ export LESS_TERMCAP_us=$'\e[1;4;31m'
 export PS1="\n\[$(tput bold)$(tput setaf 2)\]\w\n\[$(tput setaf 1)\]❯ \[$(    tput sgr0)\]"
 
 # set XDG paths
-export XDG_CONFIG_HOME="/home/charles/.config/"
-export XDG_DATA_HOME="/home/charles/.data/"
+export XDG_CONFIG_HOME="$HOME/.config/"
+export XDG_DATA_HOME="$HOME/.data/"
+
+# vim key bindings
+set -o vi
diff --git a/.gdbinit b/.gdbinit
index f8b971d..9d56111 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,3 +1,5 @@
 set disassembly-flavor intel
 set print pretty on
 set prompt \ngdb>
+set confirm off
+set listsize 25
diff --git a/.gitconfig b/.gitconfig
index 2aa7aac..88672f3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,7 @@
 	username = HappyTramp
 [log]
 	decorate = full
+[pull]
+	rebase = false
+[merge]
+	tool = vimdiff
diff --git a/.pluggins.vim b/.pluggins.vim
index e877ab6..db233cf 100644
--- a/.pluggins.vim
+++ b/.pluggins.vim
@@ -15,6 +15,8 @@ call plug#begin()
     " s19 at home
     Plug 'HappyTramp/vim-42header'            " 42 header
 
+    Plug 'HappyTramp/vim-htheader'            " my header
+
     " themes
     " Plug 'joshdick/onedark.vim'             " onedark
     " Plug 'dracula/vim', {'as': 'vim'}       " dracula
diff --git a/.zprofile b/.zprofile
index de50afc..16d3e16 100755
--- a/.zprofile
+++ b/.zprofile
@@ -1,4 +1,5 @@
 if [[ "$(tty)" = "/dev/tty1" ]]; then
     startx
+    # xset r rate 200 40
     poweroff
 fi
diff --git a/.zsh_aliases b/.zsh_aliases
index 5b5684a..69975d1 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -3,19 +3,19 @@
 ###############
 
 # color
-alias grep="grep --color=auto"
-alias tree="tree -C"
-alias pacman="pacman --color=auto"
-alias valgrind="colour-valgrind"
+alias grep='grep --color=auto'
+alias tree='tree -C'
+alias pacman='pacman --color=auto'
+alias valgrindc='colour-valgrind'
 
 # common commands
-alias less="less -N"   # enable line number
-alias v="vim"
-alias mkdir="mkdir -p"
-alias gdb="gdb -q"     # disable long intro message
-alias sudo="sudo "     # enable color (the search for aliases continues)
-alias doas="doas "     # same for doas
-alias info="info --vi-keys"
+alias less='less -N'   # enable line number
+alias v='vim'
+alias mkdir='mkdir -p'
+alias gdb='gdb -q'     # disable long intro message
+alias sudo='sudo '     # enable color (the search for aliases continues)
+alias doas='doas '     # same for doas
+alias info='info --vi-keys'
 
 # ls
 alias ls='ls --color=auto -F'
@@ -25,10 +25,12 @@ alias lla="ls -alh"
 alias lss="ls -Ssh"
 
 # tree
-alias t="tree"
-alias t1="tree -L 1"
-alias t2="tree -L 2"
-alias t3="tree -L 3"
+alias tree='tree -FC'
+alias t='tree'
+alias ta='tree -a'
+alias t1='tree -L 1'
+alias t2='tree -L 2'
+alias t3='tree -L 3'
 alias treeI="tree -I '__pycache__' -I '*.o' -I vendor"
 
 # man
@@ -42,31 +44,35 @@ alias manv3="man 3 -P 'vim -M +MANPAGER -'"
 alias manv5="man 5 -P 'vim -M +MANPAGER -'"
 
 # make
-alias m="make"
+alias m='make'
+alias mre='make re'
+alias mclean='make clean'
 
 # git
-alias ga="git add"
-alias gaa="git add --all"
-alias gc="git commit"
-alias gc!="git commit --amend"
-alias gcmsg="git commit --message"
-alias gd="git diff"
-alias gds="git diff --staged"
-alias gl="git pull"
-alias glg="git log --stat"
-alias glgg="git log --graph"
-alias glgo="git log --oneline --no-decorate"
-alias gp="git push"
-alias gcl="git clone --recurse-submodules"
-alias gst="git status"
-alias gs="git status"
-alias gss="git status --short"
-alias gco="git checkout"
-alias gsta="git stash push"
-alias gstp="git stash pop"
+alias ga='git add'
+alias gaa='git add --all'
+alias gau='git add --update'
+alias gc='git commit'
+alias gc!='git commit --amend'
+alias gcmsg='git commit --message'
+alias gd='git diff'
+alias gds='git diff --staged'
+alias gdt='git diff --stat'
+alias gl='git pull'
+alias glg='git log --stat'
+alias glgg='git log --graph'
+alias glgo='git log --oneline --no-decorate'
+alias gp='git push'
+alias gcl='git clone --recurse-submodules'
+alias gst='git status'
+alias gs='git status'
+alias gss='git status --short'
+alias gco='git checkout'
+alias gsta='git stash push'
+alias gstp='git stash pop'
 
 # lpass (lastpass-cli)
-alias lpassp="lpass show --password --clip"  # put password in clipboard
+alias lpassp='lpass show --password --clip'  # put password in clipboard
 
 # helper to switch between dual and single monitor setup
 alias dual='xrandr --output LVDS1 --primary --below VGA1 --output VGA1 --auto'
@@ -101,3 +107,6 @@ alias btoff='echo power off | bluetoothctl'
 
 # pdf selector
 alias openpdf='zathura `ls -1 *.pdf | dmenu` &'
+
+alias cagob='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo build'
+alias cagor='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo run'
diff --git a/.zshrc b/.zshrc
index 74a4f5e..59b7a4e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -100,3 +100,5 @@ source $HOME/.zsh/zsh-you-should-use/you-should-use.plugin.zsh         # alias r
 tabs 4
 
 export LFS=/mnt
+
+export PATH='/usr/local/sbin:/usr/local/bin:/usr/bin'