From 3c7c7c37df49a278e618e85a0c67603985fdaef0 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Tue, 30 Jan 2018 22:12:58 -0500
Subject: [PATCH] Auto-load .bashrc upon SSH'ing into CDF

Fix "c." function.
---
 .gitignore             |  3 +--
 dotfiles/.bash_aliases |  7 ++++---
 dotfiles/.bashrc       |  1 +
 dotfiles/.vimrc        |  3 ++-
 dotfiles/termConfig    | 35 +++++++++++++++++++++++++++++++++++
 5 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 dotfiles/termConfig

diff --git a/.gitignore b/.gitignore
index b7c59fd..66fcaf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-*.swp
+*.sw*
 temp.sh
 konsole.shortcuts
-dotfiles/termConfig
diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases
index e39b2c6..fdc1988 100644
--- a/dotfiles/.bash_aliases
+++ b/dotfiles/.bash_aliases
@@ -18,8 +18,9 @@ alias s="systemctl suspend"
 alias hst="history"
 
 # directories
+# unalias c
 d() { cd "$@" && ls -a ; }
-cd_up() { c $(printf "%0.s../" $(seq 1 $1 )) ; }
+cd_up() { d $(printf "%0.s../" $(seq 1 $1 )) ; }
 alias "c."="cd_up"
 alias cdd="d ~/Downloads"
 if $in_lab; then
@@ -68,6 +69,7 @@ fi
 # school
 alias sch="$cd_school"
 alias 136="$cd_school/136"
+alias 236="$cd_school/236"
 alias pr2="$cd_school/136/par/2"
 alias psy="$cd_school/psy"
 
@@ -77,8 +79,7 @@ alias psy="$cd_school/psy"
 	alias 9r="$cd_school/209/mokkar"
 	alias l3="$cd_school/209/mokkar/lab3"
 	alias a1="$cd_school/209/mokkar/a1"
-
-	alias cdf="ssh mokkar@cdf.utoronto.ca"
+	alias cdf="ssh -t mokkar@cdf.utoronto.ca '. ./.bashrc'"
 
 	ca12() {
 		gcc -Wall -std=gnu99 -g -o validate_sin.out validate_sin.c sin_helpers.c
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index dbaf491..2ba18b5 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -80,6 +80,7 @@ esac
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls --color=auto'
+
     #alias dir='dir --color=auto'
     #alias vdir='vdir --color=auto'
 
diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
index 934a036..43561af 100644
--- a/dotfiles/.vimrc
+++ b/dotfiles/.vimrc
@@ -57,6 +57,7 @@ map <F4> :wqa<CR>
 map <F5> :qa!<CR>
 map <F6> :LLPStartPreview<CR>
 map <F7> :AutoSaveToggle<CR>
+set pastetoggle=<F9>
 map <F10> :PlugInstall<CR>
-map <Enter> o<ESC>
+map <C-Enter> o<ESC>
 map <S-Enter> O<ESC>
diff --git a/dotfiles/termConfig b/dotfiles/termConfig
new file mode 100644
index 0000000..5dcfc82
--- /dev/null
+++ b/dotfiles/termConfig
@@ -0,0 +1,35 @@
+[global_config]
+  inactive_color_offset = 1.0
+  title_font = Noto Sans 10
+  title_transmit_bg_color = "#3d3d3d"
+[keybindings]
+  close_term = <Primary>w
+  cycle_next = <Shift>Tab
+  go_down = <Primary>j
+  go_left = <Primary>h
+  go_right = <Primary>l
+  go_up = <Primary>k
+  new_tab = <Primary>t
+  split_horiz = <Primary><Shift>e
+  split_vert = <Primary><Shift>o
+[layouts]
+  [[default]]
+    [[[child1]]]
+      parent = window0
+      type = Terminal
+    [[[window0]]]
+      parent = ""
+      type = Window
+[plugins]
+[profiles]
+  [[default]]
+    background_image = None
+    copy_on_selection = True
+    cursor_color = "#b9b9b9"
+    custom_command = env TERM=xterm-256color bash
+    font = Monospace 8.5
+    foreground_color = "#0077ff"
+    palette = "#000000:#aa0000:#00aa00:#aa5500:#0000aa:#aa00aa:#00aaaa:#aaaaaa:#555555:#ff5555:#55ff55:#ffff55:#5555ff:#ff55ff:#55ffff:#ffffff"
+    scrollbar_position = hidden
+    use_custom_command = True
+    use_system_font = False