From e948803150665bf61cd0eba06adeb3f4d1ab0547 Mon Sep 17 00:00:00 2001 From: Logan Saunders Date: Mon, 30 May 2016 00:18:19 -0700 Subject: [PATCH] Switched out vim for emacs (spacemacs) --- README.md | 12 ----- scripts/battery.sh | 112 --------------------------------------------- scripts/mpd.sh | 4 -- tmux.conf | 45 ------------------ vimrc | 109 ------------------------------------------- zshrc | 55 ---------------------- 6 files changed, 337 deletions(-) delete mode 100644 README.md delete mode 100755 scripts/battery.sh delete mode 100755 scripts/mpd.sh delete mode 100644 tmux.conf delete mode 100644 vimrc delete mode 100644 zshrc diff --git a/README.md b/README.md deleted file mode 100644 index 501c4e8..0000000 --- a/README.md +++ /dev/null @@ -1,12 +0,0 @@ - -# Dotfiles - -![Setup Preview](https://i.imgur.com/pGzolWf.png) - -This repo includes my tmux.conf and vimrc along with the scripts used in said tmux.conf. -**Note:** my vimrc is using [vundle](https://github.com/gmarik/Vundle.vim) so don't just copy and paste it without installing vundle -(also directly copying a vimrc is usually not a good idea). - -##Fonts - -The vimrc and tmux.conf files require patched fonts in order to be displayed correctly. I recommend [DejaVu Sans Mono for Powerline](https://github.com/powerline/fonts/tree/master/DejaVuSansMono) but you can find patched versions of many more fonts in that repository. diff --git a/scripts/battery.sh b/scripts/battery.sh deleted file mode 100755 index 0514e0b..0000000 --- a/scripts/battery.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -#Made by richo on GitHub - -HEART_FULL=♥ -HEART_EMPTY=♡ -[ -z "$NUM_HEARTS" ] && - NUM_HEARTS=5 - -cutinate() -{ - perc=$1 - inc=$(( 100 / $NUM_HEARTS)) - - - for i in `seq $NUM_HEARTS`; do - if [ $perc -lt 100 ]; then - echo $HEART_EMPTY - else - echo $HEART_FULL - fi - perc=$(( $perc + $inc )) - done -} - -linux_get_bat () -{ - bf=$(cat $BAT_FULL) - bn=$(cat $BAT_NOW) - echo $(( 100 * $bn / $bf )) -} - -freebsd_get_bat () -{ - echo "$(sysctl -n hw.acpi.battery.life)" - -} - -# Do with grep and awk unless too hard - -# TODO Identify which machine we're on from teh script. - -battery_status() -{ -case $(uname -s) in - "Linux") - BATPATH=/sys/class/power_supply/BAT0 - STATUS=$BATPATH/status - BAT_FULL=$BATPATH/energy_full - BAT_NOW=$BATPATH/energy_now - if [ "$1" = `cat $STATUS` -o "$1" = "" ]; then - linux_get_bat - fi - ;; - "FreeBSD") - STATUS=`sysctl -n hw.acpi.battery.state` - case $1 in - "Discharging") - if [ $STATUS -eq 1 ]; then - freebsd_get_bat - fi - ;; - "Charging") - if [ $STATUS -eq 2 ]; then - freebsd_get_bat - fi - ;; - "") - freebsd_get_bat - ;; - esac - ;; - "Darwin") - case $1 in - "Discharging") - ext="No";; - "Charging") - ext="Yes";; - esac - - ioreg -c AppleSmartBattery -w0 | \ - grep -o '"[^"]*" = [^ ]*' | \ - sed -e 's/= //g' -e 's/"//g' | \ - sort | \ - while read key value; do - case $key in - "MaxCapacity") - export maxcap=$value;; - "CurrentCapacity") - export curcap=$value;; - "ExternalConnected") - if [ "$ext" != "$value" ]; then - exit - fi - ;; - "FullyCharged") - if [ "$value" = "Yes" ]; then - exit - fi - ;; - esac - if [[ -n "$maxcap" && -n $curcap ]]; then - echo $(( 100 * $curcap / $maxcap )) - break - fi - done -esac -} - -BATTERY_STATUS=`battery_status $1` -[ -z "$BATTERY_STATUS" ] && exit - -echo `cutinate $BATTERY_STATUS` diff --git a/scripts/mpd.sh b/scripts/mpd.sh deleted file mode 100755 index 9b0df1b..0000000 --- a/scripts/mpd.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -#Inspired by tungd on GitHub -MPD_TRACK=$(mpc -f "%title%" current) -echo '#[bg=colour237,fg=colour249,bold] ♫' $MPD_TRACK diff --git a/tmux.conf b/tmux.conf deleted file mode 100644 index 77723e9..0000000 --- a/tmux.conf +++ /dev/null @@ -1,45 +0,0 @@ -# This tmux statusbar config was created by tmuxline.vim -# on Sat, 16 May 2015 -# Credit for the appearance of this config goes to the creator of tmuxline, Evgeni Kolev. - -######Behavior###### -set -g prefix ^a -#Start counting windows from 1 -set -g base-index 1 -set -g pane-base-index 1 -#Enable notifications from windows -setw -g monitor-activity on -set-option -g visual-activity on -#Set how often the status bar updates its info -set -g status-interval 1 -unbind-key C-h - -######Colors###### -set -g status-bg "colour238" -set -g message-command-fg "colour249" -set -g status-justify "left" -set -g status-left-length "100" -set -g status "on" -set -g pane-active-border-fg "colour150" -set -g message-bg "colour237" -set -g status-right-length "100" -set -g status-right-attr "none" -set -g message-fg "colour249" -set -g message-command-bg "colour237" -set -g status-attr "none" -set -g status-utf8 "on" -set -g pane-border-fg "colour237" -set -g status-left-attr "none" -setw -g window-status-fg "colour150" -setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour238" -setw -g window-status-activity-attr "none" -setw -g window-status-activity-fg "colour150" -setw -g window-status-separator "" -setw -g window-status-bg "colour238" - -######Status Bar###### -set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #(~/.scripts/battery.sh) #(~/.scripts/mpd.sh) #[fg=colour249,bg=colour237] %m/%d/%y  %l:%M %p #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour236,bg=colour150] #h " -setw -g window-status-format "#[fg=colour150,bg=colour238] #I #[fg=colour150,bg=colour238] #W " -setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #I #[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]" diff --git a/vimrc b/vimrc deleted file mode 100644 index ec71648..0000000 --- a/vimrc +++ /dev/null @@ -1,109 +0,0 @@ -""""""""Setup env"""""""" -set t_Co=256 -syntax enable -set background=dark -colorscheme Tomorrow-Night-Eighties -set nu -set laststatus=2 -set hlsearch ignorecase -"Auto indent -filetype on -filetype plugin on -filetype indent on -set autoindent -set smartindent -"Tab -set tabstop=2 shiftwidth=0 expandtab -set pastetoggle= -let mapleader = ',' -"Line wrapping -set wrap -set linebreak -set nolist - -set nocompatible -filetype off - -""""""""Setup Vundle"""""""" -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -" let Vundle manage Vundle, required -Plugin 'gmarik/Vundle.vim' - -""""""""Plugins"""""""" -Plugin 'tpope/vim-fugitive' -Plugin 'airblade/vim-gitgutter' -Plugin 'scrooloose/nerdtree' -Plugin 'bling/vim-airline' -Plugin 'Townk/vim-autoclose' -Plugin 'plasticboy/vim-markdown' -Plugin 'kchmck/vim-coffee-script' -Plugin 'pangloss/vim-javascript' -Plugin 'jelera/vim-javascript-syntax' -Plugin 'octol/vim-cpp-enhanced-highlight' -Plugin 'tpope/vim-haml' -Plugin 'hail2u/vim-css3-syntax' -Bundle 'kien/ctrlp.vim' -Bundle 'mattn/webapi-vim' -Bundle 'mattn/gist-vim' -Bundle 'vim-ruby/vim-ruby' -Bundle 'scrooloose/nerdcommenter' -Bundle 'tpope/vim-surround' -Bundle 'ervandew/supertab' - -call vundle#end() " required -filetype plugin indent on " required - -""""""""Setup Airline"""""""" -let g:airline_theme= 'bubblegum' -let g:airline_powerline_fonts = 1 - -""""""""Setup GitGutter"""""""" -let g:gitgutter_enabled = 1 -let g:gitgutter_signs = 1 -let g:gitgutter_highlight_lines = 0 - -""""""""Setup AutoClose"""""""" -let g:AutoClosePairs = "() {} \" ` ' [] <>" - -""""""""Leader Commands"""""""" -nnoremap n :NERDTreeToggle -nnoremap w :w -nnoremap i :PluginInstall -nnoremap g :Gist -nnoremap q :q -nnoremap x :x -nnoremap r :%s/ -nnoremap v :vsplit -nnoremap bd :bd -nnoremap bn :bnext! -nnoremap bp :bprevious! -nnoremap t :! - - -""""""Setup ctlp"""""" -set runtimepath^=~/.vim/bundle/ctrlp.vim -let g:ctrlp_map = 'p' -let g:ctrlp_cmd = 'CtrlP' - -""""""Remap split movement"""""" -nmap j j -nmap k k -nmap h h -nmap l l - -""""""Improve indent in visual mode"""""" -vnoremap < >gv - -""""""Enable Extra Cpp Syntax Highlighting Features"""""" -let g:cpp_class_scope_highlight = 1 -let g:cpp_experimental_template_highlight = 1 - -""""""Enable Better HTML AutoIndent"""""" -let g:html_indent_inctags = 'html,body,head,tbody, div, img, a' - -""""""Enable vim-airline's tabline"""""" -let g:airline#extensions#tabline#enabled = 1 diff --git a/zshrc b/zshrc deleted file mode 100644 index 87b2a24..0000000 --- a/zshrc +++ /dev/null @@ -1,55 +0,0 @@ -case $TERM in - xterm*) - precmd () {print -Pn "\e]0;Zshell\a"} - ;; -esac -autoload -U colors && colors -alias ls='ls --color=auto' -zstyle ':completion:*' completer _complete _ignored _approximate -zstyle :compinstall filename '/home/gigavinyl/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall -# Lines configured by zsh-newuser-install -HISTFILE=~/.histfile -HISTSIZE=500 -SAVEHIST=500 -setopt appendhistory autocd nomatch -unsetopt beep extendedglob notify -bindkey -v -# End of lines configured by zsh-newuser-install -autoload -U promptinit -promptinit -PROMPT="%{$fg[green]%}%m %{$fg_no_bold[blue]%}%1~ %{$reset_color%}%# " - -alias cl="clear && archeyjs" -alias apts="apt-cache search" -alias aptsy="sudo apt-fast update" -alias aptsyu="sudo apt-fast update && sudo apt-fast upgrade" -alias apti="sudo apt-fast install" -alias aptar="sudo apt-fast autoremove" -alias aptr="sudo apt-fast remove" - -alias gpmas="git push origin master" - -alias tma="tmux -2 a -t Home" -alias music="ncmpcpp" -alias vi="vim" - -export EDITOR=vim - -export PATH="$HOME/.rbenv/bin:$PATH" -export PATH="$HOME/.gem/ruby/2.2.0/bin:$PATH" -eval "$(rbenv init -)" - -#export PYENV_ROOT="$HOME/.pyenv" -#export PATH="$PYENV_ROOT/bin:$PATH" -#eval "$(pyenv init -)" - -#export PATH=/home/gigavinyl/.mongodb/bin:$PATH - -. ~/.nvm/nvm.sh -nvm use 0.12>/dev/null - -archeyjs