From b69a911cb1524ac695d53e518b2b86d27d7c53cc Mon Sep 17 00:00:00 2001
From: Ryan <ryan@alien.gov>
Date: Sun, 16 Jul 2023 09:49:32 +0800
Subject: [PATCH] Update conf for fedora

---
 .config/kitty/kitty.conf                      |  2 +-
 .config/sway/config                           |  4 +--
 .config/sway/config.d/custom                  |  2 +-
 .config/sway/config.d/custom.d/input-settings | 36 -------------------
 .config/sway/config.d/custom.d/output         |  8 -----
 .config/sway/config.d/display                 |  6 +++-
 .config/sway/config.d/exec                    |  8 ++---
 .config/sway/config.d/keybinds                |  8 +++--
 .config/sway/config.d/theme                   |  2 +-
 .config/sway/config.d/themes/dark             |  3 +-
 .config/sway/config.d/themes/light            |  3 +-
 .config/sway/scripts/grimshot-ui.sh           | 16 ++++-----
 .config/sway/scripts/logout.sh                |  2 +-
 .config/sway/scripts/themes.sh                |  6 ++--
 .config/sway/scripts/update-wallpaper.sh      | 11 ++++--
 .config/waybar/config                         | 16 ++++-----
 .config/waybar/style.css                      |  4 +--
 .config/wofi/config                           |  6 ++--
 18 files changed, 56 insertions(+), 87 deletions(-)
 delete mode 100644 .config/sway/config.d/custom.d/input-settings
 delete mode 100644 .config/sway/config.d/custom.d/output

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index e0e0a40..3bc617b 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -6,7 +6,7 @@ bold_italic_font IBM Plex Mono SemiBold Italic
 
 font_size 13.5
 
-symbol_map U+23FB-U+23FE,U+2B58,U+E200-U+E2A9,U+E0A0-U+E0A3,U+E0B0-U+E0BF,U+E0C0-U+E0C8,U+E0CC-U+E0CF,U+E0D0-U+E0D2,U+E0D4,U+E700-U+E7C5,U+F000-U+F2E0,U+2665,U+26A1,U+F400-U+F4A8,U+F67C,U+E000-U+E00A,U+F300-U+F313,U+E5FA-U+E62B Symbols-2048-em Nerd Font Complete
+symbol_map U+23FB-U+23FE,U+2B58,U+E200-U+E2A9,U+E0A0-U+E0A3,U+E0B0-U+E0BF,U+E0C0-U+E0C8,U+E0CC-U+E0CF,U+E0D0-U+E0D2,U+E0D4,U+E700-U+E7C5,U+F000-U+F2E0,U+2665,U+26A1,U+F400-U+F4A8,U+F67C,U+E000-U+E00A,U+F300-U+F313,U+E5FA-U+E62B Symbols Nerd Font Mono
 
 # shell stuff
 shell_integration enabled
diff --git a/.config/sway/config b/.config/sway/config
index 4d43956..d734f82 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,5 +1,5 @@
-include ~/.config/sway/config.d/exec
+include ~/.config/sway/config.d/custom
 include ~/.config/sway/config.d/display
+include ~/.config/sway/config.d/exec
 include ~/.config/sway/config.d/theme
 include ~/.config/sway/config.d/keybinds
-include ~/.config/sway/config.d/custom
diff --git a/.config/sway/config.d/custom b/.config/sway/config.d/custom
index c6cb49b..6023060 100644
--- a/.config/sway/config.d/custom
+++ b/.config/sway/config.d/custom
@@ -1,3 +1,3 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 include ~/.config/sway/config.d/custom.d/*
diff --git a/.config/sway/config.d/custom.d/input-settings b/.config/sway/config.d/custom.d/input-settings
deleted file mode 100644
index a031fbb..0000000
--- a/.config/sway/config.d/custom.d/input-settings
+++ /dev/null
@@ -1,36 +0,0 @@
-# vim: filetype=i3config
-
-# swap caps and ctrl on Thinkpad keyboard
-input 1:1:AT_Translated_Set_2_keyboard {
-  xkb_options "ctrl:swapcaps"
-}
-
-# dugod keyboard and 2.4G variant
-input 12136:130:Hoksi_Technology_DURGOD_Taurus_K320 {
-  # swap caps with ctrl, and lalt with lwin
-  xkb_options "ctrl:swapcaps, altwin:swap_lalt_lwin"
-}
-
-input 12136:32832:Hoksi_Technology_DURGOD_Infinite_Link {
-  xkb_options "ctrl:swapcaps, altwin:swap_lalt_lwin"
-}
-
-input type:mouse {
-  accel_profile flat
-}
-
-# always disable touchpad
-input type:touchpad {
-  events disabled
-#  accel_profile adaptive
-#  pointer_accel -0.3
-#  natural_scroll enabled
-#  tap enabled
-#  dwt enabled
-#  events disabled_on_external_mouse
-}
-
-input 2:14:ETPS/2_Elantech_TrackPoint {
-  accel_profile adaptive
-  pointer_accel 0
-}
diff --git a/.config/sway/config.d/custom.d/output b/.config/sway/config.d/custom.d/output
deleted file mode 100644
index 92417a2..0000000
--- a/.config/sway/config.d/custom.d/output
+++ /dev/null
@@ -1,8 +0,0 @@
-output DP-2 mode 2560x1440@74.968Hz
-output DP-2 subpixel rgb
-output * adaptive_sync on
-output eDP-1 subpixel rgb
-
-# TV at home
-output 'Unknown HUAWEI INC 0x00000000' mode 3840x2160@60.000Hz
-output 'Unknown HUAWEI INC 0x00000000' scale 2
diff --git a/.config/sway/config.d/display b/.config/sway/config.d/display
index aade454..161970d 100644
--- a/.config/sway/config.d/display
+++ b/.config/sway/config.d/display
@@ -1,4 +1,4 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 # laptop output mode
 set $laptop eDP-1
@@ -11,3 +11,7 @@ bar swaybar_command waybar
 #workspace_auto_back_and_forth yes
 force_display_urgency_hint 500 ms
 smart_borders no_gaps
+
+# Use static wallpaper
+
+output * bg $(find -L ~/.config/sway/Wallpaper/ -type f | shuf -n1) fill
diff --git a/.config/sway/config.d/exec b/.config/sway/config.d/exec
index 1f5f9a7..4425f93 100644
--- a/.config/sway/config.d/exec
+++ b/.config/sway/config.d/exec
@@ -1,11 +1,11 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 ##starting userspace software
-exec_always sh -c ~/.config/sway/scripts/update-wallpaper.sh
+# exec_always sh -c ~/.config/sway/scripts/update-wallpaper.sh
 exec mkfifo /tmp/kitty
 exec wlsunset -l 30.4 -L 104.0 -T 6500 -t 3500
 exec light -S 70
-exec gentoo-pipewire-launcher
+# exec gentoo-pipewire-launcher
 exec swaync
 exec playerctld daemon
-exec dbus-update-activation-environment --all
+# exec dbus-update-activation-environment --all
diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index 25a9100..d0f94ab 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -1,4 +1,4 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 set $mod Mod4
 set $left h
@@ -12,7 +12,7 @@ set $menu wofi | xargs swaymsg exec --
 
 # screenshot
 bindsym $mod+Print exec ~/.config/sway/scripts/grimshot-ui.sh
-bindsym $mod+Ctrl+s exec ~/.config/sway/scripts/grimshot-ui.sh
+bindsym $mod+Shift+s exec ~/.config/sway/scripts/grimshot-ui.sh
 # notification client
 bindsym $mod+m exec swaync-client -t -sw
 # Logout
@@ -41,6 +41,8 @@ bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && pa
 bindsym XF86AudioMute exec  pactl set-sink-mute @DEFAULT_SINK@ toggle && ~/.config/sway/scripts/getmute.sh  > $SWAYSOCK.wob
 bindsym XF86MonBrightnessUp exec light -A 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob
 bindsym XF86MonBrightnessDown exec light -U 5 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob
+bindsym XF86KbdBrightnessUp exec light -s sysfs/leds/asus::kbd_backlight -S 67
+bindsym XF86KbdBrightnessDown exec light -s sysfs/leds/asus::kbd_backlight -S 0
 
 bindsym XF86AudioPause exec 'playerctl pause'
 bindsym XF86AudioPlay exec 'playerctl play'
@@ -49,7 +51,7 @@ bindsym XF86AudioNext exec 'playerctl next'
 bindsym XF86AudioPrev exec 'playerctl previous'
 
 # sticky window
-bindsym $mod+Shift+s floating toggle ; sticky toggle ; resize set 800 600 ; move position 55ppt 5ppt
+bindsym $mod+Ctrl+s floating toggle ; sticky toggle ; resize set 800 600 ; move position 55ppt 5ppt
 
 # Start a terminal
 bindsym $mod+Return exec $term
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index 4dc4ecf..eb8f44c 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -1,3 +1,3 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 include ~/.config/sway/config.d/themes/dark
diff --git a/.config/sway/config.d/themes/dark b/.config/sway/config.d/themes/dark
index fcae0d5..07c5e38 100644
--- a/.config/sway/config.d/themes/dark
+++ b/.config/sway/config.d/themes/dark
@@ -1,8 +1,9 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 #set gtk theme and font
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
+    gsettings set $gnome-schema color-scheme 'prefer-dark'
     gsettings set $gnome-schema gtk-theme 'Adwaita-dark'
     gsettings set $gnome-schema icon-theme 'Papirus-Dark'
     gsettings set $gnome-schema cursor-theme 'Adwaita'
diff --git a/.config/sway/config.d/themes/light b/.config/sway/config.d/themes/light
index 1094bda..ecf8a6e 100644
--- a/.config/sway/config.d/themes/light
+++ b/.config/sway/config.d/themes/light
@@ -1,8 +1,9 @@
-# vim: filetype=i3config
+# vim: filetype=swayconfig
 
 #set gtk theme and font
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
+    gsettings set $gnome-schema color-scheme 'prefer-light'
     gsettings set $gnome-schema gtk-theme 'Adwaita'
     gsettings set $gnome-schema icon-theme 'Papirus-Light'
     gsettings set $gnome-schema cursor-theme 'Adwaita'
diff --git a/.config/sway/scripts/grimshot-ui.sh b/.config/sway/scripts/grimshot-ui.sh
index 7160d0e..33b2b3d 100755
--- a/.config/sway/scripts/grimshot-ui.sh
+++ b/.config/sway/scripts/grimshot-ui.sh
@@ -1,22 +1,22 @@
 #!/bin/sh
 
 SCRIPT_LOC=~/.config/sway/scripts/
-FILE="/tmp/share/screenshots/`date +'%y%m%d%H%M.png'`"
+FOLDER=~/Pictures/Screenshots/
+# FILE="/tmp/share/screenshots/`date +'%y%m%d%H%M.png'`"
+FILE="$FOLDER`date +'%y%m%d%H%M.png'`"
 
-action=`echo "copy\nsave" | wofi -d -Oalphabetical --prompt="Select your action"`
-target=`echo "active\nscreen\noutput\narea\nwindow" | wofi -d -Oalphabetical --prompt="Select the target"`
+action=`echo -e "copy\nsave" | wofi -d -Oalphabetical --prompt="Select your action"`
+target=`echo -e "active\nscreen\noutput\narea\nwindow" | wofi -d -Oalphabetical --prompt="Select the target"`
 
 test $action || exit
 test $target || exit
 
-test -d /tmp/share/screenshot || mkdir -p /tmp/share/screenshots
+# test -d /tmp/share/screenshot || mkdir -p /tmp/share/screenshots
 
-# TODO, add box shadows
-
-XDG_SCREENSHOTS_DIR=/tmp/share/screenshots ~/.config/sway/scripts/grimshot.sh --notify $action $target $FILE
+~/.config/sway/scripts/grimshot.sh --notify $action $target $FILE
 
 if [ $target = "active" ] || [ $target = "window" ] || [ $target = "area" ]
 then
 	$SCRIPT_LOC/boxshadow.sh "$FILE" "$FILE" || die "Unable to save screenshot"
-	echo "saved file"
+	echo -e "saved file"
 fi
diff --git a/.config/sway/scripts/logout.sh b/.config/sway/scripts/logout.sh
index 5bed593..f5ff9f2 100755
--- a/.config/sway/scripts/logout.sh
+++ b/.config/sway/scripts/logout.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-choice=`echo "suspend\nshutdown\npoweroff\nreboot\nlock\nhibernate" | wofi -d -Oalphabetical`
+choice=`echo -e "suspend\nshutdown\npoweroff\nreboot\nlock\nhibernate" | wofi -d -Oalphabetical`
 if test "$choice" = lock ; then
   bright=`light`
   swayidle -w \
diff --git a/.config/sway/scripts/themes.sh b/.config/sway/scripts/themes.sh
index c66b5f0..d15b2d9 100755
--- a/.config/sway/scripts/themes.sh
+++ b/.config/sway/scripts/themes.sh
@@ -1,4 +1,4 @@
-scheme=$(echo "light\ndark" | wofi -d -p "Select color scheme")
+scheme=$(echo -e "light\ndark" | wofi -d -p "Select color scheme")
 
 # simply subsitude dark and light
 if [ $scheme = "light" ]; then
@@ -26,14 +26,14 @@ if [ $scheme = "light" ]; then
   
   # set wallpaper location
   unlink ~/.config/sway/Wallpaper
-  ln -s ~/Pictures/Wallpapers/light ~/.config/sway/Wallpaper
+  ln -s ~/Pictures/wall/sway/light ~/.config/sway/Wallpaper
 else
   kitty -1 sh -c "kitty @ set-colors -a -c ~/.config/kitty/themes/dark.conf" &
   mv ~/.config/zathura/zathurarc.dark ~/.config/zathura/zathurarc
 
   # set dark wallpaper
   unlink ~/.config/sway/Wallpaper
-  ln -s ~/Pictures/Wallpapers/dark ~/.config/sway/Wallpaper
+  ln -s ~/Pictures/wall/sway/dark ~/.config/sway/Wallpaper
 fi
 
 sway reload
diff --git a/.config/sway/scripts/update-wallpaper.sh b/.config/sway/scripts/update-wallpaper.sh
index 4b8f501..8663669 100755
--- a/.config/sway/scripts/update-wallpaper.sh
+++ b/.config/sway/scripts/update-wallpaper.sh
@@ -4,10 +4,17 @@ export PATH="${PATH}:${HOME}/.local/bin"
 export XDG_RUNTIME_DIR=/run/user/1000
 export XDG_CACHE_HOME=$HOME/.cache
 
+# If not using sway, we exit
+if ! pidof sway > /dev/null
+then
+    exit
+fi
+
+# If the deamon starts first time, we only init it, and the wallpaper will be updated
 if ! pidof swww-daemon > /dev/null
 then
-  swww init
-  exit
+    swww init
+    exit
 fi
 
 swww img $(find -L ~/.config/sway/Wallpaper/ -type f | shuf -n1) -t wave --transition-fps 60 --transition-duration 5 --transition-wave 16,16
diff --git a/.config/waybar/config b/.config/waybar/config
index 7ca1988..42a52ac 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -28,15 +28,15 @@
     "format-alt": "  {usage}% @ {avg_frequency}GHz"
   },
   "memory": {
-    "format": "  {used:0.1f}G / {total:0.1f}G",
-    "format-alt": "  Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
+    "format": "󰍛  {used:0.1f}G / {total:0.1f}G",
+    "format-alt": "󰓡  Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
   },
   "network": {
     "format-wifi": "  {essid} ({signalStrength}%)",
-    "format-ethernet": "  {ifname}",
+    "format-ethernet": "󰈀  {ifname}",
     "format-linked": "  {ifname}",
-    "format-disconnected": "  Disconnected",
-    "format-alt": "  {ifname}: {ipaddr}/{cidr}",
+    "format-disconnected": "󰌙  Disconnected",
+    "format-alt": "󰩟  {ifname}: {ipaddr}/{cidr}",
     "tooltip-format": "{ifname} via {gwaddr}"
   },
   "battery": {
@@ -46,7 +46,7 @@
       "critical": 5
     },
     "format": "{icon} {capacity}%",
-    "format-charging": "  {capacity}%",
+    "format-charging": "🗲  {capacity}%",
     "format-plugged": "  {capacity}%",
     "format-alt": "{icon} ETA: {time}",
     "format-icons": [
@@ -58,7 +58,7 @@
     ]
   },
   "clock": {
-    "format": "{:  %H:%M\t  %m-%d}",
+    "format": "{:󰅐  %H:%M\t  %m-%d}",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
   },
   "custom/notification": {
@@ -78,7 +78,7 @@
     "escape": true
   },
   "custom/player": {
-    "format": "  {}",
+    "format": "󰎈  {}",
     "return-type": "json",
     "exec": "playerctl -a metadata --format '{\"text\": \"{{uc(playerName)}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"class\": \"{{status}}\"}' -F",
     "max-length": 35,
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 5fb4dbc..b171b06 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -5,8 +5,8 @@
 * {
   border: none;
   border-radius: 1px;
-  font-family: "IBM Plex Sans", sans-serif;
-  font-size: 13px;
+  font-family: "IBM Plex Sans", "Symbols Nerd Font" ,sans-serif;
+  font-size: 14px;
   min-height: 0;
 }
 
diff --git a/.config/wofi/config b/.config/wofi/config
index d4518d4..4c9ebea 100644
--- a/.config/wofi/config
+++ b/.config/wofi/config
@@ -1,13 +1,11 @@
 # style
-style=/home/juan/.config/wofi/dark.css
+style=/home/ryan/.config/wofi/dark.css
 width=600
 height=500
 
 # opts
 show=drun
-always_parse_args=true
-show_all=true
-print_command=true
+fork=true
 layer=overlay
 insensitive=true
 location=center