From cf805af147dc0a8cb8c8dd89b57f2f526da2f8fc Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Wed, 24 Jan 2024 17:22:43 -0500
Subject: [PATCH] update init script and configs

---
 .config/kitty/mocha.conf |  1 -
 .config/sway/config      |  2 +-
 .config/waybar/config    |  1 +
 .config/wofi/config      |  2 +-
 .zprofile                | 54 ++++++++++++++++++++++------------------
 aur                      |  1 -
 packages                 |  3 +++
 7 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/.config/kitty/mocha.conf b/.config/kitty/mocha.conf
index 77cdb3f..1a20d54 100644
--- a/.config/kitty/mocha.conf
+++ b/.config/kitty/mocha.conf
@@ -28,7 +28,6 @@ bell_border_color       #F9E2AF
 
 # OS Window titlebar colors
 wayland_titlebar_color  #1E1E2E
-macos_titlebar_color    #1E1E2E
 
 # Tab bar colors
 active_tab_foreground   #11111B
diff --git a/.config/sway/config b/.config/sway/config
index 88271ad..36d1bcd 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -30,7 +30,7 @@ set $blur_passes 3
 set $browser librewolf
 
 # Autostart apps
-exec $HOME/.config/desktop-common/scripts.d/auto.sh
+exec $HOME/.config/sway/scripts.d/auto.sh
 
 # Local configs
 include $HOME/.config/sway/config.d/*
diff --git a/.config/waybar/config b/.config/waybar/config
index b98b070..34cf25e 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,6 +1,7 @@
 {
     "height": 24,
     "position": "top",
+    "layer": "bottom",
     "spacing": 4,
     "modules-left": [
         "sway/workspaces",
diff --git a/.config/wofi/config b/.config/wofi/config
index 6b28876..51ad2ed 100644
--- a/.config/wofi/config
+++ b/.config/wofi/config
@@ -1,5 +1,5 @@
 key_expand=Tab
-term=alacritty
+term=kitty
 matching=multi-contains
 insensitive=true
 gtk_dark=true
diff --git a/.zprofile b/.zprofile
index 9045a22..492caa4 100644
--- a/.zprofile
+++ b/.zprofile
@@ -20,29 +20,35 @@ export GTK_THEME=Lavanda-Sea-Dark
 # Set terminal
 export TERMINAL=alacritty
 
+if [ -n "$TMUX" ]; then
+    return
+fi
+
 clear
-echo
-echo
-echo "Please select an environment..."
-echo "Or press any key to enter terminal"
-echo "[S]way [H]yprland"
-echo
-echo
+printf "\t\n\t\n\t\n\t\n"
+echo "\tPlease select an environment..."
+echo "\t[S]way [H]yprland [T]erminal [E]xit"
+printf "\t\n\t\n\t"
 
-stty raw -echo
-choice=$(dd bs=1 count=1 2> /dev/null)
-stty -raw echo
-
-case "$choice" in
-
-    "s")
-        echo "Launching sway..."
-        exec sway &> $HOME/.log/sway
-        ;;
-    "h")
-        echo "Launching Hyprland..."
-        exec Hyprland &> $HOME/.log/Hyprland
-        ;;
-esac
-        
-exec fbterm &> $HOME/.log/fbterm
+while true; do
+    stty raw -echo
+    choice=$(dd bs=1 count=1 2> /dev/null)
+    stty -raw echo
+    case "$choice" in
+    
+        "s")
+            echo "Launching sway..."
+            exec sway &> $HOME/.log/sway
+            ;;
+        "h")
+            echo "Launching Hyprland..."
+            exec Hyprland &> $HOME/.log/Hyprland
+            ;;
+        "t")
+            exec cage -s kitty -- -o font_size=14
+            ;;
+        "e")
+            exit
+            ;;
+    esac
+done
diff --git a/aur b/aur
index bcd33f5..583a83d 100644
--- a/aur
+++ b/aur
@@ -1,7 +1,6 @@
 autotiling
 cider
 cydia-impactor
-fbterm
 i686-elf-gcc
 librewolf-bin
 lkrg-dkms
diff --git a/packages b/packages
index 4510ac6..8104bab 100644
--- a/packages
+++ b/packages
@@ -5,17 +5,20 @@ alsa-utils
 amd-ucode
 base
 base-devel
+bemenu
 bind
 blueberry
 bluez-utils
 brightnessctl
 btrfs-progs
+cage
 chromium
 clang
 cmake
 cups
 cups-pdf
 discord
+dmenu
 dmidecode
 dnsmasq
 docker