Merge pull request #625 from JaKooLit/main

main to development

4 files changed, 8 insertions, 14 deletions

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index a5f1027a..00b5bde2 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -37,9 +37,7 @@ exec-once = $UserScripts/RainbowBorders.sh
 # Starting hypridle to start hyprlock
 exec-once = hypridle
 
-<<<<<<< HEAD
-=======
->>>>>>> 98bd6af (this is ajoke)
+
 # Here are list of features available but disabled by default
 # exec-once = swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 6a4de234..9271be3c 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -74,7 +74,6 @@ gestures {
   #workspace_swipe_use_r = true #uncomment if wanted a forever create a new workspace with swipe right
 }
 
-
 misc {
   disable_hyprland_logo = true
   disable_splash_rendering = true
@@ -104,17 +103,16 @@ xwayland {
   force_zero_scaling = true
 }
 
-# render section for Hyprland >= v0.42.0
 render {
   explicit_sync = 2
   explicit_sync_kms = 2
-  direct_scanout = false
+  direct_scanout = 0
 }
 
 cursor {
   sync_gsettings_theme = true
-  no_hardware_cursors = false
+  no_hardware_cursors = 2 # change to 1 if want to disable
   enable_hyprcursor = true
   warp_on_change_workspace = 2
   no_warps = true 
-}
+}
\ No newline at end of file
diff --git a/config/waybar/style/[Extra] Neon Circuit.css b/config/waybar/style/[Extra] Neon Circuit.css
index 0c89c952..2415841a 100644
--- a/config/waybar/style/[Extra] Neon Circuit.css
+++ b/config/waybar/style/[Extra] Neon Circuit.css
@@ -91,7 +91,6 @@ tooltip {
 #keyboard-state,
 #memory,
 #mode,
-#mpris,
 #network,
 #power-profiles-daemon,
 #pulseaudio,
diff --git a/copy.sh b/copy.sh
index 54f6109b..0140b93c 100755
--- a/copy.sh
+++ b/copy.sh
@@ -92,17 +92,16 @@ if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then
   sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf
   sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf
   sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf
-  # enabling no hardware cursors if nvidia detected
-  sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf  
-  # disabling explicit sync for nvidia for now (Hyprland 0.42.0)
-  #sed -i 's/  explicit_sync = 2/  explicit_sync = 0/' config/hypr/UserConfigs/UserSettings.conf
+  #no hardware cursors if nvidia detected 
+  #sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)2/\1 1/' config/hypr/UserConfigs/UserSettings.conf 
+  #sed -i 's/^\([[:space:]]*explicit_sync[[:space:]]*=[[:space:]]*\)2/\1 0/' config/hypr/UserConfigs/UserSettings.conf
 fi
 
 # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected
 if hostnamectl | grep -q 'Chassis: vm'; then
   echo "${INFO} System is running in a virtual machine. Setting up proper env's and configs" 2>&1 | tee -a "$LOG" || true
+  sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)2/\1 1/' config/hypr/UserConfigs/UserSettings.conf
   # enabling proper ENV's for Virtual Environment which should help
-  sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf
   sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf
   #sed -i '/env = LIBGL_ALWAYS_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf
   sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/monitors.conf