checkpoint

4 files changed, 19 insertions, 14 deletions

diff --git a/config/essentials/zsh/.zprofile b/config/essentials/zsh/.zprofile
deleted file mode 100755
index 9072f28..0000000
--- a/config/essentials/zsh/.zprofile
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if { [ "$TTY" = "/dev/tty1" ] || [ "$TTY" = "/dev/tty8" ]; } && [ "$(id -u)" -ne 0 ]; then
-    eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
-    exec startx > /dev/null 2>&1
-    exit
-fi
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 68aae3f..3a75873 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -1,5 +1,12 @@
 #!/bin/zsh
 
+if { [ "$TTY" = "/dev/tty1" ] || [ "$TTY" = "/dev/tty8" ]; } && [ "$(id -u)" -ne 0 ]; then
+    eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents ssh,gpg)"
+    keychain --dir "$XDG_CONFIG_HOME/keychain" --quiet --agents gpg IDENTITY #FILTERED
+    exec startx > /dev/null 2>&1
+    exit
+fi
+
 # zmodload zsh/zprof
 
 autoload -U select-word-style
diff --git a/config/home/.xprofile b/config/home/.xprofile
index f51fcad..718a319 100755
--- a/config/home/.xprofile
+++ b/config/home/.xprofile
@@ -1,3 +1,9 @@
+#!/bin/sh
+
+feh --no-fehbg --bg-scale "$HOME"/pics/wallpaper &
+
+setxkbmap us -variant colemak -option ctrl:swapcaps,menu:altwin &
+
 # TODO: check if this is home
 if [ "$(hostname)" = "winter" ]; then
     (
@@ -7,8 +13,6 @@ if [ "$(hostname)" = "winter" ]; then
 fi
 
 picom -b &
-feh --no-fehbg --bg-scale "$HOME"/pics/wallpaper &
-setxkbmap colemak -option ctrl:swapcaps,altwin:menu_win &
 
 # xautolock -locker slock &
 
@@ -20,6 +24,7 @@ slstatus &
 unclutter --timeout 3 --jitter 50 -b &
 202020 &
 
+echo 4
 if [ "$(hostname)" = "winter" ]; then
     signal-desktop &
     discord &
diff --git a/config/home/.zshenv b/config/home/.zshenv
index 4932584..4bb166c 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -1,9 +1,9 @@
 #!/bin/zsh
 
-export EDITOR="nvim"
-export VISUAL="nvim"
+export EDITOR="vis"
+export VISUAL="vis"
 
-export BROWSER="zen-browser"
+export BROWSER="firefox"
 export VIEWER="zathura"
 export PLAYER="mpv"
 export MENUCMD="dmenu"
@@ -47,7 +47,7 @@ alias irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HO
 alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 
 export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc
-export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
+export XAUTHORITY=$HOME/.Xauthority
 
 export ZDOTDIR="$XDG_CONFIG_HOME"/zsh
 export HISTFILE="$ZDOTDIR"/histfile
@@ -64,7 +64,7 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
 # export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 # export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on'
 
-export PASSWORD_STORE_DIR="$HOME"/src/password-store
+export PASSWORD_STORE_DIR="$HOME"/.password-store
 export PASSWORD_STORE_CLIP_TIME=5
 
 # old