Vim, i3 configs, And removed xcape

3 files changed, 24 insertions, 13 deletions

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 001dd61..a4289be 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -116,10 +116,14 @@ bindsym $mod+Tab workspace back_and_forth
 # Mark stuff
 # Create mark
 bindsym $mod+m exec i3-input -F 'mark %s' -l 1 -P 'Mark: '
-bindsym $mod+g exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Goto: '
+bindsym $mod+n exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Goto: '
 
+# Swap stuff
 bindsym $mod+Shift+s swap container with mark s
 
+# Sticky
+bindsym $mod+g sticky toggle
+
 # scratchpad
 # Make the currently focused window a scratchpad
 bindsym $mod+Shift+minus move scratchpad
@@ -173,9 +177,8 @@ bindsym $mod+semicolon exec --no-startup-id Scripts/lc --dmenu
 bindsym $mod+Shift+o exec --no-startup-id Scripts/lc common
 
 # default app workspaces
-assign [class="qutebrowser"] $ws9
 assign [class="firefox"] $ws9
-assign [class="evolution"] $ws8
+assign [class="Evolution"] $ws8
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
diff --git a/scripts/Scripts/lc b/scripts/Scripts/lc
index b67491b..484f531 100755
--- a/scripts/Scripts/lc
+++ b/scripts/Scripts/lc
@@ -24,7 +24,7 @@ handle_stuff() {
 # System maintenance
 	if [ "$1" = "sk" ] || [ "$1" = "set-keyboard" ]; then
 		setxkbmap -layout us -variant altgr-intl
-		xcape -e "Control_R=Escape"
+		#xcape -e "Control_R=Escape"
 		xmodmap .Xmodmap
 	fi
 
diff --git a/vim/.vimrc b/vim/.vimrc
index 2cead46..304e36f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -23,9 +23,12 @@ set shellslash
 	Plugin 'tpope/vim-surround'
 	Plugin 'tpope/vim-repeat'
 	Plugin 'tpope/vim-unimpaired'
+	Plugin 'tpope/vim-commentary'
+
+	Plugin 'godlygeek/tabular'
 
 	" Editor config
-	Plugin 'editorconfig/editorconfig-vim'
+	" Plugin 'editorconfig/editorconfig-vim'
 
 	" Color theme
 	" Plugin 'agude/vim-eldar'
@@ -35,10 +38,6 @@ set shellslash
 	Plugin 'morhetz/gruvbox'
 	" Plugin 'ntk148v/vim-horizon'
 
-	" File management
-	" Plugin 'scrooloose/nerdtree'
-	" Plugin 'tpope/vim-vinegar'
-
 	" Git
 	" Plugin 'jreybert/vimagit'
 	Plugin 'tpope/vim-fugitive'
@@ -51,7 +50,7 @@ set shellslash
 	" Plugin 'rust-lang/rust.vim'
 	" Plugin 'racer-rust/vim-racer'
 	
-	Plugin 'vimwiki/vimwiki'
+	" Plugin 'vimwiki/vimwiki'
 	
 
 	" Snippets are separated from the engine. Add this if you want them:
@@ -118,11 +117,18 @@ set shellslash
 	set number 
 	set relativenumber
 
+	" More sensible splitting
+	set splitbelow splitright
+
 	set tabstop=4
-	set shiftwidth=4
 	set softtabstop=4
-	set noexpandtab
-	set colorcolumn=80
+    set shiftwidth=4
+	set expandtab
+	set colorcolumn=79
+
+	" Show 5 lines above and below cursor
+	set scrolloff=5
+    set list
 
 	" Remove statusline
 	set laststatus=1
@@ -143,6 +149,8 @@ set shellslash
 	" Persistent undo
 	set undofile
 
+	set autoread
+
 	" Exit insert mode on inactivity
 	" au CursorHoldI * stopinsert