Merge pull request #300 from JaKooLit/development

Pre-release stage: Development to Main

4 files changed, 37 insertions, 29 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 1d60c24b..8681eb30 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -1,4 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Environment variables. See https://wiki.hyprland.org/Configuring/Environment-variables/
 
 #environment-variables
 env = CLUTTER_BACKEND,wayland
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index eede1669..85f3c1c3 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -19,7 +19,9 @@ bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,r
 bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview'
 
 bind = $mainMod, Return, exec, $term  # Launch terminal
-bind = $mainMod, T, exec, $files
+bind = $mainMod, T, exec, $files # Launch file manager
+
+bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
 # pyprland
 bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal
@@ -27,6 +29,7 @@ bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom
 
 # User Added Keybinds
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
+bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Changing the keyboard layout
 
 # For passthrough keyboard into a VM
 # bind = $mainMod ALT, P, submap, passthru
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index b3193e49..1ca9b5d8 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -1,6 +1,7 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # User Settings
-# This is where you put your own settings as this will not be touched during update
+# This is where you put your own settings as this will not be touched during update 
+# if the upgrade.sh is used.
 
 # refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 
@@ -25,7 +26,7 @@ master {
 general {
   sensitivity=1.00
   apply_sens_to_raw=1
-  gaps_in = 4
+  gaps_in = 6
   gaps_out = 8
   border_size = 2
   resize_on_border = true
@@ -33,7 +34,7 @@ general {
   col.active_border = $color0 $color2 $color9 $color12 $color15 90deg
   col.inactive_border = $backgroundCol
 
-  layout = master
+  layout = dwindle
 }
 
 group {
@@ -45,7 +46,7 @@ group {
 }
 
 decoration {
-  rounding = 8
+  rounding = 10
          
   active_opacity = 1.0
   inactive_opacity = 0.9
@@ -63,7 +64,7 @@ decoration {
 
   blur {
   enabled = true	
-  size = 5
+  size = 6
   passes = 2
   ignore_opacity = true
   new_optimizations = true
@@ -74,32 +75,26 @@ decoration {
 animations {
   enabled = yes
 
-  bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-  bezier = linear, 0.0, 0.0, 1.0, 1.0
   bezier = wind, 0.05, 0.9, 0.1, 1.05
   bezier = winIn, 0.1, 1.1, 0.1, 1.1
   bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = slow, 0, 0.85, 0.3, 1
-  bezier = overshot, 0.7, 0.6, 0.1, 1.1
-  bezier = bounce, 1.1, 1.6, 0.1, 0.85
-  bezier = sligshot, 1, -1, 0.15, 1.25
-  bezier = nice, 0, 6.9, 0.5, -4.20
+  bezier = liner, 1, 1, 1, 1
   
-  animation = windowsIn, 1, 5, slow, popin
-  animation = windowsOut, 1, 5, winOut, popin
+  animation = windows, 1, 6, wind, slide
+  animation = windowsIn, 1, 6, winIn, slide
+  animation = windowsOut, 1, 5, winOut, slide
   animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 10, linear
-  animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 5, overshot
+  animation = border, 1, 1, liner
+  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
+  animation = fade, 1, 10, default
   animation = workspaces, 1, 5, wind
-  animation = windows, 1, 5, bounce, popin
 }
 
 input {
   kb_layout=us
   kb_variant=
   kb_model=
-  kb_options=grp:alt_shift_toggle
+  kb_options=
   kb_rules=
   repeat_rate=50
   repeat_delay=300
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 09cc8ec2..3193d26c 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -13,16 +13,19 @@ windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-es
 windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
-windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$
-windowrulev2 = workspace 5 silent, class:^(lutris)$
+windowrulev2 = workspace 5, class:^([Ss]team)$
+windowrulev2 = workspace 5, class:^([Ll]utris)$
+windowrulev2 = workspace 7, class:^([Dd]iscord)$
+windowrulev2 = workspace 7, class:^([Ww]ebCord)$
+windowrulev2 = workspace 7, class:^([Vv]esktop)$
+
+# windowrule v2 move to workspace (silent)
 windowrulev2 = workspace 6 silent, class:^(virt-manager)$
-windowrulev2 = workspace 7 silent, class:^(discord)$
-windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
 
 # windowrule v2 - float
 windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ 
-windowrulev2 = float, class:([Zz)oom|onedriver|onedriver-launcher)$
+windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$
 windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
 windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
 windowrulev2 = float, class:(xdg-desktop-portal-gtk)
@@ -40,6 +43,12 @@ windowrulev2 = float, class:^(evince)$ # document viewer
 windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
 windowrulev2 = float, title:(Kvantum Manager)
+windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$
+windowrulev2 = float, class:^([Qq]alculate-gtk)$
+
+# windowrule v2 - position
+windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
+windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
@@ -62,12 +71,12 @@ windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$
 windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
 windowrulev2 = opacity 0.9 0.8, class:^(VSCode|code-url-handler)$
-windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-studio)$ # Android Studio
-windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-phpstorm)$ # PHPStorm
-windowrulev2 = opacity 0.94 0.86, class:^(discord)$
-windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$
+windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-.+)$ # JetBrains IDEs
+windowrulev2 = opacity 0.94 0.86, class:^([Dd]iscord|[Vv]esktop)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
 windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot-gui|org.gnome.baobab)$
 windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
+windowrulev2 = opacity 0.8 0.7, class:^(app.drey.Warp)$ # Warp file transfer
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
 windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui