diff --git a/roles/byobu/files/.tmux.conf b/roles/byobu/files/.tmux.conf index 2962c9dd..bdfe9672 100644 --- a/roles/byobu/files/.tmux.conf +++ b/roles/byobu/files/.tmux.conf @@ -1,2 +1,2 @@ -set -g default-command ~/.local/bin/xonsh -set -g default-terminal 'screen-256color' +# set -g default-command ~/.local/bin/xonsh +# set -g default-terminal 'screen-256color' diff --git a/roles/fish/files/config.fish b/roles/fish/files/config.fish new file mode 100644 index 00000000..dda797d9 --- /dev/null +++ b/roles/fish/files/config.fish @@ -0,0 +1,35 @@ +# CONFIGS +set -g fish_greeting '' +# EXPORTS +set -gx EDITOR vim +set -gx LANG en_US.UTF-8 +set -gx PATH venv/bin $HOME/bin $HOME/.local/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin /bin /sbin +# PROMPTS +function fish_prompt + set -l last_status $status + + set_color brred + printf "%s" (whoami) + set_color normal + printf " at " + set_color brgreen + printf "%s" (hostname) + set_color normal + printf " in " + set_color brblue + printf "%s" (prompt_pwd) + set_color brmagenta + printf "%s" (__fish_git_prompt) + set_color normal + + if test $last_status -ne 0 + printf " ! " + else if test (id -u) -eq 0 + printf " # " + else + printf " \$ " + end +end +# PLUGINS +eval $HOME/.anaconda/bin/conda "shell.fish" "hook" $argv | source +status --is-login; and status --is-interactive; and exec byobu-launcher diff --git a/roles/fish/tasks/main.yml b/roles/fish/tasks/main.yml new file mode 100644 index 00000000..2f4afd05 --- /dev/null +++ b/roles/fish/tasks/main.yml @@ -0,0 +1,21 @@ +--- + +- name: package + package: + name: fish + become: true + tags: admin + +- name: directory + file: + state: directory + name: ~/.config/fish/ + tags: user + +- name: config + file: + force: yes + state: link + dest: ~/.config/fish/config.fish + src: "{{ role_path }}/files/config.fish" + tags: user diff --git a/site.yml b/site.yml index 6bf0e546..567e939b 100644 --- a/site.yml +++ b/site.yml @@ -36,6 +36,7 @@ - {role: cookiecutter, tags: ['cookiecutter', 'develop']} - {role: csvkit, tags: ['csvkit', 'analyze']} - {role: ctags, tags: ['ctags', 'search']} + - {role: fish, tags: ['fish', 'shell']} - {role: functools, tags: ['functools', 'analyze']} - {role: fzf, tags: ['fzf', 'filter']} - {role: git, tags: ['git', 'develop']}