Merge from PC.

dotfiles/.bash_aliases

@@ -1,5 +1,4 @@
 # system
-xmodmap -e "clear Lock"
 alias c="clear"
 shopt -s dotglob
 alias reb="sudo shutdown -r 0"
@@ -12,10 +11,10 @@ alias cdd="cd ~/Downloads"
 alias 221="cd ~/Documents/School/221"
 alias mt="okular ~/Documents/School/221/Textbook.pdf"
 alias mlt="okular ~/Downloads/Textbook.pdf"
-
-alias p2="cd ~/258/258-labs-self/l5/p2"
-alias l5="cd ~/258/258-labs-self/l5"
-alias lab="cd ~/258/258-labs-self"
+	# 258 (lab)
+	alias p2="cd ~/258/258-labs-self/l5/p2"
+	alias l5="cd ~/258/258-labs-self/l5"
+	alias lab="cd ~/258/258-labs-self"
 
 # config
 alias vb="gvim ~/.bash_aliases"

dotfiles/.profile

@@ -0,0 +1,22 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+	. "$HOME/.bashrc"
+    fi
+fi
+
+# set PATH so it includes user's private bin directories
+PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+
+xmodmap -e "clear Lock"

dotfiles/.vimrc

@@ -16,6 +16,7 @@ Plug 'vim-scripts/L9'
 Plug 'vim-scripts/FuzzyFinder'
 Plug 'whatyouhide/vim-gotham'
 Plug 'nathanaelkane/vim-indent-guides'
+Plug 'felixhummel/setcolors.vim'
 
 call plug#end()
 

set-from-git.sh

@@ -1,5 +1,5 @@
 # home
-files=".bash_aliases .bashrc .inputrc .vimrc .gvimrc"
+files=".bash_aliases .bashrc .inputrc .vimrc .gvimrc .profile"
 dotDir=~/linux-config/dotfiles
 
 for file in $files; do