From 82895847fb03b521b87280bdef19fc5d4018cf50 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Sun, 1 Dec 2024 18:51:23 +0100 Subject: [PATCH] Updated scripts --- config/hypr/hyprland.conf | 164 ++++++++++++++------------------------ config/kitty/kitty.conf | 4 +- config/waybar/config | 3 +- update_arch.sh | 7 +- 4 files changed, 70 insertions(+), 108 deletions(-) diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 9638448..9339ba5 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -1,111 +1,59 @@ - -# ####################################################################################### -# AUTOGENERATED HYPR CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, -# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -# ####################################################################################### - - -# This is an example Hyprland config file. -# Refer to the wiki for more information. -# https://wiki.hyprland.org/Configuring/ - -# Please note not all available settings / options are set here. -# For a full list, see the wiki - -# You can split this configuration into multiple files -# Create your files separately and then link them to this file like this: -# source = ~/.config/hypr/myColors.conf - - ################ ### MONITORS ### ################ - -# See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,preferred,auto,auto - ################### ### MY PROGRAMS ### ################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ - -# Set programs that you use $terminal = kitty $fileManager = dolphin $browser = brave $menu = rofi -show drun - ################# ### AUTOSTART ### ################# - -# Autostart necessary processes (like notifications daemons, status bars, etc.) -# Or execute your favorite apps at launch like this: exec = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" # for GTK3 apps exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" # for GTK4 apps exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = waybar exec-once = hypridle -# exec-once = nm-applet & - +exec-once = /usr/local/bin/pypr --debug /tmp/pypr.log exec-once = [workspace 1 silent] $terminal exec-once = [workspace 2 silent] $browser -# exec-once = [workspace 3 silent] flatpak run com.moonlight_stream.Moonlight -exec-once = [workspace special:magic silent] kitty - ############################# ### ENVIRONMENT VARIABLES ### ############################# - -# See https://wiki.hyprland.org/Configuring/Environment-variables/ - env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 env = QT_QPA_PLATFORM,wayland env = QT_QPA_PLATFORMTHEME,qt5ct # for Qt apps - ##################### ### LOOK AND FEEL ### ##################### - -# Refer to https://wiki.hyprland.org/Configuring/Variables/ - -# https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 2 - gaps_out = 0 - + gaps_in = 5 + gaps_out = 5 border_size = 2 - - # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(333333ff) - col.inactive_border = rgba(555555ff) - - # Set to true enable resizing windows by clicking and dragging on borders and gaps + col.inactive_border = rgba(333333ff) + col.active_border = rgba(555555ff) resize_on_border = false - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on allow_tearing = false - layout = dwindle } -# https://wiki.hyprland.org/Configuring/Variables/#decoration decoration { - rounding = 0 - - # Change transparency of focused and unfocused windows + rounding = 5 active_opacity = 1.0 inactive_opacity = 1.0 - + dim_special = 0.7 + dim_around = 0.7 + shadow { enabled = true range = 4 @@ -113,22 +61,19 @@ decoration { color = rgba(1a1a1aee) } - # https://wiki.hyprland.org/Configuring/Variables/#blur blur { enabled = false size = 3 passes = 1 - + special = true vibrancy = 0.1696 + popups = false } } -# https://wiki.hyprland.org/Configuring/Variables/#animations animations { enabled = yes, please :) - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - bezier = easeOutQuint,0.23,1,0.32,1 bezier = easeInOutCubic,0.65,0.05,0.36,1 bezier = linear,0,0,1,1 @@ -153,40 +98,32 @@ animations { animation = workspacesOut, 1, 1.94, almostLinear, fade } -# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ -# "Smart gaps" / "No gaps when only" -# uncomment all if you wish to use that. -# workspace = w[tv1], gapsout:0, gapsin:0 -# workspace = f[1], gapsout:0, gapsin:0 -# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] -# windowrulev2 = rounding 0, floating:0, onworkspace:f[1] - -# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more dwindle { pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true # You probably want this } -# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more master { new_status = slave mfact = 0.5 } -# https://wiki.hyprland.org/Configuring/Variables/#misc misc { force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( + disable_splash_rendering = true + mouse_move_enables_dpms = true + vfr = true + vrr = 0 + animate_manual_resizes = true + mouse_move_focuses_monitor = true + enable_swallow = true + swallow_regex = ^(wezterm)$ } - ############# ### INPUT ### ############# - -# https://wiki.hyprland.org/Configuring/Variables/#input input { kb_layout = se kb_variant = @@ -203,34 +140,29 @@ input { } } -# https://wiki.hyprland.org/Configuring/Variables/#gestures gestures { workspace_swipe = false } -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more device { name = epic-mouse-v1 sensitivity = -0.5 } - ################### ### KEYBINDINGS ### ################### +$mainMod = SHIFT ALT -# See https://wiki.hyprland.org/Configuring/Keywords/ -$mainMod = SHIFT ALT # Sets "Windows" key as main modifier - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, Q, exec, wlogout -bind = $mainMod, T, exec, $terminal +bind = $mainMod, T, exec, [float] $terminal +bind = $mainMod, X, fullscreen bind = $mainMod, C, killactive, bind = $mainMod, M, exit, -bind = $mainMod, E, exec, $fileManager +bind = $mainMod, G, exec, flatpak run com.moonlight_stream.Moonlight bind = $mainMod, F, togglefloating, bind = $mainMod, D, exec, $menu +bind = $mainMod, Z, exec, [float] kitty -e fzfmenu bind = ALT, Tab, workspace, m+1 bind = ALT SHIFT, Tab, workspace, m-1 @@ -265,8 +197,7 @@ bind = $mainMod SUPER, 9, movetoworkspace, 9 bind = $mainMod SUPER, 0, movetoworkspace, 10 # Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SUPER, S, movetoworkspace, special:magic +bind = $mainMod, S, togglespecialworkspace, scratchpad # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 @@ -293,22 +224,47 @@ bindl = , XF86AudioPrev, exec, playerctl previous ############################## ### WINDOWS AND WORKSPACES ### ############################## +# "Smart gaps" / "No gaps when only" +workspace = w[tv1], gapsout:0, gapsin:0 +workspace = f[1], gapsout:0, gapsin:0 +windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] +windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] +windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] +windowrulev2 = rounding 0, floating:0, onworkspace:f[1] -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules +# Scratchpad +windowrulev2 = float, onworkspace:special:scratchpad +windowrulev2 = size 80% 80%, onworkspace:special:scratchpad +workspace = special:scratchpad, on-created-empty:kitty -# Example windowrule v1 -# windowrule = float, ^(kitty)$ +# Floating windows +windowrulev2 = float, title:^(volume control)$ +windowrulev2 = dimaround, title:^(Volume Control)$ +windowrulev2 = float, title:^(Helvum - Pipewire Patchbay)$ +windowrulev2 = dimaround, title:^(Helvum - Pipewire Patchbay)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -windowrulev2 = float,title:^(Volume Control)$ -windowrulev2 = float,title:^(Helvum - Pipewire Patchbay)$ -# windowrulev2 = float,class:(com.moonlight_stream.moonlight),title:(moonlight) -# windowrulev2 = tile,class:(com.moonlight_stream.moonlight),title:(moonlight) +# Discord/Moonlight PiP +windowrulev2 = opacity 1.0 0.7, class:^(.*Brave.*)$, floating:1 +windowrulev2 = size 450 253, class:^(.*Brave.*)$, floating:1 +windowrulev2 = move 100%-w-20 50+w+20, class:^(.*Brave.*)$, floating:1 +windowrulev2 = workspace 3, class:^(.*Brave.*)$, floating:1 +windowrulev2 = opacity 1.0 0.7, initialTitle:^(Discord Popout)$ +windowrulev2 = float, initialTitle:^(Discord Popout)$ +windowrulev2 = size 450 253, initialTitle:^(Discord Popout)$ +windowrulev2 = move 100%-w-20 50, initialTitle:^(Discord Popout)$ +windowrulev2 = workspace 3, initialTitle:^(Discord Popout)$ + +#Misc +layerrule = dimaround, rofi + +# Workspace definitions +windowrulev2 = workspace 3, class:^(.*moonlight.*)$ +windowrulev2 = workspace 2, initialTitle:^(vesktop)$ +windowrulev2 = size 1064 712, initialTitle:^(vesktop)$ # Ignore maximize requests from apps. You'll probably like this. windowrulev2 = suppressevent maximize, class:.* # Fix some dragging issues with XWayland windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 + diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 8e968ed..4115d5a 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -771,7 +771,7 @@ copy_on_select no #: Terminal bell {{{ -# enable_audio_bell yes +enable_audio_bell no #: The audio bell. Useful to disable it in environments that require #: silence. @@ -1026,7 +1026,7 @@ enabled_layouts Tall #: insensitive, from the set 0-9A-Z\-=[];',./\\`. Specify your #: preference as a string of characters. -# confirm_os_window_close -1 +confirm_os_window_close -1 #: Ask for confirmation when closing an OS window or a tab with at #: least this number of kitty windows in it by window manager (e.g. diff --git a/config/waybar/config b/config/waybar/config index 687eb3d..e288629 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -20,6 +20,7 @@ "modules-left": [ "hyprland/workspaces", + "hyprland/window", ], "modules-center": [ "clock", @@ -63,7 +64,7 @@ "cpu": { "interval": 5, - "format": "CPU:{usage:02}%", + "format": "CPU:{usage:02}% {avg_frequency}Ghz", "states": { "warning": 70, "critical": 90 diff --git a/update_arch.sh b/update_arch.sh index 6e08339..343137c 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -68,7 +68,8 @@ ln -sf ~/code_server/gitconfig ~/.gitconfig # Install hyprland printf -- '\033[33m Installing hyprland\n\033[37m' -sudo pacman --noconfirm --needed -S plymouth dracut dunst hypridle hyprland hyprlock polkit-gnome xorg-xhost gnome-keyring qt5ct qt6ct gnome-themes-extra qt5-wayland qt6-wayland lxappearance +sudo pacman --noconfirm --needed -S plymouth dracut dunst hypridle hyprland hyprlock xdg-desktop-portal-hyprland polkit-gnome xorg-xhost gnome-keyring qt5ct qt6ct gnome-themes-extra qt5-wayland qt6-wayland lxappearance + yay --noconfirm -S --needed --aur adwaita-qt5-git yay --noconfirm -S --needed --aur adwaita-qt6-git yay --noconfirm -S --needed --aur wlogout @@ -281,6 +282,10 @@ printf -- '\033[33m Installing starship\n\033[37m' cargo install starship --locked ln -sf ~/code_server/config/starship.toml ~/.config/starship.toml +# Install Discord (Vesktop) +printf -- '\033[33m Installing Discord (Vesktop)\n\033[37m' +flatpak install -y flathub dev.vencord.Vesktop + # Install Krita printf -- '\033[33m Installing Krita\n\033[37m' flatpak install -y flathub org.kde.krita