From 88290c4f10be314db673b2586bd78eb790e09b1b Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Tue, 9 May 2023 12:39:56 -0500
Subject: [PATCH] More catppuccin

---
 common/helix/config.toml                         |  2 +-
 common/helix/themes/custom.toml                  |  2 ++
 common/wezterm/wezterm.lua                       |  4 +---
 .../arch/provision.d/optional/ui-packages.bash   |  1 +
 os/linux/hypr/hyprland.conf                      | 16 ++++++++--------
 os/linux/hypr/hyprpaper.conf                     |  4 ++++
 os/linux/mako/config                             |  3 ++-
 7 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 common/helix/themes/custom.toml
 create mode 100644 os/linux/hypr/hyprpaper.conf

diff --git a/common/helix/config.toml b/common/helix/config.toml
index 27df4f8..3116317 100644
--- a/common/helix/config.toml
+++ b/common/helix/config.toml
@@ -1,4 +1,4 @@
-theme = "catppuccin_mocha"
+theme = "custom"
 
 [editor]
 auto-pairs = false
diff --git a/common/helix/themes/custom.toml b/common/helix/themes/custom.toml
new file mode 100644
index 0000000..d0da693
--- /dev/null
+++ b/common/helix/themes/custom.toml
@@ -0,0 +1,2 @@
+inherits = "catppuccin_mocha"
+"ui.bufferline.active" = { fg = "sapphire", bg = "base", underline = { color = "sapphire", style = "" } }
diff --git a/common/wezterm/wezterm.lua b/common/wezterm/wezterm.lua
index 1c5a142..8e14731 100644
--- a/common/wezterm/wezterm.lua
+++ b/common/wezterm/wezterm.lua
@@ -49,8 +49,6 @@ config.keys = {
   },
 }
 
--- 😋
--- -> => ==>
--- -* ** :: >> |>
+config.default_gui_startup_args = { 'connect', 'unix' }
 
 return config
diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash
index 4aca5cd..97b4f70 100755
--- a/os/linux/arch/provision.d/optional/ui-packages.bash
+++ b/os/linux/arch/provision.d/optional/ui-packages.bash
@@ -41,3 +41,4 @@ paru -Sy --needed \
 	pipewire pipewire-pulse wireplumber `# Audio System` \
 	xdg-desktop-portal xdg-desktop-portal-wlr `# Screensharing` \
 	obs-studio `# Audio and Video Streaming` \
+	eww-wayland `# Wayland Widgets`
diff --git a/os/linux/hypr/hyprland.conf b/os/linux/hypr/hyprland.conf
index b37b84d..0d39ce8 100644
--- a/os/linux/hypr/hyprland.conf
+++ b/os/linux/hypr/hyprland.conf
@@ -7,7 +7,7 @@ monitor=DP-3,3840x2160@120,1440x0,1,bitdepth,10
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
-exec-once = kitty & firefox & wezterm & hyprpaper & mako & /usr/lib/polkit-kde-authentication-agent-1 & waybar
+exec-once = firefox & wezterm & hyprpaper & mako & /usr/lib/polkit-kde-authentication-agent-1 & waybar
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -18,12 +18,12 @@ env = XCURSOR_SIZE,24
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
     kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
+    # kb_variant =
+    # kb_model =
+    # kb_options =
+    # kb_rules =
 
-    follow_mouse = 0
+    follow_mouse = 2
 
 	repeat_delay = 200
 	repeat_rate = 60
@@ -117,8 +117,8 @@ $mainMod = SUPER
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, wezterm
 bind = $mainMod, U, exec, firefox
-bind = $mainMod, ret, exec, kitty
-bind = $mainMod, return, exec, kitty
+bind = $mainMod, ret, exec, wezterm
+bind = $mainMod, return, exec, wezterm
 bind = $mainMod, C, killactive, 
 bind = $mainMod, M, exit, 
 bind = $mainMod, E, exec, dolphin
diff --git a/os/linux/hypr/hyprpaper.conf b/os/linux/hypr/hyprpaper.conf
new file mode 100644
index 0000000..b5ac52c
--- /dev/null
+++ b/os/linux/hypr/hyprpaper.conf
@@ -0,0 +1,4 @@
+preload = ~/../img/walls/orange-blue-cube.jpg
+wallpaper = DP-1,~/../img/walls/orange-blue-cube.jpg
+wallpaper = DP-2,~/../img/walls/orange-blue-cube.jpg
+wallpaper = DP-3,~/../img/walls/orange-blue-cube.jpg
diff --git a/os/linux/mako/config b/os/linux/mako/config
index e90752f..dcd59c4 100644
--- a/os/linux/mako/config
+++ b/os/linux/mako/config
@@ -1,7 +1,8 @@
 max-visible=5
 default-timeout=30000
-font=IosevkaLyteTerm Regular 12, Symbols Nerd Font 12
+font=Symbols Nerd Font 12,IosevkaLyteTerm 12
 default-timeout=15000
+border-size=1
 
 # theme src: https://github.com/catppuccin/mako/blob/main/src/mocha
 # Colors