From: Christian Heller Date: Sat, 12 Dec 2015 11:58:20 +0000 (+0100) Subject: Fix some issues with dotfiles directories structure. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=commitdiff_plain;h=1277fce3b6a1d59634159fcb6bac6912856da28c;p=config Fix some issues with dotfiles directories structure. --- diff --git a/dotfiles/bashrc b/dotfiles/bashrc deleted file mode 100644 index 4dc08f7..0000000 --- a/dotfiles/bashrc +++ /dev/null @@ -1,5 +0,0 @@ -# Bash as a non-login shell in non-POSIX-mode does not read in the startup -# script at the path in $ENV. This forces it to still read in the ~/.shinit -# startup script for non-login shells. - -. ~/.shinit diff --git a/dotfiles/minimal/bashrc b/dotfiles/minimal/bashrc new file mode 100644 index 0000000..4dc08f7 --- /dev/null +++ b/dotfiles/minimal/bashrc @@ -0,0 +1,5 @@ +# Bash as a non-login shell in non-POSIX-mode does not read in the startup +# script at the path in $ENV. This forces it to still read in the ~/.shinit +# startup script for non-login shells. + +. ~/.shinit diff --git a/dotfiles/minimal/profile b/dotfiles/minimal/profile new file mode 100644 index 0000000..5a58435 --- /dev/null +++ b/dotfiles/minimal/profile @@ -0,0 +1,6 @@ +# Initialization for login shells. + +# Tell interactive shells to look in ~/.shinit for setup. +ENV=$HOME/.shinit +export ENV +. $ENV diff --git a/dotfiles/minimal/shinit b/dotfiles/minimal/shinit new file mode 100644 index 0000000..c80a6bc --- /dev/null +++ b/dotfiles/minimal/shinit @@ -0,0 +1,32 @@ +# Settings for interactive shells. + +# Fancy colors for ls. +alias ls="ls --color=auto" + +# Use vim as default editor for anything. +export VISUAL=vim +export EDITOR=$VISUAL + +# Colored prompt with username, hostname, date/time, directory. +colornumber=7 # Default to white if no color set via colornumber dotfile. +colornumber_file=~/.shinit_color +if [ -f $colornumber_file ]; then + colornumber=`cat $colornumber_file` +fi +tput_color="$(tput setaf $colornumber)$(tput bold)" +tput_reset="$(tput sgr0)" +# Bash confuses the line length when not told to not count escape sequences. +if [ ! "$BASH" = "" ]; then + tput_color="\[$tput_color\]" + tput_reset="\[$tput_reset\]" +fi +PS1="${tput_color}["\$\(date\ +%Y-%m-%d/%H:%M:%S/%Z\)" $USER@$(hostname):"\$\(pwd\)"]$ $tput_reset" +PS2="${tput_color}> $tput_reset" +PS3="${tput_color}select: $tput_reset" +PS4="${tput_color}+ $tput_reset" + +# Add local additions. +local_shinit_file=~/.shinit_add +if [ -f $local_shinit_file ]; then + . $local_shinit_file +fi diff --git a/dotfiles/minimal/vimrc b/dotfiles/minimal/vimrc new file mode 100644 index 0000000..0103b0a --- /dev/null +++ b/dotfiles/minimal/vimrc @@ -0,0 +1,27 @@ +" Activate syntax highlighting. +syntax on +filetype plugin on + +" Number lines. +set number + +" Don't add unsolicited final newline. +set binary + +" Indentation rules (tabs to 4 spaces). +set expandtab +set shiftwidth=4 +set softtabstop=4 + +" Backups. +set backup +set backupdir=~/.vimbackups +let myvar = strftime("%Y-%m-%d_%H-%M-%S") +let myvar = "set backupext=_". myvar +execute myvar + +" Keep syntax highlighting healthy. +autocmd BufEnter * :syntax sync fromstart + +" Mark the 80-th column. +set colorcolumn=80 diff --git a/dotfiles/profile b/dotfiles/profile deleted file mode 100644 index 5a58435..0000000 --- a/dotfiles/profile +++ /dev/null @@ -1,6 +0,0 @@ -# Initialization for login shells. - -# Tell interactive shells to look in ~/.shinit for setup. -ENV=$HOME/.shinit -export ENV -. $ENV diff --git a/dotfiles/shinit b/dotfiles/shinit deleted file mode 100644 index c80a6bc..0000000 --- a/dotfiles/shinit +++ /dev/null @@ -1,32 +0,0 @@ -# Settings for interactive shells. - -# Fancy colors for ls. -alias ls="ls --color=auto" - -# Use vim as default editor for anything. -export VISUAL=vim -export EDITOR=$VISUAL - -# Colored prompt with username, hostname, date/time, directory. -colornumber=7 # Default to white if no color set via colornumber dotfile. -colornumber_file=~/.shinit_color -if [ -f $colornumber_file ]; then - colornumber=`cat $colornumber_file` -fi -tput_color="$(tput setaf $colornumber)$(tput bold)" -tput_reset="$(tput sgr0)" -# Bash confuses the line length when not told to not count escape sequences. -if [ ! "$BASH" = "" ]; then - tput_color="\[$tput_color\]" - tput_reset="\[$tput_reset\]" -fi -PS1="${tput_color}["\$\(date\ +%Y-%m-%d/%H:%M:%S/%Z\)" $USER@$(hostname):"\$\(pwd\)"]$ $tput_reset" -PS2="${tput_color}> $tput_reset" -PS3="${tput_color}select: $tput_reset" -PS4="${tput_color}+ $tput_reset" - -# Add local additions. -local_shinit_file=~/.shinit_add -if [ -f $local_shinit_file ]; then - . $local_shinit_file -fi diff --git a/dotfiles/user/gitconfig b/dotfiles/user/gitconfig deleted file mode 100644 index 5cdc162..0000000 --- a/dotfiles/user/gitconfig +++ /dev/null @@ -1,3 +0,0 @@ -[user] - name = Christian Heller - email = c.heller@plomlompom.de diff --git a/dotfiles/user/minimal/gitconfig b/dotfiles/user/minimal/gitconfig new file mode 100644 index 0000000..5cdc162 --- /dev/null +++ b/dotfiles/user/minimal/gitconfig @@ -0,0 +1,3 @@ +[user] + name = Christian Heller + email = c.heller@plomlompom.de diff --git a/dotfiles/vimrc b/dotfiles/vimrc deleted file mode 100644 index 0103b0a..0000000 --- a/dotfiles/vimrc +++ /dev/null @@ -1,27 +0,0 @@ -" Activate syntax highlighting. -syntax on -filetype plugin on - -" Number lines. -set number - -" Don't add unsolicited final newline. -set binary - -" Indentation rules (tabs to 4 spaces). -set expandtab -set shiftwidth=4 -set softtabstop=4 - -" Backups. -set backup -set backupdir=~/.vimbackups -let myvar = strftime("%Y-%m-%d_%H-%M-%S") -let myvar = "set backupext=_". myvar -execute myvar - -" Keep syntax highlighting healthy. -autocmd BufEnter * :syntax sync fromstart - -" Mark the 80-th column. -set colorcolumn=80 diff --git a/symlink.sh b/symlink.sh index 332cd53..412b55d 100755 --- a/symlink.sh +++ b/symlink.sh @@ -2,8 +2,8 @@ set -x -dir_minimal=~/config/dotfiles -dir_user_minimal=~/config/dotfiles/user +dir_minimal=~/config/dotfiles/minimal +dir_user_minimal=~/config/dotfiles/user/minimal dir_user_thinkpad=~/config/dotfiles/user/thinkpad dir_user_server=~/config/dotfiles/user/server dir_root=~/config/dotfiles/root