From d5c98eb13cf6fcbc1aab8d5f5f35ab6cac48798c Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Mon, 18 Feb 2019 18:35:54 +0100 Subject: [PATCH] common: don't use gentoo prompt anymore --- roles/common/files/.zshrc.local | 1 - roles/common/files/prompt_gentoo_setup | 33 -------------------------- roles/common/tasks/FreeBSD.yml | 1 - roles/common/tasks/Proxmox.yml | 6 +++++ 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 roles/common/files/prompt_gentoo_setup diff --git a/roles/common/files/.zshrc.local b/roles/common/files/.zshrc.local index ba47109..c137044 100644 --- a/roles/common/files/.zshrc.local +++ b/roles/common/files/.zshrc.local @@ -10,4 +10,3 @@ zstyle ':completion::complete:*' use-cache 1 # promt autoload -U promptinit promptinit -prompt gentoo diff --git a/roles/common/files/prompt_gentoo_setup b/roles/common/files/prompt_gentoo_setup deleted file mode 100644 index 046e2d8..0000000 --- a/roles/common/files/prompt_gentoo_setup +++ /dev/null @@ -1,33 +0,0 @@ -# gentoo prompt theme - -prompt_gentoo_help () { - cat <<'EOF' -This prompt is color-scheme-able. You can invoke it thus: - - prompt gentoo [ [ []]] - -EOF -} - -prompt_gentoo_setup () { - local prompt_gentoo_prompt=${1:-'blue'} - local prompt_gentoo_user=${2:-'green'} - local prompt_gentoo_root=${3:-'red'} - - if [ "$USER" = 'root' ] - then - local base_prompt="%B%F{$prompt_gentoo_root}%m%k " - else - local base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k " - fi - local post_prompt="%b%f%k" - - #setopt noxtrace localoptions - - local path_prompt="%B%F{$prompt_gentoo_prompt}%1~" - typeset -g PS1="$base_prompt$path_prompt %# $post_prompt" - typeset -g PS2="$base_prompt$path_prompt %_> $post_prompt" - typeset -g PS3="$base_prompt$path_prompt ?# $post_prompt" -} - -prompt_gentoo_setup "$@" diff --git a/roles/common/tasks/FreeBSD.yml b/roles/common/tasks/FreeBSD.yml index 1ee6409..03f6e30 100644 --- a/roles/common/tasks/FreeBSD.yml +++ b/roles/common/tasks/FreeBSD.yml @@ -25,7 +25,6 @@ with_items: - { src: '.zshrc', dest: '/root/.zshrc' } - { src: '.zshrc.local', dest: '/root/.zshrc.local' } - - { src: 'prompt_gentoo_setup', dest: '/usr/local/share/zsh/5.6.2/functions/Prompts/prompt_gentoo_setup' } - name: Create BKCA certificate directory file: path="{{ item }}" state=directory diff --git a/roles/common/tasks/Proxmox.yml b/roles/common/tasks/Proxmox.yml index 7537468..946c45a 100644 --- a/roles/common/tasks/Proxmox.yml +++ b/roles/common/tasks/Proxmox.yml @@ -8,8 +8,14 @@ - less - rsync - vim-nox + - zsh - name: Configure misc software copy: src={{ item.src }} dest={{ item.dest }} with_items: + - { src: '.zshrc', dest: '/root/.zshrc' } + - { src: '.zshrc.local', dest: '/root/.zshrc.local' } - { src: 'vimrc.local', dest: '/etc/vim/vimrc.local' } + +- name: Set shell for root user + user: name=root shell=/bin/zsh