diff --git a/README.md b/README.md index e6efc6d..d28b9f8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# This repository is a clone of https://github.com/ctorgalson/ansible-role-oh-my-zsh/tree/master, edited to make the installation of Zsh, Oh-My-ZSH for root user. + # Ansible Role Oh My ZSH This is a basic Ansible role to enable and configure Oh My Zsh on Fedora, diff --git a/defaults/main.yml b/defaults/main.yml index fad5118..b889a73 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,11 +4,6 @@ omz_install_zsh: false # User vars. omz_user: [] -# - name: "someuser" -# group: "somegroup" -# settings: | -# export PATH="/usr/local/sbin:$path" -# alias l="ls -AF" # Oh My ZSH vars. omz_git_repository: "https://github.com/robbyrussell/oh-my-zsh.git" diff --git a/tasks/oh-my-zsh-install.yml b/tasks/oh-my-zsh-install.yml index 9e24c60..9c0606c 100644 --- a/tasks/oh-my-zsh-install.yml +++ b/tasks/oh-my-zsh-install.yml @@ -1,7 +1,7 @@ --- - name: "OMZ | establish install location." set_fact: - omz_install_path: "/{{ omz_user_home_dir }}/{{ omz_user.name }}/{{ omz_install_directory }}" + omz_install_path: "{{ ansible_env.HOME }}/{{ omz_install_directory }}" - name: "OMZ | clone Oh My ZSH repo for user." git: diff --git a/tasks/oh-my-zsh-zshrc.yml b/tasks/oh-my-zsh-zshrc.yml index d6430aa..a8f0e39 100644 --- a/tasks/oh-my-zsh-zshrc.yml +++ b/tasks/oh-my-zsh-zshrc.yml @@ -1,7 +1,7 @@ --- - name: "OMZ | derive user .zshrc path." set_fact: - omz_user_zshrc_path: "/{{ omz_user_home_dir }}/{{ omz_user.name }}/.zshrc" + omz_user_zshrc_path: "{{ ansible_env.HOME }}/.zshrc" - name: "OMZ | template .zshrc into place if required." template: diff --git a/tasks/zsh.yml b/tasks/zsh.yml index 8b0bb72..dd7f774 100644 --- a/tasks/zsh.yml +++ b/tasks/zsh.yml @@ -1,8 +1,4 @@ --- -- name: "OMZ | establish home directory." - set_fact: - omz_user_home_dir: "{{ (ansible_system == 'Darwin') | ternary('Users', 'home') }}" - - name: "OMZ | ensure zsh is installed." block: - name: "OMZ | install zsh for Linux." diff --git a/templates/zshrc.zsh-template.j2 b/templates/zshrc.zsh-template.j2 index d52bf09..ee2ab90 100644 --- a/templates/zshrc.zsh-template.j2 +++ b/templates/zshrc.zsh-template.j2 @@ -4,7 +4,7 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH=/{{ omz_user_home_dir }}/{{ omz_user.name }}/{{ omz_install_directory }} +export ZSH={{ ansible_env.HOME }}/{{ omz_install_directory }} # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. @@ -86,4 +86,7 @@ source $ZSH/oh-my-zsh.sh # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" +{% if omz_user.settings is defined %} +# Custom settings {{ omz_user.settings }} +{% endif %} \ No newline at end of file