Remove ~/.vim completely

See https://github.com/greshake/i3status-rust/pull/1680

.gitignore

@@ -1 +1 @@
-/venv/
+/*.bundle

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "contrib/vim-plug"]
 	path = contrib/vim-plug
 	url = https://github.com/junegunn/vim-plug
+[submodule "ansible_roles/firefox"]
+	path = ansible_roles/firefox
+	url = https://github.com/staticdev/ansible-role-firefox

Makefile

@@ -1,21 +1,16 @@
-venv = ./venv
+ansible_run = ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
-requirements = requirements.txt
-activate = . $(venv)/bin/activate
-pip = pip
-ansible = venv/bin/ansible-playbook
-ansible_run = $(activate) && ansible-playbook --inventory localhost, --diff --verbose ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
 
 .PHONY: all
-all: $(ansible)
+all:
 	$(ansible_run)
 
-.PHONY: dryrun
+.PHONY: config
-dryrun: $(ansible)
+config:
-	$(ansible_run) --check
+	$(ansible_run) --skip-tags system-update
 
-.PHONY: update
+.PHONY: system-update
-update: $(ansible)
+system-update:
-	$(ansible_run) --tags update_system
+	$(ansible_run) --tags system-update
 
 .PHONY: reboot
 reboot:
@@ -29,27 +24,13 @@ poweroff:
 weekend: | update poweroff
 
 .PHONY: packages
-packages: $(ansible)
+packages:
 	$(ansible_run) --tags packages
 
 .PHONY: dotfiles
-dotfiles: $(ansible)
+dotfiles:
 	$(ansible_run) --tags dotfiles
 
-.PHONY: clean
-clean:
-	rm -rf venv
-
 .PHONY: test
 test:
 	./test-in-docker.sh
-
-$(ansible): venv
-
-venv:
-	python3 -m venv $(venv)
-	$(activate) && $(pip) install -r $(requirements)
-
-.PHONY: freeze
-freeze:
-	$(activate) && $(pip) freeze > $(requirements)

_machines/ares.yml

@@ -1,22 +1,46 @@
-font_size: 12
+font_size_1: 12
-letter_space: 0
+font_size_2: 12
-terminal_binary: alacritty
 
 gpu: amd
 
+i3bar_icon_padding: " "
+
 users:
 - name: hannes
   vt: 1
   firefox_profiles:
-    - name: 7kqv7aco.default-release
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
       manage_css: true
+    media:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+      bigger_font: true
   mail: hannes@hkoerber.de
   git_gpg_sign: false
+  ssh_agent: false
   gpg_agent: true
-  gpg_keys:
+  gpg_agent_for_ssh: true
-    master_key: "0xB5C002530C6A2053"
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
+  repositories:
+    - personal_projects
 
 screen:
   1: DisplayPort-0
@@ -30,15 +54,18 @@ screen:
   9: DisplayPort-0
   0: DisplayPort-0
 
+screencfgs: []
+
 workspace:
+  1: ""
+  9: ""
+  10: ""
 
 environment:
   MACHINE_TYPE: "workstation"
   MACHINE_HAS_KEEPASSX: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
   MACHINE_HAS_STEAM: "true"
-  MACHINE_HAS_DISCORD: "true"
   MACHINE_HAS_RESTIC_BACKUP: "false"
-  MACHINE_DEFAULT_SCREENPROFILE: "ares"
   MACHINE_RESOLUTION_X: "2560"
   MACHINE_RESOLUTION_Y: "1440"

_machines/neptune.yml

@@ -0,0 +1,92 @@
+font_size_1: 12
+font_size_2: 12
+
+i3bar_icon_padding: ""
+
+users:
+- name: hannes-work
+  group: hannes-work
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+    meet:
+      extensions:
+        - ublock-origin
+      manage_css: false
+  mail: h.koerber@clipmyhorse.tv
+  git_gpg_sign: false
+  ssh_agent: true
+  gpg_agent: false
+  gpg_agent_for_ssh: false
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "false"
+    MACHINE_HAS_RESTIC_BACKUP: "false"
+    MACHINE_HAS_KEEPASSX: "false"
+  repositories: []
+
+- name: hannes-private
+  group: hannes-private
+  vt: 2
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+  mail: hannes@hkoerber.de
+  git_gpg_sign: false
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+    MACHINE_HAS_RESTIC_BACKUP: "false"
+    MACHINE_HAS_KEEPASSX: "false"
+  repositories:
+    - personal_projects
+
+screen:
+  1: DP-3
+  2: DP-3
+  3: DP-4
+  4: DP-4
+  5: DP-4
+  6: DP-4
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
+
+workspace:
+  1: ""
+  2: ""
+  3: " local"
+  4: " remote"
+  7: ""
+  8: ""
+  9: ""
+  10: ""
+
+screencfgs:
+  - name: three-screens
+    key: F3
+
+environment:
+  MACHINE_TYPE: "laptop"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1200"

_machines/tb-hak.yml

@@ -1,55 +0,0 @@
-font_size: 11
-letter_space: 0
-terminal_binary: urxvt
-
-users:
-- name: hannes-work
-  group: hak
-  vt: 1
-  firefox_profiles:
-    - name: 3wmp9hdb.default-1565075150057
-      manage_css: true
-  mail: hannes.koerber@tradebyte.com
-  git_gpg_sign: false
-  gpg_agent: false
-  environment:
-    MACHINE_HAS_NEXTCLOUD: "false"
-- name: hannes-private
-  group: tpp
-  vt: 2
-  mail: hannes@hkoerber.de
-  git_gpg_sign: false
-  gpg_agent: true
-  gpg_keys:
-    master_key: "0xB5C002530C6A2053"
-  environment:
-    MACHINE_HAS_NEXTCLOUD: "true"
-
-screen:
-  1: DP-1-1
-  2: DP-1-1
-  3: DP-1-2
-  4: DP-1-2
-  5: DP-1-2
-  6: DP-1-2
-  7: eDP-1
-  8: eDP-1
-  9: eDP-1
-  0: eDP-1
-
-workspace:
-  1: www
-  2: www
-  3: term-local
-  4: term-remote
-  7: comm
-  8: pass
-  9: music
-  10: pim
-
-environment:
-  MACHINE_TYPE: "laptop"
-  MACHINE_HAS_KEEPASSX: "true"
-  MACHINE_HAS_RESTIC_BACKUP: "true"
-  MACHINE_RESOLUTION_X: "1920"
-  MACHINE_RESOLUTION_Y: "1080"

alacritty/alacritty.toml.j2

@@ -0,0 +1,58 @@
+live_config_reload = false
+
+[colors.bright]
+black = "#75715E"
+blue = "#66D9EF"
+cyan = "#A1EFE4"
+green = "#A6E22E"
+magenta = "#AE81FF"
+red = "#F92672"
+white = "#F9F8F5"
+yellow = "#F4BF75"
+
+[colors.normal]
+black = "#000000"
+blue = "#66D9EF"
+cyan = "#A1EFE4"
+green = "#A6E22E"
+magenta = "#AE81FF"
+red = "#F92672"
+white = "#F8F8F2"
+yellow = "#F4BF75"
+
+[colors.primary]
+background = "#272822"
+foreground = "#F8F8F2"
+
+[env]
+TERM = "alacritty"
+
+[font]
+size = {{ machine.font_size_2 }}
+
+[font.bold]
+family = "Inconsolata"
+style = "Bold"
+
+[font.bold_italic]
+family = "Inconsolata"
+style = "Bold Italic"
+
+[font.italic]
+family = "Inconsolata"
+style = "Italic"
+
+[font.normal]
+family = "Inconsolata"
+style = "Regular"
+
+[selection]
+save_to_clipboard = true
+
+[window]
+dynamic_title = true
+title = "[terminal]"
+
+[window.padding]
+x = 3
+y = 3

alacritty/alacritty.yml.j2

@@ -1,702 +0,0 @@
-# Configuration for Alacritty, the GPU enhanced terminal emulator.
-
-# Import additional configuration files
-#
-# Imports are loaded in order, skipping all missing files, with the importing
-# file being loaded last. If a field is already present in a previous import, it
-# will be replaced.
-#
-# All imports must either be absolute paths starting with `/`, or paths relative
-# to the user's home directory starting with `~/`.
-#import:
-#  - /path/to/alacritty.yml
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty itself.
-#env:
-  # TERM variable
-  #
-  # This value is used to set the `$TERM` environment variable for
-  # each instance of Alacritty. If it is not present, alacritty will
-  # check the local terminfo database and use `alacritty` if it is
-  # available, otherwise `xterm-256color` is used.
-  #TERM: alacritty
-
-window:
-  # Window dimensions (changes require restart)
-  #
-  # Number of lines/columns (not pixels) in the terminal. The number of columns
-  # must be at least `2`, while using a value of `0` for columns and lines will
-  # fall back to the window manager's recommended size.
-  #dimensions:
-  #  columns: 0
-  #  lines: 0
-
-  # Window position (changes require restart)
-  #
-  # Specified in number of pixels.
-  # If the position is not set, the window manager will handle the placement.
-  #position:
-  #  x: 0
-  #  y: 0
-
-  # Window padding (changes require restart)
-  #
-  # Blank space added around the window in pixels. This padding is scaled
-  # by DPI and the specified value is always added at both opposing sides.
-  padding:
-    x: 3
-    y: 3
-
-  # Spread additional padding evenly around the terminal content.
-  #dynamic_padding: false
-
-  # Window decorations
-  #
-  # Values for `decorations`:
-  #     - full: Borders and title bar
-  #     - none: Neither borders nor title bar
-  #
-  # Values for `decorations` (macOS only):
-  #     - transparent: Title bar, transparent background and title bar buttons
-  #     - buttonless: Title bar, transparent background and no title bar buttons
-  #decorations: full
-
-  # Startup Mode (changes require restart)
-  #
-  # Values for `startup_mode`:
-  #   - Windowed
-  #   - Maximized
-  #   - Fullscreen
-  #
-  # Values for `startup_mode` (macOS only):
-  #   - SimpleFullscreen
-  #startup_mode: Windowed
-
-  # Window title
-  #title: Alacritty
-
-  # Allow terminal applications to change Alacritty's window title.
-  #dynamic_title: true
-
-  # Window class (Linux/BSD only):
-  #class:
-    # Application instance name
-    #instance: Alacritty
-    # General application class
-    #general: Alacritty
-
-  # GTK theme variant (Linux/BSD only)
-  #
-  # Override the variant of the GTK theme. Commonly supported values are `dark`
-  # and `light`. Set this to `None` to use the default theme variant.
-  #gtk_theme_variant: None
-
-#scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  #history: 10000
-
-  # Scrolling distance multiplier.
-  #multiplier: 3
-
-# Font configuration
-font:
-  # Normal (roman) font face
-  normal:
-    # Font family
-    #
-    # Default:
-    #   - (macOS) Menlo
-    #   - (Linux/BSD) monospace
-    #   - (Windows) Consolas
-    family: Inconsolata
-
-    # The `style` can be specified to pick a specific face.
-    style: Regular
-
-  # Bold font face
-  bold:
-    # Font family
-    #
-    # If the bold family is not specified, it will fall back to the
-    # value specified for the normal font.
-    family: Inconsolata
-
-    # The `style` can be specified to pick a specific face.
-    style: Bold
-
-  # Italic font face
-  italic:
-    # Font family
-    #
-    # If the italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    family: Inconsolata
-
-    # The `style` can be specified to pick a specific face.
-    style: Italic
-
-  # Bold italic font face
-  bold_italic:
-    # Font family
-    #
-    # If the bold italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    family: Inconsolata
-
-    # The `style` can be specified to pick a specific face.
-    style: Bold Italic
-
-  # Point size
-  size: {{ machine.font_size }}
-
-  # Offset is the extra space around each character. `offset.y` can be thought
-  # of as modifying the line spacing, and `offset.x` as modifying the letter
-  # spacing.
-  #offset:
-  #  x: 0
-  #  y: 0
-
-  # Glyph offset determines the locations of the glyphs within their cells with
-  # the default being at the bottom. Increasing `x` moves the glyph to the
-  # right, increasing `y` moves the glyph upward.
-  #glyph_offset:
-  #  x: 0
-  #  y: 0
-
-  # Thin stroke font rendering (macOS only)
-  #
-  # Thin strokes are suitable for retina displays, but for non-retina screens
-  # it is recommended to set `use_thin_strokes` to `false`.
-  #use_thin_strokes: true
-
-# If `true`, bold text is drawn using the bright color variants.
-#draw_bold_text_with_bright_colors: false
-
-# Colors (Monokai Dark)
-colors:
-  # Default colors
-  primary:
-    background: '#272822'
-    foreground: '#F8F8F2'
-
-  # Normal colors
-  normal:
-   black:   '#272822'
-   red:     '#F92672'
-   green:   '#A6E22E'
-   yellow:  '#F4BF75'
-   blue:    '#66D9EF'
-   magenta: '#AE81FF'
-   cyan:    '#A1EFE4'
-   white:   '#F8F8F2'
-
-  # Bright colors
-  bright:
-   black:   '#75715E'
-   red:     '#F92672'
-   green:   '#A6E22E'
-   yellow:  '#F4BF75'
-   blue:    '#66D9EF'
-   magenta: '#AE81FF'
-   cyan:    '#A1EFE4'
-   white:   '#F9F8F5'
-
-# Bell
-#
-# The bell is rung every time the BEL control character is received.
-#bell:
-  # Visual Bell Animation
-  #
-  # Animation effect for flashing the screen when the visual bell is rung.
-  #
-  # Values for `animation`:
-  #   - Ease
-  #   - EaseOut
-  #   - EaseOutSine
-  #   - EaseOutQuad
-  #   - EaseOutCubic
-  #   - EaseOutQuart
-  #   - EaseOutQuint
-  #   - EaseOutExpo
-  #   - EaseOutCirc
-  #   - Linear
-  #animation: EaseOutExpo
-
-  # Duration of the visual bell flash in milliseconds. A `duration` of `0` will
-  # disable the visual bell animation.
-  #duration: 0
-
-  # Visual bell animation color.
-  #color: '#ffffff'
-
-  # Bell Command
-  #
-  # This program is executed whenever the bell is rung.
-  #
-  # When set to `command: None`, no command will be executed.
-  #
-  # Example:
-  #   command:
-  #     program: notify-send
-  #     args: ["Hello, World!"]
-  #
-  #command: None
-
-# Background opacity
-#
-# Window opacity as a floating point number from `0.0` to `1.0`.
-# The value `0.0` is completely transparent and `1.0` is opaque.
-#background_opacity: 1.0
-
-selection:
-  # This string contains all characters that are used as separators for
-  # "semantic words" in Alacritty.
-  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
-
-  # When set to `true`, selected text will be copied to the primary clipboard.
-  save_to_clipboard: true
-
-#cursor:
-  # Cursor style
-  #style:
-    # Cursor shape
-    #
-    # Values for `shape`:
-    #   - ▇ Block
-    #   - _ Underline
-    #   - | Beam
-    #shape: Block
-
-    # Cursor blinking state
-    #
-    # Values for `blinking`:
-    #   - Never: Prevent the cursor from ever blinking
-    #   - Off: Disable blinking by default
-    #   - On: Enable blinking by default
-    #   - Always: Force the cursor to always blink
-    #blinking: Off
-
-  # Vi mode cursor style
-  #
-  # If the vi mode cursor style is `None` or not specified, it will fall back to
-  # the style of the active value of the normal cursor.
-  #
-  # See `cursor.style` for available options.
-  #vi_mode_style: None
-
-  # Cursor blinking interval in milliseconds.
-  #blink_interval: 750
-
-  # If this is `true`, the cursor will be rendered as a hollow box when the
-  # window is not focused.
-  #unfocused_hollow: true
-
-  # Thickness of the cursor relative to the cell width as floating point number
-  # from `0.0` to `1.0`.
-  #thickness: 0.15
-
-# Live config reload (changes require restart)
-live_config_reload: false
-
-# Shell
-#
-# You can set `shell.program` to the path of your favorite shell, e.g.
-# `/bin/fish`. Entries in `shell.args` are passed unmodified as arguments to the
-# shell.
-#
-# Default:
-#   - (macOS) /bin/bash --login
-#   - (Linux/BSD) user login shell
-#   - (Windows) powershell
-#shell:
-#  program: /bin/bash
-#  args:
-#    - --login
-
-# Startup directory
-#
-# Directory the shell is started in. If this is unset, or `None`, the working
-# directory of the parent process will be used.
-#working_directory: None
-
-# WinPTY backend (Windows only)
-#
-# Alacritty defaults to using the newer ConPTY backend if it is available,
-# since it resolves a lot of bugs and is quite a bit faster. If it is not
-# available, the WinPTY backend will be used instead.
-#
-# Setting this option to `true` makes Alacritty use the legacy WinPTY backend,
-# even if the ConPTY backend is available.
-#winpty_backend: false
-
-# Send ESC (\x1b) before characters when alt is pressed.
-#alt_send_esc: true
-
-#mouse:
-  # Click settings
-  #
-  # The `double_click` and `triple_click` settings control the time
-  # alacritty should wait for accepting multiple clicks as one double
-  # or triple click.
-  #double_click: { threshold: 300 }
-  #triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  #hide_when_typing: false
-
-  #url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a
-    # URL. The URL is always added to the command as the last parameter.
-    #
-    # When set to `launcher: None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux/BSD) xdg-open
-    #   - (Windows) explorer
-    #launcher:
-    #  program: xdg-open
-    #  args: []
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when
-    # clicking on them. The available modifiers are documented in the key
-    # binding section.
-    #modifiers: None
-
-# Mouse bindings
-#
-# Mouse bindings are specified as a list of objects, much like the key
-# bindings further below.
-#
-# To trigger mouse bindings when an application running within Alacritty
-# captures the mouse, the `Shift` modifier is automatically added as a
-# requirement.
-#
-# Each mouse binding will specify a:
-#
-# - `mouse`:
-#
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# - `action` (see key bindings)
-#
-# And optionally:
-#
-# - `mods` (see key bindings)
-#mouse_bindings:
-#  - { mouse: Middle, action: PasteSelection }
-
-# Key bindings
-#
-# Key bindings are specified as a list of objects. For example, this is the
-# default paste binding:
-#
-# `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Each key binding will specify a:
-#
-# - `key`: Identifier of the key pressed
-#
-#    - A-Z
-#    - F1-F24
-#    - Key0-Key9
-#
-#    A full list with available key codes can be found here:
-#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#
-#    Instead of using the name of the keys, the `key` field also supports using
-#    the scancode of the desired key. Scancodes have to be specified as a
-#    decimal number. This command will allow you to display the hex scancodes
-#    for certain keys:
-#
-#       `showkey --scancodes`.
-#
-# Then exactly one of:
-#
-# - `chars`: Send a byte sequence to the running application
-#
-#    The `chars` field writes the specified string to the terminal. This makes
-#    it possible to pass escape sequences. To find escape codes for bindings
-#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
-#    of tmux. Note that applications use terminfo to map escape sequences back
-#    to keys. It is therefore required to update the terminfo when changing an
-#    escape sequence.
-#
-# - `action`: Execute a predefined action
-#
-#   - ToggleViMode
-#   - SearchForward
-#       Start searching toward the right of the search origin.
-#   - SearchBackward
-#       Start searching toward the left of the search origin.
-#   - Copy
-#   - Paste
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollHalfPageUp
-#   - ScrollHalfPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#       Remove the terminal's scrollback history.
-#   - Hide
-#       Hide the Alacritty window.
-#   - Minimize
-#       Minimize the Alacritty window.
-#   - Quit
-#       Quit Alacritty.
-#   - ToggleFullscreen
-#   - SpawnNewInstance
-#       Spawn a new instance of Alacritty.
-#   - ClearLogNotice
-#       Clear Alacritty's UI warning and error notice.
-#   - ClearSelection
-#       Remove the active selection.
-#   - ReceiveChar
-#   - None
-#
-# - Vi mode exclusive actions:
-#
-#   - Open
-#       Open URLs at the cursor location with the launcher configured in
-#       `url.launcher`.
-#   - ToggleNormalSelection
-#   - ToggleLineSelection
-#   - ToggleBlockSelection
-#   - ToggleSemanticSelection
-#       Toggle semantic selection based on `selection.semantic_escape_chars`.
-#
-# - Vi mode exclusive cursor motion actions:
-#
-#   - Up
-#       One line up.
-#   - Down
-#       One line down.
-#   - Left
-#       One character left.
-#   - Right
-#       One character right.
-#   - First
-#       First column, or beginning of the line when already at the first column.
-#   - Last
-#       Last column, or beginning of the line when already at the last column.
-#   - FirstOccupied
-#       First non-empty cell in this terminal row, or first non-empty cell of
-#       the line when already at the first cell of the row.
-#   - High
-#       Top of the screen.
-#   - Middle
-#       Center of the screen.
-#   - Low
-#       Bottom of the screen.
-#   - SemanticLeft
-#       Start of the previous semantically separated word.
-#   - SemanticRight
-#       Start of the next semantically separated word.
-#   - SemanticLeftEnd
-#       End of the previous semantically separated word.
-#   - SemanticRightEnd
-#       End of the next semantically separated word.
-#   - WordLeft
-#       Start of the previous whitespace separated word.
-#   - WordRight
-#       Start of the next whitespace separated word.
-#   - WordLeftEnd
-#       End of the previous whitespace separated word.
-#   - WordRightEnd
-#       End of the next whitespace separated word.
-#   - Bracket
-#       Character matching the bracket at the cursor's location.
-#   - SearchNext
-#       Beginning of the next match.
-#   - SearchPrevious
-#       Beginning of the previous match.
-#   - SearchStart
-#       Start of the match to the left of the vi mode cursor.
-#   - SearchEnd
-#       End of the match to the right of the vi mode cursor.
-#
-# - macOS exclusive actions:
-#   - ToggleSimpleFullscreen
-#       Enter fullscreen without occupying another space.
-#
-# - Linux/BSD exclusive actions:
-#
-#   - CopySelection
-#       Copy from the selection buffer.
-#   - PasteSelection
-#       Paste from the selection buffer.
-#
-# - `command`: Fork and execute a specified command plus arguments
-#
-#    The `command` field must be a map containing a `program` string and an
-#    `args` array of command line parameter strings. For example:
-#       `{ program: "alacritty", args: ["-e", "vttest"] }`
-#
-# And optionally:
-#
-# - `mods`: Key modifiers to filter binding actions
-#
-#    - Command
-#    - Control
-#    - Option
-#    - Super
-#    - Shift
-#    - Alt
-#
-#    Multiple `mods` can be combined using `|` like this:
-#       `mods: Control|Shift`.
-#    Whitespace and capitalization are relevant and must match the example.
-#
-# - `mode`: Indicate a binding for only specific terminal reported modes
-#
-#    This is mainly used to send applications the correct escape sequences
-#    when in different modes.
-#
-#    - AppCursor
-#    - AppKeypad
-#    - Alt
-#    - Vi
-#
-#    A `~` operator can be used before a mode to apply the binding whenever
-#    the mode is *not* active, e.g. `~Alt`.
-#
-# Bindings are always filled by default, but will be replaced when a new
-# binding with the same triggers is defined. To unset a default binding, it can
-# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
-# a no-op if you do not wish to receive input characters for that binding.
-#
-# If the same trigger is assigned to multiple actions, all of them are executed
-# in the order they were defined in.
-#key_bindings:
-  #- { key: Paste,                                action: Paste          }
-  #- { key: Copy,                                 action: Copy           }
-  #- { key: L,         mods: Control,             action: ClearLogNotice }
-  #- { key: L,         mods: Control, mode: ~Vi,  chars: "\x0c"          }
-  #- { key: PageUp,    mods: Shift,   mode: ~Alt, action: ScrollPageUp,  }
-  #- { key: PageDown,  mods: Shift,   mode: ~Alt, action: ScrollPageDown }
-  #- { key: Home,      mods: Shift,   mode: ~Alt, action: ScrollToTop,   }
-  #- { key: End,       mods: Shift,   mode: ~Alt, action: ScrollToBottom }
-
-  # Vi Mode
-  #- { key: Space,  mods: Shift|Control, mode: Vi, action: ScrollToBottom          }
-  #- { key: Space,  mods: Shift|Control,           action: ToggleViMode            }
-  #- { key: Escape,                      mode: Vi, action: ClearSelection          }
-  #- { key: I,                           mode: Vi, action: ScrollToBottom          }
-  #- { key: I,                           mode: Vi, action: ToggleViMode            }
-  #- { key: C,      mods: Control,       mode: Vi, action: ToggleViMode            }
-  #- { key: Y,      mods: Control,       mode: Vi, action: ScrollLineUp            }
-  #- { key: E,      mods: Control,       mode: Vi, action: ScrollLineDown          }
-  #- { key: G,                           mode: Vi, action: ScrollToTop             }
-  #- { key: G,      mods: Shift,         mode: Vi, action: ScrollToBottom          }
-  #- { key: B,      mods: Control,       mode: Vi, action: ScrollPageUp            }
-  #- { key: F,      mods: Control,       mode: Vi, action: ScrollPageDown          }
-  #- { key: U,      mods: Control,       mode: Vi, action: ScrollHalfPageUp        }
-  #- { key: D,      mods: Control,       mode: Vi, action: ScrollHalfPageDown      }
-  #- { key: Y,                           mode: Vi, action: Copy                    }
-  #- { key: Y,                           mode: Vi, action: ClearSelection          }
-  #- { key: Copy,                        mode: Vi, action: ClearSelection          }
-  #- { key: V,                           mode: Vi, action: ToggleNormalSelection   }
-  #- { key: V,      mods: Shift,         mode: Vi, action: ToggleLineSelection     }
-  #- { key: V,      mods: Control,       mode: Vi, action: ToggleBlockSelection    }
-  #- { key: V,      mods: Alt,           mode: Vi, action: ToggleSemanticSelection }
-  #- { key: Return,                      mode: Vi, action: Open                    }
-  #- { key: K,                           mode: Vi, action: Up                      }
-  #- { key: J,                           mode: Vi, action: Down                    }
-  #- { key: H,                           mode: Vi, action: Left                    }
-  #- { key: L,                           mode: Vi, action: Right                   }
-  #- { key: Up,                          mode: Vi, action: Up                      }
-  #- { key: Down,                        mode: Vi, action: Down                    }
-  #- { key: Left,                        mode: Vi, action: Left                    }
-  #- { key: Right,                       mode: Vi, action: Right                   }
-  #- { key: Key0,                        mode: Vi, action: First                   }
-  #- { key: Key4,   mods: Shift,         mode: Vi, action: Last                    }
-  #- { key: Key6,   mods: Shift,         mode: Vi, action: FirstOccupied           }
-  #- { key: H,      mods: Shift,         mode: Vi, action: High                    }
-  #- { key: M,      mods: Shift,         mode: Vi, action: Middle                  }
-  #- { key: L,      mods: Shift,         mode: Vi, action: Low                     }
-  #- { key: B,                           mode: Vi, action: SemanticLeft            }
-  #- { key: W,                           mode: Vi, action: SemanticRight           }
-  #- { key: E,                           mode: Vi, action: SemanticRightEnd        }
-  #- { key: B,      mods: Shift,         mode: Vi, action: WordLeft                }
-  #- { key: W,      mods: Shift,         mode: Vi, action: WordRight               }
-  #- { key: E,      mods: Shift,         mode: Vi, action: WordRightEnd            }
-  #- { key: Key5,   mods: Shift,         mode: Vi, action: Bracket                 }
-  #- { key: Slash,                       mode: Vi, action: SearchForward           }
-  #- { key: Slash,  mods: Shift,         mode: Vi, action: SearchBackward          }
-  #- { key: N,                           mode: Vi, action: SearchNext              }
-  #- { key: N,      mods: Shift,         mode: Vi, action: SearchPrevious          }
-
-  # (Windows, Linux, and BSD only)
-  #- { key: V,              mods: Control|Shift,           action: Paste            }
-  #- { key: C,              mods: Control|Shift,           action: Copy             }
-  #- { key: F,              mods: Control|Shift,           action: SearchForward    }
-  #- { key: B,              mods: Control|Shift,           action: SearchBackward   }
-  #- { key: C,              mods: Control|Shift, mode: Vi, action: ClearSelection   }
-  #- { key: Insert,         mods: Shift,                   action: PasteSelection   }
-  #- { key: Key0,           mods: Control,                 action: ResetFontSize    }
-  #- { key: Equals,         mods: Control,                 action: IncreaseFontSize }
-  #- { key: Plus,           mods: Control,                 action: IncreaseFontSize }
-  #- { key: NumpadAdd,      mods: Control,                 action: IncreaseFontSize }
-  #- { key: Minus,          mods: Control,                 action: DecreaseFontSize }
-  #- { key: NumpadSubtract, mods: Control,                 action: DecreaseFontSize }
-
-  # (Windows only)
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: K,              mods: Command, mode: ~Vi, chars: "\x0c"            }
-  #- { key: Key0,           mods: Command,            action: ResetFontSize    }
-  #- { key: Equals,         mods: Command,            action: IncreaseFontSize }
-  #- { key: Plus,           mods: Command,            action: IncreaseFontSize }
-  #- { key: NumpadAdd,      mods: Command,            action: IncreaseFontSize }
-  #- { key: Minus,          mods: Command,            action: DecreaseFontSize }
-  #- { key: NumpadSubtract, mods: Command,            action: DecreaseFontSize }
-  #- { key: K,              mods: Command,            action: ClearHistory     }
-  #- { key: V,              mods: Command,            action: Paste            }
-  #- { key: C,              mods: Command,            action: Copy             }
-  #- { key: C,              mods: Command, mode: Vi,  action: ClearSelection   }
-  #- { key: H,              mods: Command,            action: Hide             }
-  #- { key: M,              mods: Command,            action: Minimize         }
-  #- { key: Q,              mods: Command,            action: Quit             }
-  #- { key: W,              mods: Command,            action: Quit             }
-  #- { key: N,              mods: Command,            action: SpawnNewInstance }
-  #- { key: F,              mods: Command|Control,    action: ToggleFullscreen }
-  #- { key: F,              mods: Command,            action: SearchForward    }
-  #- { key: B,              mods: Command,            action: SearchBackward   }
-
-#debug:
-  # Display the time it takes to redraw each frame.
-  #render_timer: false
-
-  # Keep the log file after quitting Alacritty.
-  #persistent_logging: false
-
-  # Log level
-  #
-  # Values for `log_level`:
-  #   - None
-  #   - Error
-  #   - Warn
-  #   - Info
-  #   - Debug
-  #   - Trace
-  #log_level: Warn
-
-  # Print all received window events.
-  #print_events: false

ansible.cfg

@@ -1,3 +1,5 @@
 [defaults]
 retry_files_enabled = False
 nocows = 1
+roles_path = ./ansible_roles
+library = ./ansible_roles/firefox/library

autostart/autostart.target.j2

@@ -3,10 +3,18 @@ BindsTo=windowmanager.target
 After=windowmanager.target
 
 Wants=blueman.service
-Wants=discord.service
 Wants=dpms.service
 Wants=dunst.service
-Wants=firefox.service
+{% for profile, config in (user.firefox_profiles|default({})).items() %}
+{% if config.bigger_font|default(false) is sameas false %}
+Wants=firefox@{{ profile }}.service
+{% endif %}
+{% endfor %}
+{% for profile, config in (user.firefox_profiles|default({})).items() %}
+{% if config.bigger_font|default(false) is sameas true %}
+Wants=firefox-gtk-override-bigger-font@{{ profile }}.service
+{% endif %}
+{% endfor %}
 Wants=gpg-agent.service
 Wants=gnome-keyring.service
 Wants=keepassx.service
@@ -21,7 +29,7 @@ Wants=screencfg.service
 Wants=spotify.service
 Wants=steam.service
 Wants=touchpad.service
-Wants=wallpaper.timer
 Wants=xresources.service
 Wants=yubikey-touch-detector.service
+Wants=kdeconnect.service
 

autostart/services/blueman.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/blueman-applet
+ExecStart=/usr/bin/env blueman-applet
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/discord.service

@@ -1,8 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-ConditionEnvironment=MACHINE_HAS_DISCORD=true
-
-[Service]
-ExecStart=/usr/bin/discord

autostart/services/dpms.service

@@ -4,5 +4,6 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=xset s off
+ExecStart=/usr/bin/env xset s off
-ExecStart=xset dpms 0 0 300
+ExecStart=/usr/bin/env xset dpms 0 0 0
+PassEnvironment=DISPLAY

autostart/services/dunst.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/dunst -config %h/.config/dunstrc
+ExecStart=/usr/bin/env dunst -config %h/.config/dunstrc
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/firefox-gtk-override-bigger-font@.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env firefox --setDefaultBrowser -P %i
+PassEnvironment=DISPLAY
+Environment=XDG_CONFIG_HOME=%h/.config/gtk-3.0-overrides/bigger-font/
+Restart=always

autostart/services/firefox.service

@@ -1,6 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Service]
-ExecStart=/usr/bin/firefox --setDefaultBrowser -P default

autostart/services/firefox@.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env firefox --setDefaultBrowser -P %i
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/gnome-keyring.service

@@ -4,3 +4,5 @@ After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/env gnome-keyring-daemon --start --foreground --components secrets
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/gpg-agent.service

@@ -1,7 +1,10 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+ConditionPathExists=%h/.var/run/features/gpg_agent
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/gpg-agent --homedir %h/.gnupg --no-detach --daemon
+ExecStart=/usr/bin/env gpg-agent --homedir %h/.gnupg --no-detach --daemon
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/i3.service

@@ -1,5 +1,6 @@
 [Service]
-Type=exec
+Type=simple
-ExecStart=i3 --config %h/.i3/config
+ExecStart=/usr/bin/env i3 --config %h/.i3/config
+PassEnvironment=DISPLAY
 
 Restart=no

autostart/services/kdeconnect.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env kdeconnect-indicator
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/keepassx.service

@@ -1,7 +1,9 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_HAS_KEEPASSX=true
+ConditionPathExists=%h/.var/run/features/keepassx
 
 [Service]
-ExecStart=/usr/bin/keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
+ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/keyboard.service

@@ -4,6 +4,7 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/setxkbmap -layout de -variant nodeadkeys
+ExecStart=/usr/bin/env setxkbmap -layout de -variant nodeadkeys
-ExecStart=/usr/bin/xset r rate 150 50
+ExecStart=/usr/bin/env xset r rate 150 50
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/laptop-lid.service

@@ -1,8 +1,10 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-
+ConditionPathExists=%h/.var/run/features/machine_is_laptop
-ConditionEnvironment=MACHINE_TYPE=laptop
 
 [Service]
-ExecStart=/usr/bin/bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
+Type=oneshot
+ExecStart=/usr/bin/env bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
+RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/mousespam.service

@@ -0,0 +1,5 @@
+[Service]
+Type=simple
+ExecStart=%h/bin/mousespam
+RemainAfterExit=True
+PassEnvironment=DISPLAY

autostart/services/nextcloud.service

@@ -3,7 +3,12 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=gnome-keyring.service
 
-ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true
+ConditionPathExists=%h/.var/run/features/nextcloud
 
 [Service]
-ExecStart=/usr/bin/nextcloud --background
+ExecStart=/usr/bin/env nextcloud --background
+PassEnvironment=DISPLAY
+Restart=always
+
+MemoryHigh=20%
+MemoryMax=30%

autostart/services/nm-applet.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/nm-applet
+ExecStart=/usr/bin/env nm-applet
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/pasystray.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/pasystray
+ExecStart=/usr/bin/env pasystray
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/redshift.service

@@ -3,4 +3,7 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/redshift-gtk -c %h/.config/redshift.conf
+ExecStartPre=/usr/bin/env redshift-gtk -x
+ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/restic.service

@@ -1,7 +1,8 @@
 [Unit]
-ConditionEnvironment=MACHINE_HAS_RESTIC_BACKUP=true
+ConditionPathExists=%h/.var/run/features/restic_backup
 
 [Service]
 Type=oneshot
-ExecStart=%h/bin/restic-backup
+ExecStart=%h/restic/restic-backup
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/restic.timer

@@ -3,6 +3,4 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Timer]
-OnCalendar=Mon..Fri 09:00:00
 OnCalendar=Mon..Fri 12:00:00
-OnCalendar=Mon..Fri 16:00:00

autostart/services/screencfg.service

@@ -1,7 +1,6 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE
 
 [Service]
 Type=oneshot
@@ -9,5 +8,6 @@ Type=oneshot
 
 # > The command to execute may contain spaces, but control characters are not
 # > allowed.
-ExecStart=bash -c '%h/.screencfg/${MACHINE_DEFAULT_SCREENPROFILE}.sh'
+ExecStart=/usr/bin/env screencfg "%h/.screencfg/%H/default.yml"
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/spotify.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/spotify
+ExecStart=/usr/bin/env spotify
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/steam.service

@@ -3,7 +3,9 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=i3.service
 
-ConditionEnvironment=MACHINE_HAS_STEAM=true
+ConditionPathExists=%h/.var/run/features/steam
 
 [Service]
-ExecStart=/usr/bin/steam
+ExecStart=/usr/bin/env steam
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/touchpad.service

@@ -1,17 +1,18 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_TYPE=laptop
+ConditionPathExists=%h/.var/run/features/machine_is_laptop
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/synclient VertEdgeScroll=0
+ExecStart=/usr/bin/env synclient VertEdgeScroll=0
-ExecStart=/usr/bin/synclient VertTwoFingerScroll=1
+ExecStart=/usr/bin/env synclient VertTwoFingerScroll=1
-ExecStart=/usr/bin/synclient MaxSpeed=2.2
+ExecStart=/usr/bin/env synclient MaxSpeed=2.2
-ExecStart=/usr/bin/synclient AccelFactor=0.08
+ExecStart=/usr/bin/env synclient AccelFactor=0.08
-ExecStart=/usr/bin/synclient TapButton1=1
+ExecStart=/usr/bin/env synclient TapButton1=1
-ExecStart=/usr/bin/synclient CoastingSpeed=0
+ExecStart=/usr/bin/env synclient CoastingSpeed=0
-ExecStart=/usr/bin/synclient PalmDetect=1
+ExecStart=/usr/bin/env synclient PalmDetect=1
-ExecStart=/usr/bin/synclient PalmMinWidth=20
+ExecStart=/usr/bin/env synclient PalmMinWidth=20
-ExecStart=/usr/bin/synclient PalmMinZ=1
+ExecStart=/usr/bin/env synclient PalmMinZ=1
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/wallpaper.service

@@ -1,4 +0,0 @@
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/setrandom --recursive --onlylarge --mode=stretch /usr/share/wallpapers
-RemainAfterExit=true

autostart/services/wallpaper.timer

@@ -1,9 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Timer]
-OnActiveSec=0s
-OnCalendar=hourly
-Unit=wallpaper.service
-RemainAfterElapse=true

autostart/services/xresources.service

@@ -4,5 +4,6 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/xrdb -merge -I%h %h/.Xresources
+ExecStart=/usr/bin/env xrdb -merge -I%h %h/.Xresources
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/yubikey-touch-detector.service

@@ -1,6 +1,10 @@
 [Unit]
 BindsTo=autostart.target
+PartOf=gpg-agent.service
 After=windowmanager.target
+After=gpg-agent.service
 
 [Service]
-ExecStart=/usr/bin/yubikey-touch-detector -libnotify
+ExecStart=/usr/bin/env yubikey-touch-detector -libnotify
+PassEnvironment=DISPLAY
+Restart=always

bin/check

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 set -o errexit
-cd $HOME/sync/projects/time-tracking
+
+cd ~/code/personal/time-tracking/
 source venv/bin/activate
+source ~/.attendance_env
+
 ./call.py "${@}"

bin/dunstctl

@@ -8,13 +8,13 @@ log() {
     printf '[%s] %s\n' "$(date -uIseconds)" "$*" >> "$_logfile"
 }
 
-case "$1" in
+case "$1 $2" in
-    enable)
+    "set-paused false")
         log "Enabling dunst"
         systemctl --user --no-block kill --signal SIGUSR2 dunst
 
         ;;
-    disable)
+    "set-paused true")
         log "Disabling dunst"
         systemctl --user --no-block kill --signal SIGUSR1 dunst
         ;;

bin/gdrive-backup

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-rclone \
-    --checksum \
-    --delete-excluded \
-    --exclude /.cache/ \
-    --exclude /.vagrant.d/ \
-    --exclude /.minikube/ \
-    --exclude /Downloads/ \
-    --exclude /downloads/ \
-    --exclude /tmp/ \
-    --verbose \
-    --stats 60s \
-    sync \
-    $HOME \
-    gdrive:backup

bin/kubectl-env

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-case "$1" in
-mycloud)
-    shift
-    command kubectl --kubeconfig=<(pass show mycloud/kubeconfig) "${@}"
-    ;;
-*)
-    command kubectl "${@}"
-    ;;
-esac

bin/mousespam-toggle

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+systemctl --no-pager --user status mousespam && systemctl --no-pager --user stop mousespam || systemctl --no-pager --user start mousespam

bin/mypass

@@ -1,94 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import subprocess
-import yaml
-
-PASS = 'pass'
-
-def run(args):
-    return(subprocess.run(
-        args,
-        stdin=sys.stdin,
-        stdout=sys.stdout,
-        stderr=sys.stderr).returncode)
-
-def get_stdout(args):
-    return(subprocess.run(
-        args,
-        stdout=subprocess.PIPE).stdout)
-
-def extract_from_dict(d, k, last=None):
-    if '.' in k:
-        k1, k2 = k.split('.', 1)
-        try:
-            d1 = d[k1]
-            return extract_from_dict(d1, k2, last=k1)
-        except KeyError:
-            print("\"{}\" was not found in the data".format(k))
-            sys.exit(3)
-    else:
-        if not isinstance(d, dict):
-            print("element \"{}\" is not a dictionary".format(last))
-            sys.exit(3)
-        try:
-            return d[k]
-        except KeyError:
-            print("\"{}\" was not found in the data".format(k))
-            sys.exit(3)
-
-
-def cmd_get(*args):
-    if len(args) == 1:
-        print(get_stdout(['pass', 'show', args[0]]).split(b'\n')[0].decode())
-        return 0
-
-    if len(args) < 2:
-        print("what do you want to get?")
-        return 1
-
-    # get the pass output
-    out = get_stdout(['pass', 'show', args[0]])
-    try:
-        data = list(yaml.safe_load_all(out))[-1]
-    except yaml.scanner.ScannerError as e:
-        print("invalid YAML data: {}".format(str(e)))
-        return 2
-    except IndexError:
-        print("invalid YAML data: no YAML document found")
-        return 2
-
-    if not isinstance(data, dict):
-        print("invalid YAML data, not a dict")
-        return 2
-
-    for element in args[1:]:
-        keydata = extract_from_dict(data, element)
-        if isinstance(keydata, list) or isinstance(keydata, dict):
-            print(yaml.safe_dump(keydata, default_flow_style=False).strip())
-        else:
-            print(keydata)
-
-cmds = ['get']
-git_push_commands = ['insert', 'edit', 'generate', 'rm', 'mv', 'cp']
-
-def run_pass(argv):
-    return run([PASS] + argv[1:])
-
-def just_call_pass(argv):
-    sys.exit(run_pass(argv))
-
-if len(sys.argv) == 1:
-    just_call_pass(sys.argv)
-elif sys.argv[1] not in cmds:
-    if sys.argv[1] not in git_push_commands:
-        just_call_pass(sys.argv)
-    else:
-        e = run_pass(sys.argv)
-        if e == 0:
-            print("Pushing to remote repository...")
-            run([PASS, 'git', 'push'])
-            print("Done")
-        sys.exit(e)
-else:
-    sys.exit(globals()['cmd_' + sys.argv[1]](*sys.argv[2:]))

bin/nato

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
+import os.path
 
 hash = {
     'A': 'Alpha',
@@ -43,6 +44,45 @@ hash = {
     '.': 'Stop',
 }
 
+de = {
+    'A': 'Anton',
+    'Ä': 'Ärger',
+    'B': 'Berta',
+    'C': 'Cäsar',
+    'D': 'Dora',
+    'E': 'Emil',
+    'F': 'Friedrich',
+    'G': 'Gustav',
+    'H': 'Heinrich',
+    'I': 'Ida',
+    'J': 'Julius',
+    'K': 'Kaufmann',
+    'L': 'Ludwig',
+    'M': 'Martha',
+    'N': 'Nordpol',
+    'O': 'Otto',
+    'Ö': 'Ökonom',
+    'P': 'Paula',
+    'Q': 'Quelle',
+    'R': 'Richard',
+    'S': 'Samuel',
+    'ß': 'Eszett',
+    'T': 'Theodor',
+    'U': 'Ulrich',
+    'Ü': 'Übermut',
+    'V': 'Viktor',
+    'W': 'Wilhelm',
+    'X': 'Xanthippe',
+    'Y': 'Ypsilon',
+    'Z': 'Zacharias',
+    '-': 'Strich',
+    '.': 'Punkt',
+}
+
+if os.path.basename(sys.argv[0]) == 'natode':
+    hash = de
+
+
 if len(sys.argv) < 2 or sys.argv[1] == '-':
     text = [line.strip() for line in sys.stdin.readlines()]
 else:

bin/natode

@@ -0,0 +1 @@
+nato

bin/pf

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+import sys
+import json
+import yaml
+import subprocess
+
+jqexpression = sys.argv[1]
+
+jqprocess = subprocess.Popen(["jq", "-r", jqexpression], stdin=subprocess.PIPE, text=True)
+
+document = [d for d in yaml.safe_load_all(sys.stdin)][-1]
+
+json.dump(document, jqprocess.stdin)

bin/restic-backup

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-nice --adjustment 19 \
-ionice --class 3 \
-restic -r rclone:restic:restic --password-file=$HOME/restic_password backup --exclude-file=$HOME/restic_exclude.lst $HOME

bin/screencfg

@@ -31,7 +31,7 @@ args = parser.parse_args()
 config_path = args.config
 
 try:
-    config = yaml.load(open(config_path))
+    config = yaml.safe_load(open(config_path))
 except FileNotFoundError:
     fail("File {0} not found".format(config_path))
 
@@ -54,6 +54,8 @@ for output in config['outputs']:
         # cmd.append('--auto')
         for k, v in output['opts'].items():
             cmd.extend(['--{}'.format(k), str(v)])
+        for k,v  in output.get('set', {}).items():
+            cmd.extend(['--set', k, v])
 
 run(cmd)
 run(['i3-msg', 'restart'])

bin/share-screen

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-~/code/helper-scripts/sysop-share-screen.sh pi@monitor-sysop-${1:-middle}-${2:-top} 1

bin/since

@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-
-import datetime
-import sys
-
-USAGE="""Usage: {program} PATH_TO_FILE""".format(program=sys.argv[0])
-
-def die(message, code=1):
-    print(message)
-    sys.exit(code)
-
-def die_usage(code=1):
-    die(USAGE, code)
-
-def read_date_from_file(path):
-    text = open(path).readline().strip()
-    try:
-        time = datetime.datetime.strptime(text, '%Y-%m-%d')
-    except ValueError as e:
-        die(e)
-    return time
-
-def main(argv):
-    if len(argv) < 2:
-        die_usage()
-    last = read_date_from_file(argv[1])
-    now = datetime.datetime.now()
-    diff = now - last
-    days = diff.days
-    #hours = diff.seconds // (60 * 60)
-    if days == 1:
-        msg = "1 day"
-    else:
-        msg = "{days} days".format(days=days)
-
-    #msg += " "
-    #if hours == 1:
-    #    msg += "1 hour "
-    #else:
-    #    msg += "{hours} hours ".format(hours=hours)
-
-    print(msg)
-
-main(sys.argv)

detect-missing-packages.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+import yaml
+from pprint import pprint
+
+package_file = "./packages.yml"
+
+apps = yaml.safe_load(open(package_file, 'r'))
+
+missing_config = {}
+
+for appname, appconfig in apps['packages']['list'].items():
+    for distro, packagelist in appconfig.items():
+        if len(packagelist) == 0:
+            if distro not in missing_config.keys():
+                missing_config[distro] = []
+            missing_config[distro].append(appname)
+
+print(yaml.dump(missing_config))

dotfiles.yml

@@ -5,7 +5,14 @@ empty_directories:
   - name: .config/nvim
   - name: .config/rofi
   - name: .config/gtk-3.0
+  - name: .config/gtk-3.0-overrides
+  - name: .config/gtk-3.0-overrides/bigger-font/
+  - name: .config/gtk-3.0-overrides/bigger-font/gtk-3.0
   - name: .config/qt5ct
+  - name: .config/i3status-rust
+  - name: .config/i3status-rust/icons
+  - name: .config/i3status-rust/themes
+  - name: .config/helix
 dotfiles:
   - from: git/gitconfig
     to: .gitconfig
@@ -14,15 +21,20 @@ dotfiles:
     to: .gnupg/dirmngr.conf
   - from: gnupg/gpg-agent.conf
     to: .gnupg/gpg-agent.conf
+    template: true
   - from: gnupg/gpg.conf
     to: .gnupg/gpg.conf
     template: true
   - from: i3/config
     to: .i3/config
     template: true
-  - from: i3/i3status.conf
+  - from: i3/i3status-rust/config.toml
-    to: .i3/i3status.conf
+    to: .config/i3status-rust/config.toml
     template: true
+  - from: i3/i3status-rust/themes/native.toml
+    to: .config/i3status-rust/themes/native.toml
+  - from: i3/i3status-rust/icons/awesome.toml
+    to: .config/i3status-rust/icons/awesome.toml
   - from: i3/scripts
     to: .i3/scripts
   - from: tmux/tmux.conf
@@ -49,22 +61,31 @@ dotfiles:
     template: true
   - from: redshift/redshift.conf
     to: .config/redshift.conf
-  - from: vscode/settings.json
+  - from: vscodium/product.json
-    to: .config/Code/User/settings.json
+    to: .config/VSCodium/product.json
-  - from: vscode/keybindings.json
+  - from: vscodium/settings.json
-    to: .config/Code/User/keybindings.json
+    to: .config/VSCodium/User/settings.json
-  - from: alacritty/alacritty.yml
+  - from: vscodium/keybindings.json
-    to: .config/alacritty.yml
+    to: .config/VSCodium/User/keybindings.json
+  - from: alacritty/alacritty.toml
+    to: .config/alacritty.toml
     template: true
   - from: rofi/config
     to: .config/rofi/config
   - from: gtk/gtk-3.0.ini
     to: .config/gtk-3.0/settings.ini
+    template: true
+  - from: gtk/gtk-3.0-bigger-font.ini
+    to: .config/gtk-3.0-overrides/bigger-font/gtk-3.0/settings.ini
+    template: true
   - from: gtk/gtkrc-2.0
     to: .gtkrc-2.0
+    template: true
   - from: qt/qt5ct.conf
     to: .config/qt5ct/qt5ct.conf
   - from: screencfg
     to: .screencfg
   - from: scripts
     to: scripts
+  - from: helix/config.toml
+    to: .config/helix/config.toml

dunst/dunstrc.j2

@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "300x10-20+20"
+    geometry = "300x10-20-40"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -64,7 +64,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#e16b40"
+    frame_color = "#ff964f"
 
     # Define a color for the separator.
     # possible values are:
@@ -84,7 +84,7 @@
 
     ### Text ###
 
-    font = DejaVu Sans {{ machine.font_size }}
+    font = DejaVu Sans {{ machine.font_size_1 }}
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.

git/gitconfig.j2

@@ -3,7 +3,7 @@
     email = {{ user.mail }}
     useConfigOnly = true
 {% if user.git_gpg_sign|bool %}
-    signingkey = {{ user.gpg_keys.master_key }}
+    signingkey = {{ user.gpg_key.id }}
 {% endif %}
 [github]
     user = hakoerber
@@ -113,9 +113,14 @@
     requireForce = true
 [pull]
     rebase = true
+    ff = only
 
 [url "ssh://git@code.hkoerber.de:2222/"]
     insteadOf = https://code.hkoerber.de/
 
 [init]
 	defaultBranch = master
+[safe]
+	directory = /var/lib/dotfiles
+[includeIf "gitdir:/var/lib/dotfiles"]
+    path = /var/lib/dotfiles/gitcfg

gitcfg

@@ -0,0 +1,3 @@
+[user]
+    email = hannes@hkoerber.de
+    name = Hannes Körber

gnupg/gpg-agent.conf.j2

@@ -4,6 +4,8 @@ default-cache-ttl-ssh 60480000
 max-cache-ttl 34560000
 max-cache-ttl-ssh 34560000
 
+{% if user.gpg_agent_for_ssh %}
 enable-ssh-support
+{% endif %}
 
 pinentry-program /usr/bin/pinentry-qt

gnupg/gpg.conf.j2

@@ -34,12 +34,7 @@ fixed-list-mode
 no-mangle-dos-filenames
 require-cross-certification
 
-{% if not (distro == 'ubuntu' and ansible_distribution_version == '18.04') -%}
-{# looks like the gpg version in that ubuntu release it too old and does not
-{# contain the setting #}
 # do not cache keys for symmetric encryption
 no-symkey-cache
 
-{% endif -%}
-
 keyserver-options no-honor-keyserver-url no-auto-key-retrieve include-revoked

gpgkeys/hannes@hkoerber.de.gpg.asc

@@ -0,0 +1,109 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF52F2UBEADVm8w92aR5UoDq94jcCh5hEpbjIWrrmyBb3p7Z4x9loASIDNly
+6SrHjpFONw7EdCNzT2zQCCCoKezKfzALuU3xQ3Vl5fhtp3Ij/HGonSEFhz4ibhUC
+MsbCsUEU7yG/lzmz0dtk9UIWfVKDe8yhLCVxi+dUi2Lat58daQjO9OGjRP+Z5mMi
+ZtGzmV2UQHWmMipKlxx9yDpX5l1i2qduNXfC2ki+uBudzNNaZtwk9t690UXa6DHz
+xxnUJqewWG3zyFmhBrixOBF5Pdc+Uy79HOLfifZ+SRSpSKf7Dp7SiUE7XL0slWOD
+xxRRZPW5u6heSgFnVCLjtupLUSUCccNnvTKrKB1iOEjkpko7Q7FVMe5bTQOrO1de
+cr2PpGC3GeR6K1n0PYAwd49HgVZjCUqXzbz4Zeh9KRuM62geNTZjJxuuP7dbJP86
+p23+7uiODwVhdzvEP/ElYlwEGLGFFurbnqZ3DwFggdrQ6cOkSjQblt6xzxxlROo4
+HoyupyNz4I5yWqN+k4wk2+1A8TsSwKh1PAHG7C2LLZsKn4pSsdYgoaQaYsod89kZ
+mA1Sr4IEe9rhG6TnofxHqHegzifPM0XPmYlwVccAF+lb+CrvWbSBHHA5FVE/PCBe
+Xc4GYWghnobhK8kfgFZhr8BrBFFH+sAw8CYNbgg7O90HK7jnK79BlgU31QARAQAB
+tCNIYW5uZXMgS8O2cmJlciA8aGFubmVzQGhrb2VyYmVyLmRlPokCTAQTAQoANhYh
+BJc65I1xt2c1xHErW7XAAlMMaiBTBQJedhdlAhsBBAsJCAcEFQoJCAUWAgMBAAIe
+AQIXgAAKCRC1wAJTDGogUyIxEACZXR+fN+bb6PYW821k8oXO/MvNiiqtWC9CuLjP
+y1/eu/ZJUmeOca/8HsJsp0hOAJ7oUn3MBiW7gCVZ/2hQ+ywCtcDWp2PElutCiAyg
+QgN1IEg9RAcx+7RmHC0SEafhnyT4ogi7hJ9SK3kPnf5Ryli6qNFAWb3dtfSENYLK
+dqtzMi9+CvcsNKKMN+yhubVrQi5MHlqu7L4bdE4BW5bzsbbhLaPfmc/JYFkImF5v
+dXnOBA9gx2bVREoTw/GPioed9hpPu1ZWZC5we+WD4eEGrQD/LG/XyGUh6wQwsC7P
+aMXOydok7DHzUrCdvZ372Giv71cNV1++e6G+PdEqVo2FCp04Syzug5GwRbSAZ9B3
+1tqYV6L5SZh0TIjHNtuWTPq9dzpqVJJSxZdwvlgsv7Ni6GHYUrgTShza/+vXE1UE
+2MCoLCK0ZrdeMd8m7VMom3WIiV+N28MsKVCoYDLd0LMOrmhDDap16SGJYs/dB4lo
+a931k7ejOG68G2ViLJmRapkzEWH3TujYNyh4O7S6LuHwNvG6lyAyn9UTVSAaPT+t
+BV4zfd4UfKhYcKSm+aQuJ5RrZ+2l8YU87daeE2JXy1/z9I0C/YqbT8yHMqUi4Fzy
+VhfTAPm2lCLPomFmoS8fp2oNDt3s7AOQH2zOsimhA6pMTek/sKtywjRQ0TdXH2OA
+p2B10rkCDQRedheFARAAl4cEamPYTwineGIBGubqhznKQhUJhm1P3AbwOfzYloxg
+3wvq1njY0+1UY8HtV7EZ7xd1PpUgRxcA8paj2ootMwHM2TRxXad/EgpegfWNANQV
+YnDQj8Zqabrf3Orue93pLeRir38kOzX1qcOz72G6HDJWSQZLqF6LWJ9GehDpf9VB
+/K/8nXdEes2nLdffkR2blH5ltcM0kMak0tI3+5SnQCs1MmFWzSq+BFVYI5fT8hBf
+MCskiypF05E0Np7t0C5dQmToPPv5w6flUIJn3h7BfUYAi9uOdUfAykI57hXUWUlV
+gli5IJfDTYt/Y849vh3FH2qn0syQ425a8RqH5WLohH0qJ+A3nuOp6JfKGEFOiYxp
+9Y5tn6zEfqGC+D/xWnGGgfc6IMQVGYbWvqHRqMQquV1bD3rd7dDOE3QdkBvxpcVv
+1EeKfA36wRtlFyKgdHE0QiVD9VeCtGW1diFD3hEK+FqVdaxX45800gPjFIuzKOkv
+zoVzYxrUCSACs+6QyyXP8I1zMX9SXRvEg02MmpohwmEhSgotOMcjbWNyVFNfCAaS
+bCt9PyaWsz+qe2gGLAiYo2vvBij543vBgATSbFjhoM683gzo73AOYhaauULsy3Kq
+yfolj6TwGyEg7wvMO6YLttKCahjyz5isiAcf4fSNqWG0zSnBf6n7HXdtTjjsfx8A
+EQEAAYkEbAQYAQoAIBYhBJc65I1xt2c1xHErW7XAAlMMaiBTBQJedheFAhsCAkAJ
+ELXAAlMMaiBTwXQgBBkBCgAdFiEEyitwWoxynRUrXLoQzSinzDExgBcFAl52F4UA
+CgkQzSinzDExgBeCDw//WMa8qm/tBpr4BskpctySvIwiOf35o+cMAYvego94NkrY
+wuASAn3/2QsaZvZnYdJfCrzchCA30QZxRWAvkHIJ/zXZ1ayugsnEypvhw23012Xr
+KKMXyd6iuZdmbE1Umj6R1/LbdNjddqglR9AmKaOYaDzjpPuuirDbllRGh/7lluZq
+q8BmPvFe6Cl8FIijx03RfCbYSvQQRH10IBeJ+z+eE7z7FRspf4kJ6vXAbbSlKoRR
++PcA+Yc7meW+dvMnRpczGDvDbl522Mw2pxV3p4aN8TSMwSWztD4koXo4KCklFPh5
+M4R4HbZFEZj4i8BU+cbsQscJ4jHqrCK/qPSRx103ikVqwOElZkYqKthnrQ7rxO7S
+0CZOKzlK56Vl9LbnYE0nTHqZOxf9k9Z1ue9aVCRXWcQhCUVm9CLUegZz4DJtK9vl
+ntdYTKPRmMCUw407rhkEFA3bQc9l56GP5ARc6NN9C0fbz2PgIryuLP4BvR/BIV4L
+qLBgGfztN3KjHYI2RWAw3OcaxU7UhmXbCFvy6j/PVJckHNheqaIm/+wyDt+/rXf0
+3zc9YiEHrvGmmX+6VYlv8iE4sp2ye4EF0XSGm23/gKmvkF5jVuaB4OJeHYIQfOVP
+nnmsDan2NZ2znE5UmaqgxvxAuQh+XVjKlSUfeff+9XCscQvzuNBC39V+S+cJLoNm
+LA//Xd2Ic6Y9o44TaN1mDx031oYZjcmHq1YbwQbYnQj/uZZQHM4b62qMCCkdfsnU
+KgeIJU78BxAj2vCgWI025K7un7Sh9q3cZdafOgcNz8YaXV9Nm0f6fLFsdTWbEvQ0
+Y1cHJlh6WKDV2lVtdgoEMSN73U3hohJhsldRengydb4/Cf8pZRJgatyXN+b7Hsg5
+h9LOAZRF4Om3A84QH7oYfOfeiwqGXzFE+lLqsPhwNUVnRJd98fjxYKdKz/3hNT5c
+Pq/0/C+ivpAI3Kk1tecafhb0YSoFUEhZlnl/SSuTALvFdJGjpopbTL0M3YCcgh9v
+tXb8Dcq7BEphWSeWP4Torbq17pLSlG65bgoZXoABYWCPSZiQCKDNXa2wqC3it5J9
+wURL9AOCsJCvqh798WLlNHaz9hnh76UF3idDI5SgJGEOAPStv3EGX/HhjOzUQPD+
+ixlXM63vmhCHxV9pnIURpBFhDUS/hs7apVm8pKzSv7PRQ5iu9RDbWUAWdyMlWPW9
+TglATGSMFpxGYTJiC+pHH24FCm6wR8D8LYnKkqxzd+nqFljvfEmQ70rIyUA1I3/6
+kCxGf7yKxTr2anV7tOFkNcCuj/ZSkb8CC6BCVk1HeE6h/hks78PdlLJr5zrSPxvP
+U1iRM6NebRd4W990XCPw6ZHDm0CngSNU7s+7peB0M+pEaYO5Ag0EXnYXoQEQANxF
+tmQz1jowITJ60eY/q7fWVv/w1CTT/ynAqPPgKw/MtGVBe8BWUJKufnxbNgn6ZamX
+PU/Uq4x8QKMgbuqvaInHM3MvIqg0xoQ8qz4VBnc0Q0w0+G78UMcjzzAKJBDp1Qfy
+zTvfPBD65fL+l2kFIyy9409uhzLnsvADE0saNmslfkVxyp8u+IYRVOjLpbKqJfrq
+VDFTe3sktGSjlyWGHFKCx+xDGiJaAr/Qj0W/XH382nnC8dOhs96frQxz+cnwr4Uw
+sH1jNfY5zrXcqjxekoNhgrYBflAkHyyiVp8HRepPWFxMnXtT2Z4bdtzIJVSOwko0
+j91MItL5KyHt5pOS3sJM5wCwno3Tg8zgzbD3AZJoWSbBSKip6e8CQ0uvFcoGcpya
+IYJ38k7+yUihGfGCcPbKxdyFsHHxdIb0oVZAr9D2f9EsCzUvga4pH3yeMVKv0KWG
+2n4zLOJiZ4mvchBJjzBwuy2UCJS6yH+7EmAlkxZGEVcXUN5X+LksmRfr8kSMwjWj
+BlJyOCyKU4Jw/AFFarJlQ+5VieI9ISotXMrIS2VvqDexnxJo1vRzMvaNxK8uwaR7
+eT9h/oI1vEEkrh6aqsIZlj7Owf2TI+ve4JGJ1G+keP/1Ko1kNA+X4Trg3FAy0PR7
+Eg2iBpjxGyEOVe2K/QGnDpMSO6ISot4UgRDK+29fABEBAAGJAjYEGAEKACAWIQSX
+OuSNcbdnNcRxK1u1wAJTDGogUwUCXnYXoQIbDAAKCRC1wAJTDGogU/aMEACrQCrW
+Skyx2waPZk9PBoG1z+CypabL+NwSoPzNdsQcPPB3FlByJSm48aqamXJUH7srCkr/
+aT9GoPktdjstDoloLJ1gwvRiI0ccmwFBrkUU9wwn8mm/x+drktOOniUQA0qT/jvO
+VNYgbfUVmfht6rTfVYlpGK1MxsTgEGvhFw/2PK6tibBnPW9d+3UFVWVELtq6r72H
+l/ndkMOV2tnfBaEpRl94KHn7By0rjDUVQIOxFr73G4rWzU3h3OLHPXDPLa7zM9xF
+Wn9f72L6UJ9MLbR43RCyrAfBFaF064BUwYpg//oaxAsbEl9FTmWV+IwywpufVRMu
++hujYyIsMdIUvEohyUXwSsDDLgCJspWkzCfPBaL0vBDQ3l8LshKoa/uFQ20tWhzH
+D63XjRIAG2q/9e3E/HBBjpRoudsNJKSjbH2YH30+Uzpgc11hh2sgYRIPKWSUN3rN
+/lOBF56YSoFCf35D41VVGmWPcm3Yz7hsSKNSEdH9FL2m8a2sIVOuzup00PlrQLiq
+IrVZBHXAWk4FgqSLQLnxAX3X3Ot1OiBnqaIJZ1Q+hmRCbtOXuq964okyWs6l8FPS
+Qg2ZEOEjc6q4uvdgV8duF8bX8t6mpwMxF0FvVRULzWKmki6P3fvpfel8Qj1my2mv
+veIpzfWOcpxWhH+qvchT3gLmu/Hp8TJ+CF4VsrkCDQRedhezARAAsTrVcc970S+0
+lGVTvPfUVHIPQYg7mXz1H7Hfb9wBzsDb0lbCzm6qtEIMGo5kzC/Z0Wc1+5HO0Zhb
+V2ecqTJMhCfadeK2FymCoS6hDOD2s9JVGoEIctLHWIo7WsjbDOZblN8pOmuBfz5G
+p6awxhBLSTzCwsKQzg08JRO0x7xbSVy52HhbRdgySp1HD+hPTFhmDNc2Ha5n+N6c
+VoNmFxY6MixJDsuk1Y46sM/rSmuvuGEahVjcl3BFqiNmS6h0c2U77vuOoLJ0fvB3
+C6aL94o/zK9I2EieL6jBs9cnyp67CmVKdCIb5T2Gxo3XC9e8WGpntlK6D0vAM1ln
+oMqnhBYeeKpgqxVcP7sBK3FnFCV9yhIo63OPA2GVAStPb5xRXFyGEf3HxVqUxoZ6
+pcKfxAGgXkd86+oUupS/l5bjCIxx5ME/3g92MnRMAAY2ycASaeT3WEeDP20h7jqA
+h+nf1N+jqZMMHpMmClrxKMcT0iSFgstQKSC0GZlrnLSBXPEkH0l30YnzxAwZy/YT
+c819NG3g2JkunDyD9EyKmvX3S9QHjuvE5O6Ou39nAhNdUEx+xSPSY4bkPzOHTvI1
+MO5JrRginUXjSLmGFN8WQeMHRR7P+VMUTgsBGZ7/t7lgIB24HNeFy1rpzfT/ZrDs
+WCxz1SSv13HYR71kpkHTauGo68vx/pEAEQEAAYkCNgQYAQoAIBYhBJc65I1xt2c1
+xHErW7XAAlMMaiBTBQJedhezAhsgAAoJELXAAlMMaiBTxnUQAM2TtUXzmWLG1tKD
+mkYeOCPoFTIwp9b8QKIPwWGtijoJEmjrvJcCd+EUnqP1iZBl2Qee5iCeiFUoNPx3
+M93zpDLwjHX7r9jLbWaRkyCTX0fsq/p9zDpUM5BbGyZEZwmZ3nW5YYRIlJNkQuyV
+bGpIfI+DGMLn5KFq2pVOwyYWLmJ74Lnv/vJYgkNxg70wvjiE7RYEoY0WrDP13QQJ
+aaXdmcHkteov76ElM09wOKPdCFP9AIlmUgRYKu0jb4upQosjpfR7sCf6QtCHCDOC
+zwzvLk3VgrBKkcLKwFEhYx0LYBmgPjQ5CYvnaXBXyQsn+xUwqQs3OhcTD7/fnEYu
+4zkdkNTUtaBNxbqbV6V5Ti0odFQXHHrJ/ugPRHIgBdqXLiVQI4pxKNJhtr6HMWb0
+zjde4Mho/IuOJLYEpHDVUj00RLUCsh1IkgdbRTEaHaeUzpFCf/zGnds6RIrEPBJm
+tubuWXFFVG3d2LkUYkDAWGLE/IQLkeZPpnKCiTNyNvou5E/6BDeZGfnZA8fYAyGR
+2h6aOZkt/4XL7Ot1bgbhNbEABwqSrsRXVFfJ85j+p+2D/iUi/wqyCBA0wDq9omog
+rtNwEHwgQ9/++N3bX0KZKY5S7LXaHWWkXRuNDV2Zx2Vb4PpGmOjlZxKvyLtKgwwz
+imtrGD9EhItdmZ8PBdC2kAx3vWEM
+=553W
+-----END PGP PUBLIC KEY BLOCK-----

grm/github.toml

@@ -0,0 +1,9 @@
+provider = "github"
+token_command = "pass show github | pf '.personal_access_token.grm.value'"
+root = "~/projects/github"
+force_ssh = true
+worktree = true
+
+[filters]
+# owner = true
+# groups = ["hi"]

grm/personal_projects.toml

@@ -0,0 +1,326 @@
+[[trees]]
+root = "~/projects"
+
+[[trees.repos]]
+name = "misc/rbackupd"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/rbackupd.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/cobbler-kickstart"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/cobbler-kickstart.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/postfix-grok-patterns"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/postfix-grok-patterns.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/whyscream/postfix-grok-patterns.git"
+type = "https"
+
+[[trees.repos]]
+name = "misc/syncrepo"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/syncrepo.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/pkgbuilds"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/pkgbuilds.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/openvpn-helper"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/openvpn-helper.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/wifiqr"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/wifiqr.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/checkconn"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/checkconn.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/xftwidth"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/xftwidth.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/vixus0/xftwidth"
+type = "https"
+
+[[trees.repos]]
+name = "git-repo-manager"
+worktree_setup = true
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/git-repo-manager.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/git-repo-manager.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "talks"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/talks.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/openresty-oidc"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/openresty-oidc.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/acimaker"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/acimaker.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/drone-kaniko"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/drone-kaniko.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/banzaicloud/drone-kaniko"
+type = "https"
+
+[[trees.repos]]
+name = "container/roundcube"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/roundcube.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/mycloud-homer"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/mycloud-homer.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "projects/misc/cobbler-kickstart"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/cobbler-kickstart.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "finance-auto-import"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/finance-auto-import.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "guitar_practice"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/guitar-practice.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "picture-cleaner"
+remotes = []
+
+[[trees.repos]]
+name = "mycloud"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/mycloud.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "resume"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/resume.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "lea-michael-hochzeit"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/lea-michi-hochzeit.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "builddoc"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/builddoc.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "blog"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/blog.hkoerber.de.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/blog.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "fizzbuzz"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/fizzbuzz.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "ggj/2018-the-lost-son"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/niklas-heer/the-lost-son.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "ggj/2019-claim-your-world"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/theintroverts/claim-your-world.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "prometheus-restic-backblaze"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/prometheus-restic-backblaze.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/prometheus-restic-backblaze.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "dotfiles"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/dotfiles.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/dotfiles.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "packager"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/packager.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/packager.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "time-tracking"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/time-tracking.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/time-tracking.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "aws-glacier-backup"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/aws-glacier-backup.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/aws-glacier-backup.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "unclutter-xfixes"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "git@github.com:hakoerber/unclutter-xfixes.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/Airblader/unclutter-xfixes"
+type = "https"

gtk/gtk-3.0-bigger-font.ini.j2

@@ -0,0 +1,15 @@
+[Settings]
+gtk-theme-name=Breeze
+gtk-icon-theme-name=breeze
+gtk-font-name=DejaVu Sans {{ ((machine.font_size_1|int - 2)|float * 2.0) | round(0, 'floor') | int }}
+gtk-cursor-theme-name=breeze_cursors
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=1
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull

gtk/gtk-3.0.ini.j2

@@ -1,7 +1,7 @@
 [Settings]
 gtk-theme-name=Breeze
-gtk-icon-theme-name=breeze-dark
+gtk-icon-theme-name=breeze
-gtk-font-name=Cantarell 11
+gtk-font-name=DejaVu Sans {{ machine.font_size_1|int - 2 }}
 gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

gtk/gtkrc-2.0.j2

@@ -1,10 +1,9 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-include "/home/hannes/.gtkrc-2.0.mine"
 gtk-theme-name="Breeze"
-gtk-icon-theme-name="breeze-dark"
+gtk-icon-theme-name="breeze"
-gtk-font-name="Cantarell 11"
+gtk-font-name="DejaVu Sans {{ machine.font_size_1| int - 2 }}"
 gtk-cursor-theme-name="breeze_cursors"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

helix/config.toml

@@ -0,0 +1,44 @@
+theme = "monokai"
+
+[editor]
+idle-timeout = 0
+completion-trigger-len = 2
+
+[editor.statusline]
+left = [
+  "mode",
+  "separator",
+  "file-name",
+  "file-modification-indicator",
+]
+
+right = [
+  "spinner",
+  "spacer",
+  "diagnostics",
+  "separator",
+  "selections",
+  "separator",
+  "position",
+  "position-percentage",
+  "file-type",
+]
+
+mode.normal = "N"
+mode.insert = "I"
+mode.select = "S"
+
+[editor.lsp]
+display-inlay-hints = true
+
+[editor.cursor-shape]
+insert = "bar"
+
+[editor.file-picker]
+hidden = false
+
+[editor.indent-guides]
+render = true
+
+[editor.soft-wrap]
+enable = true

i3/config.j2

@@ -17,8 +17,8 @@
     set $mod Mod4
 
     # The default terminal
-    set $terminal "{{ machine.terminal_binary }} --title terminal"
+    set $terminal "alacritty --config-file ~/.config/alacritty.toml"
-    set $calc "{{ machine.terminal_binary }} --title calc -e $SHELL -i -c calc"
+    set $calc "alacritty --config-file ~/.config/alacritty.toml -e $SHELL -i -c calc"
 
     set $scriptdir ~/.i3/scripts
 
@@ -77,8 +77,8 @@
     set $focus_parent q
     set $focus_child  a
 
-    set $floating_toggle   Shift+space
+    set $floating_toggle   Shift+p
-    set $focus_mode_toggle space
+    set $focus_mode_toggle p
 
     set $prev_on_output u
     set $next_on_output i
@@ -93,6 +93,8 @@
 
     set $kill Shift+Q
 
+    set $screenshot o
+
 
 ################################################################################
 ### WORKSPACE ASSIGNMENTS ######################################################
@@ -113,13 +115,13 @@ workspace $workspace10 output {{ machine.screen.0 }}
 assign [class="^Keepassx$"] $workspace8
 
 # See https://github.com/i3/i3/issues/2060
-for_window [class="^Spotify$"] move to workspace $workspace9
+for_window [class="^Spotify$"] move to workspace $workspace10
-assign [class="^Spotify$"] $workspace9
+assign [class="^Spotify$"] $workspace10
 
 assign [class="^Google-chrome$"] $workspace7
 assign [class="^Chromium$"] $workspace7
-assign [class="^discord"] $workspace7
 assign [class="^Steam"] $workspace5
+for_window [class="^Steam$"] move to workspace $workspace5
 
 assign [class="^dota2$"] $workspace10
 assign [class="^Wine$"] $workspace10
@@ -212,26 +214,19 @@ assign [class="^Wine$"] $workspace10
     bindsym F2 exec --no-startup-id ~/.i3/scripts/screenmenu
 
     bindsym $mod+F1 exec --no-startup-id ~/.i3/scripts/i3exit lock
-    bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/all.yml ; exec systemctl --user restart keyboard.service
+    bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/default.yml ; exec systemctl --user restart keyboard.service
-    bindsym $mod+F3 exec --no-startup-id screencfg ~/.screencfg/laptop.yml ; exec systemctl --user restart keyboard.service
+    {% for screencfg in machine.screencfgs -%}
+    bindsym $mod+{{ screencfg.key }} exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/{{ screencfg.name }}.yml ; exec systemctl --user restart keyboard.service
+    {% endfor -%}
     bindsym $mod+F4 exec --no-startup-id ~/.i3/scripts/i3exit suspend
     bindsym $mod+Home exec --no-startup-id ~/.i3/scripts/shutdown-menu
 
+    bindsym $mod+$screenshot exec --no-startup-id sh -c 'maim | xclip -selection clipboard -t image/png'
+    bindsym $mod+Shift+$screenshot exec --no-startup-id sh -c 'maim --select | xclip -selection clipboard -t image/png'
+
     bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
 
-    bindsym $mod+Shift+$scratchpad move scratchpad
+    bindsym $mod+$pim_toggle exec --no-startup-id ~/.i3/scripts/swap-from-workspace $workspace10
-    bindsym $mod+$scratchpad scratchpad show
-
-    bindsym $mod+$pim_toggle \
-        unmark _destination; \
-        mark _source; \
-        workspace $workspace10; \
-        mark --add _destination; \
-        [con_mark="^_destination$"] swap container with mark "_source"; \
-        [con_mark="^_source$"] focus; \
-        unmark _source; \
-        [con_mark="^_destination$"] focus; \
-        unmark _destination;
 
 ################################################################################
 ### MODES ######################################################################
@@ -297,17 +292,17 @@ assign [class="^Wine$"] $workspace10
     floating_minimum_size 0 x 0
     floating_maximum_size 0 x 0
 
-    font pango:Inconsolata {{ machine.font_size }}
+    font pango:Inconsolata {{ machine.font_size_1 }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
 ################################################################################
 
 # class                 border  backgr. text    indicator
-client.focused          #E16B40 #E16B40 #000000 #FF0000
+client.focused          #e5b567 #e5b567 #000000 #FF0000
-client.focused_inactive #333333 #5f676a #ffffff #484e50
+client.focused_inactive #272822 #5f676a #ffffff #484e50
-client.unfocused        #333333 #202020 #cccccc #292d2e
+client.unfocused        #1C1C1C #272822 #cccccc #292d2e
-client.urgent           #2f343a #900000 #ffffff #900000
+client.urgent           #272822 #ff7777 #000000 #900000
 
 ################################################################################
 ### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -324,33 +319,29 @@ bindsym $mod+F9 exec --no-startup-id evolution
 ################################################################################
 
 bindsym XF86Sleep exec --no-startup-id $scriptdir/i3exit suspend
-bindsym XF86AudioMute exec --no-startup-id $scriptdir/pa-volume mute-toggle
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute '@DEFAULT_SINK@' toggle
-bindsym XF86AudioRaiseVolume exec --no-startup-id $scriptdir/pa-volume set-vol +3
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume '@DEFAULT_SINK@' +5%
-bindsym XF86AudioLowerVolume exec --no-startup-id $scriptdir/pa-volume set-vol -3
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume '@DEFAULT_SINK@' -5%
 
-bindsym XF86AudioPlay exec $scriptdir/spotify-control toggle
+bindsym XF86AudioPlay exec --no-startup-id playerctl -p spotify play-pause
-bindsym XF86AudioNext exec $scriptdir/spotify-control next
+bindsym XF86AudioNext exec --no-startup-id playerctl -p spotify next
-bindsym XF86AudioPrev exec $scriptdir/spotify-control previous
+bindsym XF86AudioPrev exec --no-startup-id playerctl -p spotify previous
 
 # keys seemingly switched
 bindsym XF86MonBrightnessUp   exec --no-startup-id xbacklight -inc 8 ; exec --no-startup-id $scriptdir/update-status
 bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 8 ; exec --no-startup-id $scriptdir/update-status
 
-bindsym $mod+o exec --no-startup-id xautorandr ; exec --no-startup-id kill -SIGUSR2 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)'"
+bindsym $mod+m exec --no-startup-id pactl set-source-mute '@DEFAULT_SOURCE@' toggle
-bindsym $mod+p exec --no-startup-id kill -SIGUSR1 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)
+bindsym $mod+space exec --no-startup-id pactl set-source-mute '@DEFAULT_SOURCE@' toggle
-
-bindsym $mod+m exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
 
 ##############################################################################
 ### BARS #######################################################################
 ################################################################################
-#
+
 bar {
     mode dock
     position bottom
 
-
-#tray_output HDMI3
     tray_output primary
     tray_padding 2
 
@@ -362,24 +353,23 @@ bar {
 
     id bar-0
 
-    font pango:Inconsolata, FontAwesome {{ machine.font_size }}
+    font pango:Inconsolata, FontAwesome {{ machine.font_size_1 }}
 
     colors {
         background #272822
         statusline #ffffff
-        separator #444444
+        separator #555555
-        # separator #e16b40
 
-        # focused_background #303030
+        focused_separator #e5b567
-        # focused_separator #272822
+        focused_background #272822
 
-        focused_workspace  #e16b40 #272822 #ffffff
+        #                  border  bg      text
-        active_workspace   #272822 #5f676a #ffffff
+        focused_workspace  #e5b567 #4f676a #ffffff
+        active_workspace   #272822 #4f676a #ffffff
         inactive_workspace #272822 #272822 #dddddd
-        urgent_workspace   #D00000 #D00000 #272822
+        urgent_workspace   #272822 #ff7777 #272822
-        binding_mode       #272822 #e16b40 #272822
+        binding_mode       #272822 #e5b567 #272822
     }
 
-    i3bar_command i3bar
+    status_command i3status-rs ~/.config/i3status-rust/config.toml
-    status_command py3status --standalone --dbus-notify -c ~/.i3/i3status.conf
 }

i3/i3status-rust/config.toml.j2

@@ -0,0 +1,109 @@
+icons_format = "{{ machine.i3bar_icon_padding }}{icon}{{ machine.i3bar_icon_padding }}"
+
+[icons]
+icons = "awesome"
+
+[icons.overrides]
+microphone = ""
+volume = ""
+bat = "\uf240"
+music = "\uf1bc"
+
+[theme]
+theme = "native"
+
+[theme.overrides]
+warning_fg = "#000000"
+warning_bg = "#F4Bf75"
+critical_fg = "#000000"
+critical_bg = "#F92672"
+end_separator = ""
+
+[[block]]
+block = "music"
+player = "spotify"
+separator = " — "
+format = " $icon {$combo $prev $play $next|-} "
+
+[[block]]
+block = "sound"
+driver = "pulseaudio"
+max_vol = 100
+format = " $icon{ $volume.eng(w:2)|} "
+
+[[block.click]]
+button = "left"
+cmd = "pactl set-sink-mute '@DEFAULT_SINK@' toggle"
+update = true
+
+[[block]]
+block = "sound"
+driver = "pulseaudio"
+device_kind = "source"
+format = "  $icon  "
+
+[block.theme_overrides]
+warning_fg = { link = "idle_fg" }
+warning_bg = { link = "idle_bg" }
+idle_fg = { link = "warning_fg" }
+idle_bg = { link = "warning_bg" }
+
+[[block.click]]
+button = "left"
+cmd = "pactl set-source-mute '@DEFAULT_SOURCE@' toggle"
+update = true
+
+[[block]]
+block = "net"
+format = " $icon{ $signal_strength|}{ $ssid | }"
+
+[[block]]
+block = "load"
+format = " $icon $1m.eng(w:4) "
+warning = 4
+critical = 1000
+interval = 1
+
+[[block]]
+block = "battery"
+interval = 10
+format = " $icon $percentage $time "
+missing_format = ""
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
+command_off = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
+command_state = "[[ $($HOME/.i3/scripts/presentation-mode status) == on ]] && echo active"
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "systemctl --user start redshift"
+command_off = "systemctl --user stop redshift"
+command_state = "[[ $(systemctl --user is-active redshift) == active ]] && echo active"
+signal = 0
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "systemctl --user start spotify"
+command_off = "systemctl --user stop spotify"
+command_state = "[[ $(systemctl --user is-active spotify) == active ]] && echo active"
+signal = 0
+
+[[block]]
+block = "custom"
+json = true
+command = "ping -n -q -w 2 -c 1 8.8.8.8 >/dev/null 2>/dev/null && printf '{\"text\":\"\",\"state\":\"Info\"}' || printf '{\"text\":\"\",\"state\":\"Critical\"}'"
+
+[[block]]
+block = "custom"
+command = "curl -s 'https://wttr.in/Stockholm?m&T&format=%c%t' | sed 's/  / /g'"
+interval = 1800
+
+[[block]]
+block = "time"
+interval = 1
+format = " $timestamp.datetime(f:'[CW %V] %a %d.%m.%Y %H:%M:%S', l:de_DE) "

i3/i3status-rust/icons/awesome.toml

@@ -0,0 +1,94 @@
+# FontAwesome 4: https://fontawesome.com/v4.7.0/cheatsheet/
+backlight_empty = "\U0001f315"
+backlight_full = "\U0001f311"
+backlight_1 = "\U0001f314"
+backlight_2 = "\U0001f314"
+backlight_3 = "\U0001f314"
+backlight_4 = "\U0001f314"
+backlight_5 = "\U0001f313"
+backlight_6 = "\U0001f313"
+backlight_7 = "\U0001f313"
+backlight_8 = "\U0001f313"
+backlight_9 = "\U0001f313"
+backlight_10 = "\U0001f312"
+backlight_11 = "\U0001f312"
+backlight_12 = "\U0001f312"
+backlight_13 = "\U0001f312"
+bat_charging = "\uf1e6" # fa-plug
+bat_discharging = "\uf242" # fa-battery-half
+bat_10 = "\uf244" # fa-battery-empty
+bat_20 = "\uf243" # fa-battery-quarter
+bat_30 = "\uf243" # fa-battery-quarter
+bat_40 = "\uf243" # fa-battery-quarter
+bat_50 = "\uf242" # fa-battery-half
+bat_60 = "\uf242" # fa-battery-half
+bat_70 = "\uf241" # fa-battery-three-quarters
+bat_80 = "\uf241" # fa-battery-three-quarters
+bat_90 = "\uf241" # fa-battery-three-quarters
+bat_full = "\uf240" # fa-battery-full
+bat_not_available = "\uf244" # fa-battery-empty
+bell = "\uf0f3" # fa-bell
+bell-slash = "\uf1f7" # fa-bell-slash-o
+bluetooth = "\uf294" # fa-bluetooth-b
+calendar = "\uf073" # fa-calendar
+cogs = "\uf085" # fa-cogs
+cpu = "\uf0e4" # fa-dashboard
+cpu_boost_off = "\uf204" # fa-toggle-off
+cpu_boost_on = "\uf205" # fa-toggle-on
+disk_drive = "\uf0a0" # fa-hdd-o
+docker = "\uf21a" # fa-ship
+github = "\uf09b" # fa-github
+gpu = "\uf26c" # fa-television
+headphones = "\uf025" # fa-headphones
+joystick = "\uf11b" # fa-gamepad
+keyboard = "\uf11c" # fa-keyboard-o
+mail = "\uf0e0" # fa-envelope
+memory_mem = "\uf2db" # fa-microchip
+memory_swap = "\uf0a0" # fa-hdd-o
+mouse = "\uf245" # fa-mouse-pointer
+music = "\uf001" # fa-music
+music_next = "\uf061" # fa-arrow-right
+music_pause = "\uf04c" # fa-pause
+music_play = "\uf04b" # fa-play
+music_prev = "\uf060" # fa-arrow-left
+net_bridge = "\uf0e8" # fa-sitemap
+net_down = "\u2b07"
+net_loopback = "LO"
+net_modem = "\uf095" # fa-phone
+net_up = "\u2b06"
+net_vpn = "\uf023" # fa-lock
+net_wired = "\uf0ac" # fa-globe
+net_wireless = "\uf1eb" # fa-wifi
+notification = "\uf0a2" # fa-bell-o
+phone = "\uf10b" # fa-mobile
+phone_disconnected = "\U0001f4f5" # https://unicode-table.com/en/1F4F5/
+ping = "\u21ba"
+pomodoro = "\U0001f345"
+pomodoro_break = "\uf0f4" # fa-coffee
+pomodoro_paused = "\uf04c" # fa-pause
+pomodoro_started = "\uf04b" # fa-play
+pomodoro_stopped = "\uf04d" # fa-stop
+resolution = "\uf096" # fa-square-o
+tasks = "\uf0ae" # fa-tasks
+thermometer = "\uf2c8" # fa-thermometer-3
+time = "\uf017" # fa-clock-o
+toggle_off = "\uf204" # fa-toggle-off
+toggle_on = "\uf205" # fa-toggle-on
+unknown = "\uf128" # fa-question
+update = "\uf062" # fa-arrow-up
+uptime = "\uf017" # fa-clock-o
+volume_empty = "\uf026" # fa-volume-off
+volume_full = "\uf028" # fa-volume-up
+volume_half = "\uf027" # fa-volume-down
+volume_muted = "\uf026 \uf00d"
+microphone_empty = "\uf130" # fa-microphone
+microphone_full = "\uf130" # fa-microphone
+microphone_half = "\uf130" # fa-microphone
+microphone_muted = "\uf131" # fa-microphone-slash
+weather_clouds = "\uf0c2" # fa-cloud
+weather_default = "\uf0c2" # fa-cloud
+weather_rain = "\uf043" # fa-tint
+weather_snow = "\uf2dc" # fa-snowflake-o
+weather_sun = "\uf185" # fa-sun-o
+weather_thunder = "\uf0e7" # fa-bolt
+xrandr = "\uf26c" # fa-television

i3/i3status.conf.j2

@@ -1,124 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-    interval = 1
-    # color = '#FFFFFF'
-    # color_good = '#00FF00'
-    # color_bad = '#FF0000'
-    # color_degraded = '#FFFF00'
-    color = '#FFFFFF'
-    color_good = '#FFFFFF'
-    color_bad = '#F92672'
-    color_degraded = '#F4Bf75'
-}
-
-
-order += "yubikey"
-order += "volume_status output"
-order += "volume_status input"
-order += spotify
-order += "wifi"
-order += "external_script presentation_mode"
-order += "systemd redshift"
-order += "systemd spotify"
-order += online_status
-order += "battery_level all"
-order += "clock"
-
-battery_level all {
-    battery_id = "all"
-    format = " {icon}  {percent}% {time_remaining} "
-    measurement_mode = "sys"
-    charging_character = ""
-    blocks = ""
-    notification = true
-    hide_when_full = false
-    hide_seconds = true
-    notify_low_level = true
-    threshold_full = 95
-}
-
-systemd redshift {
-    unit = "redshift.service"
-    user = true
-    format = "  "
-    on_click 1 = "exec $HOME/.i3/scripts/toggle-app redshift"
-    color_bad = '#F4Bf75'
-    color_degraded = '#F4Bf75'
-}
-
-systemd spotify {
-    unit = "spotify.service"
-    user = true
-    format = "  "
-    on_click 1 = "exec $HOME/.i3/scripts/toggle-app spotify"
-    color_bad = '#F4Bf75'
-    color_degraded = '#F4Bf75'
-}
-
-yubikey {
-    format = '[   YubiKey[\?if=is_gpg ][\?if=is_u2f ] ]'
-}
-
-clock {
-    format = ["{DE}", "{NZ}", "{Cuba}", "{MX}", "{CZ}", "{NL}", "{VN}"]
-    format_time = "   {name} \[KW %V\] %a %d.%m.%Y %H:%M:%S "
-}
-
-wifi {
-    bitrate_bad = 0
-    bitrate_degraded = 0
-    format = "   {signal_percent} {ssid} |   down "
-    down_color = "good"
-}
-
-spotify {
-    format = "   {title} - {artist} "
-    format_down = "   off "
-    format_stopped = "   stopped "
-    cache_timeout = 1
-    color_offline = '#FFFFFF'
-    on_click 1 = "exec $HOME/.i3/scripts/spotify-control toggle"
-    on_click 3 = "exec $HOME/.i3/scripts/spotify-control next"
-}
-
-external_script presentation_mode {
-    format = " Present: {output} "
-    script_path = "$HOME/.i3/scripts/presentation-mode status"
-    strip_output = True
-    on_click 1 = "exec $HOME/.i3/scripts/presentation-mode toggle"
-
-}
-
-online_status {
-    icon_on = ""
-    icon_off = ""
-    format = " {icon} "
-}
-
-volume_status output {
-    cache_timeout = 10
-    format = "   {percentage}% "
-    format_muted = "   mute "
-    thresholds = []
-    command = "pactl"
-    color_muted = '#FFFFFF'
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle"
-}
-
-volume_status input {
-    cache_timeout = 10
-    format = "   active "
-    format_muted = "   mute "
-    thresholds = [(0, 'good'), (1, 'bad')]
-    command = "pactl"
-    color_muted = '#FFFFFF'
-    is_input = True
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle-mic"
-}

i3/scripts/appmenu

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-rofi -show combi -combi-modi run,drun -display-combi "run"
+rofi -show combi -combi-modi run -display-combi "run"

i3/scripts/bar-update

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" ]] ; then
-    modules="$1"
-else
-    modules=all
-fi
-
-py3-cmd refresh "$modules"

i3/scripts/i3exit

@@ -18,13 +18,7 @@ log()
 lock()
 {
     set -x
-    playing=0
+    playerctl -p spotify pause
-    if [[ "$(playerctl -p spotify status)" == "Playing" ]] ; then
-        playing=1
-    fi
-    if (( $playing )) ; then
-        playerctl -p spotify pause
-    fi
 
     if [[ -f "$LOCKSCREEN" ]] ; then
         resized_lockscreen=$(mktemp)
@@ -36,9 +30,6 @@ lock()
         i3lock --nofork --show-failed-attempts --ignore-empty-password \
             --color "$_fallback_color"
     fi
-    if (( $playing )) ; then
-        playerctl -p spotify play
-    fi
 }
 
 screen_off() {
@@ -52,10 +43,11 @@ reset_screen() {
 lock_and_screen_off() {
     lock &
     _pid=$!
-    dunstctl disable
+    dunst_paused=$(dunstctl is-paused)
+    [[ "${dunst_paused}" != "true" ]] && dunstctl set-paused true
     screen_off
     wait $_pid
-    dunstctl enable
+    [[ "${dunst_paused}" != "true" ]] && dunstctl set-paused false
     reset_screen
 }
 

i3/scripts/pa-volume

@@ -1,137 +0,0 @@
-#!/bin/bash
-
-# name of the sink. execute pactl list sinks to get a list
-SINKNAME="$(pactl info | grep '^Default Sink:' | cut -d ' ' -f 3-)"
-
-# name of the sink. execute pactl list sinks to get a list
-SOURCENAME="$(pactl info | grep '^Default Source:' | cut -d ' ' -f 3-)"
-
-#SINKNAME="alsa_output.usb-Logitech_Logitech_Wireless_Headset_88C626354D45-00.analog-stereo"
-# this is the worst
-SINK=$(( $(pactl list sinks | grep "Name: " | grep -n "${SINKNAME}"$ | grep -o "^[[:digit:]]*") -1))
-
-SOURCE=$(( $(pactl list sources | grep "Name: " | grep -n "${SOURCENAME}"$ | grep -o "^[[:digit:]]*") -1))
-
-
-getvol() {
-    echo $(pactl list sinks | grep "^[[:space:]]*Volume" | head -n $(( $SINK + 1 )) | tail -n 1 | grep -o "[[:digit:]]*%" | head -n 1 | cut -d "%" -f 1)
-}
-
-setvol() {
-    if [[ $1 =~ [+-][0-9]+ ]] ; then
-        oldvol="$(getvol)"
-        echo "oldvol $oldvol"
-        delta="$(echo "$1" | cut -c 2-)"
-        echo "delta $delta"
-        if [[ "$(echo "$1" | cut -c 1)" == "+" ]] ; then
-            echo "+"
-            newvol=$(( $oldvol + $delta ))
-        else
-            echo "-"
-            newvol=$(( $oldvol - $delta ))
-            echo $newvol
-        fi
-        if [[ $newvol -gt 100 ]]; then
-            echo "capping at 100 percent"
-            newvol=100
-        fi
-        if [[ $newvol -lt 0 ]]; then
-            echo "capping at 0 percent"
-            newvol=0
-        fi
-        echo "newvol $newvol"
-    else
-        newvol="$1"
-    fi
-    pactl set-sink-volume $SINKNAME $(( $newvol * 65536 / 100 ))
-}
-
-ismuted() {
-    muted=$(pactl list sinks | grep "^[[:space:]]*Mute" | head -n $(( $SINK + 1 )) | tail -n 1 | cut -d " " -f 2)
-    if [[ $muted == "no" ]]; then
-        echo 0
-    else
-        echo 1
-    fi
-}
-
-mute() {
-    pactl set-sink-mute $SINKNAME 1
-}
-
-unmute() {
-    pactl set-sink-mute $SINKNAME 0
-}
-
-mute-toggle() {
-    pactl set-sink-mute $SINKNAME toggle
-}
-
-mute-toggle-mic() {
-    pactl set-source-mute $SOURCENAME toggle
-}
-
-status() {
-    if [[ $(ismuted) == "1" ]] ; then
-        echo "mute"
-        return
-    fi
-    echo "$(getvol)%"
-}
-
-usage() {
-    echo "Usage:"
-    echo
-    echo "$0 get-vol"
-    echo "$0 set-vol VOL_PERC"
-}
-
-update_status_bar_sink() {
-    ~/.i3/scripts/bar-update "volume_status output"
-}
-
-update_status_bar_source() {
-    ~/.i3/scripts/bar-update "volume_status input"
-}
-
-case "$1" in
-    "sink")
-        echo $SINKNAME
-        echo $SINK
-        ;;
-    "get-vol")
-        echo $(getvol)
-        ;;
-    "set-vol")
-        if [[ -z "$2" ]] ; then
-            usage
-        else
-            setvol "$2"
-        fi
-        update_status_bar_sink
-        ;;
-    "mute")
-        mute
-        update_status_bar_sink
-        ;;
-    "unmute")
-        unmute
-        update_status_bar_sink
-        ;;
-    "mute-toggle")
-        mute-toggle
-        update_status_bar_sink
-        ;;
-    "mute-toggle-mic")
-        mute-toggle-mic
-        update_status_bar_source
-        ;;
-    "is-muted")
-        echo $(ismuted)
-        ;;
-    "status")
-        echo $(status)
-        ;;
-    *)
-        usage
-esac

i3/scripts/presentation-mode

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 _status_file="${XDG_RUNTIME_DIR}/presentation-mode-on"
-_autostart="$HOME/.autostart.sh"
 
 is_on() {
     [[ -e "${_status_file}" ]]
@@ -9,22 +8,16 @@ is_on() {
 
 switch_on() {
     touch "${_status_file}"
-    dunstctl disable &
+    dunstctl set-paused true &
     systemctl --user --no-block stop redshift.service
     systemctl --user --no-block stop spotify.service
-    ~/.i3/scripts/bar-update "external_script presentation_mode"
-    ~/.i3/scripts/bar-update "systemd redshift"
-    ~/.i3/scripts/bar-update "systemd spotify"
 }
 
 switch_off() {
     rm -f "${_status_file}"
-    dunstctl enable &
+    dunstctl set-paused false &
     systemctl --user --no-block start redshift.service
     systemctl --user --no-block start spotify.service
-    ~/.i3/scripts/bar-update "external_script presentation_mode"
-    ~/.i3/scripts/bar-update "systemd redshift"
-    ~/.i3/scripts/bar-update "systemd spotify"
 }
 
 
@@ -32,10 +25,8 @@ case "$1" in
     status)
         if is_on ; then
             printf "on\n"
-            printf '#F4BF75'
         else
             printf "off\n"
-            # printf '#F4BF75'
         fi
         ;;
     toggle)

i3/scripts/spotify-control

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-case "$1" in
-toggle)
-    cmd="play-pause"
-    ;;
-next)
-    cmd="next"
-    ;;
-previous)
-    cmd="previous"
-    ;;
-*)
-    echo "wrong argument $1"
-    exit 1
-    ;;
-esac
-
-playerctl -p spotify "${cmd}"
-~/.i3/scripts/bar-update spotify

i3/scripts/spotify-current

@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-import dbus
-session_bus = dbus.SessionBus()
-spotify_bus = session_bus.get_object("org.mpris.MediaPlayer2.spotify",
-                                     "/org/mpris/MediaPlayer2")
-spotify_properties = dbus.Interface(spotify_bus,
-                                    "org.freedesktop.DBus.Properties")
-metadata = spotify_properties.Get("org.mpris.MediaPlayer2.Player", "Metadata")
-
-# The property Metadata behaves like a python dict
-# for key, value in metadata.items():
-#     print(key, value)
-
-# To just print the title
-print("{}: {} - [{}]".format(
-    metadata['xesam:artist'][0],
-    metadata['xesam:title'],
-    metadata['xesam:album']
-))
-

i3/scripts/swap-from-workspace

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+cmds=()
+
+workspacescratch="${1}"
+
+i3msgworkspaces="$(i3-msg -t get_workspaces)"
+
+output_of_pim=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.name == "'"${workspacescratch}"'")) | .[0].output')
+
+active_workspace_on_target_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.output == "'"${output_of_pim}"'" and .visible)) | .[0].name')
+
+focused_workspace_name=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].name')
+focused_workspace_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].output')
+
+if [[ "${focused_workspace_name}" == "${workspacescratch}" ]]; then
+    exit 0
+fi
+
+cmds+=('unmark _destination')
+cmds+=('mark _source')
+
+if [[ "${active_workspace_on_target_output}" != "${workspacescratch}" ]] && [[ "${output_of_pim}" != "${focused_workspace_output}" ]]; then
+    need_output_reset=1
+else
+    need_output_reset=0
+fi
+
+if ((need_output_reset)); then
+    cmds+=('workspace "'"${active_workspace_on_target_output}"'"')
+    cmds+=("mark --add _origin")
+fi
+
+cmds+=('workspace "'"${workspacescratch}"'"')
+cmds+=('mark --add _destination')
+
+cmds+=('[con_mark="^_destination$"] swap container with mark "_source"')
+
+cmds+=('[con_mark="^_source$"] focus')
+cmds+=('unmark _source')
+
+if ((need_output_reset)); then
+    cmds+=('[con_mark="^_origin$"] focus')
+    cmds+=('unmark _origin')
+fi
+
+cmds+=('[con_mark="^_destination$"] focus')
+cmds+=('unmark _destination')
+
+i3msgcmd=""
+for cmd in "${cmds[@]}"; do
+    i3msgcmd="${i3msgcmd}${cmd};"
+done
+i3-msg "${i3msgcmd}"

i3/scripts/toggle-app

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-app="${1:?app missing}"
-
-unitname="${app}.service"
-
-running() {
-    systemctl --user --quiet status "${unitname}" >/dev/null
-}
-
-if running ; then
-    systemctl --user stop "${unitname}"
-else
-    systemctl --user start "${unitname}"
-fi
-
-py3-cmd refresh "systemd $app"

install.sh

@@ -11,6 +11,8 @@ set -o nounset
 DOTDIR="/var/lib/dotfiles"
 _SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+[[ -e './.git' ]] && git submodule update --init
+
 if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
     if [[ -e "${DOTDIR}" ]] ; then
         2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n"
@@ -45,13 +47,10 @@ sudowrap() {
     fi
 }
 
+cache_updated=0
 _install() {
     _package="$1" ; shift
-    if [[ $NAME == "Fedora" ]] ; then
+    if [[ $NAME == "Arch Linux" ]] ; then
-        sudowrap dnf install --assumeyes "${_package}"
-    elif [[ $NAME == "Ubuntu" ]] ; then
-        sudowrap apt-get install --assume-yes "${_package}"
-    elif [[ $NAME == "Arch Linux" ]] ; then
         sudowrap pacman -S --noconfirm "${_package}"
     else
         2>&1 printf "Unsupported distro $NAME, exiting"
@@ -72,21 +71,8 @@ if ! command -v make >/dev/null ; then
     printf 'Done\n'
 fi
 
-# Required for compiling modules in venv.
+if [[ $NAME == "Arch Linux" ]] ; then
-if ! command -v gcc >/dev/null ; then
+    _install "ansible"
-    printf 'gcc not installed, installing ...\n'
-    _install "gcc"
-    printf 'Done\n'
-fi
-
-if ! python3 -c 'import venv' 2>/dev/null ; then
-    printf 'Python3 venv module not installed, installing ...\n'
-    _install python3-venv
-    printf 'Done\n'
 fi
 
 cd "$DOTDIR" && make
-
-# fix permissions of the directory
-sudowrap chgrp -R dotfiles "${DOTDIR}"
-sudowrap chmod g+wX "${DOTDIR}"

packages.yml

@@ -1,56 +1,23 @@
 packages:
   list:
     build-essentials:
-      fedora:
-        - autoconf
-        - automake
-        - gcc-c++
-        - gcc
-        - ctags
-        - cmake
-        - libtool
-        - elfutils-libelf-devel
-        - maven
-      ubuntu:
-        - build-essential
-        - exuberant-ctags
       archlinux:
         - gcc
         - ctags
         - cmake
         - maven
         - base-devel
-    golang:
-      fedora: ["golang", "glibc-static"]
-      ubuntu: ["golang-go"]
-      archlinux: ["go"]
     make:
-      fedora: ["make"]
-      ubuntu: ["make"]
       archlinux: ["make"]
     gdb:
-      fedora: ["gdb"]
-      ubuntu: ["gdb"]
       archlinux: ["gdb"]
     strace:
-      fedora: ["strace"]
-      ubuntu: ["strace"]
       archlinux: ["strace"]
     sudo:
-      fedora: ["sudo"]
-      ubuntu: ["sudo"]
       archlinux: ["sudo"]
     apt:
-      fedora: []
+      archlinux: [""]
-      ubuntu: ["apt-file"]
-      archlinux: []
     xorg:
-      fedora:
-        - '@base-x'
-        - xorg-x11-drv-synaptics-legacy
-        - xorg-x11-drv-libinput
-        - libinput
-      ubuntu: []
       archlinux:
         - xorg-server
         - xorg-xrandr
@@ -61,449 +28,335 @@ packages:
         - xorg-xset
         - xorg-xinit
     dmenu:
-      fedora: ["dmenu"]
-      ubuntu: ["dmenu"]
       archlinux: ["dmenu"]
     ansible:
-      fedora: ["ansible"]
+      archlinux:
-      ubuntu: ["ansible"]
+        - ansible
-      archlinux: ["ansible"]
+        - ansible-language-server
     xdotool:
-      fedora: ["xdotool"]
-      ubuntu: ["xdotool"]
       archlinux: ["xdotool"]
     arandr:
-      fedora: ["arandr"]
-      ubuntu: ["arandr"]
       archlinux: ["arandr"]
     borgbackup:
-      fedora: ["borgbackup"]
-      ubuntu: ["borgbackup"]
       archlinux: ["borgbackup"]
     docker:
-      fedora: ["docker"]
-      ubuntu: ["docker.io"]
       archlinux: ["docker", "docker-compose"]
     font-awesome:
-      fedora: ["fontawesome-fonts", "fontawesome-fonts-web"]
-      ubuntu: ["fonts-font-awesome"]
       archlinux: ["ttf-font-awesome"]
     font-inconsolata:
-      fedora: ["levien-inconsolata-fonts"]
-      ubuntu: ["fonts-inconsolata"]
       archlinux: ["ttf-inconsolata"]
     font-dejavu:
-      fedora: []
-      ubuntu: []
       archlinux: ["ttf-dejavu"]
     font-libertine:
-      fedora: []
-      ubuntu: []
       archlinux: ["ttf-linux-libertine"]
     font-emoji:
-      fedora: []
-      ubuntu: []
       archlinux: ["noto-fonts-emoji"]
     git:
-      fedora: ["git", "gitk"]
-      ubuntu: ["git", "git-extras", "gitk", "git-email"]
       # tk required for gitk
       archlinux: ["git", "tk"]
     htop:
-      fedora: ["htop"]
-      ubuntu: ["htop"]
       archlinux: ["htop"]
     feh:
-      fedora: ["feh"]
-      ubuntu: ["feh"]
       archlinux: ["feh"]
     i3:
-      fedora: ["i3"]
+      archlinux:
-      ubuntu: ["i3"]
+        - i3-wm
-      archlinux: ["i3-wm"]
+        - i3status-rust
     i3lock:
-      fedora: ["i3lock"]
-      ubuntu: ["i3lock"]
       archlinux: ["i3lock"]
     pluma:
-      fedora: ["pluma"]
-      ubuntu: ["pluma"]
       archlinux: ["pluma"]
-    vim:
-      fedora: ["vim-enhanced"]
-      ubuntu: ["vim"]
-      archlinux: ["gvim"]
     neovim:
-      fedora: ["neovim", "python3-neovim"]
-      ubuntu: ["neovim"]
       archlinux: ["neovim", "python-pynvim"]
     network-manager-applet:
-      fedora: ["network-manager-applet"]
-      ubuntu: []
       archlinux: ["network-manager-applet"]
     pasystray:
-      fedora: ["pasystray"]
-      ubuntu: ["pasystray"]
       archlinux: ["pasystray"]
     redshift:
-      fedora: ["redshift-gtk"]
-      ubuntu: ["redshift-gtk"]
       archlinux: ["redshift"]
     pavucontrol:
-      fedora: ["pavucontrol"]
-      ubuntu: ["pavucontrol"]
       archlinux: ["pavucontrol-qt"]
     pinentry-qt:
-      fedora: ["pinentry", "pinentry-curses", "pinentry-qt"]
-      ubuntu: ["pinentry-curses", "pinentry-qt"]
       archlinux: ["pinentry"]
     pinta:
-      fedora: ["pinta"]
-      ubuntu: ["pinta"]
       archlinux: ["pinta"]
-    py3status:
-      fedora: ["py3status", "python3-pytz", "python3-tzlocal"]
-      ubuntu: ["py3status", "python3-arrow", "python3-tzlocal"]
-      archlinux: ["py3status", "python-pytz", "python-tzlocal", "python-dbus", "python-pydbus"]
     pass:
-      fedora: ["pass"]
+      archlinux: ["pass", "passff-host", "xclip"]
-      ubuntu: ["pass"]
-      archlinux: ["pass", "passff-host"]
-    keepassx:
-      fedora: ["keepassx"]
-      ubuntu: ["keepassx"]
-      archlinux: []
     urxvt:
-      fedora: ["rxvt-unicode-256color"]
-      ubuntu: ["rxvt-unicode-256color"]
       archlinux: ["rxvt-unicode"]
     alacritty:
-      fedora: []
-      ubuntu: []
       archlinux: ["alacritty"]
     tmux:
-      fedora: ["tmux"]
-      ubuntu: ["tmux"]
       archlinux: ["tmux"]
     screen:
-      fedora: ["screen"]
-      ubuntu: ["screen"]
       archlinux: ["screen"]
     zsh:
-      fedora: ["zsh", "zsh-syntax-highlighting"]
-      ubuntu: ["zsh", "zsh-syntax-highlighting"]
       archlinux: ["zsh", "zsh-syntax-highlighting", "zsh-autosuggestions", "zsh-completions"]
     zathura:
-      fedora: ["zathura-pdf-mupdf"]
-      ubuntu: ["zathura", "zathura-pdf-poppler"]
       archlinux: ["zathura", "zathura-pdf-poppler"]
+    pdf:
+      archlinux: ["ghostscript", "enscript"]
     pandoc:
-      fedora: ["pandoc"]
-      ubuntu: ["pandoc"]
       archlinux: ["pandoc", "texlive-core", "texlive-fontsextra", "texlive-latexextra"]
     libvirt:
-      fedora: ["virt-manager", "libvirt-client"]
+      archlinux: ["virt-manager", "libvirt", "dnsmasq", "ebtables", "dmidecode"]
-      ubuntu: ["virt-manager", "libvirt-bin"]
-      archlinux: ["virt-manager", "libvirt"]
     firefox:
-      fedora: ["firefox"]
-      ubuntu: ["firefox"]
       archlinux: ["firefox"]
     ranger:
-      fedora: ["ranger"]
-      ubuntu: ["ranger"]
       archlinux: ["ranger"]
     thunar:
-      fedora: ["thunar"]
-      ubuntu: ["thunar"]
       archlinux: ["thunar"]
     unclutter:
-      fedora: ["unclutter"]
-      ubuntu: ["unclutter"]
       archlinux: ["unclutter"]
-    chromium:
-      fedora: ["chromium"]
-      ubuntu: ["chromium-browser"]
-      archlinux: ["chromium"]
     libreoffice:
-      fedora: ["libreoffice", "libreoffice-langpack-de", "libreoffice-langpack-en"]
-      ubuntu: ["libreoffice"]
       archlinux: ["libreoffice-fresh", "libreoffice-fresh-de"]
     qt-theming:
-      fedora: ["breeze-cursor-theme", "breeze-icon-theme"]
-      ubuntu: ["breeze-cursor-theme", "breeze-icon-theme", "breeze"]
       archlinux: ["breeze", "breeze-icons", "breeze-grub", "qt5ct"]
     gtk-theming:
-      fedora: ["breeze-gtk"]
-      ubuntu: ["gtk3-engines-breeze"]
       archlinux: ["breeze-gtk", "lxappearance"]
     xcompmgr:
-      fedora: ["xcompmgr"]
-      ubuntu: ["xcompmgr"]
       archlinux: ["xcompmgr"]
     python:
-      fedora: ["python", "python3-devel"]
+      archlinux:
-      ubuntu: ["python3", "python3-pip", "python3-venv", "virtualenv", "pylint3"]
+        - python3
-      archlinux: ["python3"]
+        - python-lsp-server
+    python-modules:
+      archlinux:
+        - python-ruamel-yaml
+        - python-gitpython
+        - python-semver
+    black:
+      archlinux: ["python-black"]
     xbacklight:
-      fedora: ["xbacklight"]
-      ubuntu: ["xbacklight"]
       archlinux: ["xorg-xbacklight"]
     wireshark:
-      fedora: ["wireshark"]
-      ubuntu: ["wireshark", "wireshark-qt"]
       archlinux: ["wireshark-cli", "wireshark-qt"]
-    dia:
-      fedora: ["dia"]
-      ubuntu: ["dia"]
-      archlinux: ["dia"]
-    shutter:
-      fedora: ["shutter"]
-      ubuntu: ["shutter"]
-      archlinux: []
     nmap:
-      fedora: ["nmap"]
-      ubuntu: ["nmap"]
       archlinux: ["nmap"]
     openvpn:
-      fedora: ["openvpn"]
-      ubuntu: ["openvpn"]
       archlinux: ["openvpn"]
     curl:
-      fedora: ["curl"]
-      ubuntu: ["curl"]
       archlinux: ["curl"]
     wget:
-      fedora: ["wget"]
-      ubuntu: ["wget"]
       archlinux: ["wget"]
     tree:
-      fedora: ["tree"]
-      ubuntu: ["tree"]
       archlinux: ["tree"]
     which:
-      fedora: ["which"]
-      ubuntu: []
       archlinux: ["which"]
     zip:
-      fedora: ["zip"]
-      ubuntu: ["zip", "unzip"]
       archlinux: ["zip", "unzip"]
     traceroute:
-      fedora: ["traceroute"]
-      ubuntu: ["traceroute"]
       archlinux: ["traceroute"]
     tcpdump:
-      fedora: ["tcpdump"]
-      ubuntu: ["tcpdump"]
       archlinux: ["tcpdump"]
     tar:
-      fedora: ["tar"]
-      ubuntu: ["tar"]
       archlinux: ["tar"]
     rsync:
-      fedora: ["rsync"]
-      ubuntu: ["rsync"]
       archlinux: ["rsync"]
     net-tools:
-      fedora: ["net-tools"]
-      ubuntu: ["net-tools"]
       archlinux: ["net-tools"]
     ntfs:
-      fedora: ["ntfs-3g", "ntfsprogs"]
-      ubuntu: ["ntfs-3g"]
       archlinux: ["ntfs-3g"]
     lsof:
-      fedora: ["lsof"]
-      ubuntu: ["lsof"]
       archlinux: ["lsof"]
     iptables:
-      fedora: ["iptables"]
+      archlinux: ["iptables-nft"]
-      ubuntu: ["iptables"]
-      archlinux: ["iptables"]
     pwgen:
-      fedora: ["pwgen"]
-      ubuntu: ["pwgen"]
       archlinux: ["pwgen"]
     gpg:
-      fedora: ["gnupg2", "paperkey", "yubikey-manager"]
-      ubuntu: ["gnupg2"]
       archlinux: ["gnupg", "paperkey", "yubikey-manager", "yubikey-touch-detector"]
     networkmanager:
-      fedora: ["NetworkManager", "NetworkManager-wifi"]
-      ubuntu: ["network-manager", "network-manager-openvpn", "network-manager-openconnect"]
       archlinux: ["networkmanager"]
     pulseaudio:
-      fedora: ["pulseaudio", "pulseaudio-utils"]
+      archlinux:
-      ubuntu: ["pulseaudio", "pulseaudio-utils"]
+        - pulseaudio
-      archlinux: ["pulseaudio", "pulseaudio-alsa"]
+        - pulseaudio-alsa
+        - lib32-libpulse
+        - alsa-utils
+        - alsa-firmware
+        - sof-firmware
+        - alsa-ucm-conf
     iw:
-      fedora: ["iw"]
-      ubuntu: ["iw"]
       archlinux: ["iw"]
     cowsay:
-      fedora: ["cowsay"]
-      ubuntu: ["cowsay"]
       archlinux: ["cowsay"]
     ruby:
-      fedora: ["ruby", "ruby-devel", "rubygem-bundler"]
-      ubuntu: ["ruby", "ruby-dev", "ruby-bundler"]
       archlinux: ["ruby"]
     lxc:
-      fedora: ["lxc"]
-      ubuntu: ["lxc"]
       archlinux: ["lxc"]
     acpi:
-      fedora: ["acpi"]
-      ubuntu: ["acpid"]
       archlinux: ["acpi", "acpid"]
-    npm:
+    nodejs:
-      fedora: ["npm"]
+      archlinux: ["nodejs", "npm"]
-      ubuntu: ["npm"]
-      archlinux: ["npm"]
     xdg:
-      fedora: ["xdg-utils"]
-      ubuntu: ["xdg-utils"]
       archlinux: ["xdg-utils"]
-    docs:
-      fedora: ["man-pages"]
-      ubuntu: ["manpages"]
-      archlinux: ["man-pages"]
     compton:
-      fedora: ["compton"]
-      ubuntu: ["compton"]
       archlinux: []
     dunst:
-      fedora: ["dunst"]
-      ubuntu: ["dunst"]
       archlinux: ["dunst"]
     cloc:
-      fedora: ["cloc"]
-      ubuntu: ["cloc"]
       archlinux: ["cloc"]
     bluetooth:
-      fedora: []
-      ubuntu: ["blueman"]
       archlinux: ["bluez", "bluez-tools", "blueman"]
     autorandr:
-      fedora: []
-      ubuntu: ["autorandr"]
       archlinux: ["autorandr"]
     bwm-ng:
-      fedora: []
-      ubuntu: ["bwm-ng"]
       archlinux: ["bwm-ng"]
     virtualbox:
-      fedora: []
+      archlinux: ["virtualbox"]
-      ubuntu: ["virtualbox"]
-      archlinux: []
     ssh:
-      fedora: []
-      ubuntu: []
       archlinux: ["openssh"]
     sshfs:
-      fedora: []
-      ubuntu: ["sshfs"]
       archlinux: ["sshfs"]
     expect:
-      fedora: []
-      ubuntu: ["expect"]
       archlinux: ["expect"]
     inotify:
-      fedora: []
-      ubuntu: ["inotify-tools"]
       archlinux: ["inotify-tools"]
     rclone:
-      fedora: ["rclone"]
-      ubuntu: ["rclone"]
       archlinux: ["rclone"]
     dnf:
-      fedora: ["python3-dnf"]
-      ubuntu: []
       archlinux: []
-    rust:
+    rustup:
-      fedora: []
+      archlinux: ["rustup"]
-      ubuntu: ["rustc", "cargo"]
-      archlinux: ["rust"]
     musescore:
-      fedora: []
-      ubuntu: ["musescore"]
       archlinux: ["musescore"]
     sipcalc:
-      fedora: []
-      ubuntu: ["sipcalc"]
       archlinux: ["sipcalc"]
     rofi:
-      fedora: []
-      ubuntu: ["rofi"]
       archlinux: ["rofi"]
-    anki:
-      fedora: ["anki"]
-      ubuntu: ["anki"]
-      archlinux: ["anki"]
     imv:
-      fedora: []
-      ubuntu: []
       archlinux: ["imv"]
     pacman:
-      fedora: []
-      ubuntu: []
       archlinux: ["pacman", "pacman-contrib"]
     steam:
-      fedora: []
-      ubuntu: []
       archlinux: ["steam"]
     man:
-      fedora: []
-      ubuntu: []
       archlinux: ["man-db", "man-pages"]
-    discord:
-      fedora: []
-      ubuntu: []
-      archlinux: ["discord"]
     nextcloud:
-      fedora: []
-      ubuntu: []
       archlinux: ["nextcloud-client"]
     kwallet:
-      fedora: []
-      ubuntu: []
       archlinux: ["kwallet", "kwalletmanager"]
-    wallpapers:
-      fedora: []
-      ubuntu: []
-      archlinux: ["elementary-wallpapers", "deepin-community-wallpapers"]
-    wallutils:
-      fedora: []
-      ubuntu: []
-      archlinux: ["wallutils"]
     pv:
-      fedora: ["pv"]
-      ubuntu: ["pv"]
       archlinux: ["pv"]
     stress:
-      fedora: []
-      ubuntu: []
       archlinux: ["stress"]
     mpris:
-      fedora: []
-      ubuntu: []
       archlinux: ["playerctl"]
     imagemagick:
-      fedora: []
-      ubuntu: []
       archlinux: ["imagemagick"]
     mpv:
-      fedora: []
-      ubuntu: []
       archlinux: ["mpv"]
     gnome-keyring:
-      fedora: []
+      archlinux: ["gnome-keyring", "seahorse"]
-      ubuntu: []
+    element:
-      archlinux: ["gnome-keyring"]
+      archlinux: ["element-desktop"]
+    maim:
+      archlinux: ["maim"]
+    mkinitcpio:
+      archlinux: ["mkinitcpio"]
+    terraform:
+      archlinux: ["terraform"]
+    synclient:
+      archlinux: ["xf86-input-synaptics"]
+    ncdu:
+      archlinux: ["ncdu"]
+    font-utils:
+      archlinux: ["woff2"]
+    jq:
+      archlinux: ["jq"]
+    musl:
+      archlinux: ["musl"]
+    kdeconnect:
+      archlinux: ["kdeconnect"]
+    restic:
+      archlinux: ["restic"]
+    discord:
+      archlinux: ["discord"]
+    kubectl:
+      archlinux: ["kubectl"]
+    bind:
+      archlinux: ["bind"]
+    fzf:
+      archlinux: ["fzf"]
+    chromium:
+      archlinux: ["chromium"]
+    signal:
+      archlinux: ["signal-desktop"]
+    go:
+      archlinux: ["go", "gopls"]
+    helix:
+      archlinux: ["helix"]
+    keepassxc:
+      archlinux: ["keepassxc"]
+    awscli:
+      archlinux: ["aws-cli"]
+    mariadb-client:
+      archlinux: ["mariadb-clients"]
+    php:
+      archlinux: ["php"]
+    exa:
+      archlinux: ["exa"]
+    just:
+      archlinux: ["just"]
+    ripgrep:
+      archlinux: ["ripgrep"]
+    fd:
+      archlinux: ["fd"]
+    bat:
+      archlinux: ["bat"]
+    mdbook:
+      archlinux: ["mdbook"]
+    bash:
+      archlinux:
+        - bash
+        - bash-language-server
+    packer:
+      archlinux: ["packer"]
+    c:
+      archlinux:
+        - gcc
+        - clang
+    sed:
+      archlinux:
+        - sed
+    findutils:
+      archlinux:
+        - findutils
+    html:
+      archlinux:
+        - vscode-html-languageserver
+    typescript:
+      archlinux:
+        - typescript
+        - typescript-language-server
+    json:
+      archlinux:
+        - vscode-json-languageserver
+    markdown:
+      archlinux:
+        - marksman
+    lldb:
+      archlinux:
+        - lldb
+    yaml:
+      archlinux:
+        - yaml-language-server
+    qemu:
+      archlinux:
+        - qemu-full
+        - tigervnc
+    cloud-init:
+      archlinux:
+        - cloud-init
+        - cloud-utils
+    netcat:
+      archlinux:
+        - openbsd-netcat
 
   remove:
     mousepad:
-      fedora: ["mousepad"]
-      ubuntu: ["mousepad"]
       archlinux: ["mousepad"]
+    vim:
+      archlinux: ["gvim"]
+    rust:
+      archlinux: ["rust"]

playbook.yml

@@ -10,113 +10,168 @@
       tags:
         - always
 
+    - name: read variables
+      include_vars:
+        file: variables.yml
+      tags:
+        - always
+
     - set_fact:
         distro: "{{ ansible_distribution|lower }}"
       tags:
         - always
 
-    - name: Check for valid distro
+    - name: check for valid distro
       assert:
-        that: distro in ('fedora', 'ubuntu', 'archlinux')
+        that: distro in ('archlinux')
 
     - block:
-      - block:
+      - name: install ansible requirements
-        - name: Update apt cache
+        package:
-          apt:
+          name: "{{ packages[distro] }}"
-            update_cache: true
+          state: present
-          become: true
+        become: true
-          changed_when: false
+        vars:
+          packages:
+            archlinux:
+              - python-jmespath
 
-        - name: Upgrade system
+    - block:
-          apt:
+      - name: enable multilib repository
-            upgrade: dist
+        blockinfile:
-          become: true
+          path: /etc/pacman.conf
+          block: |
+            [multilib]
+            Include = /etc/pacman.d/mirrorlist
+          marker: "# {mark} ANSIBLE MANAGED multilib"
+        become: true
 
-        - name: Remove unused packages
+      - name: enable parallel download
-          apt:
+        blockinfile:
-            autoremove: true
+          path: /etc/pacman.conf
-          become: true
+          insertafter: '\[options\]'
-
+          block: |
-        - name: Clean apt cache
+            ParallelDownloads = 5
-          apt:
+          marker: "# {mark} ANSIBLE MANAGED parallel_download"
-            autoclean: true
+        become: true
-          become: true
-        when: distro == 'ubuntu'
 
       - block:
-        - name: Update dnf cache
+        - name: upgrade system
-          dnf:
-            update_cache: true
-          become: true
-
-        - name: Upgrade system
-          dnf:
-            name: '*'
-            state: latest
-            update_cache: false
-          become: true
-
-        - name: Remove unused packages
-          dnf:
-            autoremove: true
-            update_cache: false
-          become: true
-        when: distro == 'fedora'
-
-      - block:
-        - name: enable multilib repository
-          blockinfile:
-            path: /etc/pacman.conf
-            block: |
-              [multilib]
-              Include = /etc/pacman.d/mirrorlist
-          become: true
-
-        - name: Upgrade system
           pacman:
             upgrade: true
             update_cache: true
           become: true
           changed_when: false
 
-        - name: install pacman-contrib for paccache
+        tags: [system-update]
-          package:
+
-            name: pacman-contrib
+      - name: install pacman-contrib for paccache
-            state: installed
+        package:
+          name: pacman-contrib
+          state: present
+        become: true
+
+      - block:
+        - name: install pacman cache clean service
+          copy:
+            dest: /etc/systemd/system/pacman-cache-cleanup.service
+            owner: root
+            group: root
+            mode: '0644'
+            content: |
+              [Service]
+              Type=oneshot
+              ExecStart=/bin/sh -c '/usr/bin/paccache -rk1 && /usr/bin/paccache -ruk0'
+              RemainAfterExit=true
           become: true
 
-        - name: Clean cache
+        - name: install pacman cache clean timer
-          command: paccache -rk2 -ruk0
+          copy:
+            dest: /etc/systemd/system/pacman-cache-cleanup.timer
+            owner: root
+            group: root
+            mode: '0644'
+            content: |
+              [Timer]
+              OnCalendar=daily
           become: true
-          changed_when: false
 
-        when: distro == 'archlinux'
+        - name: enable pacman cache clean timer
-      tags: [update_system]
+          systemd:
+            name: pacman-cache-cleanup.timer
+            enabled: true
+            state: started
+            daemon_reload: true
+          become: true
+        tags: [pacman_cache_cleanup]
 
-    - name: install selinux specials on fedora
+      when: distro == 'archlinux'
-      dnf:
+
-        state: installed
+    - block:
-        name:
+      - name: create dotfiles group
-          - python3-libselinux
+        group:
-          - policycoreutils-python-utils
+          name: dotfiles
-      become: true
+          state: present
-      when: distro == 'fedora'
+        become: true
+        become_user: root
+
+      - name: create dotfiles user
+        user:
+          name: dotfiles
+          group: dotfiles
+          home: /var/lib/dotfiles
+          create_home: false
+          shell: /bin/bash
+          system: true
+        become: true
+        become_user: root
+
+      - name: create dotfiles directory
+        file:
+          state: directory
+          path: /var/lib/dotfiles
+          owner: dotfiles
+          group: dotfiles
+          mode: '0775' # group needs write access!
+        become: true
+        become_user: root
+
+      - name: fix permissions for dotfiles directory
+        shell: |
+          cd /var/lib/dotfiles
+          if [[ -e .git ]] ; then
+              # There is no sane way to specify the global .gitconfig to use, so we
+              # actually have to override HOME so git looks into ~/.gitconfig
+              export HOME="$(mktemp -d)"
+              set -o pipefail
+              set -o errexit
+              git config --global --add safe.directory /var/lib/dotfiles
+              git ls-tree -z --name-only HEAD | xargs --null chown --changes --recursive dotfiles:dotfiles
+              git ls-tree -z --name-only HEAD | xargs --null chmod --changes --recursive g+wX
+          else
+              chown --changes --recursive dotfiles:dotfiles .
+              chmod --changes --recursive g+wX .
+          fi
+        args:
+          executable: /bin/bash
+        register: dotfiles_permission_change
+        become: true
+        become_user: root
+        changed_when: dotfiles_permission_change.stdout_lines|length > 0
+      tags: [dotfiles-directory]
 
     - block:
       - name: install sudo
         package:
-          state: installed
+          state: present
           name: sudo
 
       - name: install dependencies for paru
         package:
-          state: installed
+          state: present
           name:
             - base-devel
             - git
-            - cargo
-            - asp
-            - bat
         become: true
 
       - name: create build user on arch
@@ -126,12 +181,32 @@
           create_home: true
           shell: /bin/bash
           system: true
+        become: true
+
+      - name: create paru user on arch
+        user:
+          name: paru
+          home: /var/lib/paru
+          create_home: true
+          shell: /bin/bash
+          system: true
+        become: true
+
+      - name: configure passwordless sudo for paru user
+        copy:
+          owner: root
+          group: root
+          mode: "0600"
+          dest: /etc/sudoers.d/paru
+          content: |
+            paru ALL=(ALL) NOPASSWD: /usr/bin/pacman
+        become: true
 
       - name: check if paru is already installed
         shell: |
           set -o errexit
 
-          if pacman -Qi paru >/dev/null 2>&1; then
+          if pacman -Qi paru-bin >/dev/null 2>&1; then
               exit 100
           fi
           exit 0
@@ -149,9 +224,9 @@
           mkdir -p /tmp/paru-build
           cd /tmp/paru-build
 
-          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru.tar.gz
+          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz
-          tar xvf paru.tar.gz
+          tar xvf paru-bin.tar.gz
-          cd paru
+          cd paru-bin
           makepkg
         args:
           executable: /bin/bash
@@ -163,7 +238,7 @@
         shell: |
           set -o errexit
 
-          pacman --noconfirm -U /tmp/paru-build/paru/paru-*.pkg.tar.zst
+          pacman --noconfirm -U /tmp/paru-build/paru-bin/paru-bin-*.pkg.tar.zst
           rm -rf /tmp/paru-build
         args:
           executable: /bin/bash
@@ -178,12 +253,11 @@
         include_vars:
           file: packages.yml
 
-      - name: enable neovim ppa
+      - name: force-update iptables to iptables-nft on arch
-        apt_repository:
+        shell: pacman -Q iptables && yes | pacman -S iptables-nft
-          repo: 'ppa:neovim-ppa/stable'
+        changed_when: false
-          update_cache: true
         become: true
-        when: distro == 'ubuntu'
+        when: distro == 'archlinux'
 
       - set_fact:
           defined_packages: "{{ packages|json_query('keys(list)') }}"
@@ -205,14 +279,6 @@
         assert:
           that: "defined_packages_remove|length == distro_packages_remove|length"
 
-      - name: install packages
-        package:
-          name: "{{ packages|json_query(query) }}"
-          state: installed
-        become: true
-        vars:
-          query: "{{ 'list.*.%s[]'|format(distro) }}"
-
       - name: remove packages
         package:
           name: "{{ packages|json_query(query) }}"
@@ -221,6 +287,14 @@
         vars:
           query: "{{ 'remove.*.%s[]'|format(distro) }}"
 
+      - name: install packages
+        package:
+          name: "{{ packages|json_query(query) }}"
+          state: present
+        become: true
+        vars:
+          query: "{{ 'list.*.%s[]'|format(distro) }}"
+
       - name: install machine-specific packages
         package:
           name: "{{ machine.packages }}"
@@ -246,7 +320,7 @@
       - name: install lz4
         package:
           name: lz4
-          state: installed
+          state: present
         become: true
 
       - name: use lz4 for mkinitcpio compression
@@ -259,16 +333,6 @@
           - rebuild initrd
       when: distro == 'archlinux'
 
-    - set_fact:
-        disable_services:
-          - sshd
-      when: distro == 'fedora'
-
-    - set_fact:
-        disable_services:
-          - ssh
-      when: distro == 'ubuntu'
-
     - set_fact:
         disable_services:
           - sshd
@@ -283,23 +347,6 @@
       become: true
       when: manage_services|default(true)|bool
 
-    - set_fact:
-        enable_services:
-          - NetworkManager
-          # does not work with fedora 31 due to the switch to cgroups v2:
-          # https://github.com/docker/cli/issues/2104
-          # https://bugzilla.redhat.com/show_bug.cgi?id=1746355#c1
-          # - docker
-          - libvirtd
-      when: distro == 'fedora'
-
-    - set_fact:
-        enable_services:
-          - NetworkManager
-          - docker
-          - libvirtd
-      when: distro == 'ubuntu'
-
     - set_fact:
         enable_services:
           - NetworkManager
@@ -307,7 +354,6 @@
           - libvirtd
           - systemd-timesyncd
           - pcscd
-      when: distro == 'archlinux'
 
     - name: enable services
       service:
@@ -346,23 +392,20 @@
         line: 'HandlePowerKey=suspend'
       become: true
 
-    - block:
+    - name: create sudonopw group
-      - name: create sudonopw group
+      group:
-        group:
+        name: sudonopw
-          name: sudonopw
+        system: true
-          system: true
 
-      - name: configure passwordless sudo
+    - name: configure passwordless sudo
-        copy:
+      copy:
-          owner: root
+        owner: root
-          group: root
+        group: root
-          mode: "0600"
+        mode: "0600"
-          dest: /etc/sudoers.d/sudonopw
+        dest: /etc/sudoers.d/sudonopw
-          content: |
+        content: |
-            %sudonopw ALL=(ALL) NOPASSWD: ALL
+          %sudonopw ALL=(ALL) NOPASSWD: ALL
-        become: true
+      become: true
-
-      when: distro == 'archlinux'
 
     - block:
       - name: install AMDGPU packages
@@ -377,7 +420,7 @@
             - lib32-libva-mesa-driver
             - mesa-vdpau
             - lib32-mesa-vdpau
-          state: installed
+          state: present
         become: true
 
       - name: set AMDGPU options
@@ -399,23 +442,18 @@
         - distro == 'archlinux'
         - machine.gpu is defined and machine.gpu == 'amd'
 
+    - block:
+      - block:
+        - name: install spotify from AUR via paru
+          shell: |
+            curl -sS https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg | gpg --import
+            yes 1 | paru --skipreview --aur --batchinstall --noconfirm -S spotify
+          become: true
+          become_user: paru
+          args:
+            creates: /usr/bin/spotify
 
-    - name: create dotfiles group
+      tags: [spotify]
-      group:
-        name: dotfiles
-        state: present
-      become: true
-      become_user: root
-
-    - name: create dotfiles directory
-      file:
-        state: directory
-        path: /var/lib/dotfiles
-        owner: nobody
-        group: dotfiles
-        mode: '0775' # group needs write access!
-      become: true
-      become_user: root
 
     - set_fact:
         users: "{{ machine.users }}"
@@ -428,6 +466,7 @@
           become: true
           become_user: "{{ user.name }}"
       with_items: "{{ users }}"
+      no_log: True # less spam
       loop_control:
         loop_var: user
       tags:
@@ -437,3 +476,8 @@
     - name: rebuild initrd
       command: mkinitcpio -P
       become: true
+      register: mkinitcpio_cmd
+      failed_when: >
+        mkinitcpio_cmd.rc != 0
+        and
+        not (mkinitcpio_cmd.rc == 1 and "file not found: `fsck.overlay'" in mkinitcpio_cmd.stderr)

qt/qt5ct.conf

@@ -1,14 +1,9 @@
 [Appearance]
-color_scheme_path=/usr/share/qt5ct/colors/airy.conf
 custom_palette=false
 icon_theme=breeze
 standard_dialogs=default
 style=Fusion
 
-[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-general=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-
 [Interface]
 activate_item_on_single_click=1
 buttonbox_layout=0
@@ -23,6 +18,3 @@ stylesheets=@Invalid()
 toolbutton_style=4
 underline_shortcut=1
 wheel_scroll_lines=3
-
-[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x16\0\0\t\xff\0\0\x5\x88\0\0\0\0\0\0\0\x16\0\0\t\xff\0\0\x5\x88\0\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\0\x16\0\0\t\xff\0\0\x5\x88)

redshift/redshift.conf

@@ -55,8 +55,8 @@ adjustment-method=randr
 ; Keep in mind that longitudes west of Greenwich (e.g. the Americas)
 ; are negative numbers.
 [manual]
-lat=49.5
+lat=59.3
-lon=11
+lon=18.1
 
 ; Configuration of the adjustment-method
 ; type 'redshift -m METHOD:help' to see the settings.

requirements.txt

@@ -1,13 +0,0 @@
-ansible==2.10.4
-ansible-base==2.10.3
-cffi==1.14.4
-cryptography==3.2.1
-ipaddress==1.0.23
-Jinja2==2.11.2
-jmespath==0.10.0
-MarkupSafe==1.1.1
-packaging==20.7
-pycparser==2.20
-pyparsing==2.4.7
-PyYAML==5.3.1
-six==1.15.0

screencfg/ares.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -o xtrace
-
-xrandr --output DisplayPort-0 --mode 2560x1440 --primary --rate 144.00 --set TearFree on

screencfg/ares/default.yml

@@ -0,0 +1,8 @@
+reset: true
+outputs:
+  - name: DisplayPort-0
+    opts:
+      mode: 2560x1440
+      rate: "144.00"
+    set:
+      TearFree: "on"

screencfg/mars/default.yml

@@ -0,0 +1,14 @@
+reset: false
+outputs:
+  - name: eDP-1
+    primary: True
+    opts:
+      mode: 1920x1080
+      scale: 1x1
+      pos: "0x0" # beware of hex
+  - name: DP-1-1
+    disable: true
+  - name: DP-1-2
+    disable: true
+  - name: DP-1-3
+    disable: true

screencfg/mars/three-screens.yml

@@ -0,0 +1,18 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      pos: "0x0" # beware of hex
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      right-of: eDP-1
+    reset: true
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      right-of: DP-3
+    reset: true

screencfg/neptune/default.yml

@@ -0,0 +1,18 @@
+reset: false
+outputs:
+  - name: eDP-1
+    primary: True
+    opts:
+      mode: 1920x1080
+      scale: 1x1
+      pos: "0x0" # beware of hex
+  - name: DP-1
+    disable: true
+  - name: DP-2
+    disable: true
+  - name: DP-3
+    disable: true
+  - name: DP-4
+    disable: true
+  - name: DP-5
+    disable: true

screencfg/neptune/three-screens-laptop-left.yml

@@ -0,0 +1,18 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      pos: "0x0" # beware of hex
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      right-of: eDP-1
+    reset: true
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      right-of: DP-3
+    reset: true

screencfg/neptune/three-screens-laptop-right.yml

@@ -0,0 +1,21 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      # x: 2*1920
+      # y: 1080-(0.7*1080)
+      pos: "3840x324" # beware of hex
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      pos: "1920x0" # beware of hex
+    reset: true
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      left-of: DP-4
+      pos: "0x0" # beware of hex
+    reset: true

scripts/install-gothic.sh

@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-read -p "Make sure that gothic was installed via Steam! <Enter> to continue, <CTRL+C> to abort "
+# Steam setting: Proton 4.11-13
+#
+# * It *must not* have any symlinks for the directmusic dlls like:
+# pfx/dosdevices/c:/windows/syswow64/dmusic.dll
+
+STEAMAPPS=/var/games/steamapps/
+
+read -p "Make sure that gothic was installed via Steam and started once! <Enter> to continue, <CTRL+C> to abort "
 
 set -o nounset
 set -o xtrace
@@ -11,20 +18,58 @@ downloaddir=~/download/gothic
 mkdir -p "${downloaddir}"
 cd "${downloaddir}"
 
-curl -L -o gothic_patch_108k.exe "https://www.worldofgothic.de/download.php?id=15"
+curl -C - -L -o gothic_patch_108k.exe "https://www.worldofgothic.de/download.php?id=15"
-curl -L -o gothic1_playerkit-1.08k.exe "https://www.worldofgothic.de/download.php?id=61"
+curl -C - -L -o gothic1_playerkit-1.08k.exe "https://www.worldofgothic.de/download.php?id=61"
-curl -L -o Definitive_Edition_1_4_2.exe "https://www.worldofgothic.de/download.php?id=1586"
-curl -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/G1Classic-SystemPack-1.8.exe
-curl -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/Gothic1_PlayerKit-2.8.exe
 
-read -p "During installation, use \"Z:\\var\\games\\steamapps\\common\\Gothic\\\" as the install directory! <Enter> to continue, <CTRL+C> to abort "
+curl -C - -L -o Definitive_Edition_1_4_5.exe "https://www.worldofgothic.de/download.php?id=1586"
 
-export WINEPREFIX=/var/games/steamapps/compatdata/65540/pfx/
+# superseded by union
+curl -C - -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/G1Classic-SystemPack-1.8.exe
 
-wine "${downloaddir}"/gothic1_playerkit-1.08k.exe
+# curl -C - -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/Gothic1_PlayerKit-2.8.exe
-wine "${downloaddir}"/Gothic1_PlayerKit-2.8.exe
+
+curl -C - -L -o Ninja-2.5.09.exe "https://www.worldofgothic.de/download.php?id=1626"
+# curl -C - -L -o Union_1.0j_22.02.2021.exe "https://www.worldofgothic.de/download.php?id=1625"
+
+curl -C - -L -o G1CP-1.0.0.exe "https://www.worldofgothic.de/download.php?id=1636"
+
+#curl -C - -L -o Spine_1.29.0.exe "https://www.worldofgothic.de/download.php?id=1417"
+
+curl -C - -L -o Gothic1-GD3D11-17.7-dev16.zip https://github.com/Kirides/GD3D11/releases/download/v17.7-dev16/Gothic1-GD3D11-17.7-dev16.zip
+curl -C - -L -o RiisisGothic1TextureMixV1.1.zip "https://www.worldofgothic.de/download.php?id=1458"
+
+read -p 'During installation, use "Z:\var\games\steamapps\common\Gothic\" as the install directory! <Enter> to continue, <CTRL+C> to abort '
+
+
+export WINEPREFIX="${STEAMAPPS}/compatdata/65540/pfx/"
+
+#winetricks dxvk
+winetricks directmusic
+
+#read -p "In winecfg, go to Libraries tab, in 'existing overrides' search for 'dsound', select it and press remove button "
+#winecfg
+
+# wine "${downloaddir}"/gothic_patch_108k.exe
+# wine "${downloaddir}"/gothic1_playerkit-1.08k.exe
+
+# wine "${downloaddir}"/Gothic1_PlayerKit-2.8.exe
 wine "${downloaddir}"/G1Classic-SystemPack-1.8.exe
-wine "${downloaddir}"/Definitive_Edition_1_4_2.exe
+
+wine "${downloaddir}"/Ninja-2.5.09.exe
+
+# cmd="${WINEPREFIX}/dosdevices/c:/windows/syswow64/cmd.exe"
+# cmdtarget="$(readlink "${cmd}")"
+# rm "${WINEPREFIX}/dosdevices/c:/windows/syswow64/cmd.exe"
+# winetricks cmd # for union install
+# wine "${downloaddir}"/Union_1.0j_22.02.2021.exe
+# ln -sf "$cmdtarget" "$cmd"
+
+wine "${downloaddir}"/G1CP-1.0.0.exe
+wine "${downloaddir}"/Definitive_Edition_1_4_5.exe
+
+unzip -u "${downloaddir}"/Gothic1-GD3D11-17.7-dev16.zip -d "${STEAMAPPS}/common/Gothic/system"
+unzip -u "${downloaddir}"/RiisisGothic1TextureMixV1.1.zip -d "${STEAMAPPS}/common/Gothic/Data"
+
 
 read -p "Now run the game once and exit! <Enter> to continue, <CTRL+C> to abort "
 
@@ -33,22 +78,28 @@ cd /var/games/steamapps/common/Gothic
 sed -i 's/^playLogoVideos=.*$/playLogoVideos=0\r/' system/Gothic.ini
 sed -i 's/^sightValue=.*$/sightValue=14\r/' system/Gothic.ini
 sed -i 's/^modelDetail=.*$/modelDetail=1\r/' system/Gothic.ini
-sed -i 's/^subTitles=.*$/subTitles=0\r/' system/Gothic.ini
+sed -i 's/^subTitles=.*$/subTitles=1\r/' system/Gothic.ini
-sed -i 's/^bloodDetail=.*$/bloodDetail=3\r/' system/Gothic.ini
+sed -i 's/^animatedWindows=.*$/animatedWindows=0\r/' system/Gothic.ini
+sed -i 's/^bloodDetail=.*$/bloodDetail=2\r/' system/Gothic.ini
 sed -i 's/^zVidResFullscreenX=.*$/zVidResFullscreenX=2560\r/' system/Gothic.ini
 sed -i 's/^zVidResFullscreenY=.*$/zVidResFullscreenY=1440\r/' system/Gothic.ini
+sed -i 's/^zDetailTexturesEnabled=.*$/zDetailTexturesEnabled=1\r/' system/Gothic.ini
+sed -i 's/^zSubdivSurfacesEnabled=.*$/zSubdivSurfacesEnabled=1\r/' system/Gothic.ini
 
 sed -i 's/^SimpleWindow=.*$/SimpleWindow=0\r/' system/SystemPack.ini
 sed -i 's/^Gothic2_Control=.*$/Gothic2_Control=1\r/' system/SystemPack.ini
 sed -i 's/^USInternationalKeyboardLayout=.*$/USInternationalKeyboardLayout=0\r/' system/SystemPack.ini
 sed -i 's/^FPS_Limit=.*$/FPS_Limit=144\r/' system/SystemPack.ini
-sed -i 's/^VerticalFOV=.*$/VerticalFOV=50.625\r/' system/SystemPack.ini
+sed -i 's/^VerticalFOV=.*$/VerticalFOV=85\r/' system/SystemPack.ini
 
 sed -i 's/^OutDoorPortalDistanceMultiplier=.*$/OutDoorPortalDistanceMultiplier=3\r/' system/SystemPack.ini
 sed -i 's/^InDoorPortalDistanceMultiplier=.*$/InDoorPortalDistanceMultiplier=3\r/' system/SystemPack.ini
 sed -i 's/^WoodPortalDistanceMultiplier=.*$/WoodPortalDistanceMultiplier=3\r/' system/SystemPack.ini
 sed -i 's/^DrawDistanceMultiplier=.*$/DrawDistanceMultiplier=3\r/' system/SystemPack.ini
 
+sed -i 's/^keyDelayRate=.*$/keyDelayRate=50\r/' system/SystemPack.ini
+sed -i 's/^keyDelayFirst=.*$/keyDelayFirst=150\r/' system/SystemPack.ini
+
 sed -i 's/^HideFocus=.*$/HideFocus=0\r/' system/SystemPack.ini
 
 sed -i 's/^Scale=.*$/Scale=1.9\r/' system/SystemPack.ini

scripts/install-gothic2.sh

@@ -0,0 +1,199 @@
+#!/usr/bin/env bash
+
+# Steam setting: Proton 4.11-13
+#
+# * It *must not* have any symlinks for the directmusic dlls like:
+# pfx/dosdevices/c:/windows/syswow64/dmusic.dll
+
+set -o nounset
+set -o xtrace
+set -o errexit
+
+
+STEAMAPPS=/var/games/steamapps/
+
+BASEDIR="${STEAMAPPS}/common/Gothic II"
+
+export GAMEDATA=${BASEDIR}/data/
+export ARCHIVE=${BASEDIR}/gothic2.data.tar.zstd
+export WINEPREFIX="${STEAMAPPS}/compatdata/39510/pfx/"
+export WINEARCH=win64
+
+export WINEVERSION=6.3
+
+DOWNLOADDIR=~/download/gothic2
+
+mkdir -p "${WINEPREFIX}"
+
+# if [[ "$(wine --version)" != "wine-${WINEVERSION}" ]] ; then
+#     printf '%s\n' "Wine version ${WINEVERSION} required" >&2
+#     exit 1
+# fi
+
+archive() {
+    origin="$1"
+    if [[ -e "${ARCHIVE}" ]] ; then
+        return
+    fi
+    tar -cv --zstd -p -f "${ARCHIVE}" -C "${GAMEDATA}" .
+}
+
+extract() {
+    if [[ -e "${GAMEDATA}" ]] ; then
+        return
+    fi
+
+    mkdir -p "${GAMEDATA}"
+    tar x --zstd -f "${ARCHIVE}" -C "${GAMEDATA}"
+}
+
+start() {
+    # For the DX11 renderer, PWD has to be the folder containing the "GD3D11" folder
+    cd "${GAMEDATA}/system/"
+
+    # There is a bug in the DX11 renderer that leads to the mouse cursor always
+    # being visible
+    #
+    # See https://bugs.winehq.org/show_bug.cgi?id=48483
+    #
+    # Workaround is to disable the cursor completely during gameplay
+    # if command -v unclutter >/dev/null ; then
+    #     unclutter --timeout 0 --jitter 100000 --ignore-scrolling &
+    #     pid=$!
+    #     trap "kill $pid" EXIT
+    # else
+    #     echo "WARNING: Unclutter not installed, cannot disable mouse cursor"
+    # fi
+
+    wine ./Gothic2.exe
+}
+
+ini() {
+    cd "${GAMEDATA}"
+
+    set_ini() {
+        local file="$1"
+        local key="$2"
+        local value="$3"
+        if ! grep -q "^${key}=" "${file}" ; then
+            echo "Key ${key} not fmund in ${file}"
+            exit 1
+        fi
+
+        sed -i "s/^${key}=.*$/${key}=${value}\r/" "${file}"
+    }
+
+    set_ini system/Gothic.ini sightValue 14
+    set_ini system/Gothic.ini modelDetail 1
+    set_ini system/Gothic.ini animatedWindows 0
+    set_ini system/Gothic.ini playLogoVideos 0
+    set_ini system/Gothic.ini useGothic1Controls 1
+    set_ini system/Gothic.ini keyDelayRate 50
+    set_ini system/Gothic.ini keyDelayFirst 150
+    set_ini system/Gothic.ini subTitles 1
+    set_ini system/Gothic.ini invMaxColumns 8
+    set_ini system/Gothic.ini invMaxRows 0
+    set_ini system/Gothic.ini useQuickSaveKeys 1
+    set_ini system/Gothic.ini zVidResFullscreenX 2560
+    set_ini system/Gothic.ini zVidResFullscreenY 1440
+    set_ini system/Gothic.ini zVidResFullscreenBPP 32
+    set_ini system/Gothic.ini zRainWindScale 0.1
+    set_ini system/Gothic.ini zMouseRotationScale 15.0
+    set_ini system/Gothic.ini zSmoothMouse 0
+
+    set_ini system/SystemPack.ini VerticalFOV 85.0
+    set_ini system/SystemPack.ini DrawDistanceMultiplier 3
+    set_ini system/SystemPack.ini OutDoorPortalDistanceMultiplier 3
+    set_ini system/SystemPack.ini InDoorPortalDistanceMultiplier 3
+}
+
+
+case $1 in
+    install)
+        extract
+
+        mkdir -p "${DOWNLOADDIR}"
+        cd "${DOWNLOADDIR}"
+
+        curl -C - -L -o g2addon-2_6.exe "https://www.worldofgothic.de/download.php?id=173"
+        curl -C - -L -o gothic2_fix-2.6.0.0-rev2.exe "https://www.worldofgothic.de/download.php?id=833"
+        curl -C - -L -o gothic2_playerkit-2.6f.exe "https://www.worldofgothic.de/download.php?id=518"
+        curl -C - -L -o G2NoTR-SystemPack-1.8.exe "https://www.worldofgothic.de/download.php?id=1525"
+
+        curl -C - -L -o LHiver204_DE_22-06-20.exe "https://www.worldofgothic.de/download.php?id=1580"
+
+        curl -C - -L -o LaaHack.zip "https://www.worldofgothic.de/download.php?id=1457"
+
+        curl -C - -L -O "https://github.com/Kirides/GD3D11/releases/download/v17.7-dev20/Gothic2-GD3D11-v17.7-dev20.zip"
+
+        curl -C - -L -o Normalmaps_LHiver.zip "https://www.worldofgothic.de/download.php?id=1530"
+
+        curl -C - -L -O https://github.com/Kirides/ninja-quickloot/releases/download/v1.9.5/Quickloot.vdf
+
+        curl -C - -L -O https://github.com/szapp/Ninja/releases/download/v2.7.12/Ninja-2.7.12.exe
+
+        # winetricks -q dxvk
+        winetricks -q directmusic
+        if command -v setup_dxvk >/dev/null ; then
+            setup_dxvk install
+        else
+            echo "WARNING: Using dxvk via winetricks, untested"
+            winetricks dxvk
+        fi
+
+        read -p 'During installation, use "${GAMEDATA//\//\\}" as the install directory! <Enter> to continue, <CTRL+C> to abort '
+
+        wine "${DOWNLOADDIR}"/g2addon-2_6.exe
+        wine "${DOWNLOADDIR}"/gothic2_fix-2.6.0.0-rev2.exe
+        wine "${DOWNLOADDIR}"/gothic2_playerkit-2.6f.exe
+        wine "${DOWNLOADDIR}"/G2NoTR-SystemPack-1.8.exe
+        wine "${DOWNLOADDIR}"/LHiver204_DE_22-06-20.exe
+        wine "${DOWNLOADDIR}"/Ninja-2.7.12.exe
+
+        cd "${GAMEDATA}"
+
+        unzip -o "${DOWNLOADDIR}"/Gothic2-GD3D11-v17.7-dev20.zip -d ./system/
+
+        ln Data/ModVDF/LHE204_DE.mod Data/LHE204_DE.mod
+
+        cp "${DOWNLOADDIR}"/Quickloot.vdf ./Data
+
+        t="./system/GD3D11/Textures/replacements/Normalmaps_xxx"
+        mkdir -p "${t}"
+        set +o errexit
+        unzip -o "${DOWNLOADDIR}"/Normalmaps_LHiver.zip -d "${t}"
+        zip_exit="$?"
+        set -o errexit
+        if (( $zip_exit != 0 )) && (( $zip_exit != 2 )) ; then
+            echo zip failed
+            exit 1
+        fi
+        unset t
+
+        laatmp=$(mktemp -d)
+
+        unzip -o "${DOWNLOADDIR}"/LaaHack.zip -d "${laatmp}"
+
+        read -p "For the LAA Hack, select only ${GAMEDATA}/system/Gothic2.exe [<Enter> to continue] "
+        wine "${laatmp}"/LaaHack.exe
+        rm -rf "${laatmp}"
+
+        # Required to create all ini files
+        read -p "Now run the game once and exit! [<Enter> to continue] "
+
+        ini
+        ;;
+    ini)
+        ini
+        ;;
+    start)
+        export WINEDLLOVERRIDES="ddraw=n,b;dsound=b,n;d3dcompiler_47=n,b"
+        start
+        ;;
+    archive)
+        archive "$2"
+        ;;
+    exec)
+        "${@}"
+        ;;
+esac

test-in-docker.sh

@@ -4,7 +4,8 @@ set -o nounset
 set -o errexit
 
 tmpdir="$(mktemp -d)"
-tmpdir=/tmp/dotfiles
+
+trap "rm -rf ${tmpdir}" EXIT
 
 git archive --format tar --output "${tmpdir}/dotfiles.tar" HEAD
 
@@ -17,24 +18,73 @@ git submodule foreach 'bash -x -c "
 
 gzip -k -f -v "${tmpdir}/dotfiles.tar"
 
-exit 1
+test_ares() {
+    if [[ -d "/var/cache/pacman/pkg/" ]] ; then
+        dockeropts=(-v "/var/cache/pacman/pkg/:/var/cache/pacman/pkg_host/")
+    else
+        echo "Warning: /var/cache/pacman/pkg/ does not exist. Create it to speed up multiple runs" >&2
+    fi
+    docker pull docker.io/library/archlinux:base
+    docker run \
+        -ti \
+        --rm \
+        -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro \
+        --mount type=tmpfs,destination=/var/cache/pacman/pkg/ \
+        "${dockeropts[@]}" \
+        --hostname ares \
+        docker.io/library/archlinux:base \
+        sh -c '
+            set -o errexit
 
-docker pull docker.io/library/archlinux:base
+            # Uncomment CacheDir and append the host pacman cache as cachedir
-docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname ares docker.io/library/archlinux:base sh -c '"
+            # At worst, the cache directory will be ignored if it does not exist
-    set -o errexit
+            # Pacman will always prefer the first cache directory, so newly downloaded
+            # packages will stay in the container
+            sed -i '"'"'s/^#\?\(CacheDir.*\)/CacheDir = \/var\/cache\/pacman\/pkg_host\/\n\1/'"'"' /etc/pacman.conf
 
-    pacman -Syu --noconfirm python3
+            mkdir -p /var/cache/pacman/pkg_host/
-    cd $(mktemp -d)
+            pacman -Syu --noconfirm linux
-    tar xf /tmp/dotfiles.tar.gz -C .
+            cd $(mktemp -d)
-    ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+            tar xf /tmp/dotfiles.tar.gz -C .
-    read -p "Done, [return] to continue "
+            ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
-'
+        '
+}
 
-docker pull docker.io/library/ubuntu:18.04
+test_neptune() {
-docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname tb-hak docker.io/library/ubuntu:18.04 sh -c '
+    docker run \
-    set -o errexit
+        -ti \
+        --rm \
+        -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro \
+        --mount type=tmpfs,destination=/var/cache/pacman/pkg/ \
+        "${dockeropts[@]}" \
+        --hostname neptune \
+        docker.io/library/archlinux:base \
+        sh -c '
+            set -o errexit
 
-    cd $(mktemp -d)
+            # Uncomment CacheDir and append the host pacman cache as cachedir
-    tar xf /tmp/dotfiles.tar.gz -C .
+            # At worst, the cache directory will be ignored if it does not exist
-    ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+            # Pacman will always prefer the first cache directory, so newly downloaded
-'
+            # packages will stay in the container
+            sed -i '"'"'s/^#\?\(CacheDir.*\)/CacheDir = \/var\/cache\/pacman\/pkg_host\/\n\1/'"'"' /etc/pacman.conf
+
+            mkdir -p /var/cache/pacman/pkg_host/
+            pacman -Syu --noconfirm linux
+            cd $(mktemp -d)
+            tar xf /tmp/dotfiles.tar.gz -C .
+            ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+        '
+}
+
+case "${1:-all}" in
+    ares)
+        test_ares
+        ;;
+    neptune)
+        test_neptune
+        ;;
+    all)
+        test_ares
+        test_neptune
+        ;;
+esac

tmux/tmux.conf

@@ -1,68 +1,76 @@
-set -g default-command "${SHELL}"
+set-option -g default-command "${SHELL}"
-set -g default-terminal "${TERMBIN}"
+# This *has* to be set to something with `screen-`, do not set this bindly
+# to $TERM, e.g. "alacritty"!
+set-option -g default-terminal "screen-256color"
 
-set -g set-titles on
+set-option -g set-titles on
-set -g set-titles-string '#S'
+set-option -g set-titles-string '#S'
-setw -g automatic-rename
+set-option -g automatic-rename
 
-set -g prefix C-a
+set-option -g escape-time 0
-unbind C-b
+set-option -g aggressive-resize on
-bind C-a send-prefix
 
-unbind C-j
+set-option -g mouse on
 
-set -s escape-time 0
+set-option -g mode-keys vi
-set-window-option -g aggressive-resize on
-
-set -g mouse on
-
-set -g mode-keys vi
 
 set-option -g renumber-windows on
 
-bind-key k confirm kill-window
+set-option -g history-limit 50000
-bind-key K confirm kill-server
 
-bind h select-pane -L
+set-option -g base-index 1
-bind j select-pane -D
+set-option -g pane-base-index 1
-bind k select-pane -U
-bind l select-pane -R
 
-set -g bell-action any
+set-option -g status-position bottom
+set-option -g status-justify left
 
-set -g history-limit 50000
+# https://wiki.archlinux.org/title/tmux#256_colors
+set-option -g -a terminal-overrides ",alacritty:Tc"
 
-set -g base-index 1
+set-option -g pane-border-status off
-set-window-option -g pane-base-index 1
+set-option -g pane-border-format ''
+set-option -g -q pane-border-lines double;
+set-option -g -q pane-border-indicators colour;
 
-set -g status-position bottom
+set-option -g pane-border-style "fg=#555555"
-set -g status-justify left
+set-option -g pane-active-border-style "fg=#e5b567"
 
+set-option -g status-style bg=default
 
-set-option -g status-bg '#272822'
+set-option -g window-status-format ' #I: #W #F '
-set-option -g status-fg white
+set-option -g window-status-current-format ' #I: #W #F '
+set-option -g window-status-current-style "bg=#e5b567,fg=black"
 
-set-window-option -g window-status-format ' #I: #W #F '
+set-option -g monitor-activity on
-set-window-option -g window-status-current-format ' #I: #W #F '
+set-option -g visual-activity off
+set-option -g window-status-activity-style "bg=#ff7777,fg=black"
+set-option -g monitor-bell on
+set-option -g bell-action any
 
-set-window-option -g monitor-activity on
+set-option -g automatic-rename on
-set -g visual-activity on
+set-option -g automatic-rename-format '#{pane_current_command}'
 
-set-window-option -g automatic-rename on
+set-option -g window-status-separator '  '
-set-window-option -g automatic-rename-format '#{pane_current_command}'
 
-set-window-option -g window-status-separator '  '
+set-option -g status-left " #[bg=#6c99bb,fg=#2e2e2e] #{session_name} #[bg=default]  "
+set-option -g status-right "#[bg=#CCCCCC,fg=#555555] #{host} #[bg=default] "
+set-option -g status-left-length 100
 
-set -g status-left " #[bg=#A6E22E,fg=#000000] #{session_name} #[bg=#272822]  "
+set-option -g message-style "bg=#CCCCCC,fg=#555555"
-set -g status-right "#[bg=#CCCCCC,fg=#555555] #{host} #[bg=#272822] "
-set -g status-left-length 100
 
-set -g status-style "bg=#272822,fg=#FFFFFF"
+# Use C-a as the prefix
-set -g message-style "bg=#CCCCCC,fg=#555555"
+set-option -g prefix C-a
+unbind-key C-b
+bind-key C-a send-prefix
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
 
 # vertical = | in this case
-unbind %
+unbind-key %
-unbind '"'
+unbind-key '"'
 bind-key s split-window -v -c "#{pane_current_path}"
 bind-key v split-window -h -c "#{pane_current_path}"
 
@@ -75,10 +83,4 @@ bind-key -n S-down new-window
 bind-key -n S-left prev
 bind-key -n S-right next
 
-bind-key -n C-F1 command-prompt "split-window -h 'exec man %%'"
-bind-key -n C-F2 split-window -h "exec htop"
-bind-key -n C-F3 set-option status
-
 bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf sourced"
-
-bind P paste-buffer

user.yml

@@ -13,30 +13,6 @@
   become: true
   become_user: root
 
-- set_fact:
-    user_groups:
-      - adm
-      - cdrom
-      - sudo
-      - dip
-      - plugdev
-      - lpadmin
-      - sambashare
-      - docker
-      - libvirt
-  when: distro == 'ubuntu'
-  tags: [always]
-
-- set_fact:
-    user_groups:
-      - libvirt
-      - wheel
-      - vboxusers
-      - wireshark
-      - docker
-  when: distro == 'fedora'
-  tags: [always]
-
 - set_fact:
     user_groups:
       - libvirt
@@ -46,7 +22,7 @@
       - docker
       - sudonopw
       - games
-  when: distro == 'archlinux'
+      - kvm
   tags: [always]
 
 - set_fact:
@@ -67,17 +43,29 @@
   become: true
   become_user: root
 
+- name: create systemd directory
+  file:
+    state: directory
+    path: "{{ item }}"
+    owner: "{{ user.name }}"
+    group: "{{ user_group_name }}"
+  loop:
+    - "/home/{{ user.name }}/.config/"
+    - "/home/{{ user.name }}/.config/systemd/"
+    - "/home/{{ user.name }}/.config/systemd/user/"
+
+# No way to use the `systemd` module here, as it needs a logind
+# session. So we have to handle the symlinks for masking ourselves.
 - name: disable and mask systemd user units
-  systemd:
+  file:
-    name: "{{ item }}"
+    state: link
-    enabled: false
+    dest: "/home/{{ user.name }}/.config/systemd/user/{{ item }}"
-    masked: true
+    src: "/dev/null"
-    scope: user
   with_items:
-    - gpg-agent.service
     - gpg-agent.socket
     - gpg-agent-browser.socket
     - gpg-agent-ssh.socket
+    - gpg-agent-extra.socket
 
 - name: create directory for getty autologin
   file:
@@ -202,7 +190,7 @@
 
   - name: deploy dotfiles templates
     template:
-      src: /home/{{ user.name }}/.dotfiles/{{ item.from }}.j2
+      src: /var/lib/dotfiles/{{ item.from }}.j2
       dest: "/home/{{ user.name }}/{{ item.to }}"
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
@@ -217,6 +205,7 @@
       state: directory
       path: "{{ item }}"
     with_items:
+      - ~/tmp
       - ~/.var/lib
       - ~/.var/log
       - ~/.var/run
@@ -254,8 +243,6 @@
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
     with_items:
-      - name: terraform
-        optpath: terraform
       - name: hugo
         optpath: hugo
       - name: drone
@@ -273,63 +260,113 @@
   tags:
     - dotfiles
 
-- name: create intermediate directories for vim-plug
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - ~/.local/
-    - ~/.local/share/
-    - ~/.local/share/nvim/
-    - ~/.local/share/nvim/site/
-    - ~/.local/share/nvim/site/autoload/
-    - ~/.vim/
-    - ~/.vim/autoload
-
 - block:
+  - name: create intermediate directories for vim-plug
+    file:
+      path: "{{ item }}"
+      state: directory
+    with_items:
+      - ~/.local/
+      - ~/.local/share/
+      - ~/.local/share/nvim/
+      - ~/.local/share/nvim/site/
+      - ~/.local/share/nvim/site/autoload/
+
   - name: install vim-plug
     copy:
       src: contrib/vim-plug/plug.vim
-      dest: ~/.vim/autoload/plug.vim
+      dest: ~/.local/share/nvim/site/autoload/plug.vim
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
       mode: "0644"
 
-  - name: symlink vim-plug for neovim
-    file:
-      state: link
-      path: ~/.local/share/nvim/site/autoload/plug.vim
-      src: ~/.vim/autoload/plug.vim
-      force: true
-
   - name: install vim plugins
-    command: /usr/bin/nvim -f -E -s -c "source ~/.vimrc" +PlugInstall +qall
+    command: nvim --headless +PlugInstall +qall
-    register: vim_plugins_stdout
+    register: vim_plugin_install
-    check_mode: false
+    changed_when: vim_plugin_install.stderr != ""
-    changed_when: vim_plugins_stdout.stdout_lines|length != 0
 
-  - name: compile youcompleteme
+  - name: update vim plugins
-    shell: |
+    command: nvim --headless +PlugUpdate +qall
-      cd ~/.local/share/nvim/plugged/YouCompleteMe/
+    register: vim_plugin_update
-      python3 ./install.py # --go-completer
+    changed_when: vim_plugin_update.stderr != ""
-    args:
+
-      creates: ~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/ycm_core.so
+  tags: [vim-plugins]
-    when: vim_plugins_stdout.stdout_lines|length != 0 or true
 
 - block:
+  - name: create firefox directories
+    firefox_profile:
+      name: "{{ item.key }}"
+    loop: "{{ user.firefox_profiles | dict2items }}"
+    register: firefox_profile_names
+
+  - set_fact:
+      firefox_preferences:
+        browser.aboutConfig.showWarning: false
+        extensions.pocket.enabled: false
+        toolkit.legacyUserProfileCustomizations.stylesheets: true
+        browser.contentblocking.category: "strict"
+        browser.newtabpage.enabled: false
+        browser.shell.checkDefaultBrowser: false
+        browser.startup.homepage: "about:blank"
+        privacy.trackingprotection.enabled: true
+        privacy.trackingprotection.socialtracking.enabled: true
+        general.smoothScroll: false
+
+        # Restore last session on startup
+        # https://support.mozilla.org/de/questions/1235263
+        browser.startup.page: 3
+        browser.sessionstore.resume_from_crash: true
+
+        # "Play DRM-controlled content"
+        media.eme.enabled: true
+
+        # "Recommend (extensions|features) as you browse"
+        browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons: false
+        browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features: false
+
+        # "Ask to save logins and passwords for websites"
+        signon.rememberSignons: false
+
+        # "Allow Firefox to make personalized extension recommendations"
+        browser.discovery.enabled: false
+
+        # "Allow Firefox to install and run studies"
+        app.shield.optoutstudies.enabled: false
+
+        # "Check spelling as you type"
+        layout.spellcheckDefault: 0
+
+        # Ask for download directory
+        browser.download.useDownloadDir: false
+
+        # (Try to) disable automatic update, as firefox is pulling a Windows
+        app.update.auto: false
+        app.update.service.enabled: false
+
+        # remove this camera / microphone overlay when in calls or similar
+        privacy.webrtc.legacyGlobalIndicator: false
+
+        # use distro updates instead
+        app.update.auto: false
+
+  - include_role:
+      name: firefox
+    vars:
+      firefox_profiles: "{{ {item.key: item.value} | combine({item.key: {'preferences': firefox_preferences}}, recursive=True) }}"
+    loop: "{{ user.firefox_profiles | dict2items }}"
+    when: not ansible_check_mode
+
   - name: firefox - create chrome directory
     file:
-      path: ~/.mozilla/firefox/{{ item.name }}/chrome/
+      path: "{{ item.profile_path }}/chrome/"
       state: directory
       mode: '0755'
-    with_items: "{{ user.firefox_profiles }}"
+    with_items: "{{ firefox_profile_names.results }}"
-    when: user.firefox_profiles is defined
+    when: not ansible_check_mode
-    tags:
-      - firefox
 
   - name: firefox - configure firefox custom css
     copy:
-      dest: ~/.mozilla/firefox/{{ item.name }}/chrome/userChrome.css
+      dest: "{{ item.profile_path }}/chrome/userChrome.css"
       content: |
         #TabsToolbar {
           visibility: collapse !important;
@@ -340,19 +377,14 @@
         #sidebar-header {
           visibility: collapse !important;
         }
-        #sidebar {
+    when:
-          width: 400px !important;
+      - not ansible_check_mode
-        }
+      - user.firefox_profiles[item.profile_name].manage_css is sameas True
-    when: item.manage_css
+    with_items: "{{ firefox_profile_names.results }}"
-    with_items: "{{ user.firefox_profiles | default([]) }}"
+  tags:
-    tags:
+    - firefox
-      - firefox
 
 - block:
-  - name: set portfolio performance version
-    set_fact:
-      portfolio_performace_version: "0.50.0"
-
   - name: look of current installation
     stat:
       path: /home/{{ user.name }}/.opt/portfolio-performance-{{ portfolio_performace_version }}
@@ -368,6 +400,7 @@
       get_url:
         url: https://github.com/buchen/portfolio/releases/download/{{ portfolio_performace_version }}/PortfolioPerformance-{{ portfolio_performace_version }}-linux.gtk.x86_64.tar.gz
         dest: "{{ tempdir.path }}/PortfolioPerformance.{{ portfolio_performace_version }}.tar.gz"
+        force: false
 
     - name: create destination directory
       file:
@@ -392,7 +425,14 @@
         checksum: true
         delete: true
 
-    when: not stat_portfolio_performance_installation.stat.exists
+    - name: clean up temp directory
+      file:
+        path: "{{ tempdir.path }}"
+        state: absent
+
+    when:
+      - not stat_portfolio_performance_installation.stat.exists
+      - not ansible_check_mode
 
   - name: link portfolio performance
     file:
@@ -402,51 +442,9 @@
       group: "{{ user_group_name }}"
       state: link
       force: true
-
   tags:
     - portfolio-performance
 
-- block:
-  - name: set kubectl version
-    set_fact:
-      kubectl_version: v1.20.1
-
-  - name: get current stable version
-    uri:
-      url: https://storage.googleapis.com/kubernetes-release/release/stable.txt
-      return_content: true
-    register: kubectl_stable_version_api
-    check_mode: false
-
-  - set_fact:
-      kubectl_stable_version: "{{ kubectl_stable_version_api.content|trim }}"
-
-  - set_fact:
-      kubectl_outdated: "{{ kubectl_version != kubectl_stable_version }}"
-
-  - name: warn if not on stable version
-    debug:
-      msg: "installing kubectl {{ kubectl_version }}, stable version would be {{ kubectl_stable_version }}"
-    changed_when: kubectl_outdated is sameas true
-    when: kubectl_outdated is sameas true
-
-  - name: get kubectl
-    get_url:
-      url: https://storage.googleapis.com/kubernetes-release/release/{{ kubectl_version }}/bin/linux/amd64/kubectl
-      dest: /home/{{ user.name }}/.opt/kubectl-{{ kubectl_version }}
-      owner: "{{ user.name }}"
-      group: "{{ user_group_name }}"
-      mode: '0755'
-
-  - name: link kubectl
-    file:
-      src: /home/{{ user.name }}/.opt/kubectl-{{ kubectl_version }}
-      dest: /home/{{ user.name }}/.optbin/kubectl
-      state: link
-
-  tags:
-    - kubectl
-
 - name: handle autostart units
   block:
   - name: create systemd user directory
@@ -469,5 +467,68 @@
       group: "{{ user_group_name }}"
     with_fileglob: /var/lib/dotfiles/autostart/services/*
 
+  - name: get state of autostart.target
+    stat:
+      path: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+    register: autostart_target_stat
+
+  - name: remove invalid autostart.target
+    file:
+      path: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+      state: absent
+    when:
+      - autostart_target_stat.stat.exists
+      - not autostart_target_stat.stat.isreg
+
+  - name: deploy autostart.target
+    template:
+      src: ./autostart/autostart.target.j2
+      dest: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
+      force: true
+      follow: false
+
   tags:
     - autostart
+
+- block:
+  - name: import gpg key
+    command: gpg --import ./gpgkeys/{{ user.gpg_key.email }}.gpg.asc
+    register: gpg_import_output
+    changed_when: not ("unchanged" in gpg_import_output.stderr)
+
+  - name: trust gpg key
+    shell: "gpg --import-ownertrust <<< {{ user.gpg_key.fingerprint }}:6"
+    args:
+      executable: /bin/bash # required for <<<
+    register: gpg_trust_output
+    changed_when: gpg_trust_output.stderr_lines|length > 0
+
+  when: user.gpg_key is defined
+  tags: [gpg]
+
+- block:
+  - name: add passwordstore init script
+    copy:
+      dest: /home/{{ user.name }}/.optbin/pass
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
+      mode: '0755'
+      content: |
+        #!/usr/bin/env bash
+
+        set -o nounset
+        set -o errexit
+
+        if [[ ! -e ~/.password-store ]] ; then
+          printf '%s\n' 'This is the first time running pass, initializting repository ...'
+
+          git clone ssh://git@code.hkoerber.de:2222/hannes/passwordstore.git ~/.password-store
+
+          printf '%s\n' 'Done'
+        fi
+
+        command -p pass "${@}"
+  when: user.enable_passwordstore|default(false) is sameas true
+  tags: [passwordstore]

variables.yml

@@ -0,0 +1 @@
+portfolio_performace_version: "0.57.2"