From 2285ecc1f97c56cc98addaf9784a874c49a69c54 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Fri, 13 Sep 2024 23:18:14 -0700 Subject: ebisu: clean-up hyprland --- .../fortune/desktop/hyprland/hyprland/default.nix | 3 --- .../desktop/hyprland/hyprland/executions.nix | 14 ------------- .../fortune/desktop/hyprland/hyprland/plugins.nix | 24 ---------------------- .../hyprland/hyprland/scripts/hycov_easymotion | 10 --------- .../hyprland/hyprland/scripts/initialise_gtk | 19 ----------------- .../hyprland/hyprland/scripts/initialise_waybar | 19 ----------------- .../hyprland/scripts/initialise_xdg_portal | 13 ------------ 7 files changed, 102 deletions(-) delete mode 100755 home/ebisu/fortune/desktop/hyprland/hyprland/scripts/hycov_easymotion delete mode 100755 home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_gtk delete mode 100755 home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_waybar delete mode 100755 home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_xdg_portal diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix index acebb6a..52b9b08 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix @@ -23,9 +23,6 @@ [ "common.sh" "fake_fullscreen_status" - # "hycov_easymotion" - "initialise_waybar" - "initialise_xdg_portal" "move_focus_to_monitor" "move_window_to_monitor" "move_window_to_workspace" diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix index 7d9e110..00f2847 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix @@ -8,7 +8,6 @@ "${pkgs.pyprland}/bin/pypr" "hyprpm reload" "swaddle" - # "${pkgs.waybar}/bin/waybar" "waybar" "hyprctl setcursor Bibata-Modern-Ice 18" "trayscale --hide-window" @@ -18,10 +17,6 @@ "fcitx5 -d --replace" "fcitx5-remote -r" - # KWallet - # "pam_kwallet_init" - # "kwalletd6" - # GNOME/Keyring "gnome-keyring-daemon --replace --components=pkcs11,secrets,ssh,gpg" @@ -30,7 +25,6 @@ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment QT_QPA_PLATFORMTHEME" - "$script_path/initialise_xdg_portal" # Clipboard "wl-paste --type text --watch cliphist store" @@ -39,13 +33,5 @@ # JamesDSP & Solaar "jamesdsp -t" # "solaar -w hide" - - # SSH - # "killall -q ssh-agent" - # "eval $(ssh-agent -c)" - # "set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK" - # "set -Ux SSH_AGENT_PID $SSH_AGENT_PID" - # "set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK" - # "export SSH_AUTH_SOCK=\"$XDG_RUNTIME_DIR/ssh-agent.socket\"" ]; } diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix index 649b698..db0c978 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix @@ -52,30 +52,6 @@ out_speed = 2; }; }; - - hycov = { - overview_gappo = 10; # gaps width from screen edge - overview_gappi = 10; # gaps width from clients - enable_hotarea = 0; # enable mouse cursor hotarea, when cursor enter hotarea, it will toggle overview - enable_click_action = 1; # enable mouse left button jump and right button kill in overview mode - hotarea_monitor = "all"; # monitor name which hotarea is in, default is all - hotarea_pos = 1; # position of hotarea (1: bottom left, 2: bottom right, 3: top left, 4: top right) - hotarea_size = 10; # hotarea size, 10x10 - swipe_fingers = 4; # finger number of gesture,move any directory - move_focus_distance = 100; # distance for movefocus,only can use 3 finger to move - enable_gesture = 0; # enable gesture - auto_exit = 1; # enable auto exit when no client in overview - auto_fullscreen = 0; # auto make active window maximize after exit overview - only_active_workspace = 0; # only overview the active workspace - only_active_monitor = 0; # only overview the active monitor - enable_alt_release_exit = 1; # alt swith mode arg,see readme for detail - alt_replace_key = "Super_L"; # alt swith mode arg,see readme for detail - alt_toggle_auto_next = 0; # auto focus next window when toggle overview in alt swith mode - click_in_cursor = 1; # when click to jump,the target windwo is find by cursor, not the current foucus window. - height_of_titlebar = 0; # height deviation of title bar height - show_special = 0; # show windwos in special workspace in overview. - raise_float_to_top = 1; # raise the window that is floating before to top after leave overview mode - }; }; }; } diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/hycov_easymotion b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/hycov_easymotion deleted file mode 100755 index ab7c3bb..0000000 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/hycov_easymotion +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env dash - -workspace_name=$(hyprctl -j activeworkspace | jq -r '.name') - -if [ "${workspace_name}" = "OVERVIEW" ]; then - hyprctl dispatch hycov:leaveoverview -else - hyprctl dispatch hycov:enteroverview - hyprctl dispatch 'easymotion action:hyprctl --batch "dispatch focuswindow address:{} ; dispatch hycov:leaveoverview"' -fi diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_gtk b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_gtk deleted file mode 100755 index 861aa12..0000000 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_gtk +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env dash - -THEME='WhiteSur-Dark' -ICONS='WhiteSur-dark' -FONT='SF Pro Text' -# CURSOR='WhiteSur-cursors' -CURSOR='Bibata-Modern-Ice' -CURSOR_SIZE='18' -SCHEMA='gsettings set org.gnome.desktop.interface' - -apply_themes() { - ${SCHEMA} gtk-theme "${THEME}" - ${SCHEMA} icon-theme "${ICONS}" - ${SCHEMA} cursor-theme "${CURSOR}" - ${SCHEMA} cursor-size "${CURSOR_SIZE}" - ${SCHEMA} font-name "${FONT}" -} - -apply_themes diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_waybar b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_waybar deleted file mode 100755 index 09f7ff9..0000000 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_waybar +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env dash - -CONFIG_FILES="${HOME}/.config/waybar/config.json ${HOME}/.config/waybar/default-modules.json ${HOME}/.config/waybar/style.css ${HOME}/.cache/wal/colors-waybar.css" - -trap "pkill -x waybar" EXIT - -\cp -r ~/.cache/wal/colors-waybar.css ~/.config/waybar/ - -while true; do - if ! pgrep -x "waybar" >/dev/null; then - waybar -c ~/.config/waybar/config.json -s ~/.config/waybar/style.css & - fi - - inotifywait -e create,modify ${CONFIG_FILES} - - pkill -x waybar - - while pgrep -x waybar >/dev/null; do sleep 0.5; done -done diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_xdg_portal b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_xdg_portal deleted file mode 100755 index 10470eb..0000000 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_xdg_portal +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env dash - -sleep 1 - -killall -e xdg-desktop-portal-hyprland -killall -e xdg-desktop-portal-wlr -killall xdg-desktop-portal - -/usr/lib/xdg-desktop-portal-hyprland & - -sleep 2 - -/usr/lib/xdg-desktop-portal & -- cgit v1.2.3