Compare commits

..

No commits in common. "9499f164c05085a9c477d3e7497f483b9ba06bae" and "3725d5e1e34ca5ea3b87193e0095b4171905516c" have entirely different histories.

8 changed files with 15 additions and 45 deletions

View file

@ -120,9 +120,8 @@ bind = ALT, grave, changegroupactive, b
# ### SPECIAL WORKSPACE (SCRATCHPAD) ### # ### SPECIAL WORKSPACE (SCRATCHPAD) ###
# ###################################### # ######################################
bind = SUPER, grave, togglespecialworkspace,
bind = ALT, grave, movetoworkspace, special bind = ALT, grave, movetoworkspace, special
bind = SUPER SHIFT, grave, movetoworkspacesilent, special bind = SUPER, grave, togglespecialworkspace,
# ######################### # #########################
# ### MOVE WINDOW FOCUS ### # ### MOVE WINDOW FOCUS ###

View file

@ -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: def is_vanilla() -> bool:
"""Check whether this is a vanilla Python interpreter below 3.13.""" import sys
return (
not hasattr(__builtins__, "__IPYTHON__") return not hasattr(__builtins__, "__IPYTHON__") and "bpython" not in sys.argv[0]
and "bpython" not in sys.argv[0]
and sys.version_info < (3, 13)
)
def setup_history() -> None: def setup_history():
"""Read and write history from state file.""" import os
# Check PYTHON_HISTORY for future-compatibility with Python 3.13 import atexit
if history := os.environ.get("PYTHON_HISTORY"): import readline
history = Path(history) from pathlib import Path
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables if state_home := os.environ.get("XDG_STATE_HOME"):
elif state_home := os.environ.get("XDG_STATE_HOME"):
state_home = Path(state_home) state_home = Path(state_home)
else: else:
state_home = Path.home() / ".local" / "state" 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 # https://github.com/python/cpython/issues/105694
if not history.is_file(): if not history.is_file():
# breaks on macos + python3 without this. # breaks on macos + python3 without this.
readline.write_history_file(str(history)) readline.write_history_file(str(history))
readline.read_history_file(history) readline.read_history_file(str(history))
atexit.register(readline.write_history_file, history) atexit.register(readline.write_history_file, str(history))
if is_vanilla(): if is_vanilla():

View file

@ -257,7 +257,6 @@ fi
# XDG Base Directory fixes # XDG Base Directory fixes
alias nvidia-settings='nvidia-settings --config=$XDG_CONFIG_HOME/nvidia/settings' alias nvidia-settings='nvidia-settings --config=$XDG_CONFIG_HOME/nvidia/settings'
alias svn='svn --config-dir $XDG_CONFIG_HOME/subversion'
# enable color support # enable color support
if [ -x /usr/bin/dircolors ]; then if [ -x /usr/bin/dircolors ]; then

View file

@ -62,8 +62,6 @@ export ZSH_COMPDUMP="$ZSH_CACHE/zcompdump-${ZSH_VERSION:-}"
# Per-Application XDG settings # Per-Application XDG settings
export LESSHISTFILE="-" 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 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 WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
export GNUPGHOME="$XDG_DATA_HOME/gnupg" 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 PARALLEL_HOME="$XDG_CONFIG_HOME/parallel"
export RANDFILE="$XDG_CACHE_HOME/rnd" export RANDFILE="$XDG_CACHE_HOME/rnd"
export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc.py" export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc.py"
export PYTHON_HISTORY="$XDG_STATE_HOME/python_history"
export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/python" export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/python"
export PYTHONUSERBASE="$XDG_DATA_HOME/python" export PYTHONUSERBASE="$XDG_DATA_HOME/python"
export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history" 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 RYE_HOME="$XDG_CONFIG_HOME/rye"
export OMNISHARPHOME="$XDG_CONFIG_HOME"/omnisharp export OMNISHARPHOME="$XDG_CONFIG_HOME"/omnisharp
export PSQL_HISTORY="$XDG_STATE_HOME/psql_history" 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 # Theming
export GTK_THEME="Tokyonight-Dark" export GTK_THEME="Tokyonight-Dark"

View file

@ -1,13 +1,12 @@
[Unit] [Unit]
Description=Open %I eww window Description=Open %I eww window
Documentation=https://elkowar.github.io/eww/
After=graphical-session.target After=graphical-session.target
After=eww.service After=eww.service
PartOf=eww.service PartOf=eww.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStartPre=/bin/sh -c "sleep 1 && eww ping" ExecStartPre=/usr/bin/eww ping
ExecStart=/usr/bin/eww open %i ExecStart=/usr/bin/eww open %i
ExecStop=/usr/bin/eww close %i ExecStop=/usr/bin/eww close %i
RemainAfterExit=true RemainAfterExit=true

View file

@ -1,6 +1,5 @@
[Unit] [Unit]
Description=Eww daemon Description=Eww daemon
Documentation=https://elkowar.github.io/eww/
After=graphical-session.target After=graphical-session.target
After=pipewire.service After=pipewire.service
Requires=graphical-session.target Requires=graphical-session.target

View file

@ -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}}}
}}

View file

@ -24,7 +24,6 @@ mkdir -p ~/.cache/nv
cp -ra home/.config/wget ~/.config cp -ra home/.config/wget ~/.config
mkdir -p ~/.config/gtk-2.0 mkdir -p ~/.config/gtk-2.0
touch ~/.config/gtk-2.0/gtkrc 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) # DE configs (core apps/tools that make up the base graphical experience)
cp -ra home/.config/xdg-desktop-portal ~/.config cp -ra home/.config/xdg-desktop-portal ~/.config
@ -148,7 +147,7 @@ gsettings set org.gnome.desktop.interface cursor-size 24
# Services # Services
sudo systemctl enable --now seatd.service 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 "GUI Installation finished, you should now reboot and run uwsm start hyprland.desktop"
echo "" echo ""