Merge pull request #556 from JaKooLit/development

Development to main feat. Rofi Themes

2 files changed, 63 insertions, 22 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index e5e5ab42..7dde28c4 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -4,30 +4,39 @@
 # Set your defaults here
 #env = EDITOR,vim #default editor
 
-#environment-variables
-env = CLUTTER_BACKEND,wayland
+# environment-variables
+# Toolkit Backend Variables
 env = GDK_BACKEND,wayland,x11
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt5ct
-env = QT_QPA_PLATFORMTHEME,qt6ct   
-env = QT_SCALE_FACTOR,1
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = CLUTTER_BACKEND,wayland
+
+#Run SDL2 applications on Wayland. 
+#Remove or set to x11 if games that provide older versions of SDL cause compatibility issues
+#env = SDL_VIDEODRIVER,wayland
+
+# xdg Specifications
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 
+# QT Variables
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_QPA_PLATFORMTHEME,qt5ct 
+env = QT_QPA_PLATFORMTHEME,qt6ct
+
 # hyprland-qt-support
 env = QT_QUICK_CONTROLS_STYLE,org.hyprland.style
 
-# xwayland apps scale fix (useful if you are use monitor scaling)
+# xwayland apps scale fix (useful if you are use monitor scaling).
+# Set same value if you use scaling in Monitors.conf
+# 1 is 100% 1.5 is 150%
 # see https://wiki.hyprland.org/Configuring/XWayland/
-# toolkit-specific scale
 env = GDK_SCALE,1 
+env = QT_SCALE_FACTOR,1
 
 # Bibata-Modern-Ice-Cursor
 # NOTE! You must have the hyprcursor version to activate this.
-# If you installed from 26-Dec-2024 and choose GTK theme, then you have it.
 # https://wiki.hyprland.org/Hypr-Ecosystem/hyprcursor/
 #env = HYPRCURSOR_THEME,Bibata-Modern-Ice
 #env = HYPRCURSOR_SIZE,24
@@ -41,6 +50,7 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto
 # NVIDIA 
 # This is from Hyprland Wiki. Below will be activated nvidia gpu detected
 # See hyprland wiki https://wiki.hyprland.org/Nvidia/#environment-variables
+
 #env = LIBVA_DRIVER_NAME,nvidia 
 #env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 #env = NVD_BACKEND,direct 
@@ -49,9 +59,12 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto
 #env = AQ_DRM_DEVICES,/dev/dri/card1 (nvidia)
 #env = AQ_DRM_DEVICES,/dev/dri/card0
 
+#env = AQ_NO_ATOMIC,1 #use legacy DRM interface
+
 # additional ENV's for nvidia. Caution, activate with care
 #env = GBM_BACKEND,nvidia-drm 
 
+#env = __GL_GSYNC_ALLOWED,1 #adaptive Vsync
 #env = __NV_PRIME_RENDER_OFFLOAD,1 
 #env = __VK_LAYER_NV_optimus,NVIDIA_only
 #env = WLR_DRM_NO_ATOMIC,1
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 3975f60f..862ffa45 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -5,33 +5,61 @@
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables
 # See also Laptops.conf for laptops keybinds 
 
+# /* ---- ✴️ Variables ✴️ ---- */  #
 $mainMod = SUPER
 $files = thunar
 $term = kitty
 $scriptsDir = $HOME/.config/hypr/scripts
 $UserScripts = $HOME/.config/hypr/UserScripts
 
-# rofi App launcher
+# common shortcuts
 #bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
-bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window #Main Menu
+bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Main Menu (APP Launcher)
+bind = $mainMod, B, exec, xdg-open "http:// &"  # default browser
+bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' # desktop overview (if installed)
+bind = $mainMod, Return, exec, $term  #terminal
+bind = $mainMod, E, exec, $files #file manager
 
-bind = $mainMod CTRL, F, fullscreen, 1 # fake full screen
 
-# ags overview
-bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview'
+# FEATURES / EXTRAS
+bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # help / cheat sheet
+bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi
+bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji menu
+bind = $mainMod, S, exec, $scriptsDir/RofiSearch.sh # Google search using rofi
+bind = $mainMod ALT, O, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
+bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # Toggle animations ON/OFF
+bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
+bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
+bind = $mainMod CTRL, R, exec, $scriptsDir/RofiThemeSelector.sh # modified Rofi Theme Selector
+bind = $mainMod CTRL SHIFT, R, exec, $scriptsDir/RofiThemeSelector-modified.sh # modified Rofi Theme Selector
 
-bind = $mainMod, Return, exec, $term  #terminal
-bind = $mainMod, T, exec, $files #file manager
+bind = $mainMod SHIFT, F, fullscreen # whole full screen
+bind = $mainMod CTRL, F, fullscreen, 1 # fake full screen
+bind = $mainMod, SPACE, togglefloating, #Float Mode
+bind = $mainMod ALT, SPACE, exec, hyprctl dispatch workspaceopt allfloat #All Float Mode
+
+# Waybar / Bar related
+bind = $mainMod CTRL ALT, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar 
+bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
+bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu
 
+# FEATURES / EXTRAS (UserScripts)
+bind = $mainMod SHIFT, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
+bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music using rofi
+bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply
+bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagick
+bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
+bind = $mainMod CTRL, O, exec, hyprctl setprop active opaque toggle # disable opacity on active window
+bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # search keybinds via rofi
+bind = $mainMod SHIFT, A, exec, $scriptsDir/Animations.sh #hyprland animations menu
+bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
+bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout
 bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
-# pyprland
-bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal
+# pyprland (This is not available in Debian and Ubuntu)
+bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal not avail Debian and Ubuntu
 bind = $mainMod, Z, exec, pypr zoom # Toggle Desktop 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 # Change keyboard layout
 
 # For passthrough keyboard into a VM
 # bind = $mainMod ALT, P, submap, passthru