From 7a545cfb4d17ed180f166274d59f1901b2528d2b Mon Sep 17 00:00:00 2001 From: Vlad Doster Date: Thu, 2 Jan 2020 08:16:47 -0500 Subject: [PATCH 1/8] Make polybar more portable (#441) replace hard-coded terminal reference with $TERMINAL environment var --- .config/polybar/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/polybar/config b/.config/polybar/config index ec7dd8b6..d89c0164 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -83,7 +83,7 @@ interval = 5 format-prefix = " " format-underline = ${colors.red} -click-left = st -e neomutt +click-left = $TERMINAL -e neomutt [module/weather] @@ -186,7 +186,7 @@ label-urgent-padding = ${module/bspwm.label-urgent-padding} type = internal/mpd format-online = -click-left = st -e ncmpcpp +click-left = $TERMINAL -e ncmpcpp click-right = mpc toggle label-song = %artist% - %title% From 87f0b208f31a0996f72be55d4a81772866345bf9 Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:32:51 +0100 Subject: [PATCH 2/8] changed mpd output to alsa --- .config/mpd/mpd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 3fcb0dbd..a0548ecd 100644 --- a/.config/mpd/mpd.conf +++ b/.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" } From bf5b003d83f84635e1f1175d963775cb98016de9 Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:35:00 +0100 Subject: [PATCH 3/8] class needs to be set before the command otherwise it's not set at all --- .config/sxhkd/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index f9e6334f..e6a45d19 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -25,7 +25,7 @@ super + n super + c $TERMINAL -e calcurse -D ~/.config/calcurse super + v - $TERMINAL -e nvim -c VimwikiIndex + $TERMINAL -c VimwikiIndex -e nvim super + shift + a $TERMINAL -e alsamixer; pkill -RTMIN+10 $STATUSBAR super + shift + c From 6fda790b71b5e7ca88a27c462955eee20a6566db Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:36:31 +0100 Subject: [PATCH 4/8] use atool to extract archives instead of non-existing extract script --- .config/ranger/rc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index 801f7051..89b4b8c2 100644 --- a/.config/ranger/rc.conf +++ b/.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 fzf_select map fzf_locate From cfeafce50124603663f2e2dd0c52ab8e84b89d82 Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:38:33 +0100 Subject: [PATCH 5/8] added diff highlighting settings to make highlighted text readable when highlighted --- .config/nvim/init.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 16d88fb5..2bdca65c 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -109,3 +109,8 @@ set clipboard+=unnamedplus autocmd BufWritePost *Xresources,*Xdefaults !xrdb % " Update binds when sxhkdrc is updated. autocmd BufWritePost *sxhkdrc !pkill -USR1 sxhkd + +" 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 From c39f494876e9105430ccc1feae2b600052484654 Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:39:22 +0100 Subject: [PATCH 6/8] removed Vimwikiindex keybinding from i3 config as it is already bound in sxhkd --- .config/i3/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index ea63f883..8313bdb7 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -102,8 +102,6 @@ bindsym $mod+Shift+z gaps outer current minus 5 bindsym $mod+c exec --no-startup-id cabl -bindsym $mod+v exec --no-startup-id $term -e $EDITOR -c "VimwikiIndex" - bindsym $mod+b bar mode toggle bindsym $mod+Shift+b floating toggle; sticky toggle; exec --no-startup-id hover left From 0db554d7e57f43ae6ef525a5600161c248a4fbf2 Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:39:59 +0100 Subject: [PATCH 7/8] removed cabl keybinding from i3 config as the script is non-existant and mod+c is bound to calcurse in sxhkd --- .config/i3/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 8313bdb7..640821ff 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -100,8 +100,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 From a6421ced2bb5b1bf47ead0125bac6d5ac364c4e5 Mon Sep 17 00:00:00 2001 From: KronikPillow Date: Sun, 5 Jan 2020 19:40:56 +0100 Subject: [PATCH 8/8] moved samedir keybinding from i3/config to sxhkd --- .config/i3/config | 2 -- .config/sxhkd/sxhkdrc | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 640821ff..8fd19cf2 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -35,8 +35,6 @@ bar { } # #---Basic Bindings---# # -bindsym $mod+Shift+Return exec --no-startup-id samedir - bindsym $mod+Shift+space floating toggle bindsym $mod+space focus mode_toggle diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index e6a45d19..3e38fee7 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -10,6 +10,8 @@ # Basic binds super + Return $TERMINAL +super + shift + Return + samedir super + shift + q kill -9 `xdotool getwindowfocus getwindowpid` super + d