systems/dotfiles
1
Fork 0
Code Pull requests 1 Activity Actions

Only store really global things in global env

Browse source
This commit is contained in:
Jake Howard 2017-11-16 20:38:52 +00:00
parent 1e36e5689e
commit 36727707f6
Signed by: jake
GPG key ID: 57AFB45680EDD477
6 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/shell/files/.zshrc
View file

@ -20,11 +20,6 @@ source $ZSH/oh-my-zsh.sh
autoload -U compinit && compinit autoload -U compinit && compinit
# You may need to manually set your language environment
export LANG=en_GB.UTF-8
# Compilation flags
export ARCHFLAGS="-arch x86_64"
autoload -Uz colors && colors autoload -Uz colors && colors
local ret_status="%(?:%{$fg_bold[green]%}λ :%{$fg_bold[red]%}λ )" local ret_status="%(?:%{$fg_bold[green]%}λ :%{$fg_bold[red]%}λ )"

2
modules/shell/files/applications.sh
View file

@ -50,5 +50,3 @@ alias sc="screenshot --to img"
recreatedb() { recreatedb() {
dropdb $1 && createdb $1 dropdb $1 && createdb $1
} }
# colored GCC warnings and errors

10
modules/shell/files/base.sh
View file

@ -5,15 +5,6 @@ case $- in
esac esac
# Extend path
export PATH=${PATH}:${ANDROID_HOME}/tools
export PATH=${PATH}:${ANDROID_HOME}/platform-tools
export PATH=${PATH}:/opt/genymobile/genymotion
export PATH=${PATH}:${HOME}/.bin
export DOTFILES=~/.dotfiles
# bash aliases # bash aliases
alias refresh="cd $PWD > /dev/null" alias refresh="cd $PWD > /dev/null"
alias c="clear" alias c="clear"
@ -31,4 +22,3 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# don't put duplicate lines or lines starting with space in the history. # don't put duplicate lines or lines starting with space in the history.
HISTCONTROL=ignoreboth

20
modules/shell/files/environment.sh
View file

@ -1,6 +1,14 @@
# Export some variables
ANDROID_HOME=/opt/android-sdk # Extend path
EDITOR=/bin/nano export PATH=${PATH}:${ANDROID_HOME}/tools
TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S' export PATH=${PATH}:${ANDROID_HOME}/platform-tools
QT_QPA_PLATFORMTHEME=gtk2 export PATH=${PATH}:/opt/genymobile/genymotion
GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' export PATH=${PATH}:${HOME}/.bin
export DOTFILES=${HOME}/.dotfiles
export EDITOR=$(which nano)
export BROWSER=$(which firefox)
export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
export HISTCONTROL=ignoreboth

9
modules/shell/files/global-environment Normal file
View file

@ -0,0 +1,9 @@
ANDROID_HOME=/opt/android-sdk
QT_QPA_PLATFORMTHEME=gtk2
GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
# You may need to manually set your language environment
LANG=en_GB.UTF-8
# Compilation flags
ARCHFLAGS="-arch x86_64"

5
modules/shell/manifests/init.pp
View file

@ -6,7 +6,8 @@ class shell {
'puppet:///modules/shell/base.sh', 'puppet:///modules/shell/base.sh',
'puppet:///modules/shell/applications.sh', 'puppet:///modules/shell/applications.sh',
'puppet:///modules/shell/catfish.sh', 'puppet:///modules/shell/catfish.sh',
'puppet:///modules/shell/javascript.sh' 'puppet:///modules/shell/javascript.sh',
'puppet:///modules/shell/environment.sh'
]; ];
concat {'zshrc': concat {'zshrc':
@ -52,7 +53,7 @@ class shell {
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
source => 'puppet:///modules/shell/environment.sh', source => 'puppet:///modules/shell/global-environment',
path => '/etc/environment' path => '/etc/environment'
} }
} }