From 5be5f80179534b96e8cb2aa1a21d50c9a2d3f355 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 17:11:24 +0000 Subject: [PATCH 01/36] Add bash role --- dotfiles.yml | 15 ++++++++ hosts | 5 +++ .../.config/bash => roles/bash/files}/profile | 0 roles/bash/tasks/.main.yml.swp | Bin 0 -> 12288 bytes roles/bash/tasks/main.yml | 33 ++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 dotfiles.yml create mode 100644 hosts rename {dotfiles/.config/bash => roles/bash/files}/profile (100%) create mode 100644 roles/bash/tasks/.main.yml.swp create mode 100644 roles/bash/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml new file mode 100644 index 0000000..ee71cf6 --- /dev/null +++ b/dotfiles.yml @@ -0,0 +1,15 @@ +--- + +- name: Set up development machine + hosts: localhost + roles: + - bash + #- dircolors + #- git + #- hushlogin + #- mintty + #- python + #- readline + #- ssh + #- tmux + #- vim diff --git a/hosts b/hosts new file mode 100644 index 0000000..f4687cf --- /dev/null +++ b/hosts @@ -0,0 +1,5 @@ +[local] +localhost + +[local:vars] +ansible_connection=local diff --git a/dotfiles/.config/bash/profile b/roles/bash/files/profile similarity index 100% rename from dotfiles/.config/bash/profile rename to roles/bash/files/profile diff --git a/roles/bash/tasks/.main.yml.swp b/roles/bash/tasks/.main.yml.swp new file mode 100644 index 0000000000000000000000000000000000000000..80343adb9a52f0e51b9f12f5d13d5025be0776ec GIT binary patch literal 12288 zcmeI2KW`H;7>D07g4*)u17O0+l2b0{$o930s+5@x#?DYLrGAO!WQYZ^yGB*-RqwpPp3F(J-)Xq+RYt8yGZol)4RRr zKey@5d7=Z^GqQAkS?W?XtX3Ha6P-Cerp}C+)z-Lz$P& z@vvB4g-6%`8(7&u<+7-~Nw;q9wEVl*8`s2@%a2wr!!NJ_Hoykh02^QfY=8~00XDF{ z2Ha?ao+AFau!O7Oy0LH#w|rp(Y=8~00XDz}*Z><~18jf|umLu}2G-DkOo=XR5}gA7 z|Nrd!|Hn4b2k;iW0w>@Fn1B*I0ej#!xB)JK?^{IQz-RCgyadm{A;^FNZO{T+;49|* z0^Wl+;5C@$SVNB-nGLW3Hoykh02^QfY=8~00XFde2E=@egg+&{KQh{%oThrP?lfK8 z7Fv%wp*z#2t2$z=Z0N8~I&>6yIS4(evaTZ<$8q!MNaRip#bnZ$J#D%jff1bR&hlP; zI{R#1KYfQHQOY4o?#h7@wlZoOPaNh&A+o$og|3X4y|ikqrE?23>(e!m+MgZYA4%6o z^te7w9wzh)nU8rNE3XqSWC~`|+^DY8W*nmWvWpJ>Dtgx_Xcev>7GL`kXSG7H=(h+l zZGY^VzYjZG=$@_|&F^HLW63tvn<^8la7ce~#Shg`A1INkOjd=f*Ioy#jC8p!Ek#j8 FzW~pk@Ff5M literal 0 HcmV?d00001 diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml new file mode 100644 index 0000000..5aed636 --- /dev/null +++ b/roles/bash/tasks/main.yml @@ -0,0 +1,33 @@ +--- +- name: Remove pre-installed bash configurations which could cause conflicts + file: + state: absent + path: "~/.{{ item }}" + loop: + - bash_logout + - profile + +- name: Create the bash cache and config directories + file: + path: "~/.{{ item }}/bash" + state: directory + loop: + - cache + - config + +- name: Deploy bash profile + file: + src: "{{ role_path }}/files/profile" + dest: ~/.config/bash/profile + state: link + force: yes + +- name: Make sure bash will find our profile + file: + src: ~/.config/bash/profile + dest: "~/.{{ item }}" + state: link + force: yes + loop: + - bashrc + - bash_profile From ff1562506d011c464bd84a9b2860c44db1d1bf1f Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:08:53 +0000 Subject: [PATCH 02/36] Add vim role --- dotfiles.yml | 7 ++++-- roles/vim/defaults/main.yml | 5 ++++ .../vim => roles/vim/files}/autoload/plug.vim | 0 .../.config/vim => roles/vim/files}/vimrc | 19 +++++++++------ roles/vim/tasks/main.yml | 23 +++++++++++++++++++ 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 roles/vim/defaults/main.yml rename {dotfiles/.config/vim => roles/vim/files}/autoload/plug.vim (100%) rename {dotfiles/.config/vim => roles/vim/files}/vimrc (92%) create mode 100644 roles/vim/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index ee71cf6..1dbf9d2 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -1,7 +1,10 @@ --- - - name: Set up development machine hosts: localhost + vars: + xdg_config_home: "~/.config" + xdg_cache_home: "~/.cache" + xdg_data_home: "~/.local/share" roles: - bash #- dircolors @@ -12,4 +15,4 @@ #- readline #- ssh #- tmux - #- vim + - vim diff --git a/roles/vim/defaults/main.yml b/roles/vim/defaults/main.yml new file mode 100644 index 0000000..017b984 --- /dev/null +++ b/roles/vim/defaults/main.yml @@ -0,0 +1,5 @@ +--- +xdg_config_home: "~/.config" +xdg_cache_home: "~/.cache" +xdg_data_home: "~/.local/share" + diff --git a/dotfiles/.config/vim/autoload/plug.vim b/roles/vim/files/autoload/plug.vim similarity index 100% rename from dotfiles/.config/vim/autoload/plug.vim rename to roles/vim/files/autoload/plug.vim diff --git a/dotfiles/.config/vim/vimrc b/roles/vim/files/vimrc similarity index 92% rename from dotfiles/.config/vim/vimrc rename to roles/vim/files/vimrc index 70c4e53..503043d 100644 --- a/dotfiles/.config/vim/vimrc +++ b/roles/vim/files/vimrc @@ -1,5 +1,8 @@ set nocompatible +if $XDG_CONFIG_HOME == "" | let $XDG_CONFIG_HOME="~/.config" | endif +if $XDG_CACHE_HOME == "" | let $XDG_CACHE_HOME="~/.cache" | endif + let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" " Options {{{ @@ -102,10 +105,12 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']] - if has('multi_byte') && &encoding ==# 'utf-8' - let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v']) - else " line / total : col - let g:airline_section_z = airline#section#create(['L%4l/%L c%3v']) + if exists('airline#section#create') + if has('multi_byte') && &encoding ==# 'utf-8' + let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v']) + else " line / total : col + let g:airline_section_z = airline#section#create(['L%4l/%L c%3v']) + endif endif if !exists('g:airline_symbols') @@ -132,7 +137,7 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" highlight link srec32BitAddress Constant highlight link srecChecksum Type - colorscheme solarized + silent! colorscheme solarized filetype plugin indent on syntax enable " }}} @@ -232,7 +237,7 @@ augroup vimrc " {{{ autocmd FileType gitcommit setlocal textwidth=72 augroup END " }}} -if filereadable(expand("$XDG_CONFIG_HOME/vimrc.local")) - source $XDG_CONFIG_HOME/vimrc.local +if filereadable(expand("$XDG_CONFIG_HOME/vim/vimrc.local")) + source "$XDG_CONFIG_HOME/vim/vimrc.local" endif diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml new file mode 100644 index 0000000..7cc116a --- /dev/null +++ b/roles/vim/tasks/main.yml @@ -0,0 +1,23 @@ +--- +- name: Create the vim cache and config directories + file: + path: "{{ item }}" + state: directory + loop: + - "{{ xdg_cache_home }}/vim" + - "{{ xdg_config_home }}/vim" + - "{{ xdg_config_home }}/vim/autoload" + +- name: Deploy vim plug and vimrc + file: + src: "{{ role_path }}/files/{{ item }}" + dest: "{{ xdg_config_home }}/vim/{{ item }}" + state: link + force: yes + loop: + - autoload/plug.vim + - vimrc + +- name: Install configured vim plugins + shell: vim -u "{{ xdg_config_home }}/vim/vimrc" +PlugInstall +qall + From dad459852cd9e2222e9fa8e21725d74739238077 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:19:12 +0000 Subject: [PATCH 03/36] Simplify vim role It might make sense to make the XDG_* stuff configurable in the future, but let's keep it simple for now. --- roles/bash/tasks/main.yml | 2 +- roles/vim/defaults/main.yml | 5 ----- roles/vim/tasks/main.yml | 10 +++++----- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 roles/vim/defaults/main.yml diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml index 5aed636..edca53c 100644 --- a/roles/bash/tasks/main.yml +++ b/roles/bash/tasks/main.yml @@ -12,7 +12,7 @@ path: "~/.{{ item }}/bash" state: directory loop: - - cache + - cache - config - name: Deploy bash profile diff --git a/roles/vim/defaults/main.yml b/roles/vim/defaults/main.yml deleted file mode 100644 index 017b984..0000000 --- a/roles/vim/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -xdg_config_home: "~/.config" -xdg_cache_home: "~/.cache" -xdg_data_home: "~/.local/share" - diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml index 7cc116a..255113a 100644 --- a/roles/vim/tasks/main.yml +++ b/roles/vim/tasks/main.yml @@ -4,14 +4,14 @@ path: "{{ item }}" state: directory loop: - - "{{ xdg_cache_home }}/vim" - - "{{ xdg_config_home }}/vim" - - "{{ xdg_config_home }}/vim/autoload" + - "~/.cache/vim" + - "~/.config/vim" + - "~/.config/vim/autoload" - name: Deploy vim plug and vimrc file: src: "{{ role_path }}/files/{{ item }}" - dest: "{{ xdg_config_home }}/vim/{{ item }}" + dest: "~/.config/vim/{{ item }}" state: link force: yes loop: @@ -19,5 +19,5 @@ - vimrc - name: Install configured vim plugins - shell: vim -u "{{ xdg_config_home }}/vim/vimrc" +PlugInstall +qall + shell: vim -u "~/.config/vim/vimrc" +PlugInstall +qall From 6081b7b9eacb53af078f02a8cacfe4265fdc14dc Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:30:02 +0000 Subject: [PATCH 04/36] Add readline role --- dotfiles.yml | 2 +- .../readline => roles/readline/files}/inputrc | 0 roles/readline/tasks/.main.yml.swp | Bin 0 -> 12288 bytes roles/readline/tasks/main.yml | 13 +++++++++++++ 4 files changed, 14 insertions(+), 1 deletion(-) rename {dotfiles/.config/readline => roles/readline/files}/inputrc (100%) create mode 100644 roles/readline/tasks/.main.yml.swp create mode 100644 roles/readline/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index 1dbf9d2..092c484 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -12,7 +12,7 @@ #- hushlogin #- mintty #- python - #- readline + - readline #- ssh #- tmux - vim diff --git a/dotfiles/.config/readline/inputrc b/roles/readline/files/inputrc similarity index 100% rename from dotfiles/.config/readline/inputrc rename to roles/readline/files/inputrc diff --git a/roles/readline/tasks/.main.yml.swp b/roles/readline/tasks/.main.yml.swp new file mode 100644 index 0000000000000000000000000000000000000000..80343adb9a52f0e51b9f12f5d13d5025be0776ec GIT binary patch literal 12288 zcmeI2KW`H;7>D07g4*)u17O0+l2b0{$o930s+5@x#?DYLrGAO!WQYZ^yGB*-RqwpPp3F(J-)Xq+RYt8yGZol)4RRr zKey@5d7=Z^GqQAkS?W?XtX3Ha6P-Cerp}C+)z-Lz$P& z@vvB4g-6%`8(7&u<+7-~Nw;q9wEVl*8`s2@%a2wr!!NJ_Hoykh02^QfY=8~00XDF{ z2Ha?ao+AFau!O7Oy0LH#w|rp(Y=8~00XDz}*Z><~18jf|umLu}2G-DkOo=XR5}gA7 z|Nrd!|Hn4b2k;iW0w>@Fn1B*I0ej#!xB)JK?^{IQz-RCgyadm{A;^FNZO{T+;49|* z0^Wl+;5C@$SVNB-nGLW3Hoykh02^QfY=8~00XFde2E=@egg+&{KQh{%oThrP?lfK8 z7Fv%wp*z#2t2$z=Z0N8~I&>6yIS4(evaTZ<$8q!MNaRip#bnZ$J#D%jff1bR&hlP; zI{R#1KYfQHQOY4o?#h7@wlZoOPaNh&A+o$og|3X4y|ikqrE?23>(e!m+MgZYA4%6o z^te7w9wzh)nU8rNE3XqSWC~`|+^DY8W*nmWvWpJ>Dtgx_Xcev>7GL`kXSG7H=(h+l zZGY^VzYjZG=$@_|&F^HLW63tvn<^8la7ce~#Shg`A1INkOjd=f*Ioy#jC8p!Ek#j8 FzW~pk@Ff5M literal 0 HcmV?d00001 diff --git a/roles/readline/tasks/main.yml b/roles/readline/tasks/main.yml new file mode 100644 index 0000000..c70abf9 --- /dev/null +++ b/roles/readline/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- name: Create the readline config directory + file: + path: ~/.config/readline + state: directory + +- name: Deploy inputrc + file: + src: "{{ role_path }}/files/inputrc" + dest: ~/.config/readline/inputrc + state: link + force: yes + From 4c0bfbb30aafff74c0482165ead8f846dfb8899f Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:39:06 +0000 Subject: [PATCH 05/36] Add dircolors role --- dotfiles.yml | 2 +- .../dircolors/files}/solarized-dark | 0 .../dircolors/files}/solarized-light | 0 roles/dircolors/tasks/main.yml | 16 ++++++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) rename {dotfiles/.config/dircolors => roles/dircolors/files}/solarized-dark (100%) rename {dotfiles/.config/dircolors => roles/dircolors/files}/solarized-light (100%) create mode 100644 roles/dircolors/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index 092c484..095a7b9 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -7,7 +7,7 @@ xdg_data_home: "~/.local/share" roles: - bash - #- dircolors + - dircolors #- git #- hushlogin #- mintty diff --git a/dotfiles/.config/dircolors/solarized-dark b/roles/dircolors/files/solarized-dark similarity index 100% rename from dotfiles/.config/dircolors/solarized-dark rename to roles/dircolors/files/solarized-dark diff --git a/dotfiles/.config/dircolors/solarized-light b/roles/dircolors/files/solarized-light similarity index 100% rename from dotfiles/.config/dircolors/solarized-light rename to roles/dircolors/files/solarized-light diff --git a/roles/dircolors/tasks/main.yml b/roles/dircolors/tasks/main.yml new file mode 100644 index 0000000..ce5bb9a --- /dev/null +++ b/roles/dircolors/tasks/main.yml @@ -0,0 +1,16 @@ +--- +- name: Create the dircolors config directory + file: + path: ~/.config/dircolors + state: directory + +- name: Deploy dircolors + file: + src: "{{ role_path }}/files/solarized-{{ item }}" + dest: "~/.config/dircolors/solarized-{{ item }}" + state: link + force: yes + loop: + - dark + - light + From ffef99af11cbc118d59f4a062a1b0231afa5b364 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:43:52 +0000 Subject: [PATCH 06/36] Add mintty role --- dotfiles.yml | 2 +- .../.config/mintty => roles/mintty/files}/config | 0 roles/mintty/tasks/main.yml | 13 +++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) rename {dotfiles/.config/mintty => roles/mintty/files}/config (100%) create mode 100644 roles/mintty/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index 095a7b9..7d564fd 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -10,7 +10,7 @@ - dircolors #- git #- hushlogin - #- mintty + - mintty #- python - readline #- ssh diff --git a/dotfiles/.config/mintty/config b/roles/mintty/files/config similarity index 100% rename from dotfiles/.config/mintty/config rename to roles/mintty/files/config diff --git a/roles/mintty/tasks/main.yml b/roles/mintty/tasks/main.yml new file mode 100644 index 0000000..b06a011 --- /dev/null +++ b/roles/mintty/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- name: Create the mintty config directory + file: + path: ~/.config/mintty + state: directory + +- name: Deploy mintty config + file: + src: "{{ role_path }}/files/config" + dest: ~/.config/mintty/config + state: link + force: yes + From b2404d7266aa59091bcdda949aed9a63e39b4a21 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:49:23 +0000 Subject: [PATCH 07/36] Add python role --- dotfiles.yml | 2 +- .../python => roles/python/files}/startup.py | 0 roles/python/tasks/main.yml | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) rename {dotfiles/.config/python => roles/python/files}/startup.py (100%) create mode 100644 roles/python/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index 7d564fd..5f1a1a3 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -11,7 +11,7 @@ #- git #- hushlogin - mintty - #- python + - python - readline #- ssh #- tmux diff --git a/dotfiles/.config/python/startup.py b/roles/python/files/startup.py similarity index 100% rename from dotfiles/.config/python/startup.py rename to roles/python/files/startup.py diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml new file mode 100644 index 0000000..520ddd5 --- /dev/null +++ b/roles/python/tasks/main.yml @@ -0,0 +1,16 @@ +--- +- name: Create the python config and cache directories + file: + path: "~/.{{ item }}/python" + state: directory + loop: + - cache + - config + +- name: Deploy python startup file + file: + src: "{{ role_path }}/files/startup.py" + dest: ~/.config/python/startup.py + state: link + force: yes + From 4fc05d12bda5eea6969dcd80bca5f6bdfbf419ab Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:53:47 +0000 Subject: [PATCH 08/36] Add hushlogin role --- dotfiles.yml | 2 +- dotfiles/.hushlogin | 0 roles/hushlogin/tasks/main.yml | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 dotfiles/.hushlogin create mode 100644 roles/hushlogin/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index 5f1a1a3..f72a5f4 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -9,7 +9,7 @@ - bash - dircolors #- git - #- hushlogin + - hushlogin - mintty - python - readline diff --git a/dotfiles/.hushlogin b/dotfiles/.hushlogin deleted file mode 100644 index e69de29..0000000 diff --git a/roles/hushlogin/tasks/main.yml b/roles/hushlogin/tasks/main.yml new file mode 100644 index 0000000..fe0ea56 --- /dev/null +++ b/roles/hushlogin/tasks/main.yml @@ -0,0 +1,5 @@ +--- +- name: Create hushlogin + file: + state: touch + path: ~/.hushlogin From 0a1820a075a20f316a2b123b86e6cd6f0992db22 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:54:27 +0000 Subject: [PATCH 09/36] Remove file committed by mistake --- roles/readline/tasks/.main.yml.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 roles/readline/tasks/.main.yml.swp diff --git a/roles/readline/tasks/.main.yml.swp b/roles/readline/tasks/.main.yml.swp deleted file mode 100644 index 80343adb9a52f0e51b9f12f5d13d5025be0776ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2KW`H;7>D07g4*)u17O0+l2b0{$o930s+5@x#?DYLrGAO!WQYZ^yGB*-RqwpPp3F(J-)Xq+RYt8yGZol)4RRr zKey@5d7=Z^GqQAkS?W?XtX3Ha6P-Cerp}C+)z-Lz$P& z@vvB4g-6%`8(7&u<+7-~Nw;q9wEVl*8`s2@%a2wr!!NJ_Hoykh02^QfY=8~00XDF{ z2Ha?ao+AFau!O7Oy0LH#w|rp(Y=8~00XDz}*Z><~18jf|umLu}2G-DkOo=XR5}gA7 z|Nrd!|Hn4b2k;iW0w>@Fn1B*I0ej#!xB)JK?^{IQz-RCgyadm{A;^FNZO{T+;49|* z0^Wl+;5C@$SVNB-nGLW3Hoykh02^QfY=8~00XFde2E=@egg+&{KQh{%oThrP?lfK8 z7Fv%wp*z#2t2$z=Z0N8~I&>6yIS4(evaTZ<$8q!MNaRip#bnZ$J#D%jff1bR&hlP; zI{R#1KYfQHQOY4o?#h7@wlZoOPaNh&A+o$og|3X4y|ikqrE?23>(e!m+MgZYA4%6o z^te7w9wzh)nU8rNE3XqSWC~`|+^DY8W*nmWvWpJ>Dtgx_Xcev>7GL`kXSG7H=(h+l zZGY^VzYjZG=$@_|&F^HLW63tvn<^8la7ce~#Shg`A1INkOjd=f*Ioy#jC8p!Ek#j8 FzW~pk@Ff5M From e279c9b5d14ea11ea07d6cc0c799fde6bfcdb60d Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 19:58:27 +0000 Subject: [PATCH 10/36] Add tmux role --- dotfiles.yml | 2 +- .../.config/tmux => roles/tmux/files}/tmux.conf | 0 roles/tmux/tasks/main.yml | 13 +++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) rename {dotfiles/.config/tmux => roles/tmux/files}/tmux.conf (100%) create mode 100644 roles/tmux/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index f72a5f4..fc70638 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -14,5 +14,5 @@ - python - readline #- ssh - #- tmux + - tmux - vim diff --git a/dotfiles/.config/tmux/tmux.conf b/roles/tmux/files/tmux.conf similarity index 100% rename from dotfiles/.config/tmux/tmux.conf rename to roles/tmux/files/tmux.conf diff --git a/roles/tmux/tasks/main.yml b/roles/tmux/tasks/main.yml new file mode 100644 index 0000000..92e3311 --- /dev/null +++ b/roles/tmux/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- name: Create the tmux config directory + file: + path: ~/.config/tmux + state: directory + +- name: Deploy tmux config + file: + src: "{{ role_path }}/files/tmux.conf" + dest: ~/.config/tmux/tmux.conf + state: link + force: yes + From e9133534c4c79e7a56d6a02aade20fa0aca8c959 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 20:02:19 +0000 Subject: [PATCH 11/36] Add git role --- dotfiles.yml | 2 +- {dotfiles/.config/git => roles/git/files}/config | 0 {dotfiles/.config/git => roles/git/files}/ignore | 0 roles/git/tasks/main.yml | 16 ++++++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) rename {dotfiles/.config/git => roles/git/files}/config (100%) rename {dotfiles/.config/git => roles/git/files}/ignore (100%) create mode 100644 roles/git/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index fc70638..963ddac 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -8,7 +8,7 @@ roles: - bash - dircolors - #- git + - git - hushlogin - mintty - python diff --git a/dotfiles/.config/git/config b/roles/git/files/config similarity index 100% rename from dotfiles/.config/git/config rename to roles/git/files/config diff --git a/dotfiles/.config/git/ignore b/roles/git/files/ignore similarity index 100% rename from dotfiles/.config/git/ignore rename to roles/git/files/ignore diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml new file mode 100644 index 0000000..294c5e1 --- /dev/null +++ b/roles/git/tasks/main.yml @@ -0,0 +1,16 @@ +--- +- name: Create the git config directory + file: + path: ~/.config/git + state: directory + +- name: Deploy git config + file: + src: "{{ role_path }}/files/{{ item }}" + dest: "~/.config/git/{{ item }}" + state: link + force: yes + loop: + - config + - ignore + From 4c7c0d9e40ba2da5500516601ccf67864436d6b5 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 21:29:38 +0000 Subject: [PATCH 12/36] Add role for custom commands --- dotfiles.yml | 1 + .../.local/bin => roles/bin/files}/vboxmount | 0 roles/bin/tasks/main.yml | 15 +++++++++++++++ .../.local => roles/git/files}/bin/git-churn | 0 .../files}/bin/git-what-the-hell-just-happened | 0 {dotfiles/.local => roles/git/files}/bin/git-wtf | 0 roles/git/tasks/main.yml | 14 ++++++++++++++ 7 files changed, 30 insertions(+) rename {dotfiles/.local/bin => roles/bin/files}/vboxmount (100%) create mode 100644 roles/bin/tasks/main.yml rename {dotfiles/.local => roles/git/files}/bin/git-churn (100%) rename {dotfiles/.local => roles/git/files}/bin/git-what-the-hell-just-happened (100%) rename {dotfiles/.local => roles/git/files}/bin/git-wtf (100%) diff --git a/dotfiles.yml b/dotfiles.yml index 963ddac..7a19a57 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -6,6 +6,7 @@ xdg_cache_home: "~/.cache" xdg_data_home: "~/.local/share" roles: + - bin - bash - dircolors - git diff --git a/dotfiles/.local/bin/vboxmount b/roles/bin/files/vboxmount similarity index 100% rename from dotfiles/.local/bin/vboxmount rename to roles/bin/files/vboxmount diff --git a/roles/bin/tasks/main.yml b/roles/bin/tasks/main.yml new file mode 100644 index 0000000..8950d0d --- /dev/null +++ b/roles/bin/tasks/main.yml @@ -0,0 +1,15 @@ +--- +- name: Create local bin directory + file: + path: ~/.local/bin + state: directory + +- name: Deploy local commands + file: + src: "{{ item }}" + dest: "~/.local/bin/{{ item | basename }}" + state: link + force: yes + with_fileglob: + - ./* + diff --git a/dotfiles/.local/bin/git-churn b/roles/git/files/bin/git-churn similarity index 100% rename from dotfiles/.local/bin/git-churn rename to roles/git/files/bin/git-churn diff --git a/dotfiles/.local/bin/git-what-the-hell-just-happened b/roles/git/files/bin/git-what-the-hell-just-happened similarity index 100% rename from dotfiles/.local/bin/git-what-the-hell-just-happened rename to roles/git/files/bin/git-what-the-hell-just-happened diff --git a/dotfiles/.local/bin/git-wtf b/roles/git/files/bin/git-wtf similarity index 100% rename from dotfiles/.local/bin/git-wtf rename to roles/git/files/bin/git-wtf diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 294c5e1..cb2727d 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -14,3 +14,17 @@ - config - ignore +- name: Create bin directory for additional git commands + file: + path: ~/.local/bin + state: directory + +- name: Deploy additional git commands + file: + src: "{{ item }}" + dest: "~/.local/bin/{{ item | basename }}" + state: link + force: yes + with_fileglob: + - ./bin/* + From ed40dfba54c38816892c766ebdd2aa78a5b4ff54 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 21:35:19 +0000 Subject: [PATCH 13/36] Skip hushlogin creation if it already exists --- roles/hushlogin/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/hushlogin/tasks/main.yml b/roles/hushlogin/tasks/main.yml index fe0ea56..d53d462 100644 --- a/roles/hushlogin/tasks/main.yml +++ b/roles/hushlogin/tasks/main.yml @@ -1,5 +1,11 @@ --- +- name: Check if hushlogin exists + register: hushlogin_stat + stat: + path: ~/.hushlogin + - name: Create hushlogin + when: hushlogin_stat.stat.exists == false file: state: touch path: ~/.hushlogin From 6f0f102a6ceb6bfc51072e17c6ac6aa7e607c1c8 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 21:40:34 +0000 Subject: [PATCH 14/36] Remove unused file --- .gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 From 5cb75685e27a0a35973698c0eb84cbb33229269f Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 22:00:56 +0000 Subject: [PATCH 15/36] Add ssh role --- .gitattributes | 2 +- dotfiles.yml | 2 +- {dotfiles/.ssh => roles/ssh/files}/config | Bin roles/ssh/tasks/main.yml | 13 +++++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) rename {dotfiles/.ssh => roles/ssh/files}/config (100%) create mode 100644 roles/ssh/tasks/main.yml diff --git a/.gitattributes b/.gitattributes index e0de9b0..98a8062 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -dotfiles/.ssh/config filter=git-crypt diff=git-crypt +roles/ssh/files/config filter=git-crypt diff=git-crypt diff --git a/dotfiles.yml b/dotfiles.yml index 7a19a57..d7ffcbd 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -14,6 +14,6 @@ - mintty - python - readline - #- ssh + - ssh - tmux - vim diff --git a/dotfiles/.ssh/config b/roles/ssh/files/config similarity index 100% rename from dotfiles/.ssh/config rename to roles/ssh/files/config diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml new file mode 100644 index 0000000..32b39cb --- /dev/null +++ b/roles/ssh/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- name: Create the SSH directory + file: + path: ~/.ssh + state: directory + +- name: Deploy SSH config + file: + src: "{{ role_path }}/files/config" + dest: ~/.ssh/config + state: link + force: yes + From d87f7f0d47b40a21a05d9f04ff52f3965e209a08 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 22:01:50 +0000 Subject: [PATCH 16/36] Remove unused variables --- dotfiles.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dotfiles.yml b/dotfiles.yml index d7ffcbd..89f711d 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -1,10 +1,6 @@ --- - name: Set up development machine hosts: localhost - vars: - xdg_config_home: "~/.config" - xdg_cache_home: "~/.cache" - xdg_data_home: "~/.local/share" roles: - bin - bash From ed4485c83de207bc9ada9364aa3efcdfe8d64ee0 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 22:03:14 +0000 Subject: [PATCH 17/36] Remove executable flag from non-executable files --- roles/dircolors/files/solarized-dark | 0 roles/dircolors/files/solarized-light | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 roles/dircolors/files/solarized-dark mode change 100755 => 100644 roles/dircolors/files/solarized-light diff --git a/roles/dircolors/files/solarized-dark b/roles/dircolors/files/solarized-dark old mode 100755 new mode 100644 diff --git a/roles/dircolors/files/solarized-light b/roles/dircolors/files/solarized-light old mode 100755 new mode 100644 From 9758287c0a09043711c7dfcfee3ffa8f941a3c12 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 22:05:26 +0000 Subject: [PATCH 18/36] Fix bash path manipulation --- roles/bash/files/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bash/files/profile b/roles/bash/files/profile index cb81693..2db3b9f 100644 --- a/roles/bash/files/profile +++ b/roles/bash/files/profile @@ -36,7 +36,7 @@ export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' prepend_dir() { # 1: dir to add, 2: variable to manipulate [ -d "$1" -a -n "$2" ] || return local list="${!2}" # capture current value - list=${list#"$1sep"} # remove dir from beginning + list=${list#"$1:"} # remove dir from beginning list=${list//":$1:"/:} # remove dir from middle list=${list%":$1"} # remove dir from end printf -v "$2" "$1${list:+":$list"}" # add in front (use : only if empty) From 1a3b9973c4c138a0edaa93213d4bf10b9ec01370 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 22:10:53 +0000 Subject: [PATCH 19/36] Remove $HOME/bin from PATH (use only $HOME/.local/bin) --- roles/bash/files/profile | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/bash/files/profile b/roles/bash/files/profile index 2db3b9f..44588b9 100644 --- a/roles/bash/files/profile +++ b/roles/bash/files/profile @@ -49,7 +49,6 @@ while read -r dir; do prepend_dir "$dir" PATH; done < Date: Fri, 15 Nov 2019 22:13:57 +0000 Subject: [PATCH 20/36] Create a directory for bash completion helpers --- roles/bash/tasks/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml index edca53c..b8b3fa4 100644 --- a/roles/bash/tasks/main.yml +++ b/roles/bash/tasks/main.yml @@ -9,11 +9,12 @@ - name: Create the bash cache and config directories file: - path: "~/.{{ item }}/bash" + path: "{{ item }}" state: directory loop: - - cache - - config + - "~/.cache/bash" + - "~/.config/bash" + - "~/.config/bash/completion.d" - name: Deploy bash profile file: From 81c63724d73e32f3f93b245eac4bc8b7155c7467 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 23:44:15 +0000 Subject: [PATCH 21/36] Add installation for commonly used sotfware --- dotfiles.yml | 1 + roles/git/tasks/main.yml | 11 +++++++++++ roles/packages/tasks/main.yml | 16 ++++++++++++++++ roles/python/tasks/main.yml | 9 +++++++++ roles/tmux/tasks/main.yml | 9 +++++++++ roles/vim/tasks/main.yml | 9 +++++++++ 6 files changed, 55 insertions(+) create mode 100644 roles/packages/tasks/main.yml diff --git a/dotfiles.yml b/dotfiles.yml index 89f711d..fd67526 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -2,6 +2,7 @@ - name: Set up development machine hosts: localhost roles: + - packages - bin - bash - dircolors diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index cb2727d..4228cd4 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -1,4 +1,15 @@ --- +- name: Install git (Debian) + when: ansible_os_family == "Debian" + become: yes + apt: name={{ item }} state=latest update_cache=yes + loop: [git, git-crypt] + +- name: Install git (macOS) + when: ansible_os_family == "Darwin" + homebrew: name={{ item }} state=latest + loop: [git, git-crypt] + - name: Create the git config directory file: path: ~/.config/git diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml new file mode 100644 index 0000000..5fa4406 --- /dev/null +++ b/roles/packages/tasks/main.yml @@ -0,0 +1,16 @@ +--- +- name: Install common packages (Debian) + when: ansible_os_family == "Debian" + become: yes + apt: name={{ item }} state=latest update_cache=yes + loop: + - curl + - tree + +- name: Install common packages (macOS) + when: ansible_os_family == "Darwin" + homebrew: name={{ item }} state=latest + loop: + - curl + - tree + diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index 520ddd5..c1eef8d 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -1,4 +1,13 @@ --- +- name: Install python3 (Debian) + when: ansible_os_family == "Debian" + become: yes + apt: name=python3 state=latest update_cache=yes + +- name: Install python3 (macOS) + when: ansible_os_family == "Darwin" + homebrew: name=python3 state=latest + - name: Create the python config and cache directories file: path: "~/.{{ item }}/python" diff --git a/roles/tmux/tasks/main.yml b/roles/tmux/tasks/main.yml index 92e3311..5409aaf 100644 --- a/roles/tmux/tasks/main.yml +++ b/roles/tmux/tasks/main.yml @@ -1,4 +1,13 @@ --- +- name: Install tmux (Debian) + when: ansible_os_family == "Debian" + become: yes + apt: name=tmux state=latest update_cache=yes + +- name: Install tmux (macOS) + when: ansible_os_family == "Darwin" + homebrew: name=tmux state=latest + - name: Create the tmux config directory file: path: ~/.config/tmux diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml index 255113a..1f4bf6c 100644 --- a/roles/vim/tasks/main.yml +++ b/roles/vim/tasks/main.yml @@ -1,4 +1,13 @@ --- +- name: Install vim (Debian) + when: ansible_os_family == "Debian" + become: yes + apt: name=vim state=latest update_cache=yes + +- name: Install vim (macOS) + when: ansible_os_family == "Darwin" + homebrew: name=vim state=latest + - name: Create the vim cache and config directories file: path: "{{ item }}" From 929102158b00e45606b4174ab912657d5b69f0b2 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Fri, 15 Nov 2019 23:45:53 +0000 Subject: [PATCH 22/36] Add gpg installation --- roles/packages/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 5fa4406..7a0b2fe 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -5,6 +5,7 @@ apt: name={{ item }} state=latest update_cache=yes loop: - curl + - gpg - tree - name: Install common packages (macOS) @@ -12,5 +13,6 @@ homebrew: name={{ item }} state=latest loop: - curl + - gpg - tree From ae0b15936e9c6610554b927331c44d0db131c891 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 00:02:37 +0000 Subject: [PATCH 23/36] Add pip installation for Debian --- roles/python/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index c1eef8d..12f87f8 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -2,7 +2,8 @@ - name: Install python3 (Debian) when: ansible_os_family == "Debian" become: yes - apt: name=python3 state=latest update_cache=yes + apt: name={{ item }} state=latest update_cache=yes + loop: [python3, python3-pip] - name: Install python3 (macOS) when: ansible_os_family == "Darwin" From 7c3b26b8e2499e8b610719dd56e3b7a6007ebcf0 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 00:15:25 +0000 Subject: [PATCH 24/36] Add htop installation --- roles/packages/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 7a0b2fe..6021a1b 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -6,6 +6,7 @@ loop: - curl - gpg + - htop - tree - name: Install common packages (macOS) @@ -14,5 +15,6 @@ loop: - curl - gpg + - htop - tree From 7e59326d1ca3a496b1e8402c3478b47164635fc7 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 09:32:29 +0000 Subject: [PATCH 25/36] Prevent bash warning when no completions are installed --- roles/bash/files/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bash/files/profile b/roles/bash/files/profile index 44588b9..8408ba7 100644 --- a/roles/bash/files/profile +++ b/roles/bash/files/profile @@ -360,7 +360,7 @@ stty -ixon # disable ctrl-s and ctrl-q _update_colors "${BACKGROUND:-dark}" # Enable available completion helpers -while read -r d; do [ -d "$d" ] && for f in "$d"/*; do . "$f"; done; done < Date: Sat, 16 Nov 2019 11:56:45 +0000 Subject: [PATCH 26/36] Add template for host-specific git configuration --- dotfiles.yml | 7 +++++++ roles/git/files/config | 3 ++- roles/git/tasks/main.yml | 5 +++++ roles/git/templates/config.host.j2 | 9 +++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 roles/git/templates/config.host.j2 diff --git a/dotfiles.yml b/dotfiles.yml index fd67526..b0a0cda 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -1,6 +1,13 @@ --- - name: Set up development machine hosts: localhost + vars_prompt: + - name: git_user + private: no + default: Fernando Schauenburg + - name: git_email + private: no + default: fernando@schauenburg.me roles: - packages - bin diff --git a/roles/git/files/config b/roles/git/files/config index 7cfbb6f..7af5964 100644 --- a/roles/git/files/config +++ b/roles/git/files/config @@ -80,4 +80,5 @@ required = true [include] - path = ~/.config/git/config.local + path = ~/.config/git/config.host # host-specific (from template) + path = ~/.config/git/config.local # optional manual configurations diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 4228cd4..ba92a3f 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -25,6 +25,11 @@ - config - ignore +- name: Deploy git host-specific config + template: + src: config.host.j2 + dest: ~/.config/git/config.host + - name: Create bin directory for additional git commands file: path: ~/.local/bin diff --git a/roles/git/templates/config.host.j2 b/roles/git/templates/config.host.j2 new file mode 100644 index 0000000..33f5074 --- /dev/null +++ b/roles/git/templates/config.host.j2 @@ -0,0 +1,9 @@ +[user] + name = {{ git_user }} + email = {{ git_email }} + +{% if ansible_os_family == 'Darwin' %} +[credential] + helper = osxkeychain +{% endif %} + From 2ac9cc5a740f9b495bbcca95a0250eeec5621292 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 11:59:36 +0000 Subject: [PATCH 27/36] Use SSH default IdentityFile As I am in the process of migrating my key to the more secure ED25519, this setting was annoying for hosts that don't have RSA keys. Besides, I am using the defaults anyway, so we can just get rid of this configuration altogether. --- roles/ssh/files/config | Bin 1455 -> 1424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/roles/ssh/files/config b/roles/ssh/files/config index 834c773d29644fc5f70ad7cac3446edca601c483..9e89e110870e7abde16c4be3b666b326d6a60766 100644 GIT binary patch literal 1424 zcmV;B1#kKQM@dveQdv+`00T4S28J$wRjGR(dg!Gkwq4*Pv5s&oCpKB@XK(L)JcD@O zLt-*^^2Cb7rq!w*8x3(3-M`VqOm5f?TUa@1s{!9#JZY!(L!pvRL=!;MBjVBqA4-fi z32Qj1od7%K2uPX4o+ZZ)EEs&B)4F9oVq^rW;y=5~Wpv^gV*3f{nbH|54QPG>!b>H~ zwY+(J=CGN=rtFk_csV4}RFIfwH)1pyp^7P-a(d?Yc_?l>WZBOt^L$+K(r56qKD*L( zndPo;UF}bbb~#r5sP%QC{>Md=b0ND^NRMeOQ{w{yvQS=H_iA+4ANJY*nBtfZv9TxN zlp{9gUyLr-57{1G*;4v+M{;)zN7s8UHs`$P$IB z*y8Vgl8){J9t{K(9adP!y(>X!GDD~fRyhBguUGEH%rG6-I+eAC4IA^`K?Z%ncOi0% zKs1sO{U`99k&y}9(#$-7?ktareUq}_mVyNq;XBC-EDfW#TmZg^)I4V__~|5JCb+tY zfU9v0r_HmE@1dbX8?`1|Yh>Zp!~i~pob0?7IvZZiLIQvC@6Yc&Zf1r~Jh-&)?AZU7 z^H{^o-9O^EXp0?13WuJRY?p5rwOBBG$Fb9~;dW;GESU2pC>8Q}KQnjw`CC6Zk1pd< zfl#K;NmAc$t%GT_sN|!1n+^Ipn!F_!oHyjOA#|wG!+QQh&C+1PAa%;Yww00sCEEYZ z@BQP5^n#P(8i_%Dp}@WQb$f)e1?x27S$b-;KW8h!meoVAXfmEt{bniAdU3+{9dw`; zZ02@GD?gsf7tqp`wmvj$q{E*T((ZiIe26xnwJb89Py-IjJ3Dfe?t+|{5C2457K#Rc zKrb@eL~b#%s(WS=8h3HH2jf4msVr<&2KA5nMzA9rxF^O3l}rT$&kiRFJ7)Nu6ZU)+ zKC+Ci7jam^T&n6!^<(B6Hz7}MsHj|n4Cyo3b&L4QG7d+hm;|73v9&g zj9t!fdVU3#>Gs!4ir4eSMrWji5vBkxYz4c0$emB72lx|IT~_WAAI3FzV@ zz6~zp*PZ2;7%M%D(;2gMrIz#a`jSh+FYw$y2zYwBziBiVY*u z*LqqR`*2ug7`!HUZSKZYHZ&puM12TjFlu!_Y%{G7{nGz6ryY*Io6Lb`!A?+=4aV=bPc z-{^>O-f0T*y6(LYn>*AYiIwIhM#+8w3Kp--6s}a0gBg2AI&Xl8x`|#5Tk(YdUg<}n z_@N4Yg*D6Rsy>UAJnkK`9T^G(jeT$65}NQ5U}6Dzmp_^zLBJyR5Ez@8Xhuc2f0b`_ zKvwpZ+vsf}Ndn=-E+NxcTqzxHGMXTHWJ{^;L_em3GRQ* z?8w`w1Q_pCCHi#h1cZ+`{`Yix!`n#px(qzpoa{!6K?E{+O`0B*Gljv3p$ eZNdn~mQgaOV;V8Ut_D_&Y1~h>tqu=UxZt8vl)^gz literal 1455 zcmV;g1yK3`M@dveQdv+`02E15t93=_$#MQpd}vW++zWGNZSc_UfG=w<)~A~%@->S} zePy&cVyNSqm@Dnx^KHJe(cClY^F@c5GJPErqt#oFplRNjZRr@p3&Az?|3A^~rw*Rz7Z0Qx^Pko80i$eaE0F*X;_r~pGeC$Jxb8)99wjV@N<-`2dUH;_t_~APJr#T)p4Qp)1|F@PgRJpd(mO-=q8Yqk=IO=J`k( zuhrR^r)W>@Z_F{?R+&4FPIN{yQ|#Yt75-+4mD0LhjVcQUGmBK*seMKvK#67dWTe1F zY0c)q=C_qs9)i}-U^>dmE^~3zI>oPN^|4mZ|M9C>t-JoGWJ_X@4W*rkh@0y-N8ddZ zRIX)m(BX)rDwOvk@7g_{6|oTC%v7@Iefiz{yRnp#LY7lmIE3$35`cN0`-We3FW(40 zKNq+4ChmG#NcNX?I=|k|Ih92OEje2G_|-B1x=SD@CYa760q<>^p+0W@}F!kONt_ z+x{@KeGJ=9+9Ve<{IHm93EQ(r-yz%+KB;gWLqk}eCnF71!7xbm7};kx)m`r_{>6h9 zx{Sp1Gfyh)Lv)^0Ic7g=Zz5?XUL!ra?fvTMS&Oe1a+%=RP`1tu@+3Qx9H!c1+{G)t zFf16hPNp<8z{HV+JdBQ23`46wmgE$SMjX7$BSYf`?~$`CM+;G>BkJ|}`HTVwZZ?0` zg@=}|s%+Kug}+f8@6}C)8#fy9C5Rsfn*|n3Xd&nd(Q|%w%nJ)}5bU4`jyt=@(R>Gw z*JQ{{&M>7-Orx1ijlSPcMu9sx7*|H&gqU=$_u%<2#=2}^6vVu-9h{hP$>m)@Q%ef} zl&R!2BmZfh+l0@=&#M1peuf!}Hq{4j=&7y-tmO5j8N38a)V_sfWVSs(V)<4*1<9xH z4rdCGa4yiz<{32CxwdkqEvm-~nEr8-mVY)W;rC^^iYo;kJY1<)n;q&TFEiKti9^hY zuv1=T%WESC9oJ{Q7ne0Tmu6c1q^Hwv zPUX2P(R*L&(hsT)tHxNK6#XQHfnZw1b110<(Ps%x@x4rXXz(L|{(6vwy`OgHMdCG9 zknnZf-MViB<$^gs=@*D^TXiee z#NN@-GFudHE5PFx=G>C|y2I<;!)#dZ2=P0gceZ5OGQrd`L4@OuX-V!dO9k~vdzyIQ z-0c(bjf%3`XY}6m`{{Qt8N|u_Q9=-++cQUN=LaTK)s(L1V(_$qP>(_XfZtG12(cdb z*JAd+VX^#-gFFuSm@jH(u2STM*FECYDZWT$Q8CUhA!1ofI0r=OWTA;b59q~@^kZ4S zY^t-#lRpb1=6XP@e$b=S^y2{5i3UemYn2?C;v9+IgumcuVHaNA~WD z(5QZnPyg!)P#}^J42cEyODZ7?yvfBJq6%1<&*%Wm?Fl^juJ}DEGU| z&u08q`F0_Te53~zyjo#BuFAAL089++qMl%05Pp^dD^usfpx7?#wZ5P&eP@e?Rn+xg JhQ|wDo!gCo=N13} From b9fb127fdf7030b7be413df66a9e665e98fd6dd9 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 12:12:34 +0000 Subject: [PATCH 28/36] Add more frequently used packages --- roles/packages/tasks/main.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 6021a1b..2cb15a0 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -1,20 +1,37 @@ --- -- name: Install common packages (Debian) +- name: Install apt packages (Debian) when: ansible_os_family == "Debian" become: yes apt: name={{ item }} state=latest update_cache=yes loop: - curl + - exuberant-ctags - gpg - htop + - psmisc + - shellcheck + - sqlite + - stow - tree -- name: Install common packages (macOS) +- name: Install homebrew packages (macOS) when: ansible_os_family == "Darwin" homebrew: name={{ item }} state=latest loop: + - coreutils + - ctags - curl + - exiftool + - findutils + - gnu-sed - gpg - htop + - imagemagic + - jupyter + - pstree + - reattach-to-user-namespace + - shellcheck + - sqlite + - stow - tree - + - youtube-dl From 41f5acd61b35ec5e1ba80315c8265af3b95e8dad Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 12:18:32 +0000 Subject: [PATCH 29/36] Use blocks to organize package installations --- roles/packages/tasks/main.yml | 68 ++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 2cb15a0..39d72d7 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -1,37 +1,41 @@ --- -- name: Install apt packages (Debian) +- name: Set up Debian machine when: ansible_os_family == "Debian" become: yes - apt: name={{ item }} state=latest update_cache=yes - loop: - - curl - - exuberant-ctags - - gpg - - htop - - psmisc - - shellcheck - - sqlite - - stow - - tree + block: + - name: Install apt packages + apt: name={{ item }} state=latest update_cache=yes + loop: + - curl + - exuberant-ctags + - gpg + - htop + - psmisc + - shellcheck + - sqlite + - stow + - tree -- name: Install homebrew packages (macOS) +- name: Set up macOS machine when: ansible_os_family == "Darwin" - homebrew: name={{ item }} state=latest - loop: - - coreutils - - ctags - - curl - - exiftool - - findutils - - gnu-sed - - gpg - - htop - - imagemagic - - jupyter - - pstree - - reattach-to-user-namespace - - shellcheck - - sqlite - - stow - - tree - - youtube-dl + block: + - name: Install homebrew packages + homebrew: name={{ item }} state=latest + loop: + - coreutils + - ctags + - curl + - exiftool + - findutils + - gnu-sed + - gpg + - htop + - imagemagic + - jupyter + - pstree + - reattach-to-user-namespace + - shellcheck + - sqlite + - stow + - tree + - youtube-dl From 073790d6cff502a4850515ba3ca7d91014bfe6cd Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 12:27:32 +0000 Subject: [PATCH 30/36] Add Mac apps via homebrew cask --- roles/packages/tasks/main.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 39d72d7..de50b98 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -16,6 +16,9 @@ - stow - tree + + + - name: Set up macOS machine when: ansible_os_family == "Darwin" block: @@ -39,3 +42,21 @@ - stow - tree - youtube-dl + + - name: Tap into homebrew/cask-fonts + homebrew_tap: tap=homebrew/cask-fonts state=present + + - name: Install Mac apps with homebrew cask + homebrew_cask: name={{item}} state=present + loop: + - 1password + - cyberduck + - dropbox + - firefox + - font-source-code-pro + - google-chrome + - iterm2 + - transmission + - vagrant + - virtualbox + From 7d961dd3521418d3bc64b3a93690268a1a6c67a7 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sat, 16 Nov 2019 12:32:43 +0000 Subject: [PATCH 31/36] Remove optional --- from YAML files --- dotfiles.yml | 1 - roles/bash/tasks/main.yml | 1 - roles/bin/tasks/main.yml | 1 - roles/dircolors/tasks/main.yml | 1 - roles/git/tasks/main.yml | 1 - roles/hushlogin/tasks/main.yml | 1 - roles/mintty/tasks/main.yml | 1 - roles/packages/tasks/main.yml | 1 - roles/python/tasks/main.yml | 1 - roles/readline/tasks/main.yml | 1 - roles/ssh/tasks/main.yml | 1 - roles/tmux/tasks/main.yml | 1 - roles/vim/tasks/main.yml | 1 - 13 files changed, 13 deletions(-) diff --git a/dotfiles.yml b/dotfiles.yml index b0a0cda..9d4f343 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -1,4 +1,3 @@ ---- - name: Set up development machine hosts: localhost vars_prompt: diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml index b8b3fa4..30f5e2b 100644 --- a/roles/bash/tasks/main.yml +++ b/roles/bash/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Remove pre-installed bash configurations which could cause conflicts file: state: absent diff --git a/roles/bin/tasks/main.yml b/roles/bin/tasks/main.yml index 8950d0d..93f72ba 100644 --- a/roles/bin/tasks/main.yml +++ b/roles/bin/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Create local bin directory file: path: ~/.local/bin diff --git a/roles/dircolors/tasks/main.yml b/roles/dircolors/tasks/main.yml index ce5bb9a..adca248 100644 --- a/roles/dircolors/tasks/main.yml +++ b/roles/dircolors/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Create the dircolors config directory file: path: ~/.config/dircolors diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index ba92a3f..1490090 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Install git (Debian) when: ansible_os_family == "Debian" become: yes diff --git a/roles/hushlogin/tasks/main.yml b/roles/hushlogin/tasks/main.yml index d53d462..8563cf5 100644 --- a/roles/hushlogin/tasks/main.yml +++ b/roles/hushlogin/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Check if hushlogin exists register: hushlogin_stat stat: diff --git a/roles/mintty/tasks/main.yml b/roles/mintty/tasks/main.yml index b06a011..cbc2536 100644 --- a/roles/mintty/tasks/main.yml +++ b/roles/mintty/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Create the mintty config directory file: path: ~/.config/mintty diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index de50b98..1636a62 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Set up Debian machine when: ansible_os_family == "Debian" become: yes diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml index 12f87f8..d4ff36f 100644 --- a/roles/python/tasks/main.yml +++ b/roles/python/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Install python3 (Debian) when: ansible_os_family == "Debian" become: yes diff --git a/roles/readline/tasks/main.yml b/roles/readline/tasks/main.yml index c70abf9..a181681 100644 --- a/roles/readline/tasks/main.yml +++ b/roles/readline/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Create the readline config directory file: path: ~/.config/readline diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 32b39cb..3977b50 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Create the SSH directory file: path: ~/.ssh diff --git a/roles/tmux/tasks/main.yml b/roles/tmux/tasks/main.yml index 5409aaf..2e04c96 100644 --- a/roles/tmux/tasks/main.yml +++ b/roles/tmux/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Install tmux (Debian) when: ansible_os_family == "Debian" become: yes diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml index 1f4bf6c..816c491 100644 --- a/roles/vim/tasks/main.yml +++ b/roles/vim/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Install vim (Debian) when: ansible_os_family == "Debian" become: yes From 0647d72858dc4979e2c0f4486cd2d6b5ccbbc660 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Wed, 4 Mar 2020 18:38:03 +0100 Subject: [PATCH 32/36] Sync bash with master branch --- roles/bash/files/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bash/files/profile b/roles/bash/files/profile index 8408ba7..a7c9b81 100644 --- a/roles/bash/files/profile +++ b/roles/bash/files/profile @@ -353,7 +353,7 @@ colortest() { } ############################################################################## -# Run external cusomizations +# Run external customizations ############################################################################## stty -ixon # disable ctrl-s and ctrl-q From 6590626a7aec081a3cdf2dd621c79e71aa01237a Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Wed, 4 Mar 2020 18:38:26 +0100 Subject: [PATCH 33/36] Sync mintty with master branch --- roles/mintty/files/config | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/mintty/files/config b/roles/mintty/files/config index 1e1df5e..d0c0577 100644 --- a/roles/mintty/files/config +++ b/roles/mintty/files/config @@ -1,6 +1,7 @@ BoldAsFont=no Charset=UTF-8 Columns=130 +CtrlAltIsAltGr=yes CursorType=underscore Font=Source Code Pro Medium FontHeight=9 From 661576726d33578fe70a11e30027fe0fd9e70130 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Wed, 4 Mar 2020 18:38:47 +0100 Subject: [PATCH 34/36] Sync python with master branch --- roles/python/files/startup.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/roles/python/files/startup.py b/roles/python/files/startup.py index ca9a82a..bb3e542 100644 --- a/roles/python/files/startup.py +++ b/roles/python/files/startup.py @@ -1,16 +1,16 @@ -"""Enable default readline configuration on interactive prompts, by -registering a sys.__interactivehook__. - -If the readline module can be imported, the hook will set the Tab key as -completion key and register a history file, using -$XDG_CACHE_HOME/python/history if XDG_CACHE_HOME iset and .python_history -otherwise. -""" -import os -import sys - -def register_readline(): +# Improve interactive prompts by configuring readline. This is done by +# registering a custom hook as sys.__interactivehook__. +# +# If the readline module can be imported, the hook will: +# 1. Set the Tab key as completion key. +# 2. Initialize readline (e.g. from .inputrc). +# 3. Register a history file, using: +# - $XDG_CACHE_HOME/python/history if XDG_CACHE_HOME iset +# - .python_history otherwise. +def configure_readline(): import atexit + import os + try: import readline import rlcompleter @@ -64,5 +64,6 @@ def register_readline(): atexit.register(write_history) -sys.__interactivehook__ = register_readline - +import sys +sys.__interactivehook__ = configure_readline +del sys, configure_readline # we don't want any of this in globals() From 9455d8d285227673ce31c937faa6e75b9ce3ae9e Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Wed, 4 Mar 2020 18:45:50 +0100 Subject: [PATCH 35/36] Sync vim with master branch --- roles/vim/files/vimrc | 104 +++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 48 deletions(-) diff --git a/roles/vim/files/vimrc b/roles/vim/files/vimrc index 503043d..b1708e0 100644 --- a/roles/vim/files/vimrc +++ b/roles/vim/files/vimrc @@ -85,59 +85,61 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" Plug 'altercation/vim-colors-solarized' Plug 'bronson/vim-trailing-whitespace' Plug 'elzr/vim-json' + " Make numbers and booleans stand out, important because of the + " concealment used by vim-json. + highlight link jsonBraces Text + highlight link jsonNumber Identifier + highlight link jsonBoolean Identifier + highlight link jsonNull Identifier Plug 'godlygeek/tabular' | Plug 'plasticboy/vim-markdown' + let g:vim_markdown_conceal_code_blocks = 0 Plug 'junegunn/rainbow_parentheses.vim' + let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']] Plug 'kien/ctrlp.vim' + let g:ctrlp_match_window = 'bottom,order:ttb' + let g:ctrlp_switch_buffer = 0 " open files in new buffer + let g:ctrlp_show_hidden = 1 " show hidden files Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'tpope/vim-commentary' Plug 'tpope/vim-fugitive' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' + if !exists('g:airline_symbols') + let g:airline_symbols = {} + endif + let g:airline_left_sep = ' ' + let g:airline_left_alt_sep = '' + let g:airline_right_sep = ' ' + let g:airline_right_alt_sep = '' + let g:airline_symbols.crypt = '🔒' + let g:airline_symbols.branch = '⎇' + let g:airline_symbols.paste = 'Ⓟ' + let g:airline_symbols.spell = '✔' + let g:airline_symbols.readonly = ' ⃠' + let g:airline_symbols.notexists = '∄' + let g:airline_symbols.whitespace = '✗' Plug 'vim-scripts/srec.vim' + highlight link srecStart Comment + highlight link srecType Comment + highlight link srecLength WarningMsg + highlight link srec16BitAddress Constant + highlight link srec24BitAddress Constant + highlight link srec32BitAddress Constant + highlight link srecChecksum Type Plug 'keith/swift.vim' Plug 'chr4/nginx.vim' call plug#end() - let g:ctrlp_match_window = 'bottom,order:ttb' - let g:ctrlp_switch_buffer = 0 " open files in new buffer - let g:ctrlp_working_path_mode = 0 " use the current working directory - let g:ctrlp_show_hidden = 1 " show hidden files - - let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']] - - if exists('airline#section#create') - if has('multi_byte') && &encoding ==# 'utf-8' - let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v']) - else " line / total : col - let g:airline_section_z = airline#section#create(['L%4l/%L c%3v']) - endif + " This has to be here (as opposed to right after the Plug call) because the + " function airline#section#create doesn't exist before plug#end() is + " called. + if has('multi_byte') && &encoding ==# 'utf-8' + let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v']) + else " line / total : col + let g:airline_section_z = airline#section#create(['L%4l/%L c%3v']) endif - if !exists('g:airline_symbols') - let g:airline_symbols = {} - endif - - let g:airline_left_sep = ' ' - let g:airline_left_alt_sep = '' - let g:airline_right_sep = ' ' - let g:airline_right_alt_sep = '' - let g:airline_symbols.crypt = '🔒' - let g:airline_symbols.branch = '⎇' - let g:airline_symbols.paste = 'Ⓟ' - let g:airline_symbols.spell = '✔' - let g:airline_symbols.readonly = ' ⃠' - let g:airline_symbols.notexists = '∄' - let g:airline_symbols.whitespace = '✗' - - highlight link srecStart Comment - highlight link srecType Comment - highlight link srecLength WarningMsg - highlight link srec16BitAddress Constant - highlight link srec24BitAddress Constant - highlight link srec32BitAddress Constant - highlight link srecChecksum Type - - silent! colorscheme solarized + colorscheme solarized filetype plugin indent on syntax enable " }}} @@ -181,7 +183,6 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" " quickly exit insert mode inoremap jk - inoremap kj " retain selection when indenting/unindenting in visual mode vnoremap > >gv @@ -197,11 +198,15 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" nnoremap 5< nnoremap 5> + " easier window navigation + nnoremap j + nnoremap k + nnoremap h + nnoremap l + " easier tab navigation - nnoremap :tabprevious - nnoremap :tabnext - nnoremap :tabfirst - nnoremap :tablast + nnoremap :tabprevious + nnoremap :tabnext " quickly change background nnoremap bg @@ -214,13 +219,13 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" nnoremap n :NERDTreeToggle " toggle rainbow parens - nnoremap r :RainbowParentheses!! + nnoremap p :RainbowParentheses!! " fix whitespace nnoremap w :FixWhitespace " cycle through line numbering modes - nnoremap r :call VimrcCycleNumbers() + nnoremap l :call VimrcCycleNumbers() " }}}" @@ -228,16 +233,19 @@ augroup vimrc " {{{ autocmd! autocmd BufNewFile,BufRead bash_profile,bashrc set filetype=sh autocmd BufNewFile,BufRead gitconfig set filetype=gitconfig - autocmd BufNewFile,BufRead rcrc set filetype=sh autocmd BufNewFile,BufRead *.sx,*.s19 set filetype=srec + autocmd BufNewFile,BufRead Vagrantfile set filetype=ruby autocmd FileType vim setlocal foldmethod=marker autocmd FileType python setlocal foldmethod=indent foldignore= autocmd FileType markdown,text,gitcommit setlocal formatoptions+=t spell autocmd FileType gitcommit setlocal textwidth=72 + + autocmd BufWritePost vimrc source % augroup END " }}} -if filereadable(expand("$XDG_CONFIG_HOME/vim/vimrc.local")) - source "$XDG_CONFIG_HOME/vim/vimrc.local" +let LOCAL_VIMRC=expand("$XDG_CONFIG_HOME/vim/vimrc.local") +if filereadable(LOCAL_VIMRC) + exec "source " . LOCAL_VIMRC endif From 20efb65a1628240e53894aa5d846d649509340a6 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Wed, 4 Mar 2020 18:52:00 +0100 Subject: [PATCH 36/36] Sync ssh with master branch --- roles/ssh/files/config | Bin 1424 -> 1493 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/roles/ssh/files/config b/roles/ssh/files/config index 9e89e110870e7abde16c4be3b666b326d6a60766..645a8af0e9a83f2a9178cf8e5640949748ce1189 100644 GIT binary patch literal 1493 zcmV;`1uFUgM@dveQdv+`00z;3nCT6&PIU>xnG`cDT8C}d<2mL;fRQ^6|E!8l$G=&y zbpE<<0WoP-*XjhmJFJ3c_3X4|Yz|%3LjucjR*ex`j!O8lY4YI~VHX5zIP!!l|Dm!0 zYBkH_Pg8f_RCJU5$RAAJHb|xq$Y$#X>B?ncq|(*?JQGfR-It%3kp+3}m>HNj1v&!67G)=yeco~yW?VkAeYnBf z5ydXk^OcuWQUS1QWLRCb2#9vxNa_p{j0XR1`))Myx1D`o!=>{)D1SgSDNPqiHEH9< zzx-WEb<2&G)AGS#oPj(l zk(cO*7TKSR#IUCVNa@WauC=0Z=~JNC%_`>1(prI`sNWm+jqzwA2C@NI|aFIOzptl$@eku1jiVUq-4HF^};-Ew`_8GaEvV zSk~LF(61#s(*a1ukc|m^0MiZ@#Ef!NCh1>5n}P9?)=^7hluPY7MN(9Toa_^Y29gL0 z30qj;UpDz8J~vYcQsFfQDOat8F|^tNM}63x5@0~09q)T_sWe61%W}Q}E*JZN$)DGC zq!~CVJcXYr1(eY@F&R>hd~BlG{~-}3lpC_s(YSE??>2;GK_(4)rdQ^z<3RfO+Tkzu~4-c^>Rm^=XA z?`PMYC6l4&zfrwanXoZ|>1~kz&-ln)r)Om-jWr{_fkCIg{O^8c89GCCv9`IC_qc4c zsbL+w!I|-HEN1y!Z~54hSav36hBf6m$wgr%hZC`;@!&L8K9@-P%ozWG`NqtVU(OT6 z_FdY|Tn7Walm@S=2CxY6_j;&iki@44qezK1aqch#aRqjf+uB7gR&USJ*75*q%hLBt z1YR+8+Gfi!sLOzfTqjhJVG9YVO;aOr3>R`{_892Yumta!LQ87~u~xcgFP>9xVuw=d z_^1QBW?)olb(3sH#k=KarRVD@X0oVr8e;70h-kget#Tk8-M&l^qMMJGnqX{Iw_%X8 z7cLsLW%)eaFX^dath|qw2%N(EM^PZ`%(h63r~QqH512Q0F|R@d(ZHBz7hMTaQ#CoK zt#EJE_)El{vUTrJh_S)TGVrO$M90`=L+=+2BiwNn_)UdEPi0D6EVl%9^2^ucg7LGL ze7wG(5o5vkX70LaMvnF!41X@9xV#K*AlLsQhPG#`#cK{3>&|Mq*2f)xmIEo2)28fz zg8?{fgi74(`*Gre=!XJCG3l|Ii-hweN$@(_d2UZ$3d*ElZ)L;!d;HDi#gvynJKluI z^I)w}89umk;4#{meuN=$fDQXu9&SO5`L15A5i_2y*r;?L?E?i+;U-_Up@X+PRieNp zJV-Kv2C@7JA4N1+eFFBj#5-yijYcs<@q#q@iG3Fr^oxL_7-JJ`wH+AX1NsvJ%g#yE z0hwclOvH{|Q^@<$=~|EI8N^k(;&2^h)PQl96h8|{zQpJM4W<%hK_aI9R zgE_&$suY@|*3PYivu2-toOmA1SX)))2;Zz698ARo&NM{NP(!0N;7OM+X7!nng|QjB z=zrZ>LHC8AWXZe)YpgUQ4L!c4iO0Ez7lQ1icRNR%Ro#G?Q11Wl?-3uFxYf4Zu4%3v vfBTTK4I-6ALG5&#DQ2ME7)z~pA9GMQX$>l?jfJ7SNZIcKRCNdX?^dqyN&@2? literal 1424 zcmV;B1#kKQM@dveQdv+`00T4S28J$wRjGR(dg!Gkwq4*Pv5s&oCpKB@XK(L)JcD@O zLt-*^^2Cb7rq!w*8x3(3-M`VqOm5f?TUa@1s{!9#JZY!(L!pvRL=!;MBjVBqA4-fi z32Qj1od7%K2uPX4o+ZZ)EEs&B)4F9oVq^rW;y=5~Wpv^gV*3f{nbH|54QPG>!b>H~ zwY+(J=CGN=rtFk_csV4}RFIfwH)1pyp^7P-a(d?Yc_?l>WZBOt^L$+K(r56qKD*L( zndPo;UF}bbb~#r5sP%QC{>Md=b0ND^NRMeOQ{w{yvQS=H_iA+4ANJY*nBtfZv9TxN zlp{9gUyLr-57{1G*;4v+M{;)zN7s8UHs`$P$IB z*y8Vgl8){J9t{K(9adP!y(>X!GDD~fRyhBguUGEH%rG6-I+eAC4IA^`K?Z%ncOi0% zKs1sO{U`99k&y}9(#$-7?ktareUq}_mVyNq;XBC-EDfW#TmZg^)I4V__~|5JCb+tY zfU9v0r_HmE@1dbX8?`1|Yh>Zp!~i~pob0?7IvZZiLIQvC@6Yc&Zf1r~Jh-&)?AZU7 z^H{^o-9O^EXp0?13WuJRY?p5rwOBBG$Fb9~;dW;GESU2pC>8Q}KQnjw`CC6Zk1pd< zfl#K;NmAc$t%GT_sN|!1n+^Ipn!F_!oHyjOA#|wG!+QQh&C+1PAa%;Yww00sCEEYZ z@BQP5^n#P(8i_%Dp}@WQb$f)e1?x27S$b-;KW8h!meoVAXfmEt{bniAdU3+{9dw`; zZ02@GD?gsf7tqp`wmvj$q{E*T((ZiIe26xnwJb89Py-IjJ3Dfe?t+|{5C2457K#Rc zKrb@eL~b#%s(WS=8h3HH2jf4msVr<&2KA5nMzA9rxF^O3l}rT$&kiRFJ7)Nu6ZU)+ zKC+Ci7jam^T&n6!^<(B6Hz7}MsHj|n4Cyo3b&L4QG7d+hm;|73v9&g zj9t!fdVU3#>Gs!4ir4eSMrWji5vBkxYz4c0$emB72lx|IT~_WAAI3FzV@ zz6~zp*PZ2;7%M%D(;2gMrIz#a`jSh+FYw$y2zYwBziBiVY*u z*LqqR`*2ug7`!HUZSKZYHZ&puM12TjFlu!_Y%{G7{nGz6ryY*Io6Lb`!A?+=4aV=bPc z-{^>O-f0T*y6(LYn>*AYiIwIhM#+8w3Kp--6s}a0gBg2AI&Xl8x`|#5Tk(YdUg<}n z_@N4Yg*D6Rsy>UAJnkK`9T^G(jeT$65}NQ5U}6Dzmp_^zLBJyR5Ez@8Xhuc2f0b`_ zKvwpZ+vsf}Ndn=-E+NxcTqzxHGMXTHWJ{^;L_em3GRQ* z?8w`w1Q_pCCHi#h1cZ+`{`Yix!`n#px(qzpoa{!6K?E{+O`0B*Gljv3p$ eZNdn~mQgaOV;V8Ut_D_&Y1~h>tqu=UxZt8vl)^gz