From f370754a19df7573b9db8d265333cd066ee7db93 Mon Sep 17 00:00:00 2001
From: Marissa Staib <mstaib.git@reya.zone>
Date: Mon, 4 May 2020 17:54:59 -0400
Subject: [PATCH] Autocommitted updated scripts from mari-wovn

---
 .gitmodules                     |  3 +++
 ssh/authorized_keys             |  1 +
 tmux.conf                       |  1 +
 vim/UltiSnips/markdown.snippets | 19 +++++++++++++++++++
 vim/bundle/ultisnips            |  1 +
 vimrc                           |  6 ++++++
 6 files changed, 31 insertions(+)
 create mode 100644 vim/UltiSnips/markdown.snippets
 create mode 160000 vim/bundle/ultisnips

diff --git a/.gitmodules b/.gitmodules
index 36fa0a9..f8b84c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "ssh-find-agent"]
 	path = ssh-find-agent
 	url = https://github.com/wwalker/ssh-find-agent.git
+[submodule "vim/bundle/ultisnips"]
+	path = vim/bundle/ultisnips
+	url = https://github.com/SirVer/ultisnips.git
diff --git a/ssh/authorized_keys b/ssh/authorized_keys
index eae6863..e424397 100644
--- a/ssh/authorized_keys
+++ b/ssh/authorized_keys
@@ -4,3 +4,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINsxWR5n8WREoU6d8diPS1tbE6VVvCOSFutgPybz8ZyW
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGfOanT92heZ6YuDtUx64hUlR+/blZqRI39v9fSfGY+O rock64@rock64
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjdZqfgjifJmIfKgB1PPyU9N7q0RT8fw+/UOWnv0iX6 reya@EarthDaughter
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILYDh2+ANKksm6DEltm+naw+wXoGQG2OmKooXzqef3/o marissa@mari-wovn
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGUj5KCi1QgnwfBTsEZR5ET9Mdav/W8zp4Za09Dhos6l mari-wovn@earthdaughter
diff --git a/tmux.conf b/tmux.conf
index c42f669..9b8a22a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -8,6 +8,7 @@ set-window-option -g mode-keys vi
 set-window-option -g xterm-keys on
 bind-key _ split-window -v
 source-file $TMUX_CONF_DIR/tmux.screen.conf
+set-option -g mouse on 
 
 #####################
 # Terminal Properties
diff --git a/vim/UltiSnips/markdown.snippets b/vim/UltiSnips/markdown.snippets
new file mode 100644
index 0000000..e521865
--- /dev/null
+++ b/vim/UltiSnips/markdown.snippets
@@ -0,0 +1,19 @@
+snippet mac "Mac-only task"
+- [ ] :apple: :white_small_square: 
+endsnippet
+
+snippet lin "Linux-only task"
+- [ ] :white_small_square: :penguin: 
+endsnippet
+
+snippet bth "Both Mac and Linux task"
+- [ ] :apple: :penguin: 
+endsnippet
+
+snippet tip "Tip"
+:bulb: 
+endsnippet
+
+snippet exp "Experimental"
+:test_tube: 
+endsnippet
diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips
new file mode 160000
index 0000000..ee31ea1
--- /dev/null
+++ b/vim/bundle/ultisnips
@@ -0,0 +1 @@
+Subproject commit ee31ea1c7d08ced8577120b4c1d55c5a05351a75
diff --git a/vimrc b/vimrc
index efe8646..98587a9 100644
--- a/vimrc
+++ b/vimrc
@@ -3,9 +3,15 @@
 " Enable modern Vim features not compatible with Vi spec.
 set nocompatible
 
+" Enable mouse support.
+set mouse=a
+
 " Run Pathogen package manager
 execute pathogen#infect()
 
+" Set up vim-gfm-syntax
+let g:gfm_syntax_emoji_conceal = 1
+
 " Enable file type based indent configuration and syntax highlighting.
 " Note that when code is pasted via the terminal, vim by default does not detect
 " that the code is pasted (as opposed to when using vim's paste mappings), which