nixos fixes

master
Alex 2023-03-31 23:35:46 -05:00
parent f8ecf68699
commit 820bba9ee0
7 changed files with 21 additions and 13 deletions

View File

@ -9,7 +9,7 @@
</alias> </alias>
<alias> <alias>
<family>sans-serif</family> <family>sans-serif</family>
<prefer><family>Noto Sans</family></prefer> <prefer><family>Noto Sans Regular</family></prefer>
</alias> </alias>
<alias> <alias>
<family>sans</family> <family>sans</family>

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
img () { img () {
chafa "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g' #chafa "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
#chafa --format=symbols "$1" --size="$2"x"$3" chafa --format=symbols "$1" --size="$2"x"$3"
} }
W="$(($(tput cols)/2 - 10))" W="$(($(tput cols)/2 - 10))"

View File

@ -23,7 +23,7 @@ export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default" export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
export STACK_ROOT="$XDG_DATA_HOME"/stack export STACK_ROOT="$XDG_DATA_HOME"/stack
export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store" export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
export GNUPGHOME="$XDG_DATA_HOME/gnupg" #export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo" export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"

View File

@ -32,7 +32,15 @@ set $menu bemenu-run | xargs swaymsg exec --
#output HDMI-A-1 bg ~/.config/wall fill #output HDMI-A-1 bg ~/.config/wall fill
#output DP-1 resolution 1920x1080 position 0,0 #output DP-1 resolution 1920x1080 position 0,0
#output DP-1 bg ~/.config/wall fill #output DP-1 bg ~/.config/wall fill
output * bg ~/.config/wall fit #output * bg ~/.config/wall fit
output * bg #305767 solid_color
exec_always {
if [ -f "$HOME"/.config/wall ]; then
swaymsg "output * bg ~/.config/wall fit"
fi
}
# #

View File

@ -90,7 +90,7 @@ fi
#fi #fi
#export TERM='xterm-256color' #export TERM='xterm-256color'
[ -f "/home/alex/.ghcup/env" ] && source "/home/alex/.ghcup/env" # ghcup-env #export GPG_TTY="$(tty)"
# Load zsh-syntax-highlighting; should be last. # Load zsh-syntax-highlighting; should be last.
source $HOME/.local/share/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null source $HOME/.local/share/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null

@ -1 +1 @@
Subproject commit 46f0f439448513d79a0c83bd2a02422e468c0178 Subproject commit ec900a7324d0f19e4ee3878dd5ea3a77048a4064

View File

@ -76,9 +76,6 @@ export PATH="/opt/rocm/rocfft/bin:$PATH"
export PATH="/opt/rocm/rocfft/bin:$PATH" export PATH="/opt/rocm/rocfft/bin:$PATH"
#fix pinentry-curses on nixos
GPG_TTY=$(tty)
export GPG_TTY
#fix arduino ide issues #fix arduino ide issues
export AWT_TOOLKIT=MToolkit export AWT_TOOLKIT=MToolkit
@ -98,6 +95,9 @@ export HSA_OVERRIDE_GFX_VERSION=10.3.0
#mount /media/nagato/ & #mount /media/nagato/ &
#mount /media/bismarck & #mount /media/bismarck &
#if [ "$(tty)" = /dev/tty1 ]; then #fix pinentry-curses on nixos
# exec dbus-launch sway #export GPG_TTY="$(tty)"
#fi
if [ "$(tty)" = /dev/tty1 ]; then
exec dbus-launch sway
fi