1
0
Fork 0
mirror of https://github.com/roles-ansible/ansible_role_dotfiles.git synced 2024-08-16 16:09:49 +02:00

improve role behavior (#2)

* Resolve linting warnings

* rebuild role structure and add more bash options

* Add github action tasks

* fix typo

* fix another typo

* fix another typo

* fix another typo

* fix another typo

* fix another typo

* fix another typo

* Improve default values

* create optional bashrc for users
This commit is contained in:
L3D 2020-11-13 11:30:51 +01:00 committed by GitHub
parent 3ced87f4ed
commit 0e9269f7e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 558 additions and 284 deletions

View file

@ -0,0 +1,16 @@
name: Ansible check archlinux:latest
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with archlinux:latest
uses: roles-ansible/check-ansible-archlinux-latest-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check centos:centos6
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:centos6
uses: roles-ansible/check-ansible-centos-centos6-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check centos:centos7
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:centos7
uses: roles-ansible/check-ansible-centos-centos7-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check centos:centos8
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:centos8
uses: roles-ansible/check-ansible-centos-centos8-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check centos:latest
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:latest
uses: roles-ansible/check-ansible-centos-latest-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check debian:buster
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with debian:buster
uses: roles-ansible/check-ansible-debian-buster-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check debian:latest
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with debian:latest
uses: roles-ansible/check-ansible-debian-latest-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check debian:sid
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with debian:sid
uses: roles-ansible/check-ansible-debian-sid-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check debian:stable
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with debian:stable
uses: roles-ansible/check-ansible-debian-stable-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check debian:stretch
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with debian:stretch
uses: roles-ansible/check-ansible-debian-stretch-action@master
with:
targets: "./"

16
.github/workflows/ansible-fedora-31.yml vendored Normal file
View file

@ -0,0 +1,16 @@
name: Ansible check fedora:31
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with fedora:31
uses: roles-ansible/check-ansible-fedora-31-action@master
with:
targets: "./"

16
.github/workflows/ansible-fedora-32.yml vendored Normal file
View file

@ -0,0 +1,16 @@
name: Ansible check fedora:32
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with fedora:32
uses: roles-ansible/check-ansible-fedora-32-action@master
with:
targets: "./"

16
.github/workflows/ansible-fedora-33.yml vendored Normal file
View file

@ -0,0 +1,16 @@
name: Ansible check fedora:33
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with fedora:33
uses: roles-ansible/check-ansible-fedora-33-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check fedora:latest
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with fedora:latest
uses: roles-ansible/check-ansible-fedora-latest-action@master
with:
targets: "./"

View file

@ -0,0 +1,20 @@
name: Ansible Lint check
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Lint Ansible Playbook
uses: ansible/ansible-lint-action@master
with:
targets: "."
# [required]
# Paths to ansible files (i.e., playbooks, tasks, handlers etc..)
args: ""
# [optional]

View file

@ -0,0 +1,16 @@
name: Ansible check ubuntu:bionic
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:bionic
uses: roles-ansible/check-ansible-ubuntu-bionic-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check ubuntu:eoan
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:eoan
uses: roles-ansible/check-ansible-ubuntu-eoan-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check ubuntu:latest
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:latest
uses: roles-ansible/check-ansible-ubuntu-latest-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check ubuntu:trusty
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:trusty
uses: roles-ansible/check-ansible-ubuntu-trusty-action@master
with:
targets: "./"

View file

@ -0,0 +1,16 @@
name: Ansible check ubuntu:xenial
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: ansible check with ubuntu:xenial
uses: roles-ansible/check-ansible-ubuntu-xenial-action@master
with:
targets: "./"

View file

@ -19,23 +19,74 @@ Affected files:
~/.bashrc
~/.vimrc
```
needed vars:
our variables:
---------------
```ini
# list all admins
admins:
- l3d
# enable basic version check for this role
# set it to true to use it (recomended)
submodules_versioncheck: false
# for some ansible features we need the python selinux package at fedora
# disable it, if you don't want it
dotfiles__install_python_selinux: true
# modify bashrc
base__modify_bashrc: true
# list of aliases used in bashrc
base__aliases:
- { alias: "ls", command: "ls ", color: True }
- { alias: "grep", command: "grep", color: True }
- { alias: "ll", command: "ls -alF", color: False }
- { alias: "la", command: "ls -A", color: False }
- { alias: "l", command: "ls -CF", color: False }
- { alias: "lz", command: "ls -Z", color: False }
- { alias: "EDITOR", command: "/usr/bin/vim", color: False }
- { alias: "VISUAL", command: "/usr/bin/gedit", color: False }
- { alias: "gitsubpull", command: 'git submodule foreach "(git checkout $(git symbolic-ref --short refs/remotes/origin/HEAD | sed "s@^origin/@@"); git pull)"', color: False }
- { alias: "pwgen", command: "/usr/bin/pwgen --num-passwords=3000 --numerals --capitalize --secure --no-vowels --symbols 42 | grep -v '0' | grep -v 'o' | grep -v 'O' | grep -v '\"' | grep -v 'I' | grep -v 'l' | grep -v '1' | grep -v '´' | grep -v '@' | tail -1 ", color: false }
# enable bash completion
base__bash_completion_enabled: true
# fancy promt
base__user_promt: '\[\033[01;33m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
base__root_prompt: '\[\033[01;31m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
# log terminal to syslog
base__log_to_syslog: true
# modify bash history
history_control: 'ignoreboth'
history_size: '-1'
history_file_size: '-1'
# optional additional entries to bashrc
base__additional_bashrc_lines: []
# - eval `foo`
# - tmux new-session
# optionally allow custom bashrc for root
base__allow_own_root_bashrc: false
# otional custom commands
base__additional_bashrc_lines: []
# - eval `foo`
# - tmux new-session
# optionally allow custom bashrc for root
base__allow_own_root_bashrc: false
# otional custom commands
base__custom_config: []
# - { user: "l3d", cmd: "eval $(keychain --eval --quiet id_ed25519)"
# show hidden files in ranger
base__ranger_hidden_files: true
# list of non-admins:
accounts:
- ottojo
```
Optional config:
-----------------
```ini
# optional .bashrc commands
extra_bashrc: 'alias l="ls -all"'
- "{{ ansible_user_id }}"
```
Please have a look into ``defaults/main.yml`` for more configuration options!

View file

@ -1,31 +1,59 @@
---
# should we install keychain for improved ssh-add support?
# It is recomended for desctop users but completly useless for server installations...
install_keychain: False
# enable basic version check for this role
# set it to true to use it (recomended)
submodules_versioncheck: false
# allow additional entys in the local .basrc file
extra_bashrc: ''
# for some ansible features we need the python selinux package at fedora
# disable it, if you don't want it
dotfiles__install_python_selinux: true
# if set to False the .bashrc of the root user will be deleted.
# all that he really need are some parametes of the global /etc/bash.bashrc file...
allow_own_root_bashrc: true
# modify bashrc
base__modify_bashrc: true
# enable version check for this role
# (highly recomended for stupid users)
submodules_versioncheck: true
# list of aliases used in bashrc
base__aliases:
- { alias: "ls", command: "ls ", color: True }
- { alias: "grep", command: "grep", color: True }
- { alias: "ll", command: "ls -alF", color: False }
- { alias: "la", command: "ls -A", color: False }
- { alias: "l", command: "ls -CF", color: False }
- { alias: "lz", command: "ls -Z", color: False }
- { alias: "EDITOR", command: "/usr/bin/vim", color: False }
- { alias: "VISUAL", command: "/usr/bin/gedit", color: False }
- { alias: "gitsubpull", command: "git submodule foreach '(git checkout \\$(git symbolic-ref --short refs/remotes/origin/HEAD | sed 's@^origin/@@'); git pull)'", color: False }
- { alias: "pwgen", command: "/usr/bin/pwgen --num-passwords=3000 --numerals --capitalize --secure --no-vowels --symbols 42 | grep -v '0' | grep -v 'o' | grep -v 'O' | grep -v '\\\"' | grep -v 'I' | grep -v 'l' | grep -v '1' | grep -v '´' | grep -v '@' | tail -1 ", color: false }
# enable bash completion
base__bash_completion_enabled: true
# fancy promt
base__user_prompt: '\[\033[01;33m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
base__root_prompt: '\[\033[01;31m\] $(printf "\xE2\x9D\xA4") \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
# modify bash history
base__history_control: 'ignoreboth'
base__history_size: '-1'
base__history_file_size: '-1'
# optional additional entries to /etc/bash.bashrc
base__additional_bashrc_lines: []
# - eval `foo`
# - tmux new-session
# optional additional entries to ~/.bashrc
base__additional_user_bashrc_lines: []
# - eval $(keychain --eval --quiet id_ed25519)
# optionally allow custom bashrc for root
base__allow_own_root_bashrc: false
# otional custom commands
base__custom_config: []
# - { user: "l3d", cmd: "eval $(keychain --eval --quiet id_ed25519)"
# show hidden files in ranger
ranger_hidden_files: true
base__ranger_hidden_files: true
# affected user accounts
accounts:
- "{{ ansible_user_id }}"
# some additional aliases
git_pull_alias: false
git_typo_alias: true
# default editor/visual
install_editor: true
dotfiles_default_editor: '/usr/bin/vim'
dotfiles_default_visual: '/usr/bin/gedit'

33
tasks/bashrc.yml Normal file
View file

@ -0,0 +1,33 @@
---
- name: Create a global bashrc configuration
become: yes
template:
src: 'templates/bash.bashrc'
dest: '/etc/bash.bashrc'
owner: root
group: root
mode: 'u=rw,g=r,o=r'
- name: Copy bashrc configuration to root
become: yes
template:
src: 'templates/bashrc'
dest: '/root/.bashrc'
owner: 'root'
group: 'root'
mode: 'u=rw,g=r,o='
when: not base__allow_own_root_bashrc | bool
- name: Copy bashrc configuration to non admin users
become: yes
template:
src: 'templates/bashrc'
dest: '/home/{{ item }}/.bashrc'
owner: '{{ item }}'
group: '{{ item }}'
mode: 'u=rw,g=r,o='
with_items: '{{ accounts }}'
when:
- accounts is defined
- accounts != ['root']
- accounts != 'root'

9
tasks/basic-selinux.yml Normal file
View file

@ -0,0 +1,9 @@
---
- name: install the latest libselinux-python package
become: yes
dnf:
name: libselinux-python
state: present
when:
- ansible_distribution == "Fedora"
failed_when: false

View file

@ -1,78 +1,12 @@
---
- include_tasks: versioncheck.yml
when: submodules_versioncheck|bool
when: submodules_versioncheck | bool
- name: install the latest libselinux-python package
become: yes
dnf:
name: libselinux-python
state: latest
when:
- ansible_distribution == "Fedora"
- include_tasks: basic-selinux.yml
when: dotfiles__install_python_selinux | bool
- name: install keychain to support ssh agent
become: yes
package:
name: keychain
state: latest
when:
- ansible_os_family != 'RedHat'
- install_keychain|bool
- name: install keychain on centos
become: yes
yum:
name:
- http://packages.psychotic.ninja/7/base/x86_64/RPMS//keychain-2.8.0-3.el7.psychotic.noarch.rpm
- libselinux-python
state: present
when:
- ansible_os_family == 'RedHat'
- install_keychain|bool
- name: Create a global bashrc configuration
become: yes
template:
src: 'templates/bash.bashrc'
dest: '/etc/bash.bashrc'
owner: root
group: root
mode: 'u=rw,g=r,o=r'
- name: Copy bashrc configuration to admin users
become: yes
template:
src: 'templates/bashrc'
dest: '/home/{{ item }}/.bashrc'
owner: '{{ item }}'
group: '{{ item }}'
mode: 'u=rw,g=r,o='
with_items: '{{ admins }}'
when: admins is defined
- name: Copy bashrc configuration to root
become: yes
template:
src: 'templates/bashrc'
dest: '/root/.bashrc'
owner: 'root'
group: 'root'
mode: 'u=rw,g=r,o='
when: allow_own_root_bashrc | bool
- name: Copy bashrc configuration to non admin users
become: yes
template:
src: 'templates/bashrc'
dest: '/home/{{ item }}/.bashrc'
owner: '{{ item }}'
group: '{{ item }}'
mode: 'u=rw,g=r,o='
with_items: '{{ accounts }}'
when:
- accounts is defined
- accounts != ['root']
- accounts != 'root'
- include_tasks: bashrc.yml
when: base__modify_bashrc | bool
- name: Copy vimrc configuration to root
become: yes
@ -97,24 +31,6 @@
- accounts != ['root']
- accounts != 'root'
- name: Copy vimrc configuration to admin users
become: yes
copy:
src: 'templates/vimrc'
dest: '/home/{{ item }}/.vimrc'
owner: '{{ item }}'
group: '{{ item }}'
mode: 'u=rw,g=r,o='
with_items: "{{ admins }}"
when: admins is defined
- name: delete root .bashrc
become: yes
file:
state: absent
path: "/root/.bashrc"
when: not allow_own_root_bashrc | bool
- name: create .config/ranger/ directory
become: true
file:
@ -123,9 +39,10 @@
recurse: yes
owner: "{{ item }}"
group: "{{ item }}"
mode: '0644'
with_items: "{{ accounts }}"
when:
- ranger_hidden_files | bool
- base__ranger_hidden_files | bool
- accounts is defined
- accounts != ['root']
- accounts != 'root'
@ -137,19 +54,10 @@
dest: "/home/{{ item }}/.config/ranger/rc.conf"
owner: "{{ item }}"
group: "{{ item }}"
mode: '0644'
with_items: "{{ accounts }}"
when:
- ranger_hidden_files | bool
- base__ranger_hidden_files | bool
- accounts is defined
- accounts != ['root']
- accounts != 'root'
- name: Install vim
become: true
package:
name:
- vim
state: present
when:
- install_editor | bool
- ansible_distribution_version != '7' and ansible_distribution_release != 'wheezy' and ansible_machine != 'armv6l'

View file

@ -42,5 +42,5 @@
copy:
content: "{{ playbook_version_number }}"
dest: "/etc/.ansible-version/{{ playbook_version_path }}"
mode: 0644
mode: '0644'
when: submodules_versioncheck|bool

View file

@ -1,139 +1,52 @@
# /etc/bashrc
{% raw %}
# System wide functions and aliases
# Environment stuff goes in /etc/profile
# It's NOT a good idea to change this file unless you know what you
# are doing. It's much better to create a custom.sh shell script in
# /etc/profile.d/ to make custom changes to your environment, as this
# will prevent the need for merging in future updates.
# This file may be overwritten by ansible. Please think about commiting
# changes you want to keep persistent.
# Prevent doublesourcing
if [ -z "$BASHRCSOURCED" ]; then
BASHRCSOURCED="Y"
# are we an interactive shell?
if [ "$PS1" ]; then
if [ -z "$PROMPT_COMMAND" ]; then
case $TERM in
xterm*|vte*)
if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
elif [ "${VTE_VERSION:-0}" -ge 3405 ]; then
PROMPT_COMMAND="__vte_prompt_command"
else
PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
fi
;;
screen*)
if [ -e /etc/sysconfig/bash-prompt-screen ]; then
PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen
else
PROMPT_COMMAND='printf "\033k%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
fi
;;
*)
[ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default
;;
esac
fi
# Turn on parallel history
shopt -s histappend
history -a
# Turn on checkwinsize
shopt -s checkwinsize
[ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ "
# You might want to have e.g. tty in prompt (e.g. more virtual machines)
# and console windows
# If you want to do so, just add e.g.
if [ "$PS1" ]; then
{% endraw %}
PS1="{{ bash['keyboard'] }}"
{% raw %}
fi
# to your custom modification shell script in /etc/profile.d/ directory
fi
if ! shopt -q login_shell ; then # We're not a login shell
# Need to redefine pathmunge, it gets undefined at the end of /etc/profile
pathmunge () {
case ":${PATH}:" in
*:"$1":*)
;;
*)
if [ "$2" = "after" ] ; then
PATH=$PATH:$1
else
PATH=$1:$PATH
fi
esac
}
# By default, we want umask to get set. This sets it for non-login shell.
# Current threshold for system reserved uid/gids is 200
# You could check uidgid reservation validity in
# /usr/share/doc/setup-*/uidgid file
if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
umask 002
else
umask 022
fi
{% endraw %}
SHELL="{{ bash['shell'] }}"
{% raw %}
# Only display echos from profile.d scripts if we are no login shell
# and interactive - otherwise just process them to set envvars
for i in /etc/profile.d/*.sh; do
if [ -r "$i" ]; then
if [ "$PS1" ]; then
. "$i"
else
. "$i" >/dev/null
fi
fi
done
unset i
unset -f pathmunge
fi
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
{% for alias in base__aliases %}
{% if alias.color %}
alias {{ alias.alias }}="{{ alias.command }} --color=auto"
{% endif%}
{% endfor %}
fi
alias ls='ls --color=auto'
alias dir='dir --color=auto'
alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
{% for alias in base__aliases %}
{% if not alias.color %}
alias {{ alias.alias }}="{{ alias.command }}"
{% endif%}
{% endfor %}
# colored GCC warnings and errors
export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
{%if base__bash_completion_enabled %}
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
# some more ls aliases
alias ll='ls -la'
alias la='ls -A'
alias l='ls -CF'
{% endraw %}
# default editor
alias EDITOR='{{ dotfiles_default_editor }}'
alias VISUAL='{{ dotfiles_default_visual }}'
{% if git_typo_alias | bool -%}
alias got='git'
{% endif %}
{% if git_pull_alias | bool -%}
alias gitsubpull='git submodule foreach "(git checkout $(git symbolic-ref --short refs/remotes/origin/HEAD | sed "s@^origin/@@"); git pull)"'
{% endif %}
{% if bash['pwgen'] %}alias pwgen="/usr/bin/pwgen --num-passwords=3000 --numerals --capitalize --secure --no-vowels --symbols 42 | grep -v '0' | grep -v 'o' | grep -v 'O' | grep -v '\"' | grep -v 'I' | grep -v 'l' | grep -v '1' | grep -v '´' | grep -v '@' | tail -1 "{% endif %}
# fancy Prompt
if [ $(id -u) -eq 0 ]; then
export PS1='{{ base__root_prompt }} '
else
export PS1='{{ base__user_prompt }} '
fi
HISTSIZE=
HISTFILESIZE=
HISTCONTROL={{ base__history_control }}
shopt -s histappend
HISTSIZE={{ base__history_size }}
HISTFILESIZE={{ base__history_file_size }}
{% for _row in base__additional_bashrc_lines | default() %}
{{ _row }}
{% endfor %}
# vim:ts=4:sw=4

View file

@ -9,18 +9,36 @@ fi
PATH="$HOME/.local/bin:$HOME/bin:$PATH"
export PATH
# Uncomment the following line if you don't like systemctl's auto-paging feature:
# export SYSTEMD_PAGER=
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
{% for alias in base__aliases %}
{% if alias.color %}
alias {{ alias.alias }}="{{ alias.command }} --color=auto"
{% endif%}
{% endfor %}
fi
PS1='$(if [[ $(id -u) -ne 0 ]];then echo "\[\033[01;33m\]"; else echo "\[\033[01;31m\]"; fi) $(if [[ $? == 0 ]]; then printf "\xE2\x9D\xA4"; fi) \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
{% for alias in base__aliases %}
{% if not alias.color %}
alias {{ alias.alias }}="{{ alias.command }}"
{% endif%}
{% endfor %}
{{ bash['bashrc'] }}
{% if install_keychain %}
{{ bash['keychain'] }}
# hostory controll
HISTCONTROL={{ base__history_control }}
shopt -s histappend
HISTSIZE={{ base__history_size }}
HISTFILESIZE={{ base__history_file_size }}
{% for _row in base__additional_user_bashrc_lines | default() %}
{{ _row }}
{% endfor %}
{% for custom in base__custom_config %}
{% if custom.user == item %}
{{ custom.cmd }}
{% endif %}
{% endfor %}
{{ extra_bashrc }}
# User specific aliases and functions
alias ll="ls -all"
# vim:ts=4:sw=4

View file

@ -1,3 +1,3 @@
# {{ ansible_managed }}
#
{% if ranger_hidden_files | bool %}set show_hidden true{% endif %}
{% if base__ranger_hidden_files | bool %}set show_hidden true{% endif %}

View file

@ -1,12 +1,2 @@
# some bash variables
bash:
bashrc: ''
keychain: 'eval $(keychain --eval --quiet id_ed25519)'
nextcloud: false
nm: false
pwgen: true
shell: "/bin/bash"
keyboard: '$(if [[ $(id -u) -ne 0 ]];then echo "\[\033[01;33m\]"; else echo "\[\033[01;31m\]"; fi) $(if [[ $? == 0 ]]; then printf "\xE2\x9D\xA4"; fi) \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
playbook_version_number: 2056 # should be over ninethousand
playbook_version_number: 2063 # should be over ninethousand
playbook_version_path: 'role_dotfiles_chaos-bodensee_github.version'