minor changes

fish/.config/fish/config.fish

@@ -28,12 +28,11 @@ set -x PAGER less
         export GTK_CSD=0
         export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
         export XCURSOR_THEME=capitaine-cursors
-        export SWAY=1
         exec sway
     end
     if test $XDG_VTNR -eq 1 #faster like this
         if systemctl -q is-active graphical.target && test ! $DISPLAY
-            esway
+            esway > .swaylog
         end
     end
 
@@ -65,15 +64,13 @@ set -x PAGER less
     set SPACEFISH_CHAR_SYMBOL_ROOT '#'
 #}}}
 # Color man pages{{{
-# function man
-#     env \
-#     LESS_TERMCAP_md='\e[01;31m' \
-#     LESS_TERMCAP_me='\e[0m' \
-#     LESS_TERMCAP_se='\e[0m' \
-#     LESS_TERMCAP_so='\e[01;44;33m' \
-#     LESS_TERMCAP_ue='\e[0m' \
-#     LESS_TERMCAP_us='\e[01;32m' \
-#     command man "$argv"
-# end
+
+set -xU LESS_TERMCAP_md (printf "\e[01;31m")
+set -xU LESS_TERMCAP_me (printf "\e[0m")
+set -xU LESS_TERMCAP_se (printf "\e[0m")
+set -xU LESS_TERMCAP_so (printf "\e[01;44;33m")
+set -xU LESS_TERMCAP_ue (printf "\e[0m")
+set -xU LESS_TERMCAP_us (printf "\e[01;32m")
+
 #}}}
 # vim:foldmethod=marker

scripts/.local/bin/bmenu

@@ -1,6 +1,11 @@
 #!/bin/sh
 
-BEMENU_BACKEND=w
+BEMENU_BACKEND=wayland
+if [ "$1" == "run" ]
+then
+    j4-dmenu-desktop --dmenu="bmenu -p Iniciar:" --term "$2"
+    exit
+fi
 
 bemenu \
     --ignorecase\

scripts/.local/bin/musmenu

@@ -2,7 +2,12 @@
 set -e
 
 search(){
-    music=$(mpc playlist --format '%artist% : %title%' | sed '/^ : $/d' | bmenu)
+    music=$(mpc playlist --format '%artist% : %title%' | sed '/^ : $/d' | wofi -dk/dev/null)
+    if [ "$music" == "" ]
+    then
+        exit 1
+    fi
+
     artist=$(echo "$music" | perl -pe 's/(.*) : (.*)/\1/')
     title=$(echo "$music"  | perl -pe 's/(.*) : (.*)/\2/')
 
@@ -11,10 +16,10 @@ search(){
 
 delete(){
     current=~/Música/"$(mpc current -f %file%)"
-    answer=$(echo -e "nothing\n$current" | bmenu -p"delete?" )
-    if [ "$answer" != "nothing" ]
+    answer=$(echo -e "nothing\n$current" | wofi -dk/dev/null -p"delete?" )
+    if [ "$answer" == "$current" ]
     then
-        trash "$current"
+        trash "$answer"
         mpc next
         mpc update
     fi

scripts/.local/bin/pulse-sink

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 opts="Fone\nSpeaker\nHDMI"
-out=$(echo -e $opts | .local/bin/bmenu -p "Saida:")
+out=$(echo -e $opts | wofi -dk ~/.cache/wofi-pulse-sink -p "Saida:")
 
 if [ "$out" == "HDMI" ]
 then

sway/.config/sway/config

@@ -17,7 +17,7 @@
     set $right l
 
     set $term kitty
-    set $menu 'j4-dmenu-desktop --dmenu="bmenu -p Iniciar:" --term kitty'
+    set $menu wofi --show drun -i -p'Iniciar: '
 	font pango:Hack 14px
 
 # }}}
@@ -216,14 +216,14 @@
     set $accent     #CC575D
     set $aclite     #CC575D50
     set $fg_color   #ffffff
-    set $bg_color   #202020
+    set $bg_color   #191919
     set $bg_darker  #151515
     set $alert      #000000
 
     #                       border      background  text        indicator   child_border
     client.focused          $accent     $accent     $fg_color   $accent     $accent
-    client.focused_inactive $bg_darker  $bg_darker  $fg_color   $bg_color   $bg_color
-    client.unfocused        $bg_darker  $bg_darker  $fg_color   $bg_color   $bg_color
+    client.focused_inactive $bg_color   $bg_color   $fg_color   $bg_color   $bg_color
+    client.unfocused        $bg_color   $bg_color   $fg_color   $bg_color   $bg_color
     client.urgent           $alert      $alert      $fg_color   $alert      $alert
 
     bar swaybar_command waybar

sway/.config/waybar/config

@@ -133,12 +133,13 @@
         "format":"{} ",
         "tooltip":false,
         "exec": "$HOME/.config/waybar/custom/mail",
+        "on-click": "kitty neomutt; pkill -SIGRTMIN+4 waybar", // update system
+        "signal": 4,
         "interval": 1800
     },
     "custom/updates": {
         "format": "{} ",
         "interval": 3600,                     // every hour
-        "return-type":"json",
         "exec": "yay -Sy > /dev/null; yay -Qqu | wc -l | sed 's/^0$//'",
         "on-click": "kitty yay; pkill -SIGRTMIN+8 waybar", // update system
         "signal": 8

sway/.config/waybar/style.css

@@ -12,7 +12,7 @@
 
 window#waybar {
     background-color: #202020;
-    border-bottom: 1px solid #191919;
+    border-bottom: 2px solid #191919;
     color: #ffffff;
     transition: background-color .3s;
 }

tmux/.tmux.conf

@@ -9,7 +9,7 @@ set -g set-titles on
 set -g set-titles-string "#T"
 #sneaky bar
 # set -g status off
-set -g default-terminal "xterm-kitty"
+# set -g default-terminal "xterm-kitty"
 set -ga terminal-overrides ',xterm*:smcup@:rmcup@'
 # }}}
 #Theming# {{{

zsh/.zshrc

@@ -52,7 +52,7 @@ export PAGER=less
     then
         if systemctl -q is-active graphical.target && [[ ! $DISPLAY ]]
         then
-            esway
+            esway > .swaylog
         fi
     fi