From 820bba9ee0f7a2da22b26bab15017ad33a831ab0 Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Fri, 31 Mar 2023 23:35:46 -0500
Subject: [PATCH] nixos fixes

---
 .config/fontconfig/fonts.conf |  2 +-
 .config/lf/pv.sh              |  4 ++--
 .config/shell/cleanup.sh      |  2 +-
 .config/sway/config           | 10 +++++++++-
 .config/zsh/.zshrc            |  2 +-
 .local/scripts                |  2 +-
 .profile                      | 12 ++++++------
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index 727680a..f6cd9cf 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -9,7 +9,7 @@
   </alias>
   <alias>
     <family>sans-serif</family>
-    <prefer><family>Noto Sans</family></prefer>
+    <prefer><family>Noto Sans Regular</family></prefer>
   </alias>
   <alias>
     <family>sans</family>
diff --git a/.config/lf/pv.sh b/.config/lf/pv.sh
index 4c4e360..9450493 100755
--- a/.config/lf/pv.sh
+++ b/.config/lf/pv.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 img () {
-    chafa  "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
-    #chafa --format=symbols  "$1" --size="$2"x"$3"
+    #chafa  "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
+    chafa --format=symbols  "$1" --size="$2"x"$3"
 }
 
 W="$(($(tput cols)/2 - 10))"
diff --git a/.config/shell/cleanup.sh b/.config/shell/cleanup.sh
index ac88e72..b373efc 100755
--- a/.config/shell/cleanup.sh
+++ b/.config/shell/cleanup.sh
@@ -23,7 +23,7 @@ export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
 export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
 export STACK_ROOT="$XDG_DATA_HOME"/stack
 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 GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
 export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
diff --git a/.config/sway/config b/.config/sway/config
index f209633..9363014 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -32,7 +32,15 @@ set $menu bemenu-run | xargs swaymsg exec --
 #output HDMI-A-1 bg ~/.config/wall fill 
 #output DP-1 resolution 1920x1080 position 0,0
 #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
+}
+
 
 
 #
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 3c0c38f..1fd6fa0 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -90,7 +90,7 @@ fi
 #fi
 
 #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.
 source $HOME/.local/share/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
diff --git a/.local/scripts b/.local/scripts
index 46f0f43..ec900a7 160000
--- a/.local/scripts
+++ b/.local/scripts
@@ -1 +1 @@
-Subproject commit 46f0f439448513d79a0c83bd2a02422e468c0178
+Subproject commit ec900a7324d0f19e4ee3878dd5ea3a77048a4064
diff --git a/.profile b/.profile
index c050c5a..ec9e103 100644
--- a/.profile
+++ b/.profile
@@ -76,9 +76,6 @@ 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
 export AWT_TOOLKIT=MToolkit
@@ -98,6 +95,9 @@ export HSA_OVERRIDE_GFX_VERSION=10.3.0
 #mount /media/nagato/ &
 #mount /media/bismarck &
 
-#if [ "$(tty)" = /dev/tty1 ]; then
-#    exec dbus-launch sway
-#fi
+#fix pinentry-curses on nixos 
+#export GPG_TTY="$(tty)"
+
+if [ "$(tty)" = /dev/tty1 ]; then
+    exec dbus-launch sway
+fi