Merge remote-tracking branch 'refs/remotes/origin/main'

2023-03-04 17:06:26 -05:00 · 2023-03-04 17:06:26 -05:00 · c240ec152f
commit c240ec152f
parent 51782b8ce4 e4f27637a3
24 changed files with 48 additions and 19 deletions
--- a/bin/wallpaper.sh
+++ b/bin/wallpaper.sh
@ -1,7 +1,6 @@
 #!/bin/bash

 wallpapers_dir=~/.local/share/wallpapers
-#finder="fzf --preview='feh {}'"
 finder="rofi-dmenu Wallpaper"

 cd "$wallpapers_dir"
--- a/editors/vim/pack/man/start/vim-go
+++ b/editors/vim/pack/man/start/vim-go
@ -1 +1 @@
-Subproject commit b8a41085bfd67fee97ad075c6df65590ce7417a7
+Subproject commit 582ceb4b14d1aaf9b0a52c7f4ede68ea29c85416
--- a/editors/vim/pack/man/start/vim-markdown
+++ b/editors/vim/pack/man/start/vim-markdown
@ -1 +1 @@
-Subproject commit 5d3d1b6cbdc4be0b4c6105c1ab1f769d76d3c68f
+Subproject commit df4be8626e2c5b2a42eb60e1f100fce469b81f7d
--- a/editors/vim/pack/man/start/vimtex
+++ b/editors/vim/pack/man/start/vimtex
@ -1 +1 @@
-Subproject commit 112e62c1c873fb1910c08ed331f354ae017aac57
+Subproject commit 3a9180f1d2cc984fe24bc7afaf9d4d00b3e4c20a
--- a/gui/i3/work.conf
+++ b/gui/i3/work.conf
@ -0,0 +1,8 @@
+include base.conf
+
+# binding workspaces
+workspace 1 output DP-2
+workspace 2 output DP-1
+
+# poly bar
+exec_always --no-startup-id polybar-launch.sh work-bar
--- a/gui/polybar/config.ini
+++ b/gui/polybar/config.ini
@ -38,7 +38,7 @@ font-0 = Hack Nerd Font:size=10;2
 height = 14pt
 ; modules
 modules-left = xworkspaces weather-thinkpad
-modules-right = battery pulseaudio memory cpu wlan seafile calendar-sync date powermenu
+modules-right = battery pulseaudio memory cpu wlan seafile calendar-sync bg-selector date-tp powermenu

 [bar/desktop-bar]
 ; desktop bar config
@ -51,6 +51,17 @@ modules-left = xworkspaces focus spotify spotify-len todo
 modules-center = weather-desktop
 modules-right = pulseaudio memory cpu temperature eth mouse-power seafile calendar-sync bg-selector date powermenu

+[bar/work-bar]
+; desktop bar config
+inherit = section/base-bar
+; height
+height = 24pt
+; modules
+modules-left = xworkspaces focus todo
+;modules-left = xworkspaces spotify spotify-len
+modules-center = weather-desktop
+modules-right = memory cpu temperature eth bg-selector date powermenu
+
 [module/xworkspaces]
 type = internal/xworkspaces

@ -192,6 +203,14 @@ date-alt = %a, %b %d %l:%M %P
 label = %date%
 label-foreground = ${colors.primary}

+[module/date-tp]
+type = internal/date
+
+date = %a, %b %d %l:%M %P
+
+label = %date%
+label-foreground = ${colors.primary}
+
 [module/seafile]
 ; custom seafile script
 type = custom/script
--- a/gui/rofi
+++ b/gui/rofi
@ -1 +1 @@
-Subproject commit 0def3cd15974a19606a93082778c043d370df8bd
+Subproject commit 692d5ef4bd5b9bd06126221cd1e895938166d183
--- a/gui/sway-desktop/wallpaper.jpg
+++ b/gui/sway-desktop/wallpaper.jpg
@ -1 +1 @@
-/home/spinach/.dotfiles/gui/wallpapers/pine_tree.jpg
+/home/keegan/.dotfiles/gui/wallpapers/pine_tree.jpg
--- a/gui/wallpapers/AI_snow_mountain.jpg
+++ b/gui/wallpapers/AI_snow_mountain.jpg
--- a/gui/wallpapers/dusk_mountains.png
+++ b/gui/wallpapers/dusk_mountains.png
--- a/gui/wallpapers/iceland_spotlight.png
+++ b/gui/wallpapers/iceland_spotlight.png
--- a/gui/wallpapers/lake_mountains.png
+++ b/gui/wallpapers/lake_mountains.png
--- a/gui/wallpapers/misty_forest.png
+++ b/gui/wallpapers/misty_forest.png
--- a/gui/wallpapers/pine_tree.jpg
+++ b/gui/wallpapers/pine_tree.jpg
--- a/gui/wallpapers/rocky_shores.png
+++ b/gui/wallpapers/rocky_shores.png
--- a/gui/wallpapers/storm_eye_space.png
+++ b/gui/wallpapers/storm_eye_space.png
--- a/gui/wallpapers/woods_trail.png
+++ b/gui/wallpapers/woods_trail.png
--- a/meta/configs/i3.desktop.yaml
+++ b/meta/configs/i3.desktop.yaml
@ -8,6 +8,3 @@
 - link:
    ~/.config/i3/config: gui/i3/desktop.conf
    ~/.local/bin/wallpaper.sh: bin/wallpaper.sh
-    ~/.local/share/wallpapers/: 
-      path: gui/wallpapers/**
-      glob: true
--- a/meta/configs/i3.thinkpad.yaml
+++ b/meta/configs/i3.thinkpad.yaml
@ -3,10 +3,8 @@

 - clean:
    ~/.config/i3:
+    ~/.local/share/wallpapers:

 - link:
    ~/.config/i3/config: gui/i3/thinkpad.conf
    ~/.local/bin/wallpaper.sh: bin/wallpaper.sh
-    ~/.local/share/wallpapers/:
-      path: gui/wallpapers/**
-      globe: true
--- a/meta/configs/i3.work.yaml
+++ b/meta/configs/i3.work.yaml
@ -0,0 +1,9 @@
+- shell:
+  - [cd src/i3lock-blur && make install, Building i3lock]
+
+- clean:
+    ~/.config/i3:
+    ~/.local/share/wallpapers:
+- link:
+    ~/.config/i3/config: gui/i3/work.conf
+    ~/.local/bin/wallpaper.sh: bin/wallpaper.sh
--- a/meta/profiles/arch.work
+++ b/meta/profiles/arch.work
@ -8,11 +8,10 @@ oh-my-zsh
 fzf
 tmux.sparse
 st.work
-i3.desktop
+i3.work
 picom
-polybar.desktop
+polybar
 rofi
 lf
 scripts
 timetracker
-calcurse
--- a/src/fzf
+++ b/src/fzf
@ -1 +1 @@
-Subproject commit 3364d4d147ade148d8e5dd67609e46f0ef6c50fc
+Subproject commit 96c3de12eb717e33b175fd01a9aaaac84ea8d6af
--- a/src/i3lock-blur
+++ b/src/i3lock-blur
@ -1 +1 @@
-Subproject commit 35ba33193f93e4e849a18d262d2691afb3782f82
+Subproject commit afe4dc5e12d0eb99dcae4ae320c48bdbd7f5a8c2
--- a/src/weather
+++ b/src/weather
@ -1 +1 @@
-Subproject commit cb8bdd3e43b50a0610cff3a69959cb27eb407afc
+Subproject commit 6e263798b4cd202273f7debc3ce882ef51a7b6e7