summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdesktop/.xsession14
-rw-r--r--zsh/.zshrc2
2 files changed, 15 insertions, 1 deletions
diff --git a/desktop/.xsession b/desktop/.xsession
index fbf4ff1..6d76b30 100755
--- a/desktop/.xsession
+++ b/desktop/.xsession
@@ -7,3 +7,17 @@ if [[ ! -e "$SETUP_MARKER" ]]; then
urxvt -e sh -c "$HOME/dotfiles/setup.sh; zsh"
touch "$SETUP_MARKER"
fi
+
+export TERMINAL=urxvt
+xrdb -merge $HOME/.Xresources
+setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier
+xsetroot -solid "#2A3462"
+pasystray &
+xss-lock -- /usr/bin/env xscreensaver-command --lock &
+xset -b
+trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 100 --widthtype pixel --transparent true --alpha 0 --tint 0x000000 --height 18 &
+[[ -f /etc/nixos/configuration.nix ]] || \
+ redshift -l 40:-70 -r -t 5500:3700 &
+exec xmonad
+
+
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 01d3dc0..1ca1e22 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -30,4 +30,4 @@ prompt pure
alias ls="ls --color"
-source ~/.zshrc.local
+[[ -f ~/.zshrc.local ]] && source ~/.zshrc.local