From 12d3fdcaa5289547acea6c2c679898609f62cd1e Mon Sep 17 00:00:00 2001 From: Uyanide Date: Sat, 25 Apr 2026 20:41:31 +0200 Subject: [PATCH] update --- config-stow | 23 ------------ .../{.alt/ghostty-niri => ghostty}/.gitignore | 0 .../{.alt/ghostty-default => ghostty}/config | 5 ++- .../cursor-shaders/cursor-smear.glsl | 0 .../Catppuccin-Mocha.conf | 0 .../{.alt/kitty-default => kitty}/kitty.conf | 5 ++- config/niri/.config/niri/config/binds.kdl | 6 ++-- config/niri/.config/niri/config/execs.kdl | 3 -- config/niri/.config/niri/config/misc.kdl | 2 +- config/niri/.config/niri/config/prime.kdl | 6 +++- config/niri/.config/niri/config/rules.kdl | 2 +- config/niri/.config/niri/config/styles.kdl | 9 +++++ config/nwg-look/.config/gtk-3.0/settings.ini | 24 +++++-------- config/nwg-look/.config/gtk-4.0/settings.ini | 15 +++----- .../scripts/.local/scripts/change-colortheme | 11 +----- config/scripts/.local/snippets/set_display | 2 +- .../wlogout-default => wlogout}/apply-color | 2 +- .../icons/hibernate.svg | 0 .../wlogout-niri => wlogout}/icons/lock.svg | 0 .../wlogout-niri => wlogout}/icons/logout.svg | 0 .../wlogout-niri => wlogout}/icons/reboot.svg | 0 .../icons/shutdown.svg | 0 .../icons/suspend.svg | 0 .../{.alt/wlogout-default => wlogout}/layout | 4 +-- .../wlogout-default => wlogout}/style.css | 4 +-- legacy/scripts/.local/scripts/config-switch | 35 +++++++++++++++++++ 26 files changed, 81 insertions(+), 77 deletions(-) rename config/ghostty/.config/{.alt/ghostty-niri => ghostty}/.gitignore (100%) rename config/ghostty/.config/{.alt/ghostty-default => ghostty}/config (88%) rename config/ghostty/.config/{.alt/ghostty-niri => ghostty}/cursor-shaders/cursor-smear.glsl (100%) rename config/kitty/.config/{.alt/kitty-niri => kitty}/Catppuccin-Mocha.conf (100%) rename config/kitty/.config/{.alt/kitty-default => kitty}/kitty.conf (94%) rename config/wlogout/.config/{.alt/wlogout-default => wlogout}/apply-color (93%) rename config/wlogout/.config/{.alt/wlogout-niri => wlogout}/icons/hibernate.svg (100%) rename config/wlogout/.config/{.alt/wlogout-niri => wlogout}/icons/lock.svg (100%) rename config/wlogout/.config/{.alt/wlogout-niri => wlogout}/icons/logout.svg (100%) rename config/wlogout/.config/{.alt/wlogout-niri => wlogout}/icons/reboot.svg (100%) rename config/wlogout/.config/{.alt/wlogout-niri => wlogout}/icons/shutdown.svg (100%) rename config/wlogout/.config/{.alt/wlogout-niri => wlogout}/icons/suspend.svg (100%) rename config/wlogout/.config/{.alt/wlogout-default => wlogout}/layout (87%) rename config/wlogout/.config/{.alt/wlogout-default => wlogout}/style.css (96%) create mode 100755 legacy/scripts/.local/scripts/config-switch diff --git a/config-stow b/config-stow index a2a6b2f..1332eec 100755 --- a/config-stow +++ b/config-stow @@ -66,12 +66,6 @@ PKGS = { "niri": NIRI_PKGS, } -SESSION_NAME = { - "hyprland": "Hyprland", - "niri": "niri", - "default": "default", -} - PKGS_PATH = Path(__file__).resolve().parent.resolve() / "config" DEST_PATH = Path.home().expanduser() @@ -107,12 +101,6 @@ def unstow(pkg: str): ) -def switch(session: str): - subprocess.run( - [str(Path("~/.local/scripts/config-switch").expanduser()), session], check=True - ) - - def main(): if not check_deps(): exit(1) @@ -147,17 +135,6 @@ def main(): if is_unstow: return # No need to switch session if we're just unstowing - if args.package in SESSION_NAME: - session = SESSION_NAME[args.package] - else: - session = SESSION_NAME["default"] - - try: - switch(session) - _log("INFO", f"Switched to session profile '{session}'.") - except subprocess.CalledProcessError as e: - _log("ERROR", f"Failed to switch session profile '{session}': {e}") - if __name__ == "__main__": main() diff --git a/config/ghostty/.config/.alt/ghostty-niri/.gitignore b/config/ghostty/.config/ghostty/.gitignore similarity index 100% rename from config/ghostty/.config/.alt/ghostty-niri/.gitignore rename to config/ghostty/.config/ghostty/.gitignore diff --git a/config/ghostty/.config/.alt/ghostty-default/config b/config/ghostty/.config/ghostty/config similarity index 88% rename from config/ghostty/.config/.alt/ghostty-default/config rename to config/ghostty/.config/ghostty/config index 8da3c7c..5a3dc35 100644 --- a/config/ghostty/.config/.alt/ghostty-default/config +++ b/config/ghostty/.config/ghostty/config @@ -1,11 +1,14 @@ theme = Catppuccin Mocha -background-opacity = 0.75 +background-opacity = 0.9 background-blur = true window-padding-x = 10 window-padding-y = 10 +window-width = 100 +window-height = 36 + keybind = ctrl+shift+r=reload_config keybind = ctrl+shift+h=write_screen_file:copy diff --git a/config/ghostty/.config/.alt/ghostty-niri/cursor-shaders/cursor-smear.glsl b/config/ghostty/.config/ghostty/cursor-shaders/cursor-smear.glsl similarity index 100% rename from config/ghostty/.config/.alt/ghostty-niri/cursor-shaders/cursor-smear.glsl rename to config/ghostty/.config/ghostty/cursor-shaders/cursor-smear.glsl diff --git a/config/kitty/.config/.alt/kitty-niri/Catppuccin-Mocha.conf b/config/kitty/.config/kitty/Catppuccin-Mocha.conf similarity index 100% rename from config/kitty/.config/.alt/kitty-niri/Catppuccin-Mocha.conf rename to config/kitty/.config/kitty/Catppuccin-Mocha.conf diff --git a/config/kitty/.config/.alt/kitty-default/kitty.conf b/config/kitty/.config/kitty/kitty.conf similarity index 94% rename from config/kitty/.config/.alt/kitty-default/kitty.conf rename to config/kitty/.config/kitty/kitty.conf index 435b782..2edba92 100755 --- a/config/kitty/.config/.alt/kitty-default/kitty.conf +++ b/config/kitty/.config/kitty/kitty.conf @@ -20,7 +20,7 @@ shell /bin/zsh # hide_window_decorations yes window_padding_width 10 -background_opacity 0.75 +background_opacity 0.9 background_blur 16 font_family monospace @@ -36,6 +36,9 @@ map ctrl+down next_window cursor_trail 1 cursor_shape beam +# remember_window_size no +# initial_window_width 1021 + include Catppuccin-Mocha.conf map ctrl+plus change_font_size all +1 diff --git a/config/niri/.config/niri/config/binds.kdl b/config/niri/.config/niri/config/binds.kdl index 6cd2664..0784e39 100644 --- a/config/niri/.config/niri/config/binds.kdl +++ b/config/niri/.config/niri/config/binds.kdl @@ -45,9 +45,9 @@ binds { Mod+D repeat=false { spawn "vicinae" "vicinae://launch/system/run?toggle=true"; } // Actions - Print repeat=false { screenshot-screen; } - Mod+Shift+S repeat=false { screenshot; } - Mod+Ctrl+Shift+S repeat=false { screenshot-window; } + Print repeat=false { screenshot-screen show-pointer=false; } + Mod+Shift+S repeat=false { screenshot show-pointer=false; } + Mod+Ctrl+Shift+S repeat=false { screenshot-window show-pointer=false; } Mod+Shift+C repeat=false { spawn "hyprpicker" "-a"; } // Media diff --git a/config/niri/.config/niri/config/execs.kdl b/config/niri/.config/niri/config/execs.kdl index 47a8d32..978fa4b 100644 --- a/config/niri/.config/niri/config/execs.kdl +++ b/config/niri/.config/niri/config/execs.kdl @@ -1,6 +1,3 @@ -// Switch configs -spawn-at-startup "config-switch" "niri" - // Core spawn-at-startup "nm-applet" spawn-at-startup "gnome-keyring-daemon" "--start" "--components=secrets" diff --git a/config/niri/.config/niri/config/misc.kdl b/config/niri/.config/niri/config/misc.kdl index 395b060..7a332b3 100644 --- a/config/niri/.config/niri/config/misc.kdl +++ b/config/niri/.config/niri/config/misc.kdl @@ -1,7 +1,7 @@ screenshot-path "~/Pictures/Screenshots/niri_screenshot_%Y-%m-%d_%H-%M-%S.png" debug { - render-drm-device "/dev/dri/renderD128" + render-drm-device "/dev/dri/renderD129" honor-xdg-activation-with-invalid-serial } diff --git a/config/niri/.config/niri/config/prime.kdl b/config/niri/.config/niri/config/prime.kdl index 8b13789..d6062de 100644 --- a/config/niri/.config/niri/config/prime.kdl +++ b/config/niri/.config/niri/config/prime.kdl @@ -1 +1,5 @@ - +environment { + __NV_PRIME_RENDER_OFFLOAD "1" + __VK_LAYER_NV_optimus "NVIDIA_only" + __GLX_VENDOR_LIBRARY_NAME "nvidia" +} diff --git a/config/niri/.config/niri/config/rules.kdl b/config/niri/.config/niri/config/rules.kdl index 6f452d4..8ab453d 100644 --- a/config/niri/.config/niri/config/rules.kdl +++ b/config/niri/.config/niri/config/rules.kdl @@ -63,7 +63,7 @@ window-rule { // Block from recording window-rule { - match app-id="thunderbird" + match app-id="org.mozilla.Thunderbird" block-out-from "screen-capture" } diff --git a/config/niri/.config/niri/config/styles.kdl b/config/niri/.config/niri/config/styles.kdl index 53c3567..706c71f 100644 --- a/config/niri/.config/niri/config/styles.kdl +++ b/config/niri/.config/niri/config/styles.kdl @@ -82,6 +82,15 @@ layer-rule { } +layer-rule { + match layer="top" + match layer="overlay" + + background-effect { + xray false + } +} + cursor { xcursor-theme "Bibata-Modern-Ice" xcursor-size 24 diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index 17f5189..a2e43ec 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -1,25 +1,17 @@ [Settings] -gtk-application-prefer-dark-theme=true -gtk-button-images=true -gtk-cursor-blink=true -gtk-cursor-blink-time=1000 +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-icon-theme-name=Papirus +gtk-font-name=Sarasa UI SC 10 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 -gtk-font-name=Sarasa UI SC, 10 -gtk-icon-theme-name=Papirus -gtk-menu-images=true -gtk-modules=colorreload-gtk-module -gtk-primary-button-warps-slider=true -gtk-sound-theme-name=ocean -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-toolbar-style=3 gtk-xft-antialias=1 -gtk-xft-dpi=122880 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb +gtk-application-prefer-dark-theme=1 diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini index 4139029..af17726 100644 --- a/config/nwg-look/.config/gtk-4.0/settings.ini +++ b/config/nwg-look/.config/gtk-4.0/settings.ini @@ -1,14 +1,7 @@ [Settings] -gtk-application-prefer-dark-theme=true -gtk-cursor-blink=true -gtk-cursor-blink-time=1000 +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-icon-theme-name=Papirus +gtk-font-name=Sarasa UI SC 10 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true -gtk-font-name=Sarasa UI SC, 10 -gtk-icon-theme-name=Papirus -gtk-primary-button-warps-slider=true -gtk-sound-theme-name=ocean -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-xft-dpi=122880 +gtk-application-prefer-dark-theme=1 diff --git a/config/scripts/.local/scripts/change-colortheme b/config/scripts/.local/scripts/change-colortheme index 6322837..9dcf4e6 100755 --- a/config/scripts/.local/scripts/change-colortheme +++ b/config/scripts/.local/scripts/change-colortheme @@ -40,13 +40,9 @@ CONFIG_DIR = Path("~/.config").expanduser() # An application may have multiple scripts (e.g. due to config-switch) SCRIPTS = { - "eww": [CONFIG_DIR / "eww" / "apply-color"], "fastfetch": [CONFIG_DIR / "fastfetch" / "apply-color"], - "fuzzel": [CONFIG_DIR / "fuzzel" / "apply-color"], - "hypr": [CONFIG_DIR / "hypr" / "apply-color"], "kvantum": [CONFIG_DIR / "Kvantum" / "apply-color"], "nwg-look": [CONFIG_DIR / "nwg-look" / "apply-color"], - "mako": [CONFIG_DIR / "mako" / "apply-color"], "niri": [CONFIG_DIR / "niri" / "apply-color"], "oh-my-posh": [ CONFIG_DIR / "fish" / "apply-color-omp" @@ -55,12 +51,7 @@ SCRIPTS = { CONFIG_DIR / "fish" / "apply-color-starship" ], # borrowing fish's directory "quickshell": [CONFIG_DIR / "quickshell" / "apply-color"], - "rofi": [CONFIG_DIR / "rofi" / "apply-color"], - "waybar": [CONFIG_DIR / "waybar" / "apply-color"], - "wlogout": [ - CONFIG_DIR / ".alt" / "wlogout-default" / "apply-color", - CONFIG_DIR / ".alt" / "wlogout-niri" / "apply-color", - ], + "wlogout": [CONFIG_DIR / "wlogout" / "apply-color"], "yazi": [CONFIG_DIR / "yazi" / "apply-color"], } # or simply `find [-L] -type f -name 'apply-color*'` to get all available scripts, diff --git a/config/scripts/.local/snippets/set_display b/config/scripts/.local/snippets/set_display index 9a2ea66..a0f46de 100644 --- a/config/scripts/.local/snippets/set_display +++ b/config/scripts/.local/snippets/set_display @@ -9,7 +9,7 @@ # Constants niri_config_file="$HOME/.config/niri/config/misc.kdl" -prefer_order=(intel nvidia) +prefer_order=(nvidia intel) # Get vendor and path of each GPU default_card_path="$(find /dev/dri/card* 2>/dev/null | head -n 1)" diff --git a/config/wlogout/.config/.alt/wlogout-default/apply-color b/config/wlogout/.config/wlogout/apply-color similarity index 93% rename from config/wlogout/.config/.alt/wlogout-default/apply-color rename to config/wlogout/.config/wlogout/apply-color index 2504ad4..667d85d 100755 --- a/config/wlogout/.config/.alt/wlogout-default/apply-color +++ b/config/wlogout/.config/wlogout/apply-color @@ -21,4 +21,4 @@ sed -i -E "s/(border-color:\s*#)([0-9A-Fa-f]{6})(;)/\1${colorHex}\3/" "$file" || exit 1 } -log_success "wlogout" +log_success "wlogout (niri version)" diff --git a/config/wlogout/.config/.alt/wlogout-niri/icons/hibernate.svg b/config/wlogout/.config/wlogout/icons/hibernate.svg similarity index 100% rename from config/wlogout/.config/.alt/wlogout-niri/icons/hibernate.svg rename to config/wlogout/.config/wlogout/icons/hibernate.svg diff --git a/config/wlogout/.config/.alt/wlogout-niri/icons/lock.svg b/config/wlogout/.config/wlogout/icons/lock.svg similarity index 100% rename from config/wlogout/.config/.alt/wlogout-niri/icons/lock.svg rename to config/wlogout/.config/wlogout/icons/lock.svg diff --git a/config/wlogout/.config/.alt/wlogout-niri/icons/logout.svg b/config/wlogout/.config/wlogout/icons/logout.svg similarity index 100% rename from config/wlogout/.config/.alt/wlogout-niri/icons/logout.svg rename to config/wlogout/.config/wlogout/icons/logout.svg diff --git a/config/wlogout/.config/.alt/wlogout-niri/icons/reboot.svg b/config/wlogout/.config/wlogout/icons/reboot.svg similarity index 100% rename from config/wlogout/.config/.alt/wlogout-niri/icons/reboot.svg rename to config/wlogout/.config/wlogout/icons/reboot.svg diff --git a/config/wlogout/.config/.alt/wlogout-niri/icons/shutdown.svg b/config/wlogout/.config/wlogout/icons/shutdown.svg similarity index 100% rename from config/wlogout/.config/.alt/wlogout-niri/icons/shutdown.svg rename to config/wlogout/.config/wlogout/icons/shutdown.svg diff --git a/config/wlogout/.config/.alt/wlogout-niri/icons/suspend.svg b/config/wlogout/.config/wlogout/icons/suspend.svg similarity index 100% rename from config/wlogout/.config/.alt/wlogout-niri/icons/suspend.svg rename to config/wlogout/.config/wlogout/icons/suspend.svg diff --git a/config/wlogout/.config/.alt/wlogout-default/layout b/config/wlogout/.config/wlogout/layout similarity index 87% rename from config/wlogout/.config/.alt/wlogout-default/layout rename to config/wlogout/.config/wlogout/layout index e02672c..afa51ce 100644 --- a/config/wlogout/.config/.alt/wlogout-default/layout +++ b/config/wlogout/.config/wlogout/layout @@ -1,6 +1,6 @@ { "label": "lock", - "action": "loginctl lock-session", + "action": "hyprlock &", "text": "Lock", "keybind": "l" } @@ -12,7 +12,7 @@ } { "label": "logout", - "action": "hyprctl dispatch exit", + "action": "niri msg action quit", "text": "Logout", "keybind": "e" } diff --git a/config/wlogout/.config/.alt/wlogout-default/style.css b/config/wlogout/.config/wlogout/style.css similarity index 96% rename from config/wlogout/.config/.alt/wlogout-default/style.css rename to config/wlogout/.config/wlogout/style.css index 6f4c952..0023c9d 100644 --- a/config/wlogout/.config/.alt/wlogout-default/style.css +++ b/config/wlogout/.config/wlogout/style.css @@ -12,7 +12,7 @@ button { color: #cdd6f4; border-radius: 0; outline-style: none; - background-color: alpha(#1e1e2e, 0.8); + background-color: alpha(#1e1e2e, 1); border: none; border-width: 0px; border-radius: 0px; @@ -30,7 +30,7 @@ button:focus, button:active, button:hover { background-size: 20%; - background-color: alpha(#1e1e2e, 0.7); + background-color: alpha(#1c1c2c, 1); animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(0.55, 0, 0.28, 1.682); } diff --git a/legacy/scripts/.local/scripts/config-switch b/legacy/scripts/.local/scripts/config-switch new file mode 100755 index 0000000..5a50211 --- /dev/null +++ b/legacy/scripts/.local/scripts/config-switch @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +set -euo pipefail + +# Description: +# Updates configurations of several apps according to the current (or given as parameter) desktop environment. + +desktop=${1:-${XDG_CURRENT_DESKTOP:-default}} + +alt() { + local item profile + item=$1 + profile=$2 + if [[ -e $HOME/.config/.alt/${item}-${profile} ]]; then + ln -svfT ".alt/${item}-${profile}" "$HOME/.config/$item" + elif [[ -e $HOME/.config/.alt/${item}-default ]]; then + ln -svfT ".alt/${item}-default" "$HOME/.config/$item" + fi +} + +for item in "kitty" "wlogout" "ghostty"; do + if [[ ! -L $HOME/.config/$item ]] && [[ -e $HOME/.config/$item ]]; then + echo "Error: $HOME/.config/$item exists and is not a symlink." >&2 + exit 1 + fi + + case "$desktop" in + niri | GNOME) + alt "$item" niri + ;; + *) + alt "$item" default + ;; + esac +done