Merge remote-tracking branch 'LukeSmithxyz/master'

.config/i3/config

@@ -27,8 +27,6 @@ for_window [instance="dropdown_dropdowncalc"] border pixel 2
 for_window [instance="dropdown_*"] move position center
 
 # #---Basic Bindings---# #
-bindsym $mod+Shift+Return	exec --no-startup-id samedir
-
 bindsym $mod+Shift+space 	floating toggle
 bindsym $mod+space		focus mode_toggle
 
@@ -92,8 +90,6 @@ bindsym $mod+Ctrl+l		move workspace to output right
 bindsym $mod+z			gaps outer current plus 5
 bindsym $mod+Shift+z		gaps outer current minus 5
 
-bindsym $mod+c			exec --no-startup-id cabl
-
 bindsym $mod+b			bar mode toggle
 bindsym $mod+Shift+b		floating toggle; sticky toggle; exec --no-startup-id hover left
 

.config/mpd/mpd.conf

@@ -13,8 +13,8 @@ restore_paused "yes"
 max_output_buffer_size "16384"
 
 audio_output {
-      type  "pulse"
-      name  "pulse audio"
+      type  "alsa"
+      name  "alsa for audio soundcard"
       mixer_type "software"
 }
 

.config/nvim/init.vim

@@ -135,3 +135,8 @@ command! -nargs=? Fold :call     CocAction('fold', <f-args>)
 " use `:OR` for organize import of current buffer
 command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
 
+
+" Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable.
+if &diff
+    highlight! link DiffText MatchParen
+endif

.config/ranger/rc.conf

@@ -457,7 +457,7 @@ map cW bulkrename %s
 map mkd console mkdir%space
 map sc console shell ln -sT%space
 map D console delete
-map X shell extract %f
+map X shell atool -x %f
 map Z shell tar -cvzf %f.tar.gz %s
 map <C-f> fzf_select
 map <C-l> fzf_locate

.config/sxhkd/sxhkdrc

@@ -11,6 +11,8 @@
 
 super + Return
 	$TERMINAL
+super + shift + Return
+	samedir
 super + shift + q
 	kill -9 `xdotool getwindowfocus getwindowpid`
 super + d