Compare commits

...

4 Commits

Author SHA1 Message Date
Trianta
620afc5bb2 armory: fix minor preferences 2024-05-09 01:39:46 -05:00
Trianta
0ae5f3b92d waybar: update config 2024-05-09 01:39:23 -05:00
Trianta
0fb1e8fcee hyprland: update to latest config 2024-05-09 01:39:11 -05:00
Trianta
5a03cddbe9 hyprland: add xrandr script for custom windowed resolutions 2024-05-09 01:38:39 -05:00
11 changed files with 159 additions and 115 deletions

View File

@ -7,7 +7,7 @@ shape = "Underline"
TERM = "xterm-256color" TERM = "xterm-256color"
[font] [font]
size = 10 size = 20
[colors] [colors]
footer_bar = { foreground = "#181818", background = "#d8d8d8" } footer_bar = { foreground = "#181818", background = "#d8d8d8" }

View File

@ -4,7 +4,7 @@
### Display ### ### Display ###
# Which monitor should the notifications be displayed on. # Which monitor should the notifications be displayed on.
monitor = 0 monitor = DP-3
# Display notification on focused monitor. Possible modes are: # Display notification on focused monitor. Possible modes are:
# mouse: follow mouse pointer # mouse: follow mouse pointer

View File

@ -2,12 +2,12 @@
# █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄ # █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄
# Single # Single
monitor=DP-3, highrr, 0x0, 1, vrr, 1 monitor=DP-3, highrr, 0x0, 1, vrr, 0
monitor=DP-1, disable monitor=DP-1, disable
# Double # Double
#monitor=DP-3, highrr, 0x1080, 1, vrr, 1 #monitor=DP-3, highrr, 0x1080, 1, vrr, 0
#monitor=DP-1, highrr, 760x0, 1, vrr, 1 #monitor=DP-1, highrr, 760x0, 1, vrr, 0
@ -15,53 +15,44 @@ monitor=DP-1, disable
# █▄▄ █▀█ █▄█ █░▀█ █▄▄ █▀█ # █▄▄ █▀█ █▄█ █░▀█ █▄▄ █▀█
$scrPath = ~/.config/hypr/scripts $scrPath = ~/.config/hypr/scripts
exec-once = $scrPath/resetxdgportal.sh # reset XDPH for screenshare
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH # reset XDPH for screenshare
exec-once = dbus-update-activation-environment --systemd --all # for XDPH exec-once = $scrPath/resetxdgportal.sh
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps # for XDPH
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = dbus-update-activation-environment --systemd --all
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
# authentication dialogue for GUI apps
exec-once = /usr/lib/polkit-kde-authentication-agent-1
# xrandr settings
exec-once = $scrPath/xrandr.sh
exec-once = waybar -c ~/.config/waybar/config exec-once = waybar -c ~/.config/waybar/config
exec-once = dunst # start notification demon exec-once = dunst
exec-once = swww init exec-once = swww init
exec-once = syncthing --no-browser exec-once = syncthing --no-browser
# Main applications
exec-once = discord
# █▀▀ █▄░█ █░█ exec-once = spotify --disable-gpu
# ██▄ █░▀█ ▀▄▀ exec-once = alacritty
exec-once = firefox
env = XDG_CURRENT_DESKTOP,Hyprland exec-once = taskset -c 1-7 mangohud steam-runtime
env = XDG_SESSION_TYPE,wayland
env = XDG_SESSION_DESKTOP,Hyprland
#env = QT_QPA_PLATFORM,wayland;xcb
#env = QT_STYLE_OVERRIDE,kvantum
#env = QT_QPA_PLATFORMTHEME,qt5ct
#env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
#env = QT_AUTO_SCREEN_SCALE_FACTOR,1
env = MOZ_ENABLE_WAYLAND,1
# █ █▄░█ █▀█ █░█ ▀█▀
# █ █░▀█ █▀▀ █▄█ ░█░
input {
kb_layout = us
follow_mouse = 2
sensitivity = -.75 # -1.0 - 1.0, 0 means no modification.
force_no_accel = 1
}
# █░░ ▄▀█ █▄█ █▀█ █░█ ▀█▀ █▀ # █░░ ▄▀█ █▄█ █▀█ █░█ ▀█▀ █▀
# █▄▄ █▀█ ░█░ █▄█ █▄█ ░█░ ▄█ # █▄▄ █▀█ ░█░ █▄█ █▄█ ░█░ ▄█
workspace = 1, monitor:DP-3 workspace = 1, monitor:DP-3, persistent:true, gapsout:0 440 0 440, default:true
workspace = 5, monitor:DP-1 workspace = 2, monitor:DP-3, persistent:true, gapsout:0 440 0 440
exec-once = xrandr --output DP-3 --primary # Set primary monitor for xwayland workspace = 3, monitor:DP-3, persistent:true, gapsout:0 440 0 440
workspace = 4, monitor:DP-3, persistent:true
workspace = 5, monitor:DP-3, persistent:true
workspace = 6, monitor:DP-1, persistent:true
dwindle { dwindle {
pseudotile = yes pseudotile = yes
@ -83,6 +74,25 @@ xwayland {
# █ █▄░█ █▀█ █░█ ▀█▀
# █ █░▀█ █▀▀ █▄█ ░█░
input {
kb_layout = us
follow_mouse = 2
mouse_refocus = false;
sensitivity = -.75 # -1.0 - 1.0, 0 means no modification.
force_no_accel = 1
}
device {
name = opentabletdriver-virtual-tablet
enabled = yes
}
# █▀ █▀█ █░█ █▀█ █▀▀ █▀▀ # █▀ █▀█ █░█ █▀█ █▀▀ █▀▀
# ▄█ █▄█ █▄█ █▀▄ █▄▄ ██▄ # ▄█ █▄█ █▄█ █▀▄ █▄▄ ██▄

View File

@ -12,15 +12,20 @@ general {
# BACKGROUND # BACKGROUND
background { background {
monitor = monitor = DP-3
path = ~/.config/background path = ~/pics/dharmx/spam/a_city_with_neon_lights.png
blur_passes = 0
color = $base
}
background {
monitor = DP-1
blur_passes = 0 blur_passes = 0
color = $base color = $base
} }
# TIME # TIME
label { label {
monitor = monitor = DP-3
text = cmd[update:30000] echo "$(date +"%R")" text = cmd[update:30000] echo "$(date +"%R")"
color = $text color = $text
font_size = 90 font_size = 90
@ -32,7 +37,7 @@ label {
# DATE # DATE
label { label {
monitor = monitor = DP-3
text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")" text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
color = $text color = $text
font_size = 25 font_size = 25
@ -45,8 +50,8 @@ label {
# USER AVATAR # USER AVATAR
image { image {
monitor = monitor = DP-3
path = ~/.face path = ~/pics/fox-dying.png
size = 100 size = 100
border_color = $accent border_color = $accent
@ -57,7 +62,7 @@ image {
# INPUT FIELD # INPUT FIELD
input-field { input-field {
monitor = monitor = DP-3
size = 300, 60 size = 300, 60
outline_thickness = 4 outline_thickness = 4
dots_size = 0.2 dots_size = 0.2

View File

@ -9,7 +9,7 @@ $mainMod = SUPER
bind = , mouse:275, pass, ^(discord)$ bind = , mouse:275, pass, ^(discord)$
bind = SHIFT, mouse:275, pass, ^(discord)$ bind = SHIFT, mouse:275, pass, ^(discord)$
# Window/Session actions # Core binds
bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, Q, killactive,
bind = $mainMod SHIFT, M, exit bind = $mainMod SHIFT, M, exit
bind = $mainMod, SPACE, togglefloating, bind = $mainMod, SPACE, togglefloating,
@ -19,13 +19,10 @@ bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar
bind = $mainMod SHIFT, J, togglesplit, # dwindle bind = $mainMod SHIFT, J, togglesplit, # dwindle
bind = $mainMod SHIFT, P, pseudo, # dwindle bind = $mainMod SHIFT, P, pseudo, # dwindle
# Application shortcuts # Main application shortcuts
bind = $mainMod, RETURN, exec, alacritty bind = $mainMod, RETURN, exec, alacritty
bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
bind = $mainMod SHIFT, 7, exec, taskset -c 0-7 mangohud steamtinkerlaunch mo2 start bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 mangohud steamtinkerlaunch mo2 start
bind = $mainMod SHIFT, 8, exec, taskset -c 0-7 mangohud steam-runtime
bind = $mainMod SHIFT, 9, exec, spotify --disable-gpu
bind = $mainMod SHIFT, 0, exec, discord
bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun
# Audio control # Audio control
@ -54,22 +51,25 @@ bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3 bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4 bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5 bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2 bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3 bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4 bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5 bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod ALT, 1, movetoworkspacesilent, 1 bind = $mainMod ALT, 1, movetoworkspacesilent, 1
bind = $mainMod ALT, 2, movetoworkspacesilent, 2 bind = $mainMod ALT, 2, movetoworkspacesilent, 2
bind = $mainMod ALT, 3, movetoworkspacesilent, 3 bind = $mainMod ALT, 3, movetoworkspacesilent, 3
bind = $mainMod ALT, 4, movetoworkspacesilent, 4 bind = $mainMod ALT, 4, movetoworkspacesilent, 4
bind = $mainMod ALT, 5, movetoworkspacesilent, 5 bind = $mainMod ALT, 5, movetoworkspacesilent, 5
bind = $mainMod ALT, 6, movetoworkspacesilent, 6
# Resize windows # Resize windows
binde = $mainMod, right, resizeactive, 30 0 binde = $mainMod, right, resizeactive, 5 0
binde = $mainMod, left, resizeactive, -30 0 binde = $mainMod, left, resizeactive, -5 0
binde = $mainMod, up, resizeactive, 0 -30 binde = $mainMod, up, resizeactive, 0 -5
binde = $mainMod, down, resizeactive, 0 30 binde = $mainMod, down, resizeactive, 0 5
# Move/Resize windows with mainMod + LMB/RMB and dragging # Move/Resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:272, movewindow

View File

@ -5,11 +5,22 @@
# See https://wiki.hyprland.org/Nvidia/ for more # See https://wiki.hyprland.org/Nvidia/ for more
#env = GBM_BACKEND,nvidia-drm
#env = __GLX_VENDOR_LIBRARY_NAME,nvidia
env = LIBVA_DRIVER_NAME,nvidia env = LIBVA_DRIVER_NAME,nvidia
env = XDG_SESSION_TYPE,wayland
env = GBM_BACKEND,nvidia-drm
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
#env = WLR_NO_HARDWARE_CURSORS,1
#env = __GL_VRR_ALLOWED,1 #env = __GL_VRR_ALLOWED,1
env = __GL_GSYNC_ALLOWED,1 #env = __GL_GSYNC_ALLOWED,1
env = WLR_NO_HARDWARE_CURSORS,1
#env = WLR_DRM_NO_ATOMIC,1 #env = WLR_DRM_NO_ATOMIC,1
#env = ELECTRON_OZONE_PLATFORM_HINT,auto
env = XDG_CURRENT_DESKTOP,Hyprland
env = XDG_SESSION_DESKTOP,Hyprland
#env = QT_QPA_PLATFORM,wayland;xcb
#env = QT_STYLE_OVERRIDE,kvantum
#env = QT_QPA_PLATFORMTHEME,qt5ct
#env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
#env = QT_AUTO_SCREEN_SCALE_FACTOR,1
env = MOZ_ENABLE_WAYLAND,1

15
hypr/scripts/xrandr.sh Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
# Custom resolution through xrandr
xrandr --newmode "2560x1080" 677.75 2560 2784 3064 3568 1080 1083 1093 1188 -hsync +vsync
xrandr --addmode DP-3 2560x1080
# 3200x900 suggestion
xrandr --newmode "3200x900" 704.50 3200 3472 3824 4448 900 903 913 991 -hsync +vsync
xrandr --addmode DP-3 3200x900
# 3200x1100 suggestion
xrandr --newmode "3200x1100" 863.75 3200 3480 3832 4464 1100 1103 1113 1210 -hsync +vsync
xrandr --addmode DP-3 3200x1100
sleep 2 && xrandr --output DP-3 --primary # Set primary monitor for xwayland

View File

@ -1,28 +1,18 @@
# Cursor
exec = hyprctl setcursor Catppuccin-Mocha-Lavender 24
exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
exec = gsettings set org.gnome.desktop.interface cursor-size 24
# Font
exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
# Theme
exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-dracula'
exec = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha' exec = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha'
exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
layerrule = blur,waybar layerrule = blur,waybar
layerrule = ignorezero, waybar
# Catppuccin colorscheme
# Window Customization
source = ~/.config/hypr/mocha.conf source = ~/.config/hypr/mocha.conf
# Hyprcursor
env = HYPRCURSOR_THEME, rose-pine-hyprcursor
env = HYPRCURSOR_SIZE, 24
# Variables
# Hyprland options
general { general {
#gaps_in = 15 #gaps_in = 15
#gaps_out = 40, 160, 40, 160 #gaps_out = 40, 160, 40, 160
@ -35,6 +25,7 @@ general {
layout = dwindle layout = dwindle
resize_on_border = false resize_on_border = false
cursor_inactive_timeout = 2 cursor_inactive_timeout = 2
no_cursor_warps = false
} }
group { group {
@ -63,6 +54,19 @@ decoration {
} }
} }
misc {
disable_hyprland_logo = true
disable_splash_rendering = true
force_default_wallpaper = 0
vrr = 2
vfr = true
}
# Animations
# Config options for Hyprland's various animations
animations { animations {
enabled = yes enabled = yes
@ -81,9 +85,5 @@ animations {
animation = workspaces, 1, 5, wind animation = workspaces, 1, 5, wind
} }
misc {
disable_hyprland_logo = true
disable_splash_rendering = true
force_default_wallpaper = 0
vrr = 1
}

View File

@ -3,7 +3,7 @@
# ▀▄▀▄▀ █ █░▀█ █▄▀ █▄█ ▀▄▀▄▀   █▀▄ █▄█ █▄▄ ██▄ ▄█ # ▀▄▀▄▀ █ █░▀█ █▄▀ █▄█ ▀▄▀▄▀   █▀▄ █▄█ █▄▄ ██▄ ▄█
# Main # Core
windowrulev2 = opacity 0.80 0.80,class:^(.*)$ windowrulev2 = opacity 0.80 0.80,class:^(.*)$
windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$ windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$
windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$ windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$
@ -13,33 +13,39 @@ windowrulev2 = float, class:^(pavucontrol)$
windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
#windowrulev2 = float, class:^(steam)$ #windowrulev2 = float, class:^(steam)$
# Main
windowrulev2 = workspace 1 silent, class:^(discord)$
windowrulev2 = workspace 1 silent, class:^(Spotify)$
windowrulev2 = workspace 2 silent, class:^(Alacritty)$
windowrulev2 = workspace 3 silent, class:^(firefox)$
windowrulev2 = workspace 4 silent, class:^(steam)$
# Development # Development
windowrulev2 = float, class:^(Unity)$ windowrulev2 = pseudo, title:^(SnakePlusPlus)$
windowrulev2 = float, title:^(SnakePlusPlus)$
windowrulev2 = center, title:^(SnakePlusPlus)$ windowrulev2 = center, title:^(SnakePlusPlus)$
windowrulev2 = opacity 0.6, title:^(SnakePlusPlus)$ windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$
windowrulev2 = float, title:^(TetrisPlusPlus)$ windowrulev2 = float, title:^(TetrisPlusPlus)$
windowrulev2 = center, title:^(TetrisPlusPlus)$ windowrulev2 = center, title:^(TetrisPlusPlus)$
windowrulev2 = float, title:^(wifiLogger)$
windowrulev2 = center, title:^(wifiLogger)$
# Games # Games
# 16:9 windowed - 1920 1080
# 21:9 windowed - 2560 1080
# 32:9 windowed - 3200 900
# Theoretical mix - 3200 1100
windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$ windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$
windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$ windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$
windowrulev2 = size 825 520, class:^(net-runelite-client-RuneLite)$ windowrulev2 = size 825 520, class:^(net-runelite-client-RuneLite)$
windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$ windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$
windowrulev2 = pseudo, class:^(Minecraft.*)$ windowrulev2 = pseudo, class:^(Minecraft.*)$
windowrulev2 = size 2560 1080, class:^(Minecraft.*)$ windowrulev2 = size 3200 900, class:^(Minecraft.*)$
windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$ windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_app_.*)$
windowrulev2 = pseudo, class:^(steam_app_.*)$ windowrulev2 = pseudo, class:^(steam_app_.*)$
windowrulev2 = size 2560 1080, class:^(steam_app_.*)$ windowrulev2 = size 3200 900, class:^(steam_app_.*)$
windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$ windowrulev2 = opacity 1.00 override 1.00 override, class:^(steam_proton)$
windowrulev2 = pseudo, class:^(steam_proton)$ windowrulev2 = pseudo, class:^(steam_proton)$
windowrulev2 = size 2560 1080, class:^(steam_proton)$ windowrulev2 = size 3200 900, class:^(steam_proton)$
windowrulev2 = opacity 1.00 override 1.00 override, class:^(hl2_linux)$
# xwaylandvideobridge windowrulev2 = workspace 4 silent, class:^(Minecraft.*)$
windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ windowrulev2 = workspace 4 silent, class:^(steam_app_.*)$
windowrulev2 = noanim,class:^(xwaylandvideobridge)$ windowrulev2 = workspace 4 silent, class:^(steam_proton)$
windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ windowrulev2 = workspace 4 silent, class:^(hl2_linux)$
windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
windowrulev2 = noblur,class:^(xwaylandvideobridge)$

View File

@ -7,8 +7,8 @@
"spacing": 0, "spacing": 0,
"output": "DP-3", "output": "DP-3",
"reload_style_on_change": true, "reload_style_on_change": true,
"margin-left": 0, "margin-left": 440,
"margin-right": 0, "margin-right": 440,
"margin-top": 0, "margin-top": 0,
"margin-bottom": 0, "margin-bottom": 0,
"modules-left": [ "modules-left": [

View File

@ -10,23 +10,20 @@
} }
window#waybar { window#waybar {
background: alpha(@mantle, 0.7); background: transparent;
border-radius: 0px; border-radius: 0px;
} }
window#waybar.hidden {
opacity: 0.2;
}
#workspaces button { #workspaces button {
color: @peach; color: @peach;
transition: all 0.1s ease; margin: 1px;
border-radius: 10px;
transition: all 0.4s ease;
} }
#workspaces button.active { #workspaces button.active {
background-color: alpha(@peach, 0.2); background-color: alpha(@peach, 0.2);
border-radius: 2px; transition: all 0.4s ease;
transition: all 0.1s ease;
} }
.modules-left, .modules-left,
@ -56,7 +53,7 @@ window#waybar.hidden {
#custom-gpu, #custom-gpu,
#custom-poweroff, #custom-poweroff,
#custom-weather { #custom-weather {
background-color: @base; background-color: alpha(@base, 0.5);
border-radius: 10px; border-radius: 10px;
border: 1px solid @overlay0; border: 1px solid @overlay0;
margin-left: 6px; margin-left: 6px;