From 904f9328deb8f0fcf69c32381d13bf3bb590f4a1 Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@disroot.org>
Date: Sun, 19 Apr 2020 23:27:35 -0300
Subject: [PATCH] bump

---
 fish/.config/fish/config.fish   |  9 ++++++---
 nvim/.config/nvim/init.vim      |  3 ++-
 scripts/.local/bin/color-picker | 13 +++++++++----
 scripts/.local/bin/musmenu      |  6 ++++--
 sway/.config/sway/config        | 10 +++++-----
 sway/.config/waybar/config      |  5 ++---
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 3e5f46e..f3c3044 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -72,8 +72,8 @@ abbr ec edit-config
 
 # }}}
 # use tmux{{{
-    # set TMUX 1
-    if test -z "$TMUX" && test "$TERM" != "xterm-kitty" && test -n "$DISPLAY"
+    set TMUX 1
+    if test -z "$argv" -a -z "$TMUX" -a -n "$DISPLAY"
         set attach_session (tmux 2> /dev/null ls -F \
             '#{session_attached} #{?#{==:#{session_last_attached},},1,#{session_last_attached}} #{session_id}' |
             awk '/^0/ { if ($2 > t) { t = $2; s = $3 } }; END { if (s) printf "%s", s }')
@@ -111,6 +111,10 @@ abbr ec edit-config
     set SPACEFISH_VI_MODE_REPLACE "R"
     set SPACEFISH_VI_MODE_REPLACE_ONE 	"S"
 
+    set -l cnf /usr/share/doc/pkgfile/command-not-found.fish
+    test -f "$cnf" &&
+        source $cnf
+    
 #}}}
 # Color man pages{{{
 
@@ -122,5 +126,4 @@ set -xU LESS_TERMCAP_ue (printf "\e[0m")
 set -xU LESS_TERMCAP_us (printf "\e[01;32m")
 
 #}}}
-source  /usr/share/doc/pkgfile/command-not-found.fish
 # vim:foldmethod=marker
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9eec49c..9e93a34 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -1,5 +1,5 @@
+"
 " LEL
-
 "             _
 "  _ ____   _(_)_ __ ___
 " | '_ \ \ / / | '_ ` _ \
@@ -93,6 +93,7 @@
     Plug 'vim-scripts/AnsiEsc.vim', { 'for': 'man' }
      " Plug 'powerman/vim-plugin-AnsiEsc'
     Plug 'mboughaba/i3config.vim'
+    Plug 'dag/vim-fish'
 call plug#end()
 
 "}}}
diff --git a/scripts/.local/bin/color-picker b/scripts/.local/bin/color-picker
index ee390c8..0812d9d 100755
--- a/scripts/.local/bin/color-picker
+++ b/scripts/.local/bin/color-picker
@@ -1,14 +1,19 @@
 #!/bin/sh
 
+
+RED_ON="$(pgrep redshift)"
+
 set -e
 
-RED_ON="$(pgrep redshift)" && pkill redshift
+if test -n "$RED_ON";then
+    pkill redshift
+fi
 
 grim -g "$(slurp -b aabbcc00 -p)" - |
-    convert - txt:- | 
-    grep -oE '#[0-9a-f]{6}' | 
+    convert - txt:- |
+    grep -oE '#[0-9A-Fa-f]{6}' |
     wl-copy
 
 notify-send "$(wl-paste)" "Copied to clipboard"
 
-[ "$RED_ON" ] && redshift &> /dev/null &
+test -n "$RED_ON"  && redshift &> /dev/null &
diff --git a/scripts/.local/bin/musmenu b/scripts/.local/bin/musmenu
index 58e9b6a..87563aa 100755
--- a/scripts/.local/bin/musmenu
+++ b/scripts/.local/bin/musmenu
@@ -1,8 +1,10 @@
 #!/bin/sh
 set -e
 
+menu=bmenu
+
 search(){
-    music=$(mpc playlist --format '%artist% : %title%' | sed '/^ : $/d' | bmenu)
+    music=$(mpc playlist --format '%artist% : %title%' | sed '/^ : $/d' | $menu)
     if [ "$music" == "" ]
     then
         exit 1
@@ -16,7 +18,7 @@ search(){
 
 delete(){
     current=~/Música/"$(mpc current -f %file%)"
-    answer=$(echo -e "nothing\n$current" | bmenu -p"delete?" )
+    answer=$(echo -e "nothing\n$current" | $menu -p"delete?" )
     if [ "$answer" == "$current" ]
     then
         trash "$answer"
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index f70a01a..b14b542 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -1,5 +1,5 @@
-# LEL
 #
+# LEL
 #  _____      ____ _ _   _
 # / __\ \ /\ / / _` | | | |
 # \__ \\ V  V / (_| | |_| |
@@ -190,10 +190,10 @@
     #
 
     # Screens to file
-    bindsym Print exec grim $(xdg-user-dir PICTURES)/$(date +'%Y-%m-%d-%H%M%S_grim.png')
+    bindsym Print exec grim $(xdg-user-dir PICTURES || Imagens)/$(date +'%Y-%m-%d-%H%M%S_grim.png')
 
     # Screen area to file
-    bindsym Shift+Print exec grim -g "$(slurp)" $(xdg-user-dir PICTURES)/$(date +'%Y-%m-%d-%H%M%S_grim-slurp.png')
+    bindsym Shift+Print exec grim -g "$(slurp)" $(xdg-user-dir PICTURES || Imagens)/$(date +'%Y-%m-%d-%H%M%S_grim-slurp.png')
 
     # Screen area to clipboard
     bindsym Control+Shift+Print exec grim -g "$(slurp)" - | wl-copy
@@ -318,7 +318,7 @@
        timeout 1800 'swaylock -f' \
        # timeout 1800 'swaymsg "output * dpms off"' \
        #      resume 'swaymsg "output * dpms on;reload"' \
-#}}}
 
-include /etc/sway/config.d/
+    include /etc/sway/config.d/
+#}}}
 # vim:filetype=i3config:foldmethod=marker
diff --git a/sway/.config/waybar/config b/sway/.config/waybar/config
index 527e564..9d1ea85 100644
--- a/sway/.config/waybar/config
+++ b/sway/.config/waybar/config
@@ -43,7 +43,6 @@
         "format-stopped": "",
         "timeout":60,
         "unknown-tag": " N/A ",
-        "tooltip":false,
         "interval": 2,
         "max-length":40,
         "state-icons": {
@@ -72,13 +71,13 @@
         "format-charging": "",
         "format-plugged": "",
         "format-full": "",
-        "format-icons": ["", "", "", "", ""]
+        "format-icons": ["", "", "", "", "", ""]
     },
     "network": {
         "tooltip":false,
         "on-click": "termite -e nmtui",
         "format-wifi": "{icon}",
-        "format-icons":["","","",""],
+        "format-icons":[ "", "", "", "", "" ],
         "format-ethernet": "",
         "format-linked": "",
         "format-disconnected": "⚠"