From 40f78e442c5a703ad52246af561a23e498ff64f9 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 6 Aug 2019 12:33:23 -0500
Subject: [PATCH] Updates

---
 apps/neovim/plugins.vim |  2 +-
 de/sxhkd/sxhkdrc        |  3 +++
 scripts/bin/ezln        |  6 ++++++
 shell/bash/aliases      |  1 +
 shell/bash/bashrc       |  4 ++++
 shell/tmux/tmux.conf    | 18 ++++++++++--------
 6 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100755 scripts/bin/ezln

diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim
index 732e347..0592825 100644
--- a/apps/neovim/plugins.vim
+++ b/apps/neovim/plugins.vim
@@ -110,4 +110,4 @@ Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']}                 " C# language
 Plug 'neoclide/coc.nvim', {'branch': 'release'}                 " language server completion
 Plug 'JakeBecker/elixir-ls', {'for': ['elixir'], 'do': { -> g:elixirls.compile() }}
 " Plug 'lytedev/elm-vim'                                          " elm lang
-Plug 'https://git.lyte.dev/lytedev/vim-lytlang.git'
+Plug 'ssh://git@git.lyte.dev:2222/lytedev/vim-lytlang.git'
diff --git a/de/sxhkd/sxhkdrc b/de/sxhkd/sxhkdrc
index 524f457..d7dee84 100755
--- a/de/sxhkd/sxhkdrc
+++ b/de/sxhkd/sxhkdrc
@@ -250,3 +250,6 @@ super + Escape
 
 super + d
 	xdotool key super+4 && sleep 0.1 && xdotool key shift+4 && xdotool key shift+4 && xdotool key shift+4 && sleep 0.2 && xdotool key super+1 && xdotool key super+3
+
+super + ctrl + c
+	bspc rule -a '*' -o state=floating && urxvtc --geometry 80x16 -e sh -c "khal calendar && bash"
diff --git a/scripts/bin/ezln b/scripts/bin/ezln
new file mode 100755
index 0000000..475ff64
--- /dev/null
+++ b/scripts/bin/ezln
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+SOURCE=$(realpath "$1")
+DEST=$(realpath -m "$2")
+
+ln -s "$SOURCE" "$DEST"
diff --git a/shell/bash/aliases b/shell/bash/aliases
index 40279f8..7513ca9 100644
--- a/shell/bash/aliases
+++ b/shell/bash/aliases
@@ -29,6 +29,7 @@ alias cd..="cd .."
 alias cdd="cd \"\$DOTFILES_PATH\"" # go to dotfiles
 alias cdc="cd \"\$XDG_CONFIG_HOME\"" # go to
 alias cdn="cd \"\$NOTES_PATH\""
+alias cdl="cd \"\$NICE_HOME/dl\""
 
 # quick parent-directory aliases
 alias ..="cd .."
diff --git a/shell/bash/bashrc b/shell/bash/bashrc
index 7b9717e..2cf72b7 100644
--- a/shell/bash/bashrc
+++ b/shell/bash/bashrc
@@ -118,3 +118,7 @@ export ERL_AFLAGS="-kernel shell_history enabled"
 _make_paths
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
diff --git a/shell/tmux/tmux.conf b/shell/tmux/tmux.conf
index b96ea58..c5a1724 100644
--- a/shell/tmux/tmux.conf
+++ b/shell/tmux/tmux.conf
@@ -3,11 +3,13 @@ unbind C-b
 set -g prefix C-s
 bind-key s send-prefix
 
-set-option -g mouse on
+bind-key T source-file ~/.tmux.conf \; display-message "source-file done"
+
+# set-option -g mouse on
 
 # honestly not sure
 set -g escape-time 10
-setw -g monitor-activity on
+set-window-option -g monitor-activity on
 
 bind-key W resize-pane -x 100
 
@@ -23,7 +25,7 @@ bind r source-file ~/.tmux.conf
 
 # show tmux status bar by default (prefix H toggles)
 set -g status on
-bind-key H set status
+bind-key H set -g status
 
 bind-key j switch-client -p
 bind-key h switch-client -p
@@ -31,8 +33,8 @@ bind-key k switch-client -n
 bind-key l switch-client -n
 bind-key P attach-session -t . -c '#{pane_current_path}'
 
-bind-key T set-option -g mouse off
-bind-key G set-option -g mouse on
+# bind-key T set-option -g mouse off
+# bind-key G set-option -g mouse on
 
 # message colors
 # set -g message-bg colour0
@@ -50,7 +52,7 @@ set -g status-fg colour8
 # setw -g window-status-current-fg colour7
 # setw -g window-status-current-bg colour2
 # setw -g window-status-current-attr bold
-setw -g window-status-current-format ''
+set-window-option -g window-status-current-format ''
 
 set -g status-interval 5
 set -g status-right-length 80
@@ -59,7 +61,7 @@ set -g status-left-length 200
 set -g status-left "#[fg=colour7]#(~/.config/dotfiles/scripts/bin/tmux-session-list #S)"
 
 # vim copying
-setw -g mode-keys vi
+set-window-option -g mode-keys vi
 
 # 1-based indexing for keystroke simplicity
 set -g base-index 1
@@ -72,7 +74,7 @@ bind M-l source-file ~/.tmux/layouts/dev.tmux
 # set -g pane-active-border-fg blue
 # set -g pane-active-border-bg default
 
-bind-key s run "tmux new-window 'bash -ci tmuxswitcher'"
+bind-key s run "tmux new-window 'sh -ci tmuxswitcher'"
 
 # present a menu of urls to open from the visible pane
 bind-key u capture-pane \;\