From 26f2ae9c9e32348e65e8d33b9d66685bca21bfcf Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Sun, 24 Oct 2021 23:12:53 +0300
Subject: [PATCH] Rofi upgrade -> theming changed etc.

---
 .config/Scripts/on                      |  6 +++---
 .config/i3/config                       |  2 +-
 .config/networkmanager-dmenu/config.ini | 19 ++++++++++++-------
 .profile                                |  5 ++++-
 addons/pacman-packages                  |  3 ++-
 addons/yay-packages                     |  2 +-
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.config/Scripts/on b/.config/Scripts/on
index 6c13c22..5feff16 100755
--- a/.config/Scripts/on
+++ b/.config/Scripts/on
@@ -12,9 +12,9 @@ options="     lock
       hibernate
       reboot
       shutdown"
-themes_dir=$HOME/.config/rofi
-theme=${1:-$themes_dir/colors-rofi-dark.rasi}
-selection=$(echo -e "${options}" | rofi -dmenu -config ~/.config/rofi/config $theme -columns 6 -lines 1 -width 1700)
+themes_dir=$HOME/.config/rofi/themes
+theme=${1:-$themes_dir/powermenu.rasi}
+selection=$(echo -e "${options}" | rofi -dmenu -config ~/.config/rofi/config.rasi $theme -columns 6 -lines 1 -width 1700)
 
 echo "This is your selection: $selection"
 
diff --git a/.config/i3/config b/.config/i3/config
index 33ab56e..94b6e7d 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -150,7 +150,7 @@ bindsym $mod+Escape		workspace prev
 bindsym $mod+Shift+Escape 	exec --no-startup-id prompt "Exit i3?" "i3-msg exit"
 
 bindsym $mod+BackSpace		exec $flash
-bindsym $mod+Shift+BackSpace	exec ~/.config/Scripts/on
+bindsym $mod+Shift+BackSpace	exec ~/.config/rofi/scripts/rofi-power
 
 #STOP/HIDE EVERYTHING:
 bindsym $mod+Shift+Delete	exec $truemute ; exec $truepause ; workspace lmao ; exec $term -e htop ; exec $term -e ranger
diff --git a/.config/networkmanager-dmenu/config.ini b/.config/networkmanager-dmenu/config.ini
index e6b52b9..0558bc4 100644
--- a/.config/networkmanager-dmenu/config.ini
+++ b/.config/networkmanager-dmenu/config.ini
@@ -1,6 +1,8 @@
 [dmenu]
 fn = -*-UbuntuMono Nerd Font Mono*-*-*-20-*-*-*-*-*-*-*
-dmenu_command = rofi -width 15
+#fn = -*-terminus-medium-*-*-*-16-*-*-*-*-*-*-*
+#dmenu_command = rofi -dmenu -theme-str '@import "network.rasi"'
+dmenu_command = rofi -dmenu -theme-str '@import "network.rasi"'
 # # Note that dmenu_command can contain arguments as well like `rofi -width 30`
 # # Rofi and dmenu are set to case insensitive by default `-i`
 # l = number of lines to display, defaults to number of total network options
@@ -14,17 +16,20 @@ dmenu_command = rofi -width 15
 # p = Custom Prompt for the networks menu
 pinentry = /usr/bin/pinentry
 rofi_highlight = True
-# (Default: False) use rofi highlighting instead of '**'
+compact = True
+# wifi_chars = <string of 4 unicode characters representing 1-4 bars strength>
+wifi_chars = ▂▄▆█
+# list_saved = <True or False> # (Default: False) list saved connections
 
-# # override normal foreground and background colors (dmenu) or use the
-# # -password option (rofi) to obscure passphrase entry
 # [dmenu_passphrase]
+# override normal foreground and background colors, use the -P option along
+# with the Suckless dmenu password patch or use the -password option (rofi) to
+# obscure passphrase entry.
 # nf = #222222
 # nb = #222222
-rofi_obscure = True
+# rofi_obscure = <True or False> (Default: True) Obscure passwords when typing
+# dmenu_password = <True or False> (Default: False) Use the -P option for dmenu (you need the appropriate dmenu patch!)
 
 [editor]
 terminal = kitty
 gui_if_available = True
-# terminal = <name of terminal program>
-# gui_if_available = <True or False>
diff --git a/.profile b/.profile
index 0a72477..89ce230 100644
--- a/.profile
+++ b/.profile
@@ -13,7 +13,7 @@ export GNUPGHOME="~/.gnupg"
 export SSH_KEY_PATH="~/.ssh/id_rsa"
 export TERMINAL="kitty"
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-
+export XDG_CONFIG_HOME="$HOME/.config"
 #fzf
 #export FZF_CTRL_R_OPTS='--sort --exact'
 #export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'"
@@ -34,3 +34,6 @@ export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 # QGtkStyle
 export QT_QPA_PLATFORMTHEME=gtk2
+
+# Firefox
+MOZ_X11_EGL=1
diff --git a/addons/pacman-packages b/addons/pacman-packages
index 735b664..788ba68 100644
--- a/addons/pacman-packages
+++ b/addons/pacman-packages
@@ -42,6 +42,7 @@ findutils
 firefox
 flex
 fwupd
+galculator
 gawk
 gcc
 gcc-libs
@@ -133,7 +134,6 @@ python-mpd2
 python-pip
 python-pynvim
 python-pyqt5
-python-pywal
 python-setuptools
 python-urwid
 reflector
@@ -234,6 +234,7 @@ xorg-xwd
 xorg-xwininfo
 xorg-xwud
 xterm
+yadm
 youtube-dl
 zathura
 zathura-pdf-poppler
diff --git a/addons/yay-packages b/addons/yay-packages
index 69ae572..322a6a7 100644
--- a/addons/yay-packages
+++ b/addons/yay-packages
@@ -33,6 +33,7 @@ pacback
 pbincli
 picom-git
 polybar-git
+pywal-git
 qt5-styleplugins
 ranger-git
 redshift-minimal
@@ -41,6 +42,5 @@ ttf-weather-icons
 twmn-git
 wpgtk-git
 yad-git
-yadm
 yay-bin
 youtube-viewer