git: update config and add defaults for merging and rebasing

This merges a working ansible role for redshift & gnupg back into master

.gitignore

@@ -0,0 +1,2 @@
+*.swp
+*.retry

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ansible-gpg-vault"]
+	path = ansible-gpg-vault
+	url = https://git.finallycoffee.eu/finallycoffee.eu/ansible-gpg-vault.git

all.yml

@@ -0,0 +1,7 @@
+---
+
+- import_playbook: vim.yml
+- import_playbook: tmux.yml
+- import_playbook: gnupg.yml
+- import_playbook: redshift.yml
+

ansible-gpg-vault-store/gpg_ids.list

@@ -0,0 +1 @@
+johanna.reichmann@delta-industries.de

ansible-gpg-vault-store/vault_passphrase.gpg

@@ -0,0 +1,20 @@
+-----BEGIN PGP MESSAGE-----
+
+hQIMAxEs7W/4x4lxAQ//ZkLnB+f9bD12wnnRJm8S6j/iaxbxsV9vSe0xfGZH0mup
+7f9Kpg8kCxDaTnbgQw9HIPJPc4m/Kwlo8Jx+Zk3+AIvuEkqll3OjmiwstlH9EPBg
+VzDDnpWHb4EG0xYWv7+pztudwX2Ghp1xMqHYIokJNliU01vn/igoeZjLg+uogKWf
+4+qFest0CLONfHM2LUj3qfMJc1dndRM46i2YybjTC6BFmqtXGNuEeVOHNUV3AgTw
+M6gpq26rr+YdVElft43o2+sdZH/USlL/ga5+K0Ea272qhmO/fPbTeffqlUHtkkWs
+bURsLmPQYkgZxy8TflSVeB8qol5i30hqkD3WTuEHB+m92KkxveZcV2jHeNrI1OEP
+r/kbMcxivDod0eNaEwe7pMlm7NstrHrnIExm9pG5y8YIIRlaELNJbXPcZAHTG+o9
+j+kfPnRyqFrF1raktY0AO99jsNn13uXYMPb0TB78jR6Qs0HAm56GUtO+enZhUEBo
+3igpeiU5lMEhua8fD+xSUhA4Hx8InS/Oj2FxzK4GRyRhXag2xFoBEM9FMJnRr9cR
+m5mPFBvqMadZkejRrv+QpAy6phauR4Zo9M7qBwsZ79adeFFTMneYONuF8l6okjBu
+OSHFPeR9R+O+iv+toAMCyqfH93RM7NWKBbawhnBBvaS7bIzMw0x+xKJo+c5lkQXS
+wC0BupdYkeee+5KeD+LejKJK2UBRtYPhDYZRPbHu0Hu837liuXhrJYuKz6SFfoPU
+kQcyYUlFVcaqjIwKGLYQdwumZetGlw8DlfmQ9nax5n5wvVm+fv6ZF8wy60Wsehbi
+fqE2jTTBRStyIqScPOZKTu1OR17va9KKhDnAPLXVPZ/ROxJftIrsa2FFRhItJBJx
+fqCe73K8zvT5jcHlN+qQlHgmV2KdTbMa0i6IC+VMWgdlK8HhE+nzYfl5Z4cf6ZwA
+BHnAXdwgtnj8FxZmC1NgRQuhXj3UucPO9/HrqEToAUydUQvbT1YbX+RLnzIysrU=
+=cikY
+-----END PGP MESSAGE-----

ansible.cfg

@@ -0,0 +1,3 @@
+[defaults]
+
+vault_password_file = ansible-gpg-vault/vault.sh

git.yml

@@ -0,0 +1,7 @@
+---
+
+- name: Install & template git configuration
+  hosts: git
+  become: true
+  roles:
+    - git

global.yml

@@ -0,0 +1,43 @@
+---
+
+all:
+  hosts:
+    iodine:
+      ansible_host: iodine.int.finallycoffee.eu
+      ansible_user: jdreichmann
+      ansible_become_user: jdreichmann
+      ansible_become: true
+    carbon:
+      ansible_host: carbon.int.finallycoffee.eu
+#    iron:
+#      ansible_host: iron.int.finallycoffee.eu
+#    platinum:
+#      ansible_host: platinum.int.finallycoffee.eu
+#    xenon:
+#      ansible_host: xenon.int.finallycoffee.eu
+#    yttrium:
+#      ansible_host: yttrium.int.finallycoffee.eu
+  
+    munich:
+      ansible_host: munich.finallycoffee.eu
+      ansible_user: jdreichmann
+      ansible_become_user: jdreichmann
+      ansible_become: true
+  vars:
+    ansible_user: transcaffeine
+    ansible_become_user: transcaffeine
+    ansible_become: true
+
+
+servers:
+  hosts:
+    iodine:
+    munich:
+#    iron:
+#    platinum:
+
+clients:
+  hosts:
+#    carbon:
+#    xenon:
+

gnupg.yml

@@ -1,8 +1,7 @@
 ---
 
 - name: Sets up gpg and the configs for using it as a ssh-agent
-  #connection: local
-  hosts: gnupg
+  hosts: all
   become: true
   roles:
     - gnupg

group_vars/git.yml

@@ -0,0 +1,34 @@
+$ANSIBLE_VAULT;1.1;AES256
+64363730336134663064313633316132396335613761386239613966313864656565376230323338
+3863396633383931393031643837323037356332326664630a393662323135643562643230363437
+31343065363266353662643365303663633131393037353130316638623035356138383164346166
+6234323936383061340a366634373336333363656463656433333139333362393530363131623535
+32396534633831343632323263336565353836343035396138353132356464383763396535393337
+64353137653266653262643164613534333865666336663561376462346663663934376466343261
+64656535343937643031616663666566626265313661623034386163336232336538663365626566
+32346463363333616261643364363263363163316431623364383333353364363836613062373537
+64636337343466643333666465643162323266353663366662313639623638393961333230373838
+63363633383134623931373062396665353161636435343463646536663962333232656264306331
+37323564306135363064363663656239313165326331303865643338333463303935356436626262
+38353738366632663839626166303964396535333639646162666435363630633132646531313930
+36343439373230616433623539393938326562343465633763363865323262323366316135393339
+62616132333063643433353039353765663736633334613138363936306336303962643339313163
+35646562663861613966346437666534313839373436376666313433353338653333643263373331
+32306136333564343831343439346466626135313835346433666337653435313833383033633665
+64613430383666653036393938643734613330623066333866643965343863636166363063306534
+39343163366161373862383466313830646336333731333438663465336339313865306438353262
+37363538383132373933313566366265616538356636633636343633343830363739383237316632
+33616636666464366462613866383837323736353931623463323565356431346166393066326263
+31623561323538373437366164376464663639633932383035346165353462303264373433393231
+62353866616532313236363337306466626536306666333232613065373066663762663739633831
+39316635663761663934323733656666396661653462383665336631373537356533383332323533
+38633465326566663331383564643066366235613337356531396530323937323138313966393635
+62353365383839383762303034633562353130353434656232636539313165346134373231316333
+62656534386439623435353264313134623035303366313763316164656336346436353130363834
+36306662633139663538383238646561346166353737636163323965663030373232613564393335
+39353632333139336132636536326538353033373736643132346635613666346635616637386539
+38643031626439373830316230643331303037313363633661333539383166356137333665623336
+64376334353837353262373461663666646630323366356538313138363038626635353231626164
+64346437383261643638306566356262383534646163343164333838373738303535623535323666
+35623861663933613366306131656231353833643234373933316262633338666236386662636135
+3563

local.yml

@@ -26,3 +26,6 @@ vim:
   hosts:
     xenon:
 
+git:
+  hosts:
+    xenon:

redshift.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Sets up redshift and creates an autostart file
-  hosts: redshift
+  hosts: clients
   become: true
   roles:
     - redshift

roles/git/defaults/main.yml

@@ -0,0 +1,25 @@
+---
+
+git_user: your-username
+git_email: your-email@example.com
+git_signkey:
+git_signingkey:
+
+git_do_sign: false
+git_merge_autostash: true
+git_rebase_autostash: true
+git_pull_rebase: true
+git_pull_ff_only: true
+git_default_branch: main
+
+git_user_home: "/home/{{ git_system_user }}"
+git_system_user: "{{ git_user }}"
+git_system_group: "{{ git_system_user }}"
+
+git_gpg_program: ~
+
+git_aliases: []
+
+git_credentials: []
+
+git_config_preferred_editor: vim

roles/git/tasks/main.yml

@@ -0,0 +1,9 @@
+---
+
+- name: Template .gitconfig
+  template:
+    src: gitconfig.j2
+    dest: "{{ git_user_home }}/.gitconfig"
+    owner: "{{ git_system_user }}"
+    group: "{{ git_system_group }}"
+    mode: 0660

roles/git/templates/gitconfig.j2

@@ -0,0 +1,49 @@
+# This is Git's per-user configuration file,
+# this file is managed by ansible.
+{% if git_do_sign %}
+[gpg]
+	program = {{ git_gpg_program }}
+{% endif %}
+
+[user]
+	name = "{{ git_author }}"
+	email = {{ git_email }}
+{% if git_do_sign %}
+	signingkey = {{ git_signingkey }}
+{% endif %}
+
+[commit]
+{% if git_do_sign %}
+	gpgsign = true
+{% endif %}
+
+[alias]
+{% for alias in git_aliases %}
+	{{ alias.name }} = {{ alias.cmd }}
+{% endfor %}
+
+[pull]
+	rebase = {{ git_pull_rebase|bool|lower }}
+{% if git_pull_ff_only|bool %}
+	ff = only
+{% endif %}
+
+[rebase]
+	autostash = {{ git_rebase_autostash|bool|lower }}
+
+[merge]
+	autostash = {{ git_merge_autostash|bool|lower }}
+
+[init]
+	defaultBranch = {{ git_default_branch }}
+
+[core]
+	editor = {{ git_config_preferred_editor }}
+
+{% for cred in git_credentials %}
+[credential "{{ cred.remote_url }}"]
+	username = {{ cred.username }}
+{% if cred.helper is defined %}
+	helper = {{ cred.helper }}
+{% endif %}
+{% endfor %}

roles/gnupg/tasks/main.yml

@@ -5,7 +5,11 @@
   package:
     name: gnupg2
     state: latest
+  become: yes
+  become_user: root
+  become_method: sudo
   when: ansible_os_family == "RedHat"
+  ignore_errors: true
 
 - name: Install gnupg (Arch)
   package:

roles/i3/tasks/main.yml

@@ -16,3 +16,7 @@
     src: config.j2
     dest: ~/.config/i3/config
 
+- name: Create autostart entry
+  template:
+    src: ""
+    dest: ~/.config/autostart/i3.desktop

roles/i3/templates/config.j2

@@ -1,10 +1,3 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
 # i3 config file (v4)
 #
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
@@ -149,13 +142,6 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-
-
-#-old-#bar {
-#-old-#       status_command i3status
-#-old-#}
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id synergy
 

roles/network/tasks/main.yml

@@ -0,0 +1,14 @@
+---
+
+- name: Install network manager
+
+- name: Template config for default network
+
+- name: Copy KIT VPN configuration
+
+- name: Copy flauschekatze.space VPN configuration
+
+- name: Copy FFKA VLAN config
+
+- name: Copy int.finallycofffee.eu VPN/VLAN config
+

roles/redshift/tasks/main.yml

@@ -4,7 +4,7 @@
   package:
     name: redshift
     state: present
-
+  ignore_errors: true
 
 - name: Ensure .config folder for redshift exists
   file:

roles/tmux/tasks/main.yml

@@ -4,9 +4,18 @@
   package:
     name: tmux
     state: present
+  become: yes
+  become_user: root
+  become_method: sudo
+  ignore_errors: true
 
 - name: Template config file into home folder
   template:
     src: tmux.conf.j2
     dest: ~/.tmux.conf
 
+- name: Template controller config file to home folder
+  template:
+    src: controller.tmux.conf.j2
+    dest: ~/.controller.tmux.conf
+

roles/tmux/templates/controller.tmux.conf.j2

@@ -0,0 +1,39 @@
+# Reload controller config with "r" key
+unbind t
+bind t source-file ~/.controller.tmux.conf \; display-message "Controller config reloaded..."
+
+# No automatic renaming of windows
+set -g automatic-rename off
+
+# Enable 256-color terminal
+set -g default-terminal "screen-256color"
+
+# Set titles to be informative
+set set-titles on
+set set-titles-string "tmux: [#H] [#S] [#W:#D #I:#P]"
+
+# Change colors on the pane seperators
+set pane-border-fg colour237
+set pane-active-border-fg colour27
+
+# Tweak currently highlighted window ('active')
+setw window-status-current-fg colour255
+setw window-status-current-bg colour27
+setw window-status-current-format " #F[#W] "
+setw window-status-current-attr none
+
+# Tweak overview of windows
+setw window-status-format " #F[#I][#W] "
+setw window-status-bg colour237
+setw window-status-fg colour255
+
+# Tweak status line design
+set status-bg colour237
+set status-fg colour27
+set status-justify centre
+set status-left " [#H] [#S] "
+set status-left-length 100
+set status-right ' [#(curl https://wttr.in/berlin?format=3)] [%Y-%m-%d %H:%M.%S] '
+# Refresh status bar every second
+set status-interval 1
+

roles/tmux/templates/tmux.conf.j2

@@ -1,40 +1,46 @@
+# vi:syntax=tmux
 # Reload the config with the "r" key
 bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
 
 # No automatic renaming of windows
-set -g automatic-rename off
+set automatic-rename off
 
 # Enable 256-color terminal
-set -g default-terminal "screen-256color"
+set default-terminal "screen-256color"
 
 # Set titles to be informative
-set -g set-titles on
-set -g set-titles-string "tmux: [#H] [#S] [#W:#D #I:#P]"
+set set-titles on
+set set-titles-string "tmux: [#H] [#S] [#W:#D #I:#P]"
 
-# Install tmux-plugin-manager, first run `git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm`
-#set -g @plugin 'tmux-plugins/tpm'
-#set -g @plugin 'tmux-plugins/tmux-sensible'
+# Change pane colors
+set -g pane-border-style fg=colour237
+set -g pane-active-border-style fg=colour199
 
-# Tweak currently highlighted pane
-setw -g window-status-current-fg colour236
-setw -g window-status-current-bg colour199
+# Tweak currently active window
+setw -g window-status-current-style bg=colour199,fg=colour255,none
 setw -g window-status-current-format " #F[#W] "
-setw -g window-status-current-attr none
+# Tweak last active window style
+setw -g window-status-last-style fg=colour255,bg=colour238,none
 
-# Tweak pane display
+# Tweak display of window overview
 setw -g window-status-format " #F[#W][#I] "
-setw -g window-status-bg colour237
-setw -g window-status-fg colour255
+setw -g window-status-style bg=colour233,fg=colour255,none
 
 # Tweak status line design
-set -g status-bg colour235
-set -g status-fg colour199
-set -g status-justify centre
-set -g status-left " [#H] [#S] "
-set -g status-left-length 100
-set -g status-right '[FFKA: #(ip addr show freifunk | grep inet6 | grep -v fe80 | cut -d/ -f1 | cut -d " " -f6)] [%Y-%m-%d %H:%M.%S]'
-# Refresh status bar every 5s
-set -g status-interval 5
+set -g status-style bg=colour235,fg=colour199
+set status-justify centre
+set status-left " [#H] [#S] "
+set status-left-length 100
+set status-right '[%Y-%m-%d %H:%M.%S]'
+# Refresh status bar every 2s
+set status-interval 2
+
+# Set some helpful limits & modes
+set -g mouse off
+set -g history-limit 50000
+
+# Make tmux resize based on smallest client actually viewing the window, not just attached
+setw -g aggressive-resize on
 
 # Initialize tmux-plugin-manager
 run '~/.tmux/plugins/tpm/tpm'

tmux.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Set up tmux
-  hosts: tmux
+  hosts: all
   become: true
   roles:
     - tmux

vim.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Install vim and copy color scheme and template its config
-  hosts: vim
+  hosts: all
   become: true
   roles:
     - vim

vim/.netrwhist

@@ -1,3 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =1
-let g:netrw_dirhist_1='/home/electron/git/critical_infrastructure'