Renamed files and updated vimrc

jtemplet · Aug 22, 2022 · 1acc099 · 1acc099
1 parent 65ceb7f
commit 1acc099
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 67 deletions.
diff --git a/.gitconfig b/.gitconfig
diff --git a/.ackrc → ackrc b/.ackrc → ackrc
diff --git a/.bash_aliases → bash_aliases b/.bash_aliases → bash_aliases
diff --git a/.bash_profile → bash_profile b/.bash_profile → bash_profile
diff --git a/.bashrc → bashrc b/.bashrc → bashrc
diff --git a/.dircolors → dircolors b/.dircolors → dircolors
diff --git a/gitconfig b/gitconfig
@@ -0,0 +1,58 @@
+[user]
+	name = Jason Templeton
+	email = [email protected]
+[github]
+	user = jtemplet
+	token = fd412aa6f0af1cee9173995a0752232a
+[apply]
+	whitespace = nowarn
+[alias]
+	co = checkout
+	st = status
+  ci = commit
+  cm = "commit -m"
+  br = branch
+  df = diff
+  lg = log -p
+  lol = log --graph --decorate --pretty=oneline --abbrev-commit
+  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
+  hist = log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
+  ls = ls-files
+  dump = cat-file -p
+  type = cat-file -t
+  pf = push --force-with-lease
+  branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
+[core]
+  whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
+[fetch]
+  prune = true
+[color]
+  ui = true
+[color "branch"]
+  current = yellow reverse
+  local = yellow
+  remote = green
+[color "diff"]
+  meta = yellow bold
+  frag = magenta bold
+  old = red bold
+  new = green bold
+  whitespace = red reverse
+[color "status"]
+  added = yellow
+  changed = green
+  untracked = cyan
+[diff]
+  tool = meld
+[difftool]
+  prompt = false
+[difftool "meld"]
+  trustExitCode = true
+  cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
+[merge]
+  tool = meld
+[mergetool]
+  prompt = false
+[mergetool "meld"]
+  trustExitCode = true
+  cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
diff --git a/.gitignore → gitignore b/.gitignore → gitignore
diff --git a/.gitmodules → gitmodules b/.gitmodules → gitmodules
diff --git a/.gvimrc → gvimrc b/.gvimrc → gvimrc
diff --git a/.inputrc → inputrc b/.inputrc → inputrc
diff --git a/.pylintrc → pylintrc b/.pylintrc → pylintrc
diff --git a/.screenrc → screenrc b/.screenrc → screenrc
diff --git a/.vimrc → vimrc b/.vimrc → vimrc
@@ -1,12 +1,18 @@
+call plug#begin('~/.vim/plugged')
+  Plug 'ayu-theme/ayu-vim' " 
+  Plug 'NLKNguyen/papercolor-theme'
+call plug#end()
+
 " enable syntax highlighting
 syntax on
 
-
 " setup correct spacing and tab widths
-set expandtab                   " expand tabs to spaces
-set softtabstop=4               " 4 spaces
-set shiftwidth=4                " 4 sapces
-set tabstop=4                   " 4 spaces
+" Softtabs, 2 spaces
+set tabstop=2
+set shiftwidth=2
+set shiftround
+set expandtab
+
 "set autoindent                 " automatic indent new lines
 "set smartindent                
 
@@ -29,8 +35,13 @@ abbreviate teh the
 
 
 " change the color scheme to something i like
-colors desert
-
+set termguicolors     " enable true colors support
+" let ayucolor="light"  " for light version of theme
+" let ayucolor="mirage" " for mirage version of theme
+" let ayucolor="dark"   " for dark version of theme
+" colorscheme ayu
+set background=dark
+colorscheme PaperColor
 
 " more nifty ux settings
 set ruler               " always show cursor