From 4db68649060afc844db385ba1dd8d3d92214cd98 Mon Sep 17 00:00:00 2001
From: spinach <19keegandeppe@gmail.com>
Date: Sun, 12 Feb 2023 01:43:43 -0500
Subject: [PATCH] swapped out dmenu for rofi, added polybar tweaks and calcurse
 tweaks

---
 .gitmodules                 |  3 +++
 arch/i3.deps                |  4 ++++
 gui/i3-desktop/config       |  4 ++--
 gui/polybar/config.ini      | 11 +++++++++--
 gui/rofi                    |  1 +
 meta/configs/rofi.yaml      |  2 ++
 meta/profiles/arch.desktop  |  1 +
 meta/profiles/arch.thinkpad |  1 +
 meta/profiles/arch.work     |  1 +
 shells/zsh/zprofile         |  1 +
 src/fzf                     |  2 +-
 tui/calcurse/conf           |  6 +++---
 12 files changed, 29 insertions(+), 8 deletions(-)
 create mode 160000 gui/rofi
 create mode 100644 meta/configs/rofi.yaml

diff --git a/.gitmodules b/.gitmodules
index 1e47c5b..2e2a69b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,3 +62,6 @@
 [submodule "shells/st"]
 	path = shells/st
 	url = https://git.keegandeppe.com/kdeppe/st.git
+[submodule "gui/rofi"]
+	path = gui/rofi
+	url = https://git.keegandeppe.com/kdeppe/rofi.git
diff --git a/arch/i3.deps b/arch/i3.deps
index c2ec9a7..85f0899 100644
--- a/arch/i3.deps
+++ b/arch/i3.deps
@@ -1,2 +1,6 @@
 feh
 imagemagick
+rofi
+mpv
+mpd
+mpc
diff --git a/gui/i3-desktop/config b/gui/i3-desktop/config
index 45fc137..ae04ced 100644
--- a/gui/i3-desktop/config
+++ b/gui/i3-desktop/config
@@ -28,7 +28,7 @@ smart_gaps on
 # https://wiki.archlinux.org/index.php/XDG_Autostart
 workspace 1 output DP-2
 workspace 2 output DP-0
-exec --no-startup-id dex --autostart --environment i3 'workspace 2; exec brave-bin; workspace 1; exec st'
+exec --no-startup-id dex --autostart --environment i3
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
@@ -65,7 +65,7 @@ bindsym $mod+q exec i3lock-blur
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id dmenu_run -b
+bindsym $mod+d exec --no-startup-id rofi-launcher
 # A more modern dmenu replacement is rofi:
 # bindcode $mod+40 exec "rofi -modi drun,run -show drun"
 # There also is i3-dmenu-desktop which only displays applications shipping a
diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini
index e609bcf..70b3566 100644
--- a/gui/polybar/config.ini
+++ b/gui/polybar/config.ini
@@ -34,7 +34,7 @@ inherit = section/base-bar
 height = 16pt
 ; modules
 modules-left = xworkspaces xwindow-thinkpad weather-thinkpad
-modules-right = battery pulseaudio memory cpu wlan seafile date
+modules-right = battery pulseaudio memory cpu wlan seafile date powermenu
 
 [bar/desktop-bar]
 ; desktop bar config
@@ -44,7 +44,7 @@ height = 24pt
 ; modules
 modules-left = xworkspaces xwindow-desktop
 modules-center = weather-desktop
-modules-right = pulseaudio memory cpu eth seafile date
+modules-right = pulseaudio memory cpu eth seafile date powermenu
 
 
 
@@ -182,5 +182,12 @@ type = custom/script
 exec = seafile_check
 interval = 3
 
+[module/powermenu]
+type = custom/text
+
+content = %{F#F30} 
+
+click-left = rofi-powermenu
+
 [settings]
 screenchange-reload = true
diff --git a/gui/rofi b/gui/rofi
new file mode 160000
index 0000000..0786c86
--- /dev/null
+++ b/gui/rofi
@@ -0,0 +1 @@
+Subproject commit 0786c86b63dd66ae345ed51c79d46f427522dd08
diff --git a/meta/configs/rofi.yaml b/meta/configs/rofi.yaml
new file mode 100644
index 0000000..4650074
--- /dev/null
+++ b/meta/configs/rofi.yaml
@@ -0,0 +1,2 @@
+- link:
+   ~/.config/rofi: gui/rofi
diff --git a/meta/profiles/arch.desktop b/meta/profiles/arch.desktop
index c19aa6f..ccf991d 100644
--- a/meta/profiles/arch.desktop
+++ b/meta/profiles/arch.desktop
@@ -11,6 +11,7 @@ st.desktop
 i3.desktop
 polybar
 picom
+rofi
 lf
 scripts
 calcurse
diff --git a/meta/profiles/arch.thinkpad b/meta/profiles/arch.thinkpad
index 74a8081..3b6c440 100644
--- a/meta/profiles/arch.thinkpad
+++ b/meta/profiles/arch.thinkpad
@@ -11,6 +11,7 @@ st.thinkpad
 i3.thinkpad
 polybar
 picom
+rofi
 lf
 scripts
 calcurse
diff --git a/meta/profiles/arch.work b/meta/profiles/arch.work
index 613e8e4..0200cc3 100644
--- a/meta/profiles/arch.work
+++ b/meta/profiles/arch.work
@@ -11,6 +11,7 @@ st.work
 i3.desktop
 picom
 polybar.desktop
+rofi
 lf
 scripts
 timetracker
diff --git a/shells/zsh/zprofile b/shells/zsh/zprofile
index b812cef..0ce2f80 100644
--- a/shells/zsh/zprofile
+++ b/shells/zsh/zprofile
@@ -1,5 +1,6 @@
 # go path
 export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
+export PATH=$PATH:$HOME/.config/rofi/bin
 
 # editor
 export VISUAL=vim
diff --git a/src/fzf b/src/fzf
index f7447ae..6ea38b4 160000
--- a/src/fzf
+++ b/src/fzf
@@ -1 +1 @@
-Subproject commit f7447aece12f9b95133b803d5c4f71815bee8ca6
+Subproject commit 6ea38b44384e7a09a3863465dc3cc7b93cd7e781
diff --git a/tui/calcurse/conf b/tui/calcurse/conf
index 312f290..8e80df4 100644
--- a/tui/calcurse/conf
+++ b/tui/calcurse/conf
@@ -4,8 +4,8 @@ appearance.defaultpanel=todo
 appearance.layout=5
 appearance.headerline=yes
 appearance.eventseparator=yes
-appearance.dayseparator=yes
-appearance.emptyline=yes
+appearance.dayseparator=no
+appearance.emptyline=no
 appearance.emptyday=No Events
 appearance.notifybar=yes
 appearance.sidebarwidth=2
@@ -30,4 +30,4 @@ general.systemevents=yes
 notification.command=printf '\a'
 notification.notifyall=flagged-only
 notification.warning=300
-format.appointmenttime=%H:%M
+format.appointmenttime=%l:%M %P