From 713fda355e666f6fc52edcc0069fa8b4aa5f7373 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 22 Aug 2025 11:06:20 -0400 Subject: [PATCH] (mellinoe) sync --- dot_envrc | 18 ++++++++++++------ dot_profile | 2 ++ executable_dot_aliasrc | 5 ++++- private_dot_config/ghostty/config | 2 +- private_dot_config/mako/config | 2 +- private_dot_config/private_gtk-2.0/gtkrc | 18 ++++++++++++++++++ private_dot_config/sway/i3blocks.conf | 2 +- private_dot_config/sway/theme | 7 +++---- 8 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 dot_profile create mode 100644 private_dot_config/private_gtk-2.0/gtkrc diff --git a/dot_envrc b/dot_envrc index ac698e2..c12b027 100644 --- a/dot_envrc +++ b/dot_envrc @@ -62,31 +62,37 @@ export GNUPGHOME="$XDG_DATA_HOME/gnupg" # export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc #export PNPM_HOME="$XDG_DATA_HOME/pnpm" +alias adb='HOME="$XDG_DATA_HOME"/android adb' alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" +export ANDROID_USER_HOME="$XDG_DATA_HOME"/android export AWS_CONFIG_FILE="$XDG_CONFIG_HOME"/aws/config export AWS_SHARED_CREDENTIALS_FILE="$XDG_CONFIG_HOME"/aws/credentials export CARGO_HOME="$XDG_DATA_HOME/cargo" export CARGO_INSTALL_ROOT="$HOME/.local" export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker +export ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors" export GOPATH="$XDG_DATA_HOME"/go export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc +export ICEAUTHORITY="$XDG_CACHE_HOME"/ICEauthority export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME"/jupyter export LESSHISTFILE="$XDG_STATE_HOME/less/history" export MYPY_CACHE_DIR="$XDG_CACHE_HOME"/mypy +export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history export NPM_CONFIG_PREFIX="$XDG_DATA_HOME/npm-global" export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel -export RUSTUP_HOME="$XDG_DATA_HOME"/rustup -export WINEPREFIX="$XDG_DATA_HOME"/wine -export XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons -export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history export PYTHONSTARTUP="$HOME"/python/pythonrc +export RUSTUP_HOME="$XDG_DATA_HOME"/rustup +export TERMINFO="$XDG_DATA_HOME"/terminfo +export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo export TLDR_CACHE_DIR="$XDG_CACHE_HOME"/tldr -export ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors" +export WINEPREFIX="$XDG_DATA_HOME"/wine +export WORKON_HOME="$XDG_DATA_HOME/virtualenvs" export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority - +export XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons +export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java -Djavafx.cachedir=${XDG_CACHE_HOME}/openjfx" ############### # SET UP PATH # diff --git a/dot_profile b/dot_profile new file mode 100644 index 0000000..12b8405 --- /dev/null +++ b/dot_profile @@ -0,0 +1,2 @@ +. "$HOME"/.envrc +. "$HOME/.rye/env" diff --git a/executable_dot_aliasrc b/executable_dot_aliasrc index 6d3ce4c..646da95 100644 --- a/executable_dot_aliasrc +++ b/executable_dot_aliasrc @@ -37,10 +37,13 @@ load_aliases() { alias musl-go="GOBIN=$HOME/bin CGO_ENABLED=1 CC=musl-gcc go install --ldflags '-linkmode external -extldflags=-static'" # Replace df with duf - if checkCommand duf; then + if checkCommand dfrs; then alias df="dfrs" fi + if checkCommand edit; then + alias ed="edit" + fi # Replace diff with delta if checkCommand delta; then alias diff="delta" diff --git a/private_dot_config/ghostty/config b/private_dot_config/ghostty/config index 3e0c58e..ee480bf 100644 --- a/private_dot_config/ghostty/config +++ b/private_dot_config/ghostty/config @@ -5,7 +5,7 @@ window-theme = dark mouse-shift-capture = true gtk-titlebar = false gtk-wide-tabs = false -font-family = TX-02 +font-family = Berkeley Mono confirm-close-surface = false window-padding-x = 4,2 diff --git a/private_dot_config/mako/config b/private_dot_config/mako/config index 166835e..c8d181c 100644 --- a/private_dot_config/mako/config +++ b/private_dot_config/mako/config @@ -1,4 +1,4 @@ -font=TX-02, FontAwesome 11 +font=Berkeley Mono, FontAwesome 11 max-icon-size=32 height=300 width=300 diff --git a/private_dot_config/private_gtk-2.0/gtkrc b/private_dot_config/private_gtk-2.0/gtkrc new file mode 100644 index 0000000..265adc3 --- /dev/null +++ b/private_dot_config/private_gtk-2.0/gtkrc @@ -0,0 +1,18 @@ +# DO NOT EDIT! This file will be overwritten by LXAppearance. +# Any customization should be done in ~/.gtkrc-2.0.mine instead. + +include "/home/mira/.gtkrc-2.0.mine" +gtk-theme-name="adw-gtk3-dark" +gtk-icon-theme-name="Yaru-blue-dark" +gtk-font-name="Atkinson Hyperlegible 11" +gtk-cursor-theme-name="DMZ-Black" +gtk-cursor-theme-size=24 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=0 +gtk-enable-input-feedback-sounds=0 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle="hintfull" diff --git a/private_dot_config/sway/i3blocks.conf b/private_dot_config/sway/i3blocks.conf index cc55dfa..69d2deb 100644 --- a/private_dot_config/sway/i3blocks.conf +++ b/private_dot_config/sway/i3blocks.conf @@ -33,7 +33,7 @@ markup=none # The first parameter sets the step (and units to display) # The second parameter overrides the mixer selection # See the script for details. -[volume] +[volume-pipewire] interval=persist signal=1 AUDIO_HIGH_SYMBOL= diff --git a/private_dot_config/sway/theme b/private_dot_config/sway/theme index 373d3d4..41e8f59 100644 --- a/private_dot_config/sway/theme +++ b/private_dot_config/sway/theme @@ -1,6 +1,6 @@ # Colors set $fg #EBF6FF -set $bg #504573 +set $bg #74689F set $inactive #1E1B30 set $urgent #A04558 # class border backgr. text indicator child_border @@ -13,13 +13,12 @@ client.background $bg # font pango:Atkinson Hyperlegible bold 9 # font pango:FOT-UDKakugo_Large Pr6N semibold 10 -font pango:TX-02 bold 11 +font pango:Berkeley Mono Bold 11 bar { status_command i3blocks -c ~/.config/sway/i3blocks.conf # font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9 - font pango:TX-02 bold 11 - # font pango:FOT-UDKakugo_Large Pr6N semibold 10 + font pango:Berkeley Mono bold 11 #mode hide colors { background $inactive