11 files changed, 32 insertions(+), 14 deletions(-)

M bin/bin/album
M bin/bin/toggle
M fish/.config/fish/config.fish
M fisher/.config/fish/fishfile
M i3blocks/.config/i3blocks/config
M nvim/.config/nvim/plugins.toml
M qutebrowser/.config/qutebrowser/conf.d/colors.py
M qutebrowser/.config/qutebrowser/config.py
M sway/.config/sway/conf.d/colors
M sway/.config/sway/config
M termite/.config/termite/config

@@ 1,2 1,2 @@
 #!/usr/bin/fish
-set -l a (mpc list album | fzf -q "$argv") && mpc -q clear && mpc -q random off && mpc findadd album $a && mpc play
+set -l a (mpc list album | fzf -1 -q "$argv") && mpc -q clear && mpc -q random off && mpc findadd album $a && mpc play

@@ 1,5 1,6 @@
 #!/bin/sh
 
-(playerctl status && playerctl play-pause) \
-  || (test -S /tmp/mpvsocket && echo 'cycle "pause"' | socat - /tmp/mpvsocket) \
+SOCKET=/run/user/1000/podcast.mpv-ipc
+(test -S "$SOCKET" && echo 'cycle "pause"' | socat - "$SOCKET") \
   || mpc toggle
+  #|| (playerctl status && playerctl play-pause)

@@ 6,3 6,7 @@ set -gx fish_key_bindings fish_hybrid_key_bindings
 set -gx fish_cursor_default     block
 set -gx fish_cursor_insert      line
 set -gx fish_cursor_replace_one underscore
+
+if which direnv > /dev/null 2>&1
+    eval (direnv hook fish)
+end

@@ 1,3 1,3 @@
 fisherman/z
-pvsr/fzf
 pvsr/mono
+jethrokuan/fzf

@@ 2,7 2,7 @@ separator_block_width=15
 markup=none
 
 [mpd]
-command=~/.cabal/bin/mpd-status
+command=MPD_HOST=127.0.0.1 LANG=C.UTF-8 mpd-status
 interval=persist
 markup=pango
 

@@ 177,3 177,9 @@ repo = "tpope/vim-fugitive"
 
 [[plugins]]
 repo = "LnL7/vim-nix"
+
+[[plugins]]
+repo = "norcalli/nvim-colorizer.lua"
+hook_post_source = """
+  lua require'colorizer'.setup()
+"""

@@ 161,3 161,5 @@ c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg
 
 c.colors.webpage.bg = ''
 c.colors.webpage.prefers_color_scheme_dark = True
+# c.colors.webpage.darkmode.enabled = True
+# c.colors.webpage.darkmode.policy.images = 'smart'

@@ 42,7 42,7 @@ c.completion.scrollbar.padding = 0
 c.completion.open_categories = ['quickmarks', 'bookmarks', 'history']
 
 c.hints.auto_follow = 'always'
-c.hints.auto_follow_timeout = 400
+#c.hints.auto_follow_timeout = 400
 c.hints.mode = 'letter'
 
 c.search.incremental = False


@@ 89,6 89,7 @@ c.fonts.prompts = '12pt sans_serif'
 
 config.bind(',d', 'hint all delete')
 config.bind(',r', 'set-cmd-text :open {url:domain}/')
+config.bind(',R', 'set-cmd-text :open -t {url:domain}/')
 config.bind('xP', 'open -b -- {primary}')
 config.bind('xp', 'open -b -- {clipboard}')
 config.bind(';x', 'hint links spawn -dv mpv --profile=no-term {hint-url}')

@@ 1,5 1,6 @@
 # vim:ft=conf
-set $black        #282828
+#set $black        #282828
+set $black        #32302f
 set $dark1        #3c3836
 set $dark2        #504945
 set $dark3        #665c54

@@ 4,7 4,7 @@ set $left h
 set $down j
 set $up k
 set $right l
-set $term termite -e 'env SHELL=/usr/bin/fish fish'
+set $term /usr/bin/alacritty
 set $font Sarasa Term J
 set $menu j4-dmenu-desktop --dmenu="dmenu -i -fn '$font-12'"
 # TODO reenable this when https://github.com/swaywm/sway/issues/1524 and


@@ 107,15 107,13 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
-exec (test -p /tmp/wobpipe || mkfifo /tmp/wobpipe) && tail -f /tmp/wobpipe | wob
-
 bindsym --locked XF86AudioPlay exec ~/bin/toggle
 bindsym --locked XF86AudioPrev exec mpc prev
 bindsym --locked XF86AudioNext exec mpc next
 bindsym --locked XF86AudioStop exec mpc stop
-bindsym --locked XF86AudioMute exec amixer -q -D pulse sset Master toggle && pkill -RTMIN+10 i3blocks
-bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 5 && pkill -RTMIN+10 i3blocks && pamixer --get-volume > /tmp/wobpipe
-bindsym --locked XF86AudioLowerVolume exec pamixer -ud 5 && pkill -RTMIN+10 i3blocks && pamixer --get-volume > /tmp/wobpipe
+bindsym --locked XF86AudioMute exec pamixer --toggle-mute && pkill -RTMIN+10 i3blocks && (pamixer --get-mute && echo 0 > $SWAYSOCK.wob) || pamixer --get-volume > $SWAYSOCK.wob
+bindsym --locked XF86AudioRaiseVolume exec pamixer -ui 5 && pkill -RTMIN+10 i3blocks && pamixer --get-volume > $SWAYSOCK.wob
+bindsym --locked XF86AudioLowerVolume exec pamixer -ud 5 && pkill -RTMIN+10 i3blocks && pamixer --get-volume > $SWAYSOCK.wob
 
 bindsym Print exec grim $(xdg-user-dir PICTURES)/screenshots/$(date +"%Y-%m-%d-%H:%M:%S.png")
 bindsym Shift+Print exec slurp | grim -g - $(xdg-user-dir PICTURES)/screenshots/$(date +"%Y-%m-%d-%H:%M:%S.png")


@@ 162,3 160,7 @@ mode "$mode_system" {
     bindsym Control+bracketleft mode "default"
 }
 bindsym $mod+q mode "$mode_system"
+
+exec mako
+exec mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob
+# TODO idle

@@ 7,7 7,7 @@ allow_bold = true
 dynamic_title = true
 urgent_on_bell = true
 clickable_url = true
-font = Inconsolata 14
+font = Sarasa Term J 13
 scrollback_lines = 10000
 search_wrap = true
 #icon_name = terminal


@@ 36,6 36,7 @@ filter_unmatched_urls = true
 # background = #282828
 background = rgba(40, 40, 40, 1)
 # soft contrast: background = #32302f
+#background = rgba(50, 48, 47, 1)
 foreground = #ebdbb2
 foreground_bold = #ebdbb2