From 8a45491a28f9864beed13d1796e439283d7b8fec Mon Sep 17 00:00:00 2001
From: Luis Guilherme Coelho <lgcoelho@disroot.org>
Date: Wed, 20 Mar 2024 03:57:30 -0300
Subject: [PATCH] files: river,fnott: update

---
 .../radio/files/.config/fnott/fnott.ini       |  4 +-
 .../radio/files/.config/river/init            | 58 +++++++++++--------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/home-environments/radio/files/.config/fnott/fnott.ini b/home-environments/radio/files/.config/fnott/fnott.ini
index e9d6724..1b88bb7 100644
--- a/home-environments/radio/files/.config/fnott/fnott.ini
+++ b/home-environments/radio/files/.config/fnott/fnott.ini
@@ -23,8 +23,8 @@ background=000000FF
 border-color=ddddddFF
 border-size=1
 
-padding-vertical=20
-padding-horizontal=30
+padding-vertical=4
+padding-horizontal=10
 
 # dpi-aware=auto
 
diff --git a/home-environments/radio/files/.config/river/init b/home-environments/radio/files/.config/river/init
index c3a6537..81c1016 100755
--- a/home-environments/radio/files/.config/river/init
+++ b/home-environments/radio/files/.config/river/init
@@ -1,5 +1,16 @@
 #!/bin/sh
 
+# Decorations _________________________________________________________________
+
+# wallpaper
+setsid -f swww-daemon &
+swww img ~/media/pictures/wallpapers/wall.png -t none
+
+# Set background and border color
+riverctl border-color-focused 0x8581e0
+riverctl border-color-unfocused 0x313131
+riverctl border-width 1
+
 # Window layout _______________________________________________________________
 
 # Set the default layout generator to be rivercarro and start it.
@@ -7,6 +18,20 @@
 riverctl default-layout rivercarro
 rivercarro -inner-gaps 10 -outer-gaps 10 -no-smart-gaps &
 
+# Window focus ________________________________________________________________
+riverctl focus-follows-cursor normal
+
+# Inputs ______________________________________________________________________
+riverctl input keyboard-0-1-Power_Button events enabled
+riverctl input keyboard-0-6-Video_Bus events enabled
+riverctl input switch-0-5-Lid_Switch events enabled
+riverctl input keyboard-0-3-Sleep_Button events enabled
+riverctl input keyboard-1-1-AT_Translated_Set_2_keyboard events enabled
+riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad events enabled
+riverctl input pointer-2-10-TPPS/2_IBM_TrackPoint events enabled
+riverctl input keyboard-6058-20564-ThinkPad_Extra_Buttons events enabled
+riverctl input switch-6058-20564-ThinkPad_Extra_Buttons events enabled
+
 # Keyboard ____________________________________________________________________
 
 # layout
@@ -79,13 +104,13 @@ riverctl map normal Super q close
 ## Application related keybindings ____________________________________________
 
 # $TERMINAL
-riverctl map normal Super Return spawn foot
+riverctl map normal Super Return spawn $TERMINAL
 
 # $EDITOR
-riverctl map normal Super e spawn "foot -e $EDITOR"
+riverctl map normal Super e spawn "$TERMINAL -e $EDITOR"
 
 # file manager
-riverctl map normal Super e spawn "foot -e lf"
+riverctl map normal Super d spawn "$TERMINAL -t st -e lf"
 
 # $BROWSER
 riverctl map normal Super b spawn $BROWSER
@@ -94,10 +119,10 @@ riverctl map normal Super b spawn $BROWSER
 riverctl map normal Super Semicolon spawn fuzzel
 
 # webcam (TODO: fix)
-#riverctl map normal XF86WebCam spawn cam
+riverctl map normal XF86WebCam spawn cam
 
 # rss reader (TODO: fix)
-#riverctl map normal XF86Launch1 spawn newsraft
+riverctl map normal XF86Launch1 spawn newsraft
 
 # telegram
 riverctl map normal Super a spawn telegram-desktop
@@ -109,7 +134,7 @@ riverctl map normal Super c spawn keepassxc
 riverctl map normal Super z spawn anna
 
 # guix repl
-riverctl map normal Super g spawn "foot -e guix repl"
+riverctl map normal Super g spawn "$TERMINAL -e guix repl"
 
 ## Tag related keybindings ____________________________________________________
 
@@ -144,10 +169,11 @@ riverctl map normal Super+Shift 0 set-view-tags $all_tags
 riverctl map normal Super V spawn "wl-paste | xargs vid"
 riverctl map normal Super+Shift V spawn "wl-paste | xargs vd"
 
-riverctl map normal Super p spawn 'grim -g "$(slurp)" -t png - | wl-copy -t image/png'
+riverctl map normal Super P \
+         spawn 'grim -g "$(slurp)" -t png - | wl-copy -t image/png'
 
 # screenshot (TODO: fix)
-# riverctl map normal Print \
+# riverctl map normal PrintScreen \
 #          spawn "grim ~/media/pictures/screenshots/$(date +'%Y-%m-%d--%H-%M-%S.png')"
 
 ## Audio related keybindings __________________________________________________
@@ -209,17 +235,7 @@ riverctl spawn keepassxc
 riverctl spawn fnott
 
 # wayneko
-riverctl spawn wayneko --background-colour 0x606060
-
-# Decorations _________________________________________________________________
-
-# wallpaper
-riverctl spawn "swaybg -i ~/media/pictures/wallpapers/wall.png"
-
-# Set background and border color
-riverctl border-color-focused 0x8581e0
-riverctl border-color-unfocused 0x313131
-riverctl border-width 1
+riverctl spawn "wayneko --background-colour 0x606060"
 
 # Application rules ___________________________________________________________
 
@@ -227,7 +243,3 @@ riverctl border-width 1
 riverctl rule-add -app-id 'KeePassXC'       float
 riverctl rule-add -app-id 'Pavucontrol'     float
 riverctl rule-add -app-id 'TelegramDesktop' float
-
-# client side decorations
-riverctl rule-add -app-id 'Pavucontrol'     csd
-riverctl rule-add -app-id "TelegramDesktop" csd