From 465baf9b1fa0acb2cdf6dd539e15828837b16dba Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Mon, 5 Apr 2021 11:30:45 +0200
Subject: Move to nixos and zsh changes

---
 xinit/.xprofile         |  3 +--
 xinit/Scripts/xlaunchrc |  2 +-
 zsh/.zshrc              | 15 +++++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/xinit/.xprofile b/xinit/.xprofile
index 1d62f9c..d2a6731 100755
--- a/xinit/.xprofile
+++ b/xinit/.xprofile
@@ -3,7 +3,7 @@ export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.su
 export TERM=termite
 export TERMINAL=termite
 
-export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
+# export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
 
 export XKB_DEFAULT_LAYOUT=us
 export XKB_DEFAULT_VARIANT=altgr-intl
@@ -11,4 +11,3 @@ export XKB_DEFAULT_VARIANT=altgr-intl
 export LOPTS="screensaver composer gnome-keyring"
 export MOZ_X11_EGL=1
 export MOZ_WEBRENDER=1
-source $HOME/Scripts/xlaunchrc
diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
index 369dd0a..09a961d 100755
--- a/xinit/Scripts/xlaunchrc
+++ b/xinit/Scripts/xlaunchrc
@@ -19,7 +19,7 @@ dunst &
 play ~/Winsounds/login.wav -q &
 
 # Set dbus display variable
-dbus-update-activation-environment --systemd DISPLAY
+# dbus-update-activation-environment --systemd DISPLAY
 
 args="$LOPTS"
 for arg in $args
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 774beef..08977b7 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -48,7 +48,7 @@ else
 fi
 
 setopt PROMPT_SUBST
-PROMPT='$MAINCOL%~$(git_info)$MAINCOL %(!.#.>) %F{255}'
+PROMPT='$MAINCOL%~$(git_info)$MAINCOL %(!.#.$) %F{255}'
 
 #
 # General setting
@@ -90,16 +90,20 @@ export SUDO_EDITOR=$EDITOR
 export TERM="xterm-256color"
 export PATH=$PATH:$HOME/Scripts/bin
 export PATH=$PATH:$HOME/go/bin
-export PATH=$PATH:$HOME/.local/bin
 export WORDCHARS='*?.[]~=&;!#$%^(){}<>'
 
+function extra_env {
+    export PATH=$PATH:$HOME/Software/litex/riscv64/bin/
+    export PATH=$PATH:$HOME/.local/bin
+    export PATH=$PATH:$HOME/go/bin
+}
+
 #
 # Alias
 #
 alias vim="$EDITOR"
 alias ls='ls --color=auto'
-alias etckeep="/usr/bin/git --git-dir=/etc/.git --work-tree=/etc/"
-alias vim="echo no"
+alias python="python3"
 
 #
 # Functions
@@ -132,3 +136,6 @@ function goto {
         echo cd $(</tmp/where)
     fi
 }
+
+source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+
-- 
cgit v1.2.3