From 29cc263555fc0c81d451627b72d8b6c9d7e293d8 Mon Sep 17 00:00:00 2001
From: flick0 <flickerdroid211@gmail.com>
Date: Mon, 22 Jan 2024 13:15:39 +0000
Subject: [PATCH] update layout

---
 config/hypr/hyprland.conf      | 13 ++-----------
 config/hypr/land/defaults.conf | 13 +++++++++----
 config/hypr/land/general.conf  |  9 +++++----
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 897552e..0fe53ba 100755
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -1,18 +1,9 @@
-source=/home/flicko/.config/hypr/themes/hyprtheme.conf
-
-$HERE=~/.config/hypr
-$SCRIPTS=$HERE/scripts
 source=./land/defaults.conf # this needs to be sourced before theme file
 # source=./land/nvidia.conf
 
-exec-once=$HERE/scripts/powercheck
-exec-once=$SCRIPTS/portal.sh
-exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-
 ######################################################################################################
-$THEME=$HERE/themes
-source=$THEME/hyprtheme.conf
+$yorha=$HERE/themes/yorha
+source=$yorha/theme.conf
 ######################################################################################################
 
 source=./land/general.conf
diff --git a/config/hypr/land/defaults.conf b/config/hypr/land/defaults.conf
index f4a9604..64504b8 100644
--- a/config/hypr/land/defaults.conf
+++ b/config/hypr/land/defaults.conf
@@ -1,11 +1,19 @@
+$HERE=~/.config/hypr
+$SCRIPTS=$HERE/scripts
+
 ##########################################################################################
 # hyprland cant override variable values so we are taking advantage of that
 # if these variables are set in theme, these values wont be used
 
 $DRUN=wofi --show drun
 $SCREENSHOT=$SCRIPTS/screenshot
-$FOOTCONF=$HERE/components/foot.ini
 $LOCK=$SCRIPTS/lock
+$TERM=footclient
+$TERMSERVER=foot -s
+$TERMFLOAT=$TERM --title fly_is_foot -w 1067x630
+
+##########################################################################################
+
 $VOLINC=$SCRIPTS/buttons/volume+
 $VOLRED=$SCRIPTS/buttons/volume-
 $BRIGHTINC=$SCRIPTS/buttons/bright+
@@ -26,7 +34,4 @@ $ANIMATEDDRAG=yes
 
 $MOD1=SUPER
 $MOD2=ALT
-
-$FISHCONF=$HERE/components/fish/theme.fish
-
 ##########################################################################################
\ No newline at end of file
diff --git a/config/hypr/land/general.conf b/config/hypr/land/general.conf
index ec96b58..c966bb6 100644
--- a/config/hypr/land/general.conf
+++ b/config/hypr/land/general.conf
@@ -1,8 +1,9 @@
-$TERM=footclient -o shell="fish -C 'source $FISHCONF'"
-$TERMSERVER=foot -s -c $FOOTCONF -o shell="fish -C 'source $FISHCONF'"
-$TERMFLOAT=$TERM --title fly_is_foot -w 1067x630
+exec-once=$HERE/scripts/powercheck
+exec-once=$SCRIPTS/portal.sh
+exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 
-exec=$TERMSERVER
+exec-once=$TERMSERVER
 exec=pkill swayidle; swayidle -w timeout 300 '$LOCK' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$LOCK'
 
 input {