diff --git a/home/.config/hypr/hyprland.d/keybinds.conf b/home/.config/hypr/hyprland.d/keybinds.conf index 572e375..61039bb 100644 --- a/home/.config/hypr/hyprland.d/keybinds.conf +++ b/home/.config/hypr/hyprland.d/keybinds.conf @@ -120,9 +120,8 @@ bind = ALT, grave, changegroupactive, b # ### SPECIAL WORKSPACE (SCRATCHPAD) ### # ###################################### -bind = SUPER, grave, togglespecialworkspace, bind = ALT, grave, movetoworkspace, special -bind = SUPER SHIFT, grave, movetoworkspacesilent, special +bind = SUPER, grave, togglespecialworkspace, # ######################### # ### MOVE WINDOW FOCUS ### diff --git a/home/.config/python/pythonrc.py b/home/.config/python/pythonrc.py index 3c6cf66..bf6051f 100644 --- a/home/.config/python/pythonrc.py +++ b/home/.config/python/pythonrc.py @@ -1,44 +1,29 @@ -#!/usr/bin/env python3 -# This entire thing is unnecessary post v3.13.0a3 -# https://github.com/python/cpython/issues/73965 - -import os -import sys -import atexit -import readline -from pathlib import Path - - def is_vanilla() -> bool: - """Check whether this is a vanilla Python interpreter below 3.13.""" - return ( - not hasattr(__builtins__, "__IPYTHON__") - and "bpython" not in sys.argv[0] - and sys.version_info < (3, 13) - ) + import sys + + return not hasattr(__builtins__, "__IPYTHON__") and "bpython" not in sys.argv[0] -def setup_history() -> None: - """Read and write history from state file.""" - # Check PYTHON_HISTORY for future-compatibility with Python 3.13 - if history := os.environ.get("PYTHON_HISTORY"): - history = Path(history) +def setup_history(): + import os + import atexit + import readline + from pathlib import Path - # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables - elif state_home := os.environ.get("XDG_STATE_HOME"): + if state_home := os.environ.get("XDG_STATE_HOME"): state_home = Path(state_home) else: state_home = Path.home() / ".local" / "state" - history: Path = history or state_home / "python_history" + history: Path = state_home / "python_history" # https://github.com/python/cpython/issues/105694 if not history.is_file(): # breaks on macos + python3 without this. readline.write_history_file(str(history)) - readline.read_history_file(history) - atexit.register(readline.write_history_file, history) + readline.read_history_file(str(history)) + atexit.register(readline.write_history_file, str(history)) if is_vanilla(): diff --git a/home/.config/shell/aliases b/home/.config/shell/aliases index 1873cd0..7080257 100755 --- a/home/.config/shell/aliases +++ b/home/.config/shell/aliases @@ -257,7 +257,6 @@ fi # XDG Base Directory fixes alias nvidia-settings='nvidia-settings --config=$XDG_CONFIG_HOME/nvidia/settings' -alias svn='svn --config-dir $XDG_CONFIG_HOME/subversion' # enable color support if [ -x /usr/bin/dircolors ]; then diff --git a/home/.config/shell/environment b/home/.config/shell/environment index 158a86d..3feb330 100755 --- a/home/.config/shell/environment +++ b/home/.config/shell/environment @@ -62,8 +62,6 @@ export ZSH_COMPDUMP="$ZSH_CACHE/zcompdump-${ZSH_VERSION:-}" # Per-Application XDG settings export LESSHISTFILE="-" -export TERMINFO="$XDG_DATA_HOME"/terminfo -export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc":"$XDG_CONFIG_HOME/gtk-2.0/gtkrc.mine" export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" export GNUPGHOME="$XDG_DATA_HOME/gnupg" @@ -81,7 +79,6 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME/NuGetPackages" export PARALLEL_HOME="$XDG_CONFIG_HOME/parallel" export RANDFILE="$XDG_CACHE_HOME/rnd" export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc.py" -export PYTHON_HISTORY="$XDG_STATE_HOME/python_history" export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/python" export PYTHONUSERBASE="$XDG_DATA_HOME/python" export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history" @@ -102,9 +99,6 @@ export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" export RYE_HOME="$XDG_CONFIG_HOME/rye" export OMNISHARPHOME="$XDG_CONFIG_HOME"/omnisharp export PSQL_HISTORY="$XDG_STATE_HOME/psql_history" -export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible -export MINIKUBE_HOME="$XDG_DATA_HOME/minikube" -export LEIN_HOME="$XDG_DATA_HOME"/lein # Theming export GTK_THEME="Tokyonight-Dark" diff --git a/home/.config/systemd/user/eww-window@.service b/home/.config/systemd/user/eww-window@.service index 14c7b73..cdc12a7 100644 --- a/home/.config/systemd/user/eww-window@.service +++ b/home/.config/systemd/user/eww-window@.service @@ -1,13 +1,12 @@ [Unit] Description=Open %I eww window -Documentation=https://elkowar.github.io/eww/ After=graphical-session.target After=eww.service PartOf=eww.service [Service] Type=oneshot -ExecStartPre=/bin/sh -c "sleep 1 && eww ping" +ExecStartPre=/usr/bin/eww ping ExecStart=/usr/bin/eww open %i ExecStop=/usr/bin/eww close %i RemainAfterExit=true diff --git a/home/.config/systemd/user/eww.service b/home/.config/systemd/user/eww.service index 2908154..a9a46fb 100644 --- a/home/.config/systemd/user/eww.service +++ b/home/.config/systemd/user/eww.service @@ -1,6 +1,5 @@ [Unit] Description=Eww daemon -Documentation=https://elkowar.github.io/eww/ After=graphical-session.target After=pipewire.service Requires=graphical-session.target diff --git a/home/.local/share/lein/profiles.clj b/home/.local/share/lein/profiles.clj deleted file mode 100644 index f4633b5..0000000 --- a/home/.local/share/lein/profiles.clj +++ /dev/null @@ -1,4 +0,0 @@ -{:user {:local-repo #=(eval (str (System/getenv "XDG_CACHE_HOME") "/m2")) - :repositories {"local" {:url #=(eval (str "file://" (System/getenv "XDG_DATA_HOME") "/m2")) - :releases {:checksum :ignore}}} - }} diff --git a/install_gui.sh b/install_gui.sh index ad1e4b9..1b29a36 100755 --- a/install_gui.sh +++ b/install_gui.sh @@ -24,7 +24,6 @@ mkdir -p ~/.cache/nv cp -ra home/.config/wget ~/.config mkdir -p ~/.config/gtk-2.0 touch ~/.config/gtk-2.0/gtkrc -cp -ra home/.local/share/lein ~/.local/share # DE configs (core apps/tools that make up the base graphical experience) cp -ra home/.config/xdg-desktop-portal ~/.config @@ -148,7 +147,7 @@ gsettings set org.gnome.desktop.interface cursor-size 24 # Services sudo systemctl enable --now seatd.service -systemctl --user enable polkit-gnome-agent.service fumon.service hyprpaper.service hypridle.service hyprsunset.service elephant.service walker.service swaync.service systemd-lock-handler.service hyprlock.service swaync-inhibit-lock.service swaync-inhibit-unlock.service pcmanfm-qt.service nm-applet.service cliphist.service +systemctl --user enable polkit-gnome-agent.service fumon.service hyprpaper.service hypridle.service hyprsunset.service elephant.service walker.service swaync.service systemd-lock-handler.service hyprlock.service swaync-inhibit-lock.service swaync-inhibit-unlock.service pcmanfm-qt.service nm-applet.service echo "GUI Installation finished, you should now reboot and run uwsm start hyprland.desktop" echo ""