Merge pull request #10 from JaKooLit/Beta-v0.4

Hyprland-Dots V2

6 files changed, 57 insertions, 46 deletions

diff --git a/config/hypr/configs/ENVariables.conf b/config/hypr/configs/ENVariables.conf
index a705aa70..08541a1f 100644
--- a/config/hypr/configs/ENVariables.conf
+++ b/config/hypr/configs/ENVariables.conf
@@ -16,7 +16,7 @@ env = XDG_SESSION_TYPE,wayland
 #env = WLR_RENDERER,vulkan
 
 # firefox
-#env = MOZ_ENABLE_WAYLAND,1
+env = MOZ_ENABLE_WAYLAND,1
 
 # NVIDIA 
 # This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected
@@ -30,3 +30,5 @@ env = XDG_SESSION_TYPE,wayland
 #env = WLR_DRM_NO_ATOMIC,1
 #env = NVD_BACKEND,direct
 
+# FOR VM and POSSIBLY NVIDIA
+#env = WLR_RENDERER_ALLOW_SOFTWARE,1
diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index 15bd093a..a5777762 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -3,10 +3,12 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $themes = $HOME/.config/hypr/themes
 $lock = $scriptsDir/LockScreen.sh
 
+# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
+exec-once = $HOME/.config/hypr/initial-boot.sh
+
 # wallpaper stuff
 exec-once = swww query || swww init 
 #exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  #using swww utility
-#exec-once = swaybg -m fill -i $HOME/Pictures/wallpapers/mecha-nostalgia.png #using swaybg
 
 # Startup
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@@ -15,13 +17,16 @@ exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESK
 # Polkit (Polkit Gnome / KDE)
 exec-once = $scriptsDir/Polkit.sh
 
+#gnome polkit for nixos
+#exec-once = $scriptsDir/Polkit-NixOS.sh
+
 # Portal Hyprland
 #exec-once = $scriptsDir/PortalHyprland.sh
 
 # starup apps
 exec-once = waybar &
 exec-once = dunst &
-exec-once = blueman-applet & 
+#exec-once = blueman-applet & 
 exec-once = nm-applet --indicator &
 #exec-once = rog-control-center &
 #exec-once = easyeffects --gapplication-service -l my_own
@@ -41,7 +46,10 @@ exec-once = $scriptsDir/RainbowBorders.sh
 # auto close of apps (timeout 5 secs)
 # exec-once = $scriptsDir/AppAutoClose.sh
 
-# sway-idle with lock
-exec-once = swayidle -w timeout 1200 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
-# without lock
+
+# sway-idle with lock only
+exec-once = swayidle -w timeout 1200 '$lock' timeout 1200
+# sway-idle with lock and sleep
+#exec-once = swayidle -w timeout 1200 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
+# sway idle without lock
 #exec-once = swayidle -w  timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 3c0a00a1..11a2d719 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -3,7 +3,7 @@
 $mainMod = SUPER
 $files = thunar
 $browser = firefox
-$term = foot
+$term = kitty
 $hyprDir = $HOME/.config/hypr
 $scriptsDir = $HOME/.config/hypr/scripts
 
@@ -11,53 +11,42 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $AirplaneMode = $scriptsDir/AirplaneMode.sh
 $backlight = $scriptsDir/Brightness.sh
 $ChangeBlur = $scriptsDir/ChangeBlur.sh
-$ChangeLayout = $scriptsDir/ChangeLayout.sh
-$ChangeLayoutMenu = $scriptsDir/ChangeLayoutMenu.sh
-$Clipboard = $scriptsDir/ClipManager.sh
 $DarkLight = $scriptsDir/DarkLight.sh
-$GameMode = $scriptsDir/GameMode.sh
-$Help = $scriptsDir/Help.sh
 $kbacklight = $scriptsDir/BrightnessKbd.sh
 $LidSwitch = $scriptsDir/LidSwitch.sh
 $LockScreen = $scriptsDir/LockScreen.sh
 $Media = $scriptsDir/MediaCtrl.sh
-$QuickEdit = $scriptsDir/QuickEdit.sh
 $screenshot = $scriptsDir/ScreenShot.sh
 $touchpad = $scriptsDir/TouchPad.sh
 $volume = $scriptsDir/Volume.sh
-$wallpaper = $scriptsDir/Wallpaper.sh
-$wallpaperSelect = $scriptsDir/WallpaperSelect.sh
 $waybar = $scriptsDir/Waybar.sh
-$waybarStyle = $scriptsDir/WaybarStyles.sh
-$wlogout = $scriptsDir/Wlogout.sh
-$Wofi = $scriptsDir/Wofi.sh
-$WofiBeats = $scriptsDir/WofiBeats.sh
-$WofiBig = $scriptsDir/WofiBig.sh
-$WofiEmoji = $scriptsDir/WofiEmoji.sh
 
+
+bind = SUPER, Y, exec, rofi -show run -theme
 # see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, C, exec, hyprctl reload
-bind = $mainMod SHIFT, D, exec, $WofiBig
-bind = $mainMod, D, exec, $Wofi
+bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi run,drun,filebrowser
+#bind = CTRL, D, exec, pkill rofi || rofi -dmenu
 bind = $mainMod SHIFT, Q, killactive, 
 bind = $mainMod SHIFT, Space, togglefloating, 
 bind = $mainMod, F, fullscreen
 bind = $mainMod, Q, killactive,
 bind = $mainMod, Return, exec, $term
 bind = $mainMod, T, exec, $files
-bind = CTRL ALT, L, exec, $LockScreen
-bind = CTRL ALT, P, exec, $wlogout
-bind = $mainMod CTRL, S, exec, $WofiBeats
-bind = $mainMod ALT, E, exec, $WofiEmoji
-bind = $mainMod, W, exec, $wallpaper swaybg
-bind = $mainMod SHIFT, W, exec, $waybarStyle
-bind = $mainMod CTRL, W, exec, $wallpaperSelect
-bind = $mainMod ALT, W, exec, $ChangeLayoutMenu
-bind = $mainMod, H, exec, $Help
-bind = $mainMod, E, exec, $QuickEdit
+bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
+bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
+bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh
+bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh
+bind = $mainMod, W, exec, $scriptsDir/Wallpaper.sh swww
+bind = $mainMod SHIFT, W, exec, $scriptsDir/WaybarStyles.sh
+bind = $mainMod CTRL, W, exec, $scriptsDir/WallpaperSelect.sh
+bind = $mainMod ALT, W, exec, $scriptsDir/ChangeLayoutMenu.sh
+bind = $mainMod SHIFT, H, exec, $scriptsDir/Help.sh
+bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh
+bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh
 bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar
-bind = $mainMod SHIFT, G, exec, $GameMode
+bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh
 
 #bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3
 #bind = $mainMod SHIFT, Y, exec, $term --class clock -T clock -e tty-clock -c -C 7 -r -s -f "%A, %B, %d"
@@ -70,9 +59,9 @@ bind = $mainMod, K, layoutmsg, cycleprev
 bind = $mainMod, M, exec, hyprctl dispatch splitratio 0.3
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
-bind = $mainMod, Space, exec, $ChangeLayout
-bind = $mainMod ALT, V, exec, $Clipboard
-
+bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh
+bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh
+bind = $mainMod SHIFT, F, exec, hyprctl dispatch workspaceopt allfloat
 # group
 bind = $mainMod, G, togglegroup
 bind = $mainMod, tab, workspace, m+1
diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/configs/Monitors.conf
index 4587d6b0..f7299e6a 100644
--- a/config/hypr/configs/Monitors.conf
+++ b/config/hypr/configs/Monitors.conf
@@ -9,12 +9,11 @@ monitor=,preferred,auto,1
 # my G15 Laptop
 #monitor = eDP-1, preferred, auto, 1
 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
-#monitor = DP-2, preferred, auto, 1 #my Samsung Odyssey-G7
+#monitor = DP-2, preferred, auto, 1 
 #monitor = DP-1, preferred, auto, 1
 #monitor = HDMI-A-1, preferred,auto,1
 
-
-# QEMU
+# QEMU-KVM or any virtual box
 #monitor = Virtual-1, 1920x1080@60,auto,1
 
 # Hi Refresh Rate
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 13d8bf19..87fb04dc 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -2,7 +2,7 @@
 ## JaKooLit Github - https://github.com/JaKooLit
 
 # blurls = waybar
-blurls = wofi
+#blurls = rofi
 
 dwindle {
   pseudotile = yes
@@ -134,7 +134,7 @@ misc {
   enable_swallow = true
   no_direct_scanout = true #for fullscreen games
   focus_on_activate = false
-  swallow_regex = ^(foot)$
+  swallow_regex = ^(kitty)$
 }
 
 binds {
diff --git a/config/hypr/configs/WindowRules.conf b/config/hypr/configs/WindowRules.conf
index 8ca3396b..42da0e2b 100644
--- a/config/hypr/configs/WindowRules.conf
+++ b/config/hypr/configs/WindowRules.conf
@@ -3,12 +3,14 @@
 
 windowrule = float, org.kde.polkit-kde-authentication-agent-1
 windowrule = float, nm-connection-editor|blueman-manager
-windowrule = float, viewnior|pavucontrol
+windowrule = float, pavucontrol
 windowrule = float, nwg-look|qt5ct|mpv
 windowrule = float, onedriver|onedriver-launcher
-windowrule = float, swayimg|zoom
-windowrule = float, wofi
+windowrule = float, viewnior|swayimg
+windowrule = float, zoom
+windowrule = float, rofi
 windowrule = float, gnome-system-monitor
+windowrule = float, yad
 
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
@@ -19,10 +21,13 @@ windowrule = center,^(pavucontrol) # Make sure to delete this line if uncommen t
 #windowrule = size 533 533,^(pavucontrol) # These are optionals. But recommended
 
 # windowrule v2
+
+windowrulev2 = float, class:^([Vv]iewnior)$
+
 windowrulev2 = workspace 1, class:^(thunderbird)$
 windowrulev2 = workspace 2, class:^(firefox)$
 windowrulev2 = workspace 2, class:^(Firefox-esr)$
-windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ #this is on arch
+windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ 
 windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
 windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$
@@ -33,13 +38,21 @@ windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^(audacious)$
 
 #opacity (transparent) #enable as desired
+windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(firefox)$
 windowrulev2 = opacity 0.9 0.7, class:^([Tt]hunar)$
+windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
+windowrulev2 = opacity 0.9 0.7, class:^(gedit)$
 #windowrulev2 = opacity 0.8 0.7, class:^(foot)$
+windowrulev2 = opacity 0.8 0.7, class:^(kitty)$
 #windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
 windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$
 windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
+windowrulev2 = opacity 0.9 0.7, class:^(yad)$
 
+#layerrule = unset,class:^([Rr]ofi)$
+#layerrule = blur,class:^([Rr]ofi)$
+#layerrule = ignorezero, <rofi>
 
 #windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
 #windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1