aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Kohls <mattkohls13@gmail.com>2020-04-07 00:03:31 -0400
committerMatt Kohls <mattkohls13@gmail.com>2020-04-07 00:06:16 -0400
commit126c79af4b43becba7bf46d40851c7f3f4e79d22 (patch)
tree9e3b350f29e0f0cc6e721c7101676b7e3a27c826
parentc65afb13e9a2890f6b2d659a67f4bc054fad766f (diff)
downloaddotfiles-126c79af4b43becba7bf46d40851c7f3f4e79d22.tar.gz
dotfiles-126c79af4b43becba7bf46d40851c7f3f4e79d22.tar.bz2
dotfiles-126c79af4b43becba7bf46d40851c7f3f4e79d22.zip
cleaning up repo, updating dots
-rw-r--r--.bashrc6
-rw-r--r--.conkyrc106
-rw-r--r--.gitconfig6
m---------.vim/bundle/Vundle.vim0
m---------.vim/bundle/ctrlp.vim0
m---------.vim/bundle/delimitMate0
m---------.vim/bundle/gruvbox0
m---------.vim/bundle/nerdtree0
m---------.vim/bundle/previm0
m---------.vim/bundle/salt-vim0
m---------.vim/bundle/syntastic0
m---------.vim/bundle/vim-airline0
m---------.vim/bundle/vim-ansible-yaml0
m---------.vim/bundle/vim-bufferline0
m---------.vim/bundle/vim-commentary0
m---------.vim/bundle/vim-fugitive0
m---------.vim/bundle/vim-gitgutter0
-rw-r--r--.vim/colors/256_jungle.vim102
-rw-r--r--init.vim (renamed from nvim/init.vim)19
-rwxr-xr-xlinker.sh34
l---------nvim/.vim1
m---------nvim/bundle/Vundle.vim0
m---------nvim/bundle/ctrlp.vim0
m---------nvim/bundle/delimitMate0
m---------nvim/bundle/gruvbox0
m---------nvim/bundle/nerdtree0
m---------nvim/bundle/previm0
m---------nvim/bundle/salt-vim0
m---------nvim/bundle/syntastic0
m---------nvim/bundle/vim-airline0
m---------nvim/bundle/vim-ansible-yaml0
m---------nvim/bundle/vim-bufferline0
m---------nvim/bundle/vim-commentary0
m---------nvim/bundle/vim-fugitive0
m---------nvim/bundle/vim-gitgutter0
-rw-r--r--nvim/colors/256_jungle.vim102
36 files changed, 141 insertions, 235 deletions
diff --git a/.bashrc b/.bashrc
index e8264f2..55f59b6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -100,6 +100,9 @@ alias grep='grep --color=tty -d skip'
alias vi=nvim
alias cp="cp -i" #confirms before overwrite
+alias ip="ip -color"
+
+alias dd4='sudo dd bs=4M status=progress oflag=sync'
# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
@@ -126,6 +129,3 @@ if ! shopt -oq posix; then
fi
export EDITOR=/usr/bin/nvim
-
-export PAGER='vimpager'
-alias less=$PAGER
diff --git a/.conkyrc b/.conkyrc
new file mode 100644
index 0000000..bb19928
--- /dev/null
+++ b/.conkyrc
@@ -0,0 +1,106 @@
+-- Allows us to use our own variables
+-- Found on stackoverflow by Oka
+local function interp (s, t)
+ return s:gsub('(#%b{})', function (w)
+ return t[w:sub(3, -2)] or w
+ end)
+end
+
+-- Variables for whatever we want
+-- Should be used as #{var} in conky.text and added to tuple at end
+eth0 = 'enp11s0'
+eth1 = 'enp0s31f6'
+wifi = 'wlp3s0'
+
+-- conky configuration
+conky.config = {
+ total_run_times = 0,
+ background = true,
+ use_xft = true,
+ font = 'Hack:bold:size=9',
+ xftalpha = 0.8,
+ update_interval = 0.5,
+
+ own_window = true,
+ own_window_argb_visual = true,
+ own_window_argb_value = 120,
+ own_window_type = 'desktop',
+ own_window_hints= 'undecorated,below,sticky,skip_taskbar,skip_pager',
+ own_window_color= '212121',
+ use_xft = true,
+ xftalpha = 0.8,
+
+ double_buffer = true,
+
+ maximum_width = 350,
+ minimum_width = 200,
+ minimum_height = 200,
+
+ draw_shades = true,
+ draw_outline = false,
+ draw_borders = false,
+ draw_graph_borders = true,
+
+ default_color = 'F2F2F2',
+ color0 = 'ffa500',
+
+ alignment = 'top_left',
+ gap_x = 2572,
+ gap_y = 370,
+ uppercase = false,
+ cpu_avg_samples = 1,
+ net_avg_samples = 1,
+ override_utf8_locale = false
+};
+
+conky.text = interp( [[
+${color0}S Y S T E M I N F O
+${hr}
+${color0}Host:$color$alignr$nodename
+${color0}Kernel:$color$alignr$kernel
+${color0}Uptime:$color$alignr$uptime
+
+${color0}Disk usage:$color$alignr${fs_used /}/${fs_size /}
+${fs_bar /}
+
+${color0}CPU usage:$color$alignr${cpu cpu0}%
+${color0}CPU temp:$color$alignr${acpitemp}C
+
+${color0}CPU usage${alignr}CPU% MEM%$color
+${top name 1}${alignr}${top cpu 1} ${top mem 1}
+${top name 2}${alignr}${top cpu 2} ${top mem 2}
+${top name 3}${alignr}${top cpu 3} ${top mem 3}
+
+${color0}Memory usage$color
+${top_mem name 1}${alignr}${top_mem cpu 1} ${top_mem mem 1}
+${top_mem name 2}${alignr}${top_mem cpu 2} ${top_mem mem 2}
+${top_mem name 3}${alignr}${top_mem cpu 3} ${top_mem mem 3}
+
+${color0}RAM:$color$alignr$mem/$memmax
+${memgraph 20,200 0000ff 0000ff}
+
+${color0}Processes running:$color$alignr${running_processes}
+
+${color0}N E T W O R K
+${hr}$color
+${color0}Wired 1$color
+${color0}IP:$color$alignr${addr #{eth0}}
+${color0}Up:$color$alignr${upspeed #{eth0}}
+${upspeedgraph #{eth0} 30,200 ff0000 ff0000}
+${color0}Down:$color$alignr${downspeed #{eth0}}
+${downspeedgraph #{eth0} 30,200 00cd00 00cd00}
+
+${color0}Wired 2$color
+${color0}IP:$color$alignr${addr #{eth1}}
+${color0}Up:$color$alignr${upspeed #{eth1}}
+${upspeedgraph #{eth1} 30,200 ff0000 ff0000}
+${color0}Down:$color$alignr${downspeed #{eth1}}
+${downspeedgraph #{eth1} 30,200 00cd00 00cd00}
+
+${color0}Wireless$color
+${color0}IP:$color$alignr${addr #{wifi}}
+${color0}Up:$color$alignr${upspeed #{wifi}}
+${upspeedgraph #{wifi} 30,200 ff0000 ff0000}
+${color0}Down:$color$alignr${downspeed #{wifi}}
+${downspeedgraph #{wifi} 30,200 00cd00 00cd00}
+]], { eth0 = eth0, eth1 = eth1, wifi = wifi });
diff --git a/.gitconfig b/.gitconfig
index 85d6f84..14077bf 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,14 +1,14 @@
[user]
email = mattkohls13@gmail.com
name = Matt Kohls
- signingkey = A07E2D8DC7660C76
+ signingkey = 16D76B74E19E38A8
[help]
autocorrect = 1
[alias]
st = status
ll = log --stat --abbrev-commit
- graph1 = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m"
- graph2 = log --graph --full-history --all --color --pretty=tformat:"%C(red)%h%C(reset)%x09%C(green)%d%C(reset)%C(bold)%s%C(reset)%C(yellow)(%an)%C(reset)"
+ graph = log --graph --full-history --all --color --pretty=tformat:"%C(red)%h%C(reset)%x09%C(green)%d%C(reset)%C(bold)%s%C(reset)%C(yellow)(%an)%C(reset)"
+ bv = for-each-ref --color=always --sort=-committerdate --format='%(color:green)[%(refname:short)]%(color:reset) %(color:blue)%(committerdate:short)%(color:reset) %(color:yellow)%(objectname:short)%(color:reset) %(contents:subject)' refs/heads/
[core]
editor = nvim
excludesfile = /home/matt/.gitignore_global
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
deleted file mode 160000
-Subproject f6cc06238d5ac888ddfc514f80392f44cb2e21a
diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
deleted file mode 160000
-Subproject 564176f01d7f3f7f8ab452ff4e1f5314de7b098
diff --git a/.vim/bundle/delimitMate b/.vim/bundle/delimitMate
deleted file mode 160000
-Subproject b5719054beebe0135c94f4711a06dc7588041f0
diff --git a/.vim/bundle/gruvbox b/.vim/bundle/gruvbox
deleted file mode 160000
-Subproject 127c9d14d4bac1bac31e328b835a8919a255789
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
deleted file mode 160000
-Subproject e671e403dd1ec1da59f70605c73aaedb6cb0e63
diff --git a/.vim/bundle/previm b/.vim/bundle/previm
deleted file mode 160000
-Subproject e9967c225ddbcc67b45f6de7d3e2c5c656ef8fb
diff --git a/.vim/bundle/salt-vim b/.vim/bundle/salt-vim
deleted file mode 160000
-Subproject 5b15d379fbcbb84f82c6a345abc08cea9d374be
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
deleted file mode 160000
-Subproject 48e8b0e9d2721f608fd1d1157c9388b2626cbdd
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
deleted file mode 160000
-Subproject 46b0b6bf5a5cab3704bb8b7ba1b16b847006c57
diff --git a/.vim/bundle/vim-ansible-yaml b/.vim/bundle/vim-ansible-yaml
deleted file mode 160000
-Subproject 33643fc45b20e217e985436d005685dc8f476f0
diff --git a/.vim/bundle/vim-bufferline b/.vim/bundle/vim-bufferline
deleted file mode 160000
-Subproject 651fd010aa9613a4b8636a4af8a2db0d2280026
diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
deleted file mode 160000
-Subproject be79030b3e8c0ee3c5f45b4333919e4830531e8
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
deleted file mode 160000
-Subproject 87c1bda4d5573185a1f79c42a919c4b62bc34c4
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
deleted file mode 160000
-Subproject 1c034be0d31168c8f4770ef7b69adb67d00d6f3
diff --git a/.vim/colors/256_jungle.vim b/.vim/colors/256_jungle.vim
deleted file mode 100644
index 5a58587..0000000
--- a/.vim/colors/256_jungle.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Vim color file - 256_jungle
-" Generated by http://bytefluent.com/vivify 2016-02-13
-set background=dark
-if version > 580
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-
-set t_Co=256
-let g:colors_name = "256_jungle"
-
-"hi IncSearch -- no settings --
-"hi WildMenu -- no settings --
-"hi SignColumn -- no settings --
-"hi Title -- no settings --
-"hi CTagsMember -- no settings --
-"hi CTagsGlobalConstant -- no settings --
-hi Normal guifg=#dadada guibg=#1c1c1c guisp=#1c1c1c gui=NONE ctermfg=253 ctermbg=234 cterm=NONE
-"hi CTagsImport -- no settings --
-"hi CTagsGlobalVariable -- no settings --
-"hi SpellRare -- no settings --
-"hi EnumerationValue -- no settings --
-"hi Float -- no settings --
-"hi CursorLine -- no settings --
-"hi Union -- no settings --
-"hi Question -- no settings --
-"hi WarningMsg -- no settings --
-"hi VisualNOS -- no settings --
-"hi DiffDelete -- no settings --
-"hi ModeMsg -- no settings --
-"hi CursorColumn -- no settings --
-"hi EnumerationName -- no settings --
-"hi MoreMsg -- no settings --
-"hi SpellCap -- no settings --
-"hi DiffChange -- no settings --
-"hi SpellLocal -- no settings --
-"hi DefinedName -- no settings --
-"hi MatchParen -- no settings --
-"hi LocalVariable -- no settings --
-"hi SpellBad -- no settings --
-"hi CTagsClass -- no settings --
-"hi Underlined -- no settings --
-"hi DiffAdd -- no settings --
-"hi clear -- no settings --
-hi SpecialComment guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Typedef guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Folded guifg=#af5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=132 ctermbg=NONE cterm=NONE
-hi PreCondit guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi Include guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi TabLineSel guifg=#8787d7 guibg=#303030 guisp=#303030 gui=NONE ctermfg=104 ctermbg=236 cterm=NONE
-hi StatusLineNC guifg=#a8a8a8 guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=248 ctermbg=239 cterm=NONE
-hi NonText guifg=#8787ff guibg=NONE guisp=NONE gui=NONE ctermfg=105 ctermbg=NONE cterm=NONE
-hi DiffText guifg=#d700ff guibg=#808080 guisp=#808080 gui=NONE ctermfg=165 ctermbg=8 cterm=NONE
-hi ErrorMsg guifg=#d70000 guibg=#8a8a8a guisp=#8a8a8a gui=NONE ctermfg=160 ctermbg=245 cterm=NONE
-hi Ignore guifg=#ffd75f guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE
-hi Debug guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi PMenuSbar guifg=#9e9e9e guibg=#121212 guisp=#121212 gui=NONE ctermfg=247 ctermbg=233 cterm=NONE
-hi Identifier guifg=#afaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE
-hi SpecialChar guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Conditional guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi StorageClass guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Todo guifg=#d70087 guibg=NONE guisp=NONE gui=NONE ctermfg=162 ctermbg=NONE cterm=NONE
-hi Special guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi LineNr guifg=#808080 guibg=#121212 guisp=#121212 gui=NONE ctermfg=8 ctermbg=233 cterm=NONE
-hi StatusLine guifg=#00afff guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=39 ctermbg=239 cterm=NONE
-hi Label guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi PMenuSel guifg=#5f87ff guibg=#080808 guisp=#080808 gui=NONE ctermfg=69 ctermbg=232 cterm=NONE
-hi Search guifg=#af005f guibg=NONE guisp=NONE gui=NONE ctermfg=125 ctermbg=NONE cterm=NONE
-hi Delimiter guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Statement guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Comment guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE
-hi Character guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi Number guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi Boolean guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Operator guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi TabLineFill guifg=#4e4e4e guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=239 ctermbg=239 cterm=NONE
-hi Define guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi Function guifg=#afaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE
-hi FoldColumn guifg=#af5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=132 ctermbg=NONE cterm=NONE
-hi PreProc guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi Visual guifg=#a8a8a8 guibg=#444444 guisp=#444444 gui=NONE ctermfg=248 ctermbg=238 cterm=NONE
-hi VertSplit guifg=#4e4e4e guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=239 ctermbg=239 cterm=NONE
-hi Exception guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Keyword guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Type guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Cursor guifg=#dadada guibg=#5f00ff guisp=#5f00ff gui=NONE ctermfg=253 ctermbg=57 cterm=NONE
-hi Error guifg=NONE guibg=#ff0000 guisp=#ff0000 gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE
-hi PMenu guifg=#5f5fd7 guibg=#121212 guisp=#121212 gui=NONE ctermfg=62 ctermbg=233 cterm=NONE
-hi SpecialKey guifg=#5faf00 guibg=NONE guisp=NONE gui=NONE ctermfg=70 ctermbg=NONE cterm=NONE
-hi Constant guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi Tag guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi String guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi PMenuThumb guifg=#a8a8a8 guibg=#121212 guisp=#121212 gui=NONE ctermfg=248 ctermbg=233 cterm=NONE
-hi Repeat guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Directory guifg=#5f00ff guibg=#e4e4e4 guisp=#e4e4e4 gui=NONE ctermfg=57 ctermbg=254 cterm=NONE
-hi Structure guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Macro guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi TabLine guifg=#8a8a8a guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=245 ctermbg=239 cterm=NONE
-hi cursorim guifg=#192224 guibg=#536991 guisp=#536991 gui=NONE ctermfg=235 ctermbg=60 cterm=NONE
-hi underline guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE
diff --git a/nvim/init.vim b/init.vim
index 2879f44..c45a320 100644
--- a/nvim/init.vim
+++ b/init.vim
@@ -1,11 +1,16 @@
" BEGIN VUNDLE CONFIG
+set nocompatible
filetype off
-set rtp+=~/.vim/bundle/Vundle.vim
+set rtp+=~/.config/nvim/.vim/bundle/Vundle.vim
call vundle#begin()
" Vundle, a plugin manager for vim
Plugin 'gmarik/Vundle.vim'
+" Colorschemes from github
+Bundle 'clinstid/eink.vim'
+Bundle 'logico-dev/typewriter'
+
" gruvbox colorscheme
Plugin 'morhetz/gruvbox'
@@ -31,12 +36,6 @@ Plugin 'airblade/vim-gitgutter'
" Use Ctrl+P to search a project for a file
Plugin 'kien/ctrlp.vim'
-" Ansible syntax and indentation
-Plugin 'chase/vim-ansible-yaml'
-
-" Salt syntax and indentation
-Plugin 'saltstack/salt-vim'
-
" Automatically close parentheses, etc.
Plugin 'Raimondi/delimitMate'
@@ -63,10 +62,10 @@ set background=dark
syntax on
" Sane defaults for indentation
-" set expandtab
-set softtabstop=4
+set tabstop=4
set shiftwidth=4
set autoindent
+set noexpandtab
" Show line numbers
set number
@@ -140,6 +139,6 @@ let g:syntastic_check_on_wq = 0
" GitGutter tweaks
" Display diff markers between index and HEAD
-let g:gitgutter_diff_args = ' HEAD '
+"let g:gitgutter_diff_args = ' HEAD '
set clipboard+=unnamedplus
diff --git a/linker.sh b/linker.sh
index 7c4b382..3ec63c3 100755
--- a/linker.sh
+++ b/linker.sh
@@ -1,48 +1,54 @@
#!/bin/bash
-# Matt Kohls 2017
+# Matt Kohls 2020
# License GPLv3 or later
# Save dir of where we start from to link back to
DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd ~
+cd ~ || echo "Unable to change directory" && exit
# Start with .bashrc
if [[ -e .bashrc ]] ; then
- cp .bashrc .bashrc.original
+ mv .bashrc .bashrc.original
fi
ln -s "$DIR"/.bashrc ~/.bashrc
# Next .vim(rc)
if [[ -e .vimrc ]] ; then
- cp .vimrc .vimrc.original
-fi
-if [[ -e .vim ]] ; then
- cp -r .vim .vim.original
+ mv .vimrc .vimrc.original
fi
ln -s "$DIR"/.vimrc ~/.vimrc
-ln -s "$DIR"/.vim ~/.vim
+
+echo "Install VundleVim if not already present"
# Next .git
if [[ -e .gitconfig ]] ; then
- cp .gitconfig .gitconfig.original
+ mv .gitconfig .gitconfig.original
fi
if [[ -e .gitignore_global ]] ; then
- cp .gitignore_global .gitignore_global.original
+ mv .gitignore_global .gitignore_global.original
fi
ln -s "$DIR"/.gitconfig ~/.gitconfig
ln -s "$DIR"/.gitignore_global ~/.gitignore_global
+# Conky
+if [[ -e .conkyrc ]] ; then
+ mv .conkyrc .conkyrc_original
+fi
+ln -s "$DIR"/.conkyrc ~/.conkyrc
+
# .config stuff
-cd ~
+cd ~ || echo "Unable to change directory" && exit
if [[ ! -e .config ]] ; then
mkdir .config
fi
# Neovim
-cd .config
+cd .config || echo "Unable to access config directory" && exit
if [[ -e nvim ]] ; then
- cp -r nvim nvim.original
+ mv nvim nvim.original
+else
+ mkdir nvim
fi
-ln -s "$DIR"/nvim ~/.config/nvim
+ln -s "$DIR"/init.vim ~/.config/nvim/init.vim
diff --git a/nvim/.vim b/nvim/.vim
deleted file mode 120000
index bdbaa8a..0000000
--- a/nvim/.vim
+++ /dev/null
@@ -1 +0,0 @@
-/home/matt/dotfiles/.vim \ No newline at end of file
diff --git a/nvim/bundle/Vundle.vim b/nvim/bundle/Vundle.vim
deleted file mode 160000
-Subproject f6cc06238d5ac888ddfc514f80392f44cb2e21a
diff --git a/nvim/bundle/ctrlp.vim b/nvim/bundle/ctrlp.vim
deleted file mode 160000
-Subproject 564176f01d7f3f7f8ab452ff4e1f5314de7b098
diff --git a/nvim/bundle/delimitMate b/nvim/bundle/delimitMate
deleted file mode 160000
-Subproject b5719054beebe0135c94f4711a06dc7588041f0
diff --git a/nvim/bundle/gruvbox b/nvim/bundle/gruvbox
deleted file mode 160000
-Subproject 127c9d14d4bac1bac31e328b835a8919a255789
diff --git a/nvim/bundle/nerdtree b/nvim/bundle/nerdtree
deleted file mode 160000
-Subproject e671e403dd1ec1da59f70605c73aaedb6cb0e63
diff --git a/nvim/bundle/previm b/nvim/bundle/previm
deleted file mode 160000
-Subproject e9967c225ddbcc67b45f6de7d3e2c5c656ef8fb
diff --git a/nvim/bundle/salt-vim b/nvim/bundle/salt-vim
deleted file mode 160000
-Subproject 5b15d379fbcbb84f82c6a345abc08cea9d374be
diff --git a/nvim/bundle/syntastic b/nvim/bundle/syntastic
deleted file mode 160000
-Subproject 48e8b0e9d2721f608fd1d1157c9388b2626cbdd
diff --git a/nvim/bundle/vim-airline b/nvim/bundle/vim-airline
deleted file mode 160000
-Subproject 46b0b6bf5a5cab3704bb8b7ba1b16b847006c57
diff --git a/nvim/bundle/vim-ansible-yaml b/nvim/bundle/vim-ansible-yaml
deleted file mode 160000
-Subproject 33643fc45b20e217e985436d005685dc8f476f0
diff --git a/nvim/bundle/vim-bufferline b/nvim/bundle/vim-bufferline
deleted file mode 160000
-Subproject 651fd010aa9613a4b8636a4af8a2db0d2280026
diff --git a/nvim/bundle/vim-commentary b/nvim/bundle/vim-commentary
deleted file mode 160000
-Subproject be79030b3e8c0ee3c5f45b4333919e4830531e8
diff --git a/nvim/bundle/vim-fugitive b/nvim/bundle/vim-fugitive
deleted file mode 160000
-Subproject 87c1bda4d5573185a1f79c42a919c4b62bc34c4
diff --git a/nvim/bundle/vim-gitgutter b/nvim/bundle/vim-gitgutter
deleted file mode 160000
-Subproject 1c034be0d31168c8f4770ef7b69adb67d00d6f3
diff --git a/nvim/colors/256_jungle.vim b/nvim/colors/256_jungle.vim
deleted file mode 100644
index 5a58587..0000000
--- a/nvim/colors/256_jungle.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Vim color file - 256_jungle
-" Generated by http://bytefluent.com/vivify 2016-02-13
-set background=dark
-if version > 580
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-
-set t_Co=256
-let g:colors_name = "256_jungle"
-
-"hi IncSearch -- no settings --
-"hi WildMenu -- no settings --
-"hi SignColumn -- no settings --
-"hi Title -- no settings --
-"hi CTagsMember -- no settings --
-"hi CTagsGlobalConstant -- no settings --
-hi Normal guifg=#dadada guibg=#1c1c1c guisp=#1c1c1c gui=NONE ctermfg=253 ctermbg=234 cterm=NONE
-"hi CTagsImport -- no settings --
-"hi CTagsGlobalVariable -- no settings --
-"hi SpellRare -- no settings --
-"hi EnumerationValue -- no settings --
-"hi Float -- no settings --
-"hi CursorLine -- no settings --
-"hi Union -- no settings --
-"hi Question -- no settings --
-"hi WarningMsg -- no settings --
-"hi VisualNOS -- no settings --
-"hi DiffDelete -- no settings --
-"hi ModeMsg -- no settings --
-"hi CursorColumn -- no settings --
-"hi EnumerationName -- no settings --
-"hi MoreMsg -- no settings --
-"hi SpellCap -- no settings --
-"hi DiffChange -- no settings --
-"hi SpellLocal -- no settings --
-"hi DefinedName -- no settings --
-"hi MatchParen -- no settings --
-"hi LocalVariable -- no settings --
-"hi SpellBad -- no settings --
-"hi CTagsClass -- no settings --
-"hi Underlined -- no settings --
-"hi DiffAdd -- no settings --
-"hi clear -- no settings --
-hi SpecialComment guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Typedef guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Folded guifg=#af5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=132 ctermbg=NONE cterm=NONE
-hi PreCondit guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi Include guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi TabLineSel guifg=#8787d7 guibg=#303030 guisp=#303030 gui=NONE ctermfg=104 ctermbg=236 cterm=NONE
-hi StatusLineNC guifg=#a8a8a8 guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=248 ctermbg=239 cterm=NONE
-hi NonText guifg=#8787ff guibg=NONE guisp=NONE gui=NONE ctermfg=105 ctermbg=NONE cterm=NONE
-hi DiffText guifg=#d700ff guibg=#808080 guisp=#808080 gui=NONE ctermfg=165 ctermbg=8 cterm=NONE
-hi ErrorMsg guifg=#d70000 guibg=#8a8a8a guisp=#8a8a8a gui=NONE ctermfg=160 ctermbg=245 cterm=NONE
-hi Ignore guifg=#ffd75f guibg=NONE guisp=NONE gui=NONE ctermfg=221 ctermbg=NONE cterm=NONE
-hi Debug guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi PMenuSbar guifg=#9e9e9e guibg=#121212 guisp=#121212 gui=NONE ctermfg=247 ctermbg=233 cterm=NONE
-hi Identifier guifg=#afaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE
-hi SpecialChar guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Conditional guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi StorageClass guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Todo guifg=#d70087 guibg=NONE guisp=NONE gui=NONE ctermfg=162 ctermbg=NONE cterm=NONE
-hi Special guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi LineNr guifg=#808080 guibg=#121212 guisp=#121212 gui=NONE ctermfg=8 ctermbg=233 cterm=NONE
-hi StatusLine guifg=#00afff guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=39 ctermbg=239 cterm=NONE
-hi Label guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi PMenuSel guifg=#5f87ff guibg=#080808 guisp=#080808 gui=NONE ctermfg=69 ctermbg=232 cterm=NONE
-hi Search guifg=#af005f guibg=NONE guisp=NONE gui=NONE ctermfg=125 ctermbg=NONE cterm=NONE
-hi Delimiter guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Statement guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Comment guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE
-hi Character guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi Number guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi Boolean guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi Operator guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi TabLineFill guifg=#4e4e4e guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=239 ctermbg=239 cterm=NONE
-hi Define guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi Function guifg=#afaf00 guibg=NONE guisp=NONE gui=NONE ctermfg=142 ctermbg=NONE cterm=NONE
-hi FoldColumn guifg=#af5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=132 ctermbg=NONE cterm=NONE
-hi PreProc guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi Visual guifg=#a8a8a8 guibg=#444444 guisp=#444444 gui=NONE ctermfg=248 ctermbg=238 cterm=NONE
-hi VertSplit guifg=#4e4e4e guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=239 ctermbg=239 cterm=NONE
-hi Exception guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Keyword guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Type guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Cursor guifg=#dadada guibg=#5f00ff guisp=#5f00ff gui=NONE ctermfg=253 ctermbg=57 cterm=NONE
-hi Error guifg=NONE guibg=#ff0000 guisp=#ff0000 gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE
-hi PMenu guifg=#5f5fd7 guibg=#121212 guisp=#121212 gui=NONE ctermfg=62 ctermbg=233 cterm=NONE
-hi SpecialKey guifg=#5faf00 guibg=NONE guisp=NONE gui=NONE ctermfg=70 ctermbg=NONE cterm=NONE
-hi Constant guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi Tag guifg=#d78700 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE
-hi String guifg=#5fd700 guibg=NONE guisp=NONE gui=NONE ctermfg=76 ctermbg=NONE cterm=NONE
-hi PMenuThumb guifg=#a8a8a8 guibg=#121212 guisp=#121212 gui=NONE ctermfg=248 ctermbg=233 cterm=NONE
-hi Repeat guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Directory guifg=#5f00ff guibg=#e4e4e4 guisp=#e4e4e4 gui=NONE ctermfg=57 ctermbg=254 cterm=NONE
-hi Structure guifg=#d75f00 guibg=NONE guisp=NONE gui=NONE ctermfg=166 ctermbg=NONE cterm=NONE
-hi Macro guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE
-hi TabLine guifg=#8a8a8a guibg=#4e4e4e guisp=#4e4e4e gui=NONE ctermfg=245 ctermbg=239 cterm=NONE
-hi cursorim guifg=#192224 guibg=#536991 guisp=#536991 gui=NONE ctermfg=235 ctermbg=60 cterm=NONE
-hi underline guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE