commit 0b3c202af237aeffbdf6ad0b67182b2f7cb7108a Author: Joseph Groocock Date: Thu Mar 31 03:03:55 2016 +0100 Initial commit diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..a4ca19b --- /dev/null +++ b/.Xresources @@ -0,0 +1,113 @@ +!!============================================================================= +!! RXVT-unicode setting +!!============================================================================= + + +urxvt.depth: 32 + +urxvt.internalBorder: 9 +urxvt.blurRadius: 25 +urxvt.scrollBar: true +urxvt.scrollBar_right: true +urxvt.scrollBar_floating: false +urxvt.scrollstyle: plain +urxvt.saveLines: 10000 +urxvt.preeditType: Root +urxvt.jumpScroll: false +URxvt.altSendsEscape: true + +xterm.metaSendsEscape: true + +!Set TERM +urxvt.termName: xterm-256color + +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.autohint: false +Xft.hinting: true +Xft.hintstyle: hintfull +urxvt*font: xft:Cousine:size=11 +urxvt*imFont: xft:Cousine:size=11 +urxvt*boldFont: xft:Cousine:bold:size=11 +urxvt*italicFont: xft:Cousine:italic:size=11 +urxvt*boldItalicFont: xft:Cousine:bold:italic:size=10 +urxvt*scaleHeight: 1.01 +!urxvt*letterSpace: -5 + +! clickable Url and copy paste keys + +urxvt.iso14755: false +urxvt.iso14755_52: false +urxvt.perl-ext-common: default,clipboard,vtwheel +urxvt.keysym.Shift-Control-C: perl:clipboard:copy +urxvt.keysym.Shift-Control-V: perl:clipboard:paste +urxvt.url-launcher: /usr/bin/google-chrome-stable +urxvt.matcher.button: 1 + + +Xft.lcdfilter: lcddefault + + +urxvt*dynamicColors: on +urxvt*highlightSelection: true +urxvt*colorMode: on + + +!urxvt*borderColor: #373b41 + +! special +*.foreground: #eceff1 +*.background: #002b36 +*.cursorColor: #eceff1 +urxvt.background: [80]#002b36 + +! black +*.color0: #263238 +*.color8: #37474f + +! red +*.color1: #ff9800 +*.color9: #ffa74d + +! green +*.color2: #8bc34a +*.color10: #9ccc65 + +! yellow +*.color3: #ffc107 +*.color11: #ffa000 + +! blue +*.color4: #03a9f4 +*.color12: #81d4fa + +! magenta +*.color5: #e91e63 +*.color13: #A56ECC + +! cyan +*.color6: #009688 +*.color14: #26a69a + +! white +*.color7: #cfd8dc +*.color15: #eceff1 + + +!----------------------------- +! Rofi config + +rofi.fg: #D3DAE3 +rofi.bg: #383C4A +rofi.hlbg: #5294E2 +rofi.bc: #383C4A +rofi.opacity: 80 +rofi.padding: 8 +rofi.lines: 14 +rofi.width: 40 +rofi.font: Noto Sans 14 +rofi.line-margin: 3 +rofi.sep: | +rofi.prompt: > + diff --git a/.config/Trolltech.conf b/.config/Trolltech.conf new file mode 100644 index 0000000..e148896 --- /dev/null +++ b/.config/Trolltech.conf @@ -0,0 +1,2 @@ +[Qt] +style=GTK+ diff --git a/.config/compton.conf b/.config/compton.conf new file mode 100644 index 0000000..edcd4d5 --- /dev/null +++ b/.config/compton.conf @@ -0,0 +1,86 @@ +# Shadow +shadow = true; # Enabled client-side shadows on windows. +no-dock-shadow = true; # Avoid drawing shadows on dock/panel windows. +no-dnd-shadow = true; # Don't draw shadows on DND windows. +clear-shadow = true; # Zero the part of the shadow's mask behind the + # window. Fix some weirdness with ARGB windows. +shadow-radius = 12; # The blur radius for shadows. (default 12) +shadow-offset-x = -16; # The left offset for shadows. (default -15) +shadow-offset-y = -16; # The top offset for shadows. (default -15) +shadow-opacity = 0.65; # The translucency for shadows. (default .75) +# shadow-red = 0.0; # Red color value of shadow. (0.0 - 1.0, defaults to 0) +# shadow-green = 0.0; # Green color value of shadow. (0.0 - 1.0, defaults to 0) +# shadow-blue = 0.0; # Blue color value of shadow. (0.0 - 1.0, defaults to 0) +shadow-exclude = [ "n:e:Notification" ]; # Exclude conditions for shadows. +shadow-ignore-shaped = true; # Avoid drawing shadow on all shaped windows + # (see also: --detect-rounded-corners) + +# Opacity +menu-opacity = 0.9; # The opacity for menus. (default 1.0) +inactive-opacity = 0.9; # Default opacity of inactive windows. (0.0 - 1.0) +active-opacity = 1.0; # Default opacity for active windows. (0.0 - 1.0) +frame-opacity = 1.0; # Opacity of window titlebars and borders. (0.1 - 1.0) +inactive-opacity-override = true; # Let inactive opacity set by 'inactive-opacity' overrides + # value of _NET_WM_OPACITY. Bad choice. +alpha-step = 0.06; # XRender backend: Step size for alpha pictures. Increasing + # it may result in less X resource usage, + # Yet f ading may look bad. +# inactive-dim = 0.2; # Dim inactive windows. (0.0 - 1.0) +#inactive-dim-fixed = true; # Do not let dimness adjust based on window opacity. +blur-background = true; # Blur background of transparent windows. +blur-background-frame = true; # Blur background of opaque windows with transparent + # frames as well. +blur-background-fixed = true; # Do not let blur radius adjust based on window opacity. +inactive-opacity-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ]; + # Exclude conditions for background blur. + +# Fading +fading = true; # Fade windows during opacity changes. +# fade-delta = 16; # The time between steps in a fade in milliseconds. (default 10). +fade-in-step = 0.026; # Opacity change between steps while fading in. (default 0.028). +fade-out-step = 0.03; # Opacity change between steps while fading out. (default 0.03). +# no-fading-openclose = true; # Avoid fade windows in/out when opening/closing. +# fade-exclude = [ ]; # Exclude conditions for fading. + +# Other +backend = "glx" # Backend to use: "xrender" or "glx". GLX backend is typically + # much faster but depends on a sane driver. +mark-wmwin-focused = true; # Try to detect WM windows and mark them as active. +mark-ovredir-focused = true; # Mark all non-WM but override-redirect windows active (e.g. menus). +use-ewmh-active-win = false; # Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused + # instead of using FocusIn/Out events. Usually more reliable but + # depends on a EWMH-compliant WM. +detect-rounded-corners = false; # Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on. +detect-client-opacity = true; # Detect _NET_WM_OPACITY on client windows, useful for window + # managers not passing _NET_WM_OPACITY of client windows to frame windows. +refresh-rate = 0; # For --sw-opti: Specify refresh rate of the screen. 0 for auto. +vsync = "none"; # "none", "drm", "opengl", "opengl-oml", "opengl-swc", "opengl-mswc" + # See man page for more details. +dbe = false; # Enable DBE painting mode. Rarely needed. +paint-on-overlay = true; # Painting on X Composite overlay window. Recommended. +sw-opti = false; # Limit compton to repaint at most once every 1 / refresh_rate. + # Incompatible with certain VSync methods. +unredir-if-possible = false; # Unredirect all windows if a full-screen opaque window is + # detected, to maximize performance for full-screen windows. +focus-exclude = [ "i:ai:google-chrome" ]; # A list of conditions of windows that should always be considered focused. +detect-transient = true; # Use WM_TRANSIENT_FOR to group windows, and consider windows in + # the same group focused at the same time. +detect-client-leader = true; # Use WM_CLIENT_LEADER to group windows. +invert-color-include = [ ]; # Conditions for windows to be painted with inverted color. + +# GLX backend # GLX backend fine-tune options. See man page for more info. +glx-no-stencil = true; # Recommended. +glx-copy-from-front = false; # Useful with --glx-swap-method, +# glx-use-copysubbuffermesa = true; # Recommended if it works. Breaks VSync. +# glx-no-rebind-pixmap = true; # Recommended if it works. +glx-swap-method = "undefined"; # See man page. + +# Window type settings +wintypes: +{ + tooltip = { fade = true; shadow = false; opacity = 0.75; focus = true; }; + # fade: Fade the particular type of windows. + # shadow: Give those windows shadow + # opacity: Default opacity for the type of windows. + # focus: Whether to always consider windows of this type focused. +}; diff --git a/.config/pacaur/config b/.config/pacaur/config new file mode 100644 index 0000000..11a7b51 --- /dev/null +++ b/.config/pacaur/config @@ -0,0 +1,10 @@ +#!/bin/bash + +displaybuildfiles=none # display build files (none|diff|full) +sudoloop=false # prevent sudo timeout + +#editor="${EDITOR:-vi}" # build files editor +#fallback=true # pacman fallback to the AUR +#silent=false # silence output +#sortby=popularity # sort method (name|votes|popularity) +#sortorder=descending # sort order (ascending|descending) diff --git a/.config/redshift.conf b/.config/redshift.conf new file mode 100644 index 0000000..e66e1f3 --- /dev/null +++ b/.config/redshift.conf @@ -0,0 +1,56 @@ +; Global settings for redshift +[redshift] +; Set the day and night screen temperatures +temp-day=5600 +temp-night=3600 + +; Enable/Disable a smooth transition between day and night +; 0 will cause a direct change from day to night screen temperature. +; 1 will gradually increase or decrease the screen temperature. +transition=1 + +; Set the screen brightness. Default is 1.0. +;brightness=0.8 +; It is also possible to use different settings for day and night +; since version 1.8. +;brightness-day=0.9 +;brightness-night=0.7 +; Set the screen gamma (for all colors, or each color channel +; individually) +gamma=1.0 +;gamma=0.8:0.7:0.8 +; This can also be set individually for day and night since +; version 1.10. +;gamma-day=0.8:0.7:0.8 +;gamma-night=0.8 + +; Set the location-provider: 'geoclue', 'geoclue2', 'manual' +; type 'redshift -l list' to see possible values. +; The location provider settings are in a different section. +location-provider=manual + +; Set the adjustment-method: 'randr', 'vidmode' +; type 'redshift -m list' to see all possible values. +; 'randr' is the preferred method, 'vidmode' is an older API. +; but works in some cases when 'randr' does not. +; The adjustment method settings are in a different section. +adjustment-method=randr + +; Configuration of the location-provider: +; type 'redshift -l PROVIDER:help' to see the settings. +; ex: 'redshift -l manual:help' +; Keep in mind that longitudes west of Greenwich (e.g. the Americas) +; are negative numbers. +[manual] +lat=52.4 +lon=-1.9 + +; Configuration of the adjustment-method +; type 'redshift -m METHOD:help' to see the settings. +; ex: 'redshift -m randr:help' +; In this example, randr is configured to adjust screen 1. +; Note that the numbering starts from 0, so this is actually the +; second screen. If this option is not specified, Redshift will try +; to adjust _all_ screens. +[randr] +screen=0 diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs new file mode 100644 index 0000000..3fc3404 --- /dev/null +++ b/.config/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/desktop" +XDG_DOCUMENTS_DIR="$HOME/documents" +XDG_DOWNLOAD_DIR="$HOME/downloads" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pictures" +XDG_VIDEOS_DIR="$HOME/videos" +XDG_PUBLICSHARE_DIR="$HOME/public" +XDG_TEMPLATES_DIR="$HOME/.templates" diff --git a/.fehbg b/.fehbg new file mode 100755 index 0000000..46acfda --- /dev/null +++ b/.fehbg @@ -0,0 +1,2 @@ +#!/bin/sh +feh --no-xinerama --bg-fill '/home/frebib/Pictures/Wallpapers/lakeside-sunrisejpg' diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..8c276ce --- /dev/null +++ b/.gitconfig @@ -0,0 +1,5 @@ +[push] + default = simple +[user] + name = Joseph Groocock + email = frebib@gmail.com diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 new file mode 100644 index 0000000..f669237 --- /dev/null +++ b/.gtkrc-2.0 @@ -0,0 +1,19 @@ +# DO NOT EDIT! This file will be overwritten by LXAppearance. +# Any customization should be done in ~/.gtkrc-2.0.mine instead. + +include "/home/frebib/.gtkrc-2.0.mine" +gtk-theme-name="Arc-Dark" +gtk-icon-theme-name="Xenlism-Wildfire-MidNight" +gtk-font-name="Noto Sans 11" +gtk-cursor-theme-name="Breeze_Obsidian" +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle="hintfull" +gtk-xft-rgba="rgb" diff --git a/.profile b/.profile new file mode 100644 index 0000000..c9fdede --- /dev/null +++ b/.profile @@ -0,0 +1,11 @@ +export LC_ALL="C" + +export DOTFILES=~/.config/dotfiles +export PATH="${PATH}:$DOTFILES/scripts" + +export EDITOR="vim" +export VISUAL="vim" +export BROWSER="google-chrome-stable" +export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" +export QT_STYLE_OVERRIDE=GTK+ + diff --git a/.vimrc b/.vimrc new file mode 100644 index 0000000..4a62b9f --- /dev/null +++ b/.vimrc @@ -0,0 +1,35 @@ +set nocompatible " be iMproved, required +filetype off " required + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +Plugin 'VundleVim/Vundle.vim' +Plugin 'Valloric/YouCompleteMe' +Plugin 'vim-airline/vim-airline' +Plugin 'vim-airline/vim-airline-themes' + +call vundle#end() + +syntax enable +set tabstop=4 +set shiftwidth=4 +set softtabstop=4 +set expandtab +set number +set autoindent +set laststatus=2 +set mouse=a + +" Interface with system clipboard +noremap y "*y +noremap p "*p +noremap Y "+y +noremap P "+p + +" Write with sudo +cmap w!! w !sudo tee > /dev/null % + +" airline buffer list +let g:airline#extensions#tabline#enabled = 1 diff --git a/.xbindkeysrc b/.xbindkeysrc new file mode 100644 index 0000000..9e4f8b0 --- /dev/null +++ b/.xbindkeysrc @@ -0,0 +1,15 @@ +# thumb wheel up => increase volume and unmute +"amixer -D pulse set Master 1000+ unmute ; pkill -RTMIN+10 i3blocks" + b:6 + +# thumb wheel down => lower volume +"amixer -D pulse set Master 1000- ; pkill -RTMIN+10 i3blocks" + b:7 + +# backward button => previous song +"xte 'key XF86AudioPrev'" + b:8 + +# forward button => next song +"xte 'key XF86AudioNext'" + b:9 diff --git a/.xinitrc b/.xinitrc new file mode 100644 index 0000000..0d3c47c --- /dev/null +++ b/.xinitrc @@ -0,0 +1,22 @@ +#!/bin/sh + +xrdb -merge ~/.Xresources + +# start some programs +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +setxkbmap -option caps:none +xset r rate 180 24 +xbindkeys & + +xrandr --dpi 96 + +pulseaudio & +dropbox & + +exec i3 diff --git a/.yaourtrc b/.yaourtrc new file mode 100644 index 0000000..d44f681 --- /dev/null +++ b/.yaourtrc @@ -0,0 +1,66 @@ +# yaourtrc - Configuration for yaourt +# +# See yaourtrc(5) for more information +# +# + +# General +#AUTOSAVEBACKUPFILE=0 +#DEVELSRCDIR="" +#DEVEL=0 +#VISUAL="$VISUAL" +#EDITOR="$EDITOR" +#FORCEENGLISH=0 +#FORCE=0 +#TMPDIR="/tmp" +#NO_TESTDB=0 + +# SUDO +#SUDONOVERIF=0 # Avoid multiple sudo checks when timestamp_timeout=0 +#SUDOREDIRECT=1 # Define to 0 in case you use a fingerprint device + +# ABS +#USE_GIT=0 +# If the package "abs" is installed, those var are parsed from abs.conf +#REPOS=() # REPOS available at $SYNCSERVER +#SYNCSERVER="" + +# AUR +#AURURL="https://aur.archlinux.org" +#AURCOMMENT=5 +#AURDEVELONLY=0 +#AURSEARCH=1 +#AURUPGRADE=0 +#AURVOTE=1 +#AURUSEGIT=0 + +# Build +#EXPORT=0 # Export to 1: EXPORTDIR or PKGDEST + # 2: pacman cache (as root) +#EXPORTSRC=0 # Need EXPORT>0 to be used +#EXPORTDIR="" # If empty, use makepkg's connfiguration (see makepkg.conf) + +# Prompt +#NOCONFIRM=0 +#UP_NOCONFIRM=0 # No prompt while build upgrades (including -Sbu) +#PU_NOCONFIRM=0 # Add --noconfirm to $PACMAN -U +#NOENTER=1 +BUILD_NOCONFIRM=1 +EDITFILES=0 + +# Output +#USECOLOR=1 +#USEPAGER=0 +#DETAILUPGRADE=1 +#SHOWORPHANS=1 +#TERMINALTITLE=1 + +# Command +#PACMAN="pacman" +#MAKEPKG="makepkg" +#DIFFEDITCMD="vimdiff" + +# pacdiffviewer +#P_LOCATE=0 # Use locate instead of find +#P_SEARCHDIR=(/etc/ /boot/) +#P_SAVEDIR='/var/lib/yaourt/backupfiles' diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..f76f83e --- /dev/null +++ b/.zshrc @@ -0,0 +1,81 @@ +unsetopt MULTIBYTE + +# Path to your oh-my-zsh installation. +ZSH=/usr/share/oh-my-zsh + +# Set the theme +ZSH_THEME="fishy" +DISABLE_AUTO_UPDATE="true" + +HISTFILE=~/.config/zsh-histfile +HISTSIZE=100000 +SAVEHIST=100000 +setopt appendhistory autocd extendedglob + +export WORDCHARS='*?_[]~=&;!#$%^(){}' + +bindkey -v +bindkey "\e$terminfo[kcub1]" backward-word +bindkey "\e$terminfo[kcuf1]" forward-word +bindkey "^[[7~" beginning-of-line +bindkey "^[[8~" end-of-line + +x-bash-backward-kill-word(){ + WORDCHARS='' zle kill-word +} +zle -N x-bash-backward-kill-word +bindkey '^[^[[3~' x-bash-backward-kill-word +bindkey '^[^[[3^' x-bash-backward-kill-word + +autoload -U up-line-or-beginning-search +autoload -U down-line-or-beginning-search +zle -N up-line-or-beginning-search +zle -N down-line-or-beginning-search +bindkey "^[[A" up-line-or-beginning-search # Up +bindkey "^[^[[A" up-line-or-beginning-search # Up +bindkey "^[[B" down-line-or-beginning-search # Down +bindkey "^[^[[B" down-line-or-beginning-search # Down + +zstyle ':completion:*:sudo::' environ PATH="/sbin:/usr/sbin:$PATH" HOME="/root" +zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*' +zstyle :compinstall filename '/home/frebib/.zshrc' + +autoload -U compinit ; compinit + +plugins=(command-not-found common-aliases cp history-substring-search sudo zsh-autosuggestions zsh-completions) +source $ZSH/oh-my-zsh.sh + +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + +ZSH_AUTOSUGGEST_CLEAR_WIDGETS=("${(@)ZSH_AUTOSUGGEST_CLEAR_WIDGETS:#(up|down)-line-or-history}") +ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(history-substring-search-up history-substring-search-down) + +ZSH_HIGHLIGHT_STYLES[default]='fg=blue' +ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red,bold' +ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=yellow' +ZSH_HIGHLIGHT_STYLES[alias]='fg=63' +ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=green,underline' +ZSH_HIGHLIGHT_STYLES[builtin]='fg=63' +ZSH_HIGHLIGHT_STYLES[function]='fg=63' +ZSH_HIGHLIGHT_STYLES[command]='fg=63' +ZSH_HIGHLIGHT_STYLES[precommand]='fg=63' +ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=blue' +ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=green' +ZSH_HIGHLIGHT_STYLES[path]='fg=63,underline' +ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=yellow,bold' +ZSH_HIGHLIGHT_STYLES[path_approx]='fg=red,bold,underline' +ZSH_HIGHLIGHT_STYLES[globbing]='fg=red' +ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=blue' +ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue' +ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='none' +ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=yellow' +ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=yellow' +ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=yellow' +ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=cyan' +ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=cyan' +ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=cyan' +ZSH_HIGHLIGHT_STYLES[assign]='none' +ZSH_HIGHLIGHT_STYLES[redirection]='none' + +source ~/.config/dotfiles/aliases diff --git a/aliases b/aliases new file mode 100644 index 0000000..4078383 --- /dev/null +++ b/aliases @@ -0,0 +1,93 @@ +# Common Aliases +#alias "-"="cd -" +#alias "~"="cd ~" +alias ...=../.. +alias ....=../../.. +alias .....=../../../.. +alias ......=../../../../.. + +alias ..la="cd ..;la" +alias ..ll="cd..;ll" +alias ..l="..ll" + +alias l=ll +alias ll="ls -lFh" +alias la="ls -lAFh" +alias count="la | wc -l" + +alias md="mkdir -p" +mcd(){ + mkdir $1 && cd $1 +} + +alias svi=sudoedit + +# Git Aliases +alias g=git +alias gcl="git clone --recursive" +alias gco="git checkout" +alias ga="git add" +alias gaa="ga -A" +alias gc="git commit" +alias gcm="gc -m" +alias gcam="gc -a" +alias gst="git status" + +alias gm="git merge" +alias gma="git merge --abort" +alias grb="git rebase" +alias grba="grb --abort" +alias grbc="grb --continue" + +alias gf="git fetch" +alias gp="git push" +alias gpf="gp --force" +alias gl="git pull --rebase" +alias gd="git diff" +alias glg="git log --stat --color" +alias glog="git log --oneline --decorate --color --graph" + +alias gclean="git clean" +alias gbr="git branch" +alias gr="git remote" +alias gra="gr add" +alias grr="gr rm" +alias grao="gra origin" +alias grro="grr origin" + +alias gsta='git stash' +alias gstd='gsta drop' +alias gstl='gsta list' +alias gstp='gsta pop' +alias gstv="gsta show -p stash@{0}" + + +# General Aliases +alias aliases="$EDITOR $DOTFILES/aliases ; source ~/.zshrc" +alias vimrc="$EDITOR ~/.vimrc" +alias zshrc="$EDITOR ~/.zshrc ; source ~/.zshrc" +alias yaourtrc="$EDITOR ~/.yaourtrc" +alias xinitrc="$EDITOR ~/.xinitrc" +alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources" +alias sshc="$EDITOR ~/.ssh/config" +alias dotfiles="cd $DOTFILES" +alias i3c="$EDITOR ~/.config/i3/config ; i3-msg restart" +alias i3bc="$EDITOR ~/.config/i3blocks/config ; i3-msg restart" +alias sf=screenfetch + +alias startcsecvm="VBoxManage startvm 'Intro to Computer Security' --type headless" +alias stopcsecvm="VBoxManage controlvm 'Intro to Computer Security' poweroff" + +alias lab="ssh -tt tw '~/ctl' 2>/dev/null" +alias downloads="~/Downloads" +alias dl="downloads" +alias doc="~/Documents" +alias desktop="cd ~/Desktop" +alias uni="~/university" +alias drive="~/drive" +alias lol="fortune | cowsay -f sodomized | lolcat -p 1" + +alias gsvn="git svn" +alias gsync="git pull -q ; sl ; sp ; git push" +alias sp="git stash -q ; gsvn dcommit ; git stash pop" +alias sl="git stash -q ; gsvn rebase ; git stash pop"