mirror of
https://github.com/foo-dogsquared/dotfiles.git
synced 2025-01-30 22:57:54 +00:00
Update i3, zsh, and Xinit
This commit is contained in:
parent
ac4951378e
commit
4499a7e020
@ -22,7 +22,6 @@ exec_always feh --bg-scale ~/wallpapers/sand.jpg
|
|||||||
# Startup applications
|
# Startup applications
|
||||||
exec firefox
|
exec firefox
|
||||||
exec thunderbird
|
exec thunderbird
|
||||||
exec thunar
|
|
||||||
|
|
||||||
# i3 config file (v4)
|
# i3 config file (v4)
|
||||||
#
|
#
|
||||||
|
@ -8,15 +8,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
|
|||||||
# merge in defaults and keymaps
|
# merge in defaults and keymaps
|
||||||
|
|
||||||
if [ -f $sysresources ]; then
|
if [ -f $sysresources ]; then
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xrdb -merge $sysresources
|
xrdb -merge $sysresources
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f $sysmodmap ]; then
|
if [ -f $sysmodmap ]; then
|
||||||
@ -24,15 +16,7 @@ if [ -f $sysmodmap ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$userresources" ]; then
|
if [ -f "$userresources" ]; then
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xrdb -merge "$userresources"
|
xrdb -merge "$userresources"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$usermodmap" ]; then
|
if [ -f "$usermodmap" ]; then
|
||||||
@ -40,7 +24,7 @@ if [ -f "$usermodmap" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/bin/lxsession &
|
/usr/bin/lxsession &
|
||||||
|
compton &
|
||||||
dunst &
|
dunst &
|
||||||
udiskie &
|
udiskie &
|
||||||
flameshot &
|
|
||||||
exec i3
|
exec i3
|
||||||
|
18
zsh/.zshrc
18
zsh/.zshrc
@ -2,9 +2,10 @@
|
|||||||
PICTURES_DIRECTORY=$HOME/Pictures
|
PICTURES_DIRECTORY=$HOME/Pictures
|
||||||
DOCUMENTS_DIRECTORY=$HOME/Documents
|
DOCUMENTS_DIRECTORY=$HOME/Documents
|
||||||
BIN_DIRECTORY=$HOME/bin
|
BIN_DIRECTORY=$HOME/bin
|
||||||
|
SCRIPTS_DIRECTORY=$HOME/.scripts/
|
||||||
|
|
||||||
# If you come from bash you might have to change your $PATH.
|
# If you come from bash you might have to change your $PATH.
|
||||||
export PATH=$BIN_DIRECTORY:/usr/local/bin:.cargo/bin:$PATH
|
export PATH=$BIN_DIRECTORY:$SCRIPTS_DIRECTORY:/usr/local/bin:$PATH
|
||||||
|
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH="/home/foo-dogsquared/.oh-my-zsh"
|
export ZSH="/home/foo-dogsquared/.oh-my-zsh"
|
||||||
@ -102,3 +103,18 @@ source $ZSH/oh-my-zsh.sh
|
|||||||
# Example aliases
|
# Example aliases
|
||||||
# alias zshconfig="mate ~/.zshrc"
|
# alias zshconfig="mate ~/.zshrc"
|
||||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||||
|
|
||||||
|
# >>> conda initialize >>>
|
||||||
|
# !! Contents within this block are managed by 'conda init' !!
|
||||||
|
__conda_setup="$('/home/foo-dogsquared/anaconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
eval "$__conda_setup"
|
||||||
|
else
|
||||||
|
if [ -f "/home/foo-dogsquared/anaconda3/etc/profile.d/conda.sh" ]; then
|
||||||
|
. "/home/foo-dogsquared/anaconda3/etc/profile.d/conda.sh"
|
||||||
|
else
|
||||||
|
export PATH="/home/foo-dogsquared/anaconda3/bin:$PATH"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
unset __conda_setup
|
||||||
|
# <<< conda initialize <<<
|
||||||
|
Loading…
Reference in New Issue
Block a user