Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development to Main in preparation for Hyprland v0.42.0 recently released #395

Merged
merged 41 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a573529
fix: Fixup waybar's integrated system updater module
ElectroPerf Jul 7, 2024
33db28c
Merge pull request #373 from ElectroPerf/main
JaKooLit Jul 7, 2024
c72b006
feat: add neovim configuration files
FernuDev Jul 8, 2024
fd0344c
feat: add neovim configuration files
FernuDev Jul 8, 2024
9d8709a
Merge pull request #374 from Fernu292/nvim-config
JaKooLit Jul 8, 2024
745d41a
feat: kitty: Use meslo nerd fonts for oh-my-posh
ElectroPerf Jul 8, 2024
3e3273e
Merge pull request #376 from ElectroPerf/development
JaKooLit Jul 8, 2024
3a2c20d
Revert "fix: Fixup waybar's integrated system updater module"
JaKooLit Jul 8, 2024
f7e09af
Merge pull request #377 from JaKooLit/revert-373-main
JaKooLit Jul 8, 2024
b2e13f8
Revert "feat: kitty: Use meslo nerd fonts for oh-my-posh"
JaKooLit Jul 8, 2024
0883d13
Merge pull request #378 from JaKooLit/revert-376-development
JaKooLit Jul 8, 2024
e2f3978
update: Update plugins, added alpha plugin
FernuDev Jul 9, 2024
122e87e
Merge pull request #380 from Fernu292/nvim-config
JaKooLit Jul 9, 2024
92f7e4c
updated waybar update for arch linux
JaKooLit Jul 9, 2024
6b29fc5
hyprlock fix (Debian is showing -e)
JaKooLit Jul 9, 2024
da2f8ee
config: Add documentation for 10 bit color displays
gab-gil Jul 10, 2024
7e7de9c
Update Monitors.conf
JaKooLit Jul 10, 2024
27b2d05
Merge pull request #381 from AstralCookie/document-10-bitdepth-support
JaKooLit Jul 10, 2024
d7641d4
Bump to v2.3.2
JaKooLit Jul 10, 2024
3836d2c
Updated wallpaper Select.sh to handle the wallpapers with spaces or w…
JaKooLit Jul 10, 2024
50884ce
updated wallpaper effects
Jul 10, 2024
c314624
updated default waybar style
Jul 11, 2024
3301c62
fix: fix bug on Weather.py reversing min/max temp
alzalia1 Jul 11, 2024
17a8199
Merge pull request #383 from alzalia1/weatherpy-bugfix
JaKooLit Jul 12, 2024
54204ae
Update WindowRules.conf
JaKooLit Jul 16, 2024
99316fb
feat: Use $EDITOR and nano if not set
ningen Jul 16, 2024
fc555c0
Merge pull request #386 from ningen/QuickEdit-Support-EDITOR
JaKooLit Jul 19, 2024
c780ed0
fix: switch layout keyboard
Jul 26, 2024
abd3006
Merge pull request #388 from luanlouzada/development
JaKooLit Jul 26, 2024
b88457e
window-rules: add rules for GNOME apps
JohnRTitor Jul 29, 2024
7b8f355
window-rules: cleanup, merge similar rules
JohnRTitor Jul 29, 2024
a78d581
Merge pull request #389 from JohnRTitor/patch-window-rules
JaKooLit Jul 30, 2024
7e6c569
Update copy.sh to create backup for nvim
JaKooLit Jul 31, 2024
b50b303
Update upgrade.sh for nvim configs
JaKooLit Jul 31, 2024
6e0b067
Code Clean ups
JaKooLit Aug 2, 2024
c37aa1c
no hardware cursors if nvidia detected
JaKooLit Aug 3, 2024
fb3cd6d
reduced font size for kitty if user chose <1080p resolution during in…
JaKooLit Aug 4, 2024
9e71f32
Clean up windowRules.conf
JaKooLit Aug 6, 2024
6c26dc6
Merge pull request #394 from JaKooLit/main
JaKooLit Aug 6, 2024
e602fc3
Update UserSettings.conf
JaKooLit Aug 7, 2024
66cfe8e
Preparation for Hyprland 0.42.0 & Code cleanup
JaKooLit Aug 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions config/hypr/UserConfigs/Monitors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
# https://wiki.hyprland.org/Configuring/Monitors/
# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info.


# Monitors
monitor=,preferred,auto,1

# NOTE: for laptop, kindly check notes in Laptops.conf regarding display
# Created this inorder for the monitor display to not wake up if not intended.
# See here: https://github.com/hyprwm/Hyprland/issues/4090

# Some examples
#monitor = eDP-1, preferred, auto, 1
#monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
#monitor = DP-3, 1920x1080@240, auto, 1
#monitor = DP-1, preferred, auto, 1
#monitor = HDMI-A-1, preferred,auto,1

# QEMU-KVM or any virtual box
# QEMU-KVM, virtual box or vmware
#monitor = Virtual-1, 1920x1080@60,auto,1

# Hi Refresh Rate
# High Refresh Rate
#monitor=,highrr,auto,1

# High Resolution
Expand All @@ -31,18 +31,21 @@ monitor=,preferred,auto,1
# to disable a monitor
#monitor=name,disable

# Mirror
# Mirror samples
#monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2
#monitor=,preferred,auto,1,mirror,eDP-1


# Example :
#monitor=eDP-1,2560x1440@165,0x0,1
#workspace=HDMI-A-1,1
#monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1
#workspace=HDMI-A-2,2

# 10 bit monitor support - See wiki https://wiki.hyprland.org/Configuring/Monitors/#10-bit-support - See NOTES below
# NOTE: Colors registered in Hyprland (e.g. the border color) do not support 10 bit.
# NOTE: Some applications do not support screen capture with 10 bit enabled. (Screen captures like OBS may render black screen)
# monitor=,preferred,auto,1,bitdepth,10

#monitor=eDP-1,transform,0
#monitor=eDP-1,addreserved,10,10,10,49
#workspace=eDP-1,1

# workspaces - Monitor rules
# https://wiki.hyprland.org/Configuring/Workspace-Rules/
# SUPER E - Workspace-Rules
# See ~/.config/hypr/UserConfigs/WorkspaceRules.conf

17 changes: 10 additions & 7 deletions config/hypr/UserConfigs/UserSettings.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@
# Sourcing colors generated by wallust
source = $HOME/.config/hypr/wallust/wallust-hyprland.conf

# blurls = waybar
# blurls = rofi

dwindle {
pseudotile = yes
preserve_split = yes
special_scale_factor = 0.8
}

master {
new_status = master #from Hyprland >v0.41.2
new_status = master
new_on_top = 1
mfact = 0.5
}
Expand Down Expand Up @@ -148,7 +145,7 @@ misc {
enable_swallow = true
swallow_regex = ^(kitty)$
focus_on_activate = false
no_direct_scanout = true #for fullscreen games
#no_direct_scanout = true #for fullscreen games - deprecated
initial_workspace_tracking = 0
middle_click_paste = false
}
Expand All @@ -164,9 +161,15 @@ xwayland {
force_zero_scaling = true
}

# cursor section for Hyprland >= v0.41.0
# render section for Hyprland >= v0.42.0
render {
explicit_sync = 2
explicit_sync_kms = 2
direct_scanout = false
}

cursor {
no_hardware_cursors = false
enable_hyprcursor = true
warp_on_change_workspace = true # for -git or Hyprland >v0.41.1
warp_on_change_workspace = true
}
68 changes: 33 additions & 35 deletions config/hypr/UserConfigs/WindowRules.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#windowrule = fullscreen,gamescope
#windowrule = workspace 6 silent,^(gamescope)$

# windowrule center
windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol)
# windowrule Position
windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)
windowrule = center,^([Ww]hatsapp-for-linux)$
windowrule = center,^([Ff]erdium)$

Expand All @@ -15,6 +15,8 @@ windowrule = center,^([Ff]erdium)$
# windowrulev2 = center,floating:1 # warning, it cause even the menu to float and center.
windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
windowrulev2 = move 72% 7%,title:^(Picture-in-Picture)$
#windowrulev2 = move 72% 7%,title:^(Firefox)$

# windowrule v2 to avoid idle for fullscreen apps
windowrulev2 = idleinhibit fullscreen, class:^(*)$
Expand All @@ -25,13 +27,12 @@ windowrulev2 = idleinhibit fullscreen, fullscreen:1
windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
windowrulev2 = workspace 2, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
#windowrulev2 = workspace 3, class:^([Tt]hunar)$
windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
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)$
windowrulev2 = workspace 7, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
windowrulev2 = workspace 7, class:^([Ff]erdium)$
windowrulev2 = workspace 7, class:^([Ww]hatsapp-for-linux)$

Expand All @@ -48,13 +49,14 @@ windowrulev2 = float, class:(xdg-desktop-portal-gtk)
windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
windowrulev2 = float, class:^([Rr]ofi)$
windowrulev2 = float, class:^(eog)$
windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol)$
windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct|mpv)$
windowrulev2 = float, class:^(eog|org.gnome.Loupe)$ # image viewer
windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct)$
windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$
windowrulev2 = float, class:^(nm-applet|nm-connection-editor|blueman-manager)$
windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$ # system monitor
windowrulev2 = float, class:^(yad)$ # icon browser
windowrulev2 = float, class:^(wihotspot-gui)$ # wifi hotspot
windowrulev2 = float, class:^(wihotspot(-gui)?)$ # wifi hotspot
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
Expand All @@ -63,6 +65,8 @@ windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ett
windowrulev2 = float, class:^([Qq]alculate-gtk)$
windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
windowrulev2 = float, class:^([Ff]erdium)$
windowrulev2 = float, title:^(Picture-in-Picture)$
#windowrulev2 = float, title:^(Firefox)$

# windowrule v2 - opacity #enable as desired
windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
Expand All @@ -72,62 +76,56 @@ windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser)$
windowrulev2 = opacity 0.9 0.8, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
windowrulev2 = opacity 0.9 0.8, class:^(google-chrome(-beta|-dev|-unstable)?)$
windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar|org.gnome.Nautilus)$
windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor)$
windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$
windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
windowrulev2 = opacity 0.9 0.8, class:^(Alacritty)$
windowrulev2 = opacity 0.9 0.8, class:^(kitty)$
windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
windowrulev2 = opacity 0.9 0.8, class:^(Alacritty|kitty)$ # Terminals
windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler)$
windowrulev2 = opacity 0.9 0.8, class:^(nwg-look|qt5ct|qt6ct|yad)$
windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
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-.+)$ # 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:^(im.riot.Riot)$ # Element matrix client
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
windowrulev2 = opacity 0.9 0.7, class:^([Ww]hatsapp-for-linux)$
windowrulev2 = opacity 0.9 0.7, class:^([Ff]erdium)$
windowrulev2 = opacity 0.95 0.75, title:^(Picture-in-Picture)$

# windowrule v2 - size
windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
windowrulev2 = size 70% 70%, class:^(xdg-desktop-portal-gtk)$
windowrulev2 = size 60% 70%, title:(Kvantum Manager)
windowrulev2 = size 60% 70%, class:^(qt6ct)$
windowrulev2 = size 70% 70%, class:^(evince|wihotspot-gui)$
windowrulev2 = size 70% 70%, class:^(evince|wihotspot(-gui)?)$
windowrulev2 = size 60% 70%, class:^(file-roller|org.gnome.FileRoller)$
windowrulev2 = size 60% 70%, class:^([Ww]hatsapp-for-linux)$
windowrulev2 = size 60% 70%, class:^([Ff]erdium)$
windowrulev2 = size 25% 25%, title:^(Picture-in-Picture)$
#windowrulev2 = size 25% 25%, title:^(Firefox)$

#layerrule = unset,class:^([Rr]ofi)$
#layerrule = blur,class:^([Rr]ofi)$
#layerrule = ignorezero, <rofi>

layerrule = ignorezero, overview
layerrule = blur, overview
# windowrule v2 - pinning
windowrulev2 = pin,title:^(Picture-in-Picture)$
#windowrulev2 = pin,title:^(Firefox)$

#windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
#windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1
#windowrulev2 = opacity 0.8 0.8, pinned:1

# Picture-in-a-Picture (PIP) rules: Oddly, some need re-duplication. This is because the window for
# PIP changes after on first launch, and will not inherant the rules...
windowrulev2=opacity 0.95 0.75,title:^(Picture-in-Picture)$ # for opacity: [focus num] [bg num]
# Interestingly, the opacity rule above doesn't need the reduplication?
windowrulev2=pin,title:^(Picture-in-Picture)$
#windowrulev2=pin,title:^(Firefox)$
windowrulev2=float, title:^(Picture-in-Picture)$
#windowrulev2=float, title:^(Firefox)$
windowrulev2=size 25% 25%,title:^(Picture-in-Picture)$
#windowrulev2=size 25% 25%,title:^(Firefox)$
windowrulev2=move 72% 7%,title:^(Picture-in-Picture)$
#windowrulev2=move 72% 7%,title:^(Firefox)$

# LAYER RULES
#layerrule = unset,class:^([Rr]ofi)$
#layerrule = blur,class:^([Rr]ofi)$
#layerrule = ignorezero, <rofi>

#layerrule = ignorezero, overview
#layerrule = blur, overview
2 changes: 1 addition & 1 deletion config/hypr/UserScripts/QuickEdit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Rofi menu for Quick Edit / View of Settings (SUPER E)

# define your preferred text editor and terminal to use
editor=nano
editor=${EDITOR:-nano}
tty=kitty

configs="$HOME/.config/hypr/configs"
Expand Down
Loading