From 98057ae01ec59127b64bae17a712c5326a639595 Mon Sep 17 00:00:00 2001 From: Hannes Date: Tue, 9 Jun 2026 19:48:10 +0200 Subject: [PATCH] refactor --- .gitignore | 3 +- config/autostart.conf | 42 -------------------- config/bind.conf | 53 ------------------------- config/monitor.conf | 55 +------------------------- config/theme.conf | 23 +---------- config/workspaces.conf | 65 ------------------------------- hyprland.conf | 19 ++------- hyprlock.conf.example | 67 -------------------------------- hyprpaper.conf.example | 5 --- install.sh | 46 +++++++++++++++++++++- scripts/autostart/floorp.sh | 41 ------------------- scripts/autostart/keepass.sh | 41 ------------------- user_config/monitor.conf.example | 23 ----------- 13 files changed, 51 insertions(+), 432 deletions(-) delete mode 100755 config/autostart.conf delete mode 100755 config/workspaces.conf delete mode 100755 hyprlock.conf.example delete mode 100755 hyprpaper.conf.example delete mode 100755 scripts/autostart/floorp.sh delete mode 100755 scripts/autostart/keepass.sh delete mode 100644 user_config/monitor.conf.example diff --git a/.gitignore b/.gitignore index de37d6d..2f176a8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.log hyprlock.conf hyprpaper.conf -user_config/monitor.conf \ No newline at end of file +user_config/* +config/autostart.conf \ No newline at end of file diff --git a/config/autostart.conf b/config/autostart.conf deleted file mode 100755 index 09aaf3e..0000000 --- a/config/autostart.conf +++ /dev/null @@ -1,42 +0,0 @@ -# Needs To start first -exec-once = tmux new-session -d -s qs 'sleep 2 && quickshell' -exec-once = hypridle -exec-once = hyprpaper -# now via: -exec-once = bash -c 'sleep 2 && ~/.config/hypr/scripts/wallpapers/random_wallpaper.sh > ~/.config/hypr/scripts/wallpapers/random_wallpaper.log' -exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' -exec-once = tmux new-session -d -s keyring '/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg' -# exec-once = sleep 1 && ~/.config/hypr/scripts/wallpapers/wallpaper.sh -# exec-once = ~/.config/hypr/scripts/goxlr/goxlr-start.sh -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = systemctl --user start hyprpolkitagent -# exec-once = tmux new-session -d -s carla 'carla -n /home/honney/Downloads/test.carxp' -# exec-once = udiskie -t -# exec-once = tmux new-session -d -s fah 'cd ~/.local/share/fah && fah-client' -exec-once = tmux new-session -d -s ollama '/usr/bin/ollama serve' -exec-once = tmux new-session -d -s ydotool 'ydotoold' -exec-once = sleep 2 && hyprctl reload - - -# Monitor LT -exec-once = discord -exec-once = nextcloud -exec-once = bash -c '~/.config/hypr/scripts/autostart/keepass.sh > ~/.config/hypr/scripts/autostart/keepass.log' - - -# Monitor RT -exec-once = bash -c '~/.config/hypr/scripts/autostart/floorp.sh > ~/.config/hypr/scripts/autostart/floorp.log' -# exec-once = librewolf -# exec-once = thunderbird -# exec-once = alacritty -e /usr/bin/ollama serve - -# Monitor LB - -# Monitor RB - - -# Reset to default workspaces -exec-once = sleep 3 && hyprctl dispatch workspace 4 -exec-once = sleep 3 && hyprctl dispatch workspace 3 -exec-once = sleep 3 && hyprctl dispatch workspace 2 -exec-once = sleep 3 && hyprctl dispatch workspace 1 diff --git a/config/bind.conf b/config/bind.conf index 26745a9..3a52876 100755 --- a/config/bind.conf +++ b/config/bind.conf @@ -1,5 +1,4 @@ # -- keybinds -- - $mod = SUPER bind = $mod, RETURN, exec, $terminal @@ -11,31 +10,12 @@ bind = $mod, D, exec, $menu # "Apps" bind = $mod SHIFT, D, pseudo, # dwindle # bind = $mod, J, togglesplit, # dwindle -#waybar -bind = $mod SHIFT, B, exec, ~/.config/waybar/launch.sh -bind = $mod, B, exec, killall -SIGUSR1 waybar - -# wallpaper/swww -# bind = $mod SHIFT, W, exec, ~/.config/hypr/scripts/wallpapers/wallpaper.sh - -# quickshell -bind = $mod SHIFT, W, global, quickshell:Wallpaper -bind = $mod SHIFT, J, global, quickshell:JLearner -bind = $mod SHIFT, L, global, quickshell:WLogout -bind = , Esc, global, quickshell:Closer - -# wlogout -bind = $mod, M, exec, wlogout -b 2 - # file manager bind = $mod, E, exec, $fileManager # hyprlock bind = $mod, L, exec, hyprlock -# hyprpaper -bind = $mod SHIFT, H, exec, hyprpaper - # switch workspaces bind = $mod, 1, workspace, 1 bind = $mod, 2, workspace, 2 @@ -95,40 +75,7 @@ bind = $mod ALT, P, exec, ~/.config/hypr/scripts/screenshot/screenshot_monitor.s bind = $mod SHIFT, P, exec, ~/.config/hypr/scripts/screenshot/screenshot_area.sh bind = $mod SHIFT, S, exec, ~/.config/hypr/scripts/screenshot/screenshot_area_2.sh -# Umlaute / German compatability on english Keyboard -bind = $mod, a, exec, bash -c 'wtype "ä"; xdotool type "ä"' -bind = $mod SHIFT, a, exec, wtype "Ä" -bind = $mod, o, exec, wtype "ö" -bind = $mod SHIFT, o, exec, wtype "Ö" -bind = $mod, u, exec, wtype "ü" -bind = $mod SHIFT, u, exec, wtype "Ü" -bind = $mod, s, exec, wtype "ß" -bind = $mod SHIFT, e, exec, wtype "€" - -# Makro Pad -bind = $mod SHIFT CTRL, F1, exec, ~/.config/hypr/scripts/makropad/button01.sh -bind = $mod SHIFT CTRL, F2, exec, ~/.config/hypr/scripts/makropad/button02.sh -bind = $mod SHIFT CTRL, F3, exec, ~/.config/hypr/scripts/makropad/button03.sh -bind = $mod SHIFT CTRL, F4, exec, ~/.config/hypr/scripts/makropad/button04.sh -bind = $mod SHIFT CTRL, F5, exec, ~/.config/hypr/scripts/makropad/button05.sh -bind = $mod SHIFT CTRL, F6, exec, ~/.config/hypr/scripts/makropad/button06.sh -bind = $mod SHIFT CTRL, F7, exec, ~/.config/hypr/scripts/makropad/button07.sh -bind = $mod SHIFT CTRL, F8, exec, ~/.config/hypr/scripts/makropad/button08.sh -bind = $mod SHIFT CTRL, F9, exec, ~/.config/hypr/scripts/makropad/button09.sh -bind = $mod SHIFT CTRL, F10, exec, ~/.config/hypr/scripts/makropad/button10.sh -bind = $mod SHIFT CTRL, F11, exec, ~/.config/hypr/scripts/makropad/button11.sh -bind = $mod SHIFT CTRL, F12, exec, ~/.config/hypr/scripts/makropad/button12.sh - -# Auto Type -bind = ALT, T, exec, ~/.config/hypr/scripts/writing/todo.sh -bind = ALT, Y, exec, ~/.config/hypr/scripts/writing/tmdb.sh - -# Opening Additional Apps -bind = $mod SHIFT, C, exec, code -bind = $mod SHIFT, V, exec, vscodium - # Scrolling - bind = $mod CTRL, left, layoutmsg, focus l bind = $mod CTRL, right, layoutmsg, focus r bind = $mod CTRL SHIFT, left, layoutmsg, swapcol l diff --git a/config/monitor.conf b/config/monitor.conf index 16a53e0..4d6caf9 100644 --- a/config/monitor.conf +++ b/config/monitor.conf @@ -9,57 +9,4 @@ misc { render { cm_auto_hdr = 1 # 0: off, 1: on, 2: edid -} - -monitorv2 { - output = desc:ASUSTek COMPUTER INC PA279CRV S5LMSB007609 - mode = 3840x2160@60 - position = -3840x0 - scale = 1 - bitdepth = 10 - supports_hdr = 1 - transform = 0 - supports_wide_color = 1 - sdr_min_luminance = 1000 - sdr_max_luminance = 400 -} - -monitorv2 { - output = desc:BNQ BenQ EX2710U Y8P00876019 - mode = 3840x2160@144 - position = 0x0 - scale = 1 - bitdepth = 10 - supports_hdr = 1 - transform = 0 - supports_wide_color = 1 - sdr_min_luminance = 1000 - sdr_max_luminance = 400 -} - -monitor = desc:LG Electronics LG ULTRAFINE 503NTKF3L437, 3840x2160@60, 0x-2160, 1, transform, 2, bitdepth, 10, cm, wide - -monitor = desc:LG Electronics LG ULTRAGEAR 107MAKR2RE65, 1920x1080@144, -1920x-1080, 1, transform, 2 -# monitor = desc:LG Electronics LG ULTRAGEAR 107MAKR2RE65, 3840x2160@60, -3840x-2160, 1, transform, 2 - -monitor = desc:Dell Inc. DELL P2419H D4CN3Q2, 1920x1080@60, -1920x-2160, 1 - -monitor = desc:BOE 0x08A8, 1920x1080@60, 0x0, 1 - -# Workspaces on Monitor 1 -workspace = 1, monitor:desc:BOE 0x08A8 - -# Workspaces on Monitor 2 -# workspace = 2, monitor:desc:ASUSTek COMPUTER INC PA279CRV S5LMSB007609, layout:scrolling, layoutopt:direction:right -# workspace = 200, monitor:desc:ASUSTek COMPUTER INC PA279CRV S5LMSB007609 - -# Workspaces on Monitor 3 -# workspace = 3, monitor:desc:LG Electronics LG ULTRAFINE 503NTKF3L437 -# workspace = 300, monitor:desc:LG Electronics LG ULTRAFINE 503NTKF3L437 -# workspace = 301, monitor:desc:LG Electronics LG ULTRAFINE 503NTKF3L437 -# workspace = 302, monitor:desc:LG Electronics LG ULTRAFINE 503NTKF3L437 - -# Workspaces on Monitor 4 -# workspace = 4, monitor:desc:LG Electronics LG ULTRAGEAR 107MAKR2RE65 -# workspace = 400, monitor:desc:LG Electronics LG ULTRAGEAR 107MAKR2RE65 -# workspace = 401, monitor:desc:LG Electronics LG ULTRAGEAR 107MAKR2RE65 +} \ No newline at end of file diff --git a/config/theme.conf b/config/theme.conf index af020ea..ce12506 100644 --- a/config/theme.conf +++ b/config/theme.conf @@ -3,10 +3,6 @@ $CURSOR_THEME = "DJ-FOX-C" $ICON_THEME = "BeautyLine-Garuda" $KVANTUM_THEME = "Catppuccin-Mocha-Blue" -# Experimental HDR (optional) -# experimental:xx_color_management_v4 = true -# debug:full_cm_proto=true - # GTK Theming env = GTK_THEME,Colloid-Dark env = GTK_ICON_THEME,BeautyLine-Garuda @@ -21,7 +17,7 @@ env = GTK_THEME_VARIANT,dark # in env.conf # Icons: -env = XDG_DATA_DIRS,/usr/local/share:/usr/share:/home/honney/.local/share:/home/honney/.icons +env = XDG_DATA_DIRS,/usr/local/share:/usr/share:~/.local/share:~/.icons env = GTK_ICON_THEME,BeautyLine-Garuda # Icons & Cursor @@ -34,9 +30,6 @@ cursor { no_hardware_cursors = true } - -# Font - # Window management general { gaps_in = 5 @@ -59,20 +52,6 @@ decoration { } } -input { - kb_layout = de - kb_variant = - kb_model = - kb_options = - kb_rules = - follow_mouse = 1 - touchpad { - natural_scroll = no - } - sensitivity = 0 # -1.0 to 1.0; 0 means no modification. - numlock_by_default = true -} - animations { enabled = yes bezier = myBezier, 0.05, 0.9, 0.1, 1.05 diff --git a/config/workspaces.conf b/config/workspaces.conf deleted file mode 100755 index fdbde6a..0000000 --- a/config/workspaces.conf +++ /dev/null @@ -1,65 +0,0 @@ -# The config for to which workspace which window goes - -### Apps windows to Workspaces -# Recommended Command: sleep 2 && hyprctl activewindow - -# windowrulev2 = workspace 5, class:^(.*python3.*)$ - -# Apps on Monitor 1 - -# Apps on Monitor 2 -#windowrule { -# name = VirtualBox -# match:class = .*VirtualBox.* -# workspace = 200 -#} - -# Apps on Monitor 3 -# windowrule { -# name = Floorp -# match:class = .*floorp.* -# workspace = 3 -# } - -#windowrule { -# name = Librewolf -# match:class = .*librewolf.* -# workspace = 300 -#} - -#windowrule { -# name = Thunderbird -# match:class = .*org.mozilla.Thunderbird.* -# workspace = 301 -#} - -#windowrule { -# name = Alacritty -# match:class = .*Alacritty.* -# workspace = 302 -#} - -# Apps on Monitor 4 -windowrule { - name = Discord - match:class = .*discord.* - workspace = 4 -} -windowrule { - name = Signal - match:class = .*Signal.* - workspace = 4 -} -windowrule { - name = Nextcloud - match:class = .*com.nextcloud.desktopclient.nextcloud.* - workspace = 400 -} -# windowrule { -# name = KeePassXC -# match:class = .*org.keepassxc.KeePassXC.* -# workspace = 401 -# } - - -#windowrulev2 = tile,xwayland:1 # Grayjay and other xWayland fix but can also break diff --git a/hyprland.conf b/hyprland.conf index 5728c43..10156d6 100755 --- a/hyprland.conf +++ b/hyprland.conf @@ -4,28 +4,15 @@ # |__|__| |_| |__| |__|__|_____|__|__|_|___|____/ # # by Bina & edited by Honney -# -- execute at launch -- -source = ~/.config/hypr/config/autostart.conf - - -# -- monitor -- -source = ~/.config/hypr/config/monitor.conf -source = ~/.config/hypr/user_config/monitor.conf - -# -- pywal colors -- -#source = ~/.config/wal/templates/colors-hyprland # -- programs -- $terminal = kitty $fileManager = nautilus# nemo # put your preffered fileManager here, choose keybind $menu = wofi --show drun, run -# -- environment variables -- -source = ~/.config/hypr/config/env.conf - -source = ~/.config/hypr/config/bind.conf -source = ~/.config/hypr/config/workspaces.conf -source = ~/.config/hypr/config/theme.conf +# including all the sub configs +source = ~/.config/hypr/config/* +source = ~/.config/hypr/user_config/* debug:disable_logs=false debug:gl_debugging=true diff --git a/hyprlock.conf.example b/hyprlock.conf.example deleted file mode 100755 index b6f8c9e..0000000 --- a/hyprlock.conf.example +++ /dev/null @@ -1,67 +0,0 @@ -general { - hide_cursor = true - no_fade_in = false - grace = 0 - disable_loading_bar = true -} - -background { - monitor = - path = ~/Pictures/Wallpapers/Static/blurred.jpg - blur_passes = 0 -} - -# -- time -- -label { - monitor = - text = cmd[update:1000] echo "$(date +"%H:%M")" - color = 0xFFceca75 - font_size = 80 - font_family = JetBrains Mono ExtraBold - position = 0, 140 - halign = center - valign = center -} - -# -- quote -- -label { - monitor = - text = - PAIN IS REAL, BUT SO IS HOPE - - color = 0xFFa5d0bb - font_size = 12 - font_family = JetBrains Mono ExtraLight - position = 0, 80 - halign = center - valign = center -} - -# -- greeting -- -label { - monitor = - text = Heya $USER :3 - color = 0xFFceca75 - font_size = 20 - font_family = JetBrains Mono Light - position = 0, 0 - halign = center - valign = center -} - -# -- password input -- -input-field { - monitor = - size = 230, 40 - outline_thickness = 0 - dots_size = 0.2 - dots_spacing = 0.4 - dots_center = true - inner_color = 0xFF4b4900 - font_color = 0xFFceca75 - fade_on_empty = false - placeholder_text = unlock the magic... - fail_color = 0xFFffb4ab - hide_input = false - position = 0, -50 - halign = center - valign = center -} diff --git a/hyprpaper.conf.example b/hyprpaper.conf.example deleted file mode 100755 index 078cfe8..0000000 --- a/hyprpaper.conf.example +++ /dev/null @@ -1,5 +0,0 @@ -wallpaper { - monitor = * - path = /home/honney/Pictures/Wallpapers/Japanes_tempel_dark.png - fit_mode = cover -} \ No newline at end of file diff --git a/install.sh b/install.sh index 2ea845a..859e8fa 100755 --- a/install.sh +++ b/install.sh @@ -5,14 +5,56 @@ if [ -e "$SCRIPT_DIR/user_config/monitor.conf" ]; then echo "User monitor.conf allready exists" else echo "Creating User monitor.conf" - cp "$SCRIPT_DIR/user_config/monitor.conf.example" "$SCRIPT_DIR/user_config/monitor.conf" + cp "$SCRIPT_DIR/examples/monitor.conf.example" "$SCRIPT_DIR/user_config/monitor.conf" +fi + +if [ -e "$SCRIPT_DIR/user_config/input.conf" ]; then + echo "User input.conf allready exists" +else + echo "Creating User input.conf" + cp "$SCRIPT_DIR/examples/input.conf.example" "$SCRIPT_DIR/user_config/input.conf" +fi + +if [ -e "$SCRIPT_DIR/user_config/workspace.conf" ]; then + echo "User workspace.conf allready exists" +else + echo "Creating User workspace.conf" + cp "$SCRIPT_DIR/examples/workspace.conf.example" "$SCRIPT_DIR/user_config/workspace.conf" +fi + +if [ -e "$SCRIPT_DIR/scripts/autostart/workspace" ]; then + echo "User workspace allready exists" +else + echo "Creating User workspace" + cp "$SCRIPT_DIR/examples/workspace.example" "$SCRIPT_DIR/scripts/autostart/workspace" +fi + +if [ -e "$SCRIPT_DIR/user_config/input.conf" ]; then + echo "User input.conf allready exists" +else + echo "Creating User input.conf" + cp "$SCRIPT_DIR/examples/input.conf.example" "$SCRIPT_DIR/user_config/input.conf" fi if [ -e "$SCRIPT_DIR/hyprlock.conf" ]; then echo "User hyprlock.conf allready exists" else echo "Creating User monitor.conf" - cp "$SCRIPT_DIR/hyprlock.conf.example" "$SCRIPT_DIR/hyprlock.conf" + cp "$SCRIPT_DIR/examples/hyprlock.conf.example" "$SCRIPT_DIR/hyprlock.conf" +fi + +if [ -e "$SCRIPT_DIR/hyprpaper.conf" ]; then + echo "User hyprpaper.conf allready exists" +else + echo "Creating User hyprpaper.conf" + cp "$SCRIPT_DIR/examples/hyprpaper.conf.example" "$SCRIPT_DIR/hyprpaper.conf" +fi + +if [ -e "$SCRIPT_DIR/config/autostart.conf" ]; then + echo "User autostart.conf allready exists" +else + echo "Creating User autostart.conf" + cp "$SCRIPT_DIR/examples/autostart.conf.example" "$SCRIPT_DIR/config/autostart.conf" fi echo "The script will now install dependencies via pacman" diff --git a/scripts/autostart/floorp.sh b/scripts/autostart/floorp.sh deleted file mode 100755 index c5d4dfb..0000000 --- a/scripts/autostart/floorp.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# Dependencies: hyprctl -# Wait until the window exists - -floorp & - -NAME="Floorp" -CLASS="floorp" -WORKSPACE=2 - -while true; do - WIN=$(hyprctl clients -j | jq -r '.[] | select(.class == "'$CLASS'") | .address') - - if [ -n "$WIN" ]; then - echo "Found window: $WIN" - break - fi - - echo "Waiting for $NAME window..." - sleep 0.5 -done - -# Move to workspace -while true; do - # Focus the window - hyprctl dispatch focuswindow address:$WIN - - sleep 0.1 - - ACTIVE=$(hyprctl activewindow -j | jq -r '.address') - - if [ "$ACTIVE" = "$WIN" ]; then - echo "Window is now focused: $WIN" - hyprctl dispatch movetoworkspace $WORKSPACE - break - fi - - echo "Waiting for focus..." - sleep $((RANDOM % 3)) -done diff --git a/scripts/autostart/keepass.sh b/scripts/autostart/keepass.sh deleted file mode 100755 index f48d9d6..0000000 --- a/scripts/autostart/keepass.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# Dependencies: hyprctl -# Wait until the window exists - -keepassxc & - -NAME="KeePassXC" -CLASS="org.keepassxc.KeePassXC" -WORKSPACE=10 - -while true; do - WIN=$(hyprctl clients -j | jq -r '.[] | select(.class == "'$CLASS'") | .address') - - if [ -n "$WIN" ]; then - echo "Found window: $WIN" - break - fi - - echo "Waiting for $NAME window..." - sleep 0.5 -done - -# Move to workspace -while true; do - # Focus the window - hyprctl dispatch focuswindow address:$WIN - - sleep 0.1 - - ACTIVE=$(hyprctl activewindow -j | jq -r '.address') - - if [ "$ACTIVE" = "$WIN" ]; then - echo "Window is now focused: $WIN" - hyprctl dispatch movetoworkspace $WORKSPACE - break - fi - - echo "Waiting for focus..." - sleep $((RANDOM % 3)) -done diff --git a/user_config/monitor.conf.example b/user_config/monitor.conf.example deleted file mode 100644 index 6cec1c1..0000000 --- a/user_config/monitor.conf.example +++ /dev/null @@ -1,23 +0,0 @@ -monitor=,preferred,auto,auto - -# Getting monitor info: -# hyprctl monitors -j -# -# -# Example: -# monitorv2 { -# output = desc:BNQ BenQ EX2710U Y8P00876019 -# mode = 3840x2160@144 -# position = 0x0 -# scale = 1 -# bitdepth = 10 -# supports_hdr = 1 -# transform = 0 -# supports_wide_color = 1 -# sdr_min_luminance = 1000 -# sdr_max_luminance = 400 -# } -# -# monitor = desc:LG Electronics LG ULTRAFINE 503NTKF3L437, 3840x2160@60, 0x-2160, 1, transform, 2, bitdepth, 10, cm, wide -# -# monitor = desc:LG Electronics LG ULTRAGEAR 107MAKR2RE65, 1920x1080@144, -1920x-1080, 1, transform, 2 \ No newline at end of file