Merge remote-tracking branch 'LukeSmithxyz/master'

This commit is contained in:
Vlad Doster 2020-01-05 23:07:20 -05:00
commit 95c1fc66f0
5 changed files with 10 additions and 7 deletions

View File

@ -27,8 +27,6 @@ for_window [instance="dropdown_dropdowncalc"] border pixel 2
for_window [instance="dropdown_*"] move position center for_window [instance="dropdown_*"] move position center
# #---Basic Bindings---# # # #---Basic Bindings---# #
bindsym $mod+Shift+Return exec --no-startup-id samedir
bindsym $mod+Shift+space floating toggle bindsym $mod+Shift+space floating toggle
bindsym $mod+space focus mode_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+z gaps outer current plus 5
bindsym $mod+Shift+z gaps outer current minus 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+b bar mode toggle
bindsym $mod+Shift+b floating toggle; sticky toggle; exec --no-startup-id hover left bindsym $mod+Shift+b floating toggle; sticky toggle; exec --no-startup-id hover left

View File

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

View File

@ -135,3 +135,8 @@ command! -nargs=? Fold :call CocAction('fold', <f-args>)
" use `:OR` for organize import of current buffer " use `:OR` for organize import of current buffer
command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') 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

View File

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

View File

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