aur: Update screencfg-git

It's now available in the official repos

.gitignore

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

.gitmodules

@@ -1,3 +1,60 @@
-[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
+[submodule "pkgbuilds/spotify"]
+	path = pkgbuilds/spotify
+	url = https://aur.archlinux.org/spotify.git
+[submodule "pkgbuilds/nodejs-intelephense"]
+	path = pkgbuilds/nodejs-intelephense
+	url = https://aur.archlinux.org/nodejs-intelephense.git
+[submodule "pkgbuilds/portfolio-performance-bin"]
+	path = pkgbuilds/portfolio-performance-bin
+	url = https://aur.archlinux.org/portfolio-performance-bin.git
+[submodule "pkgbuilds/vim-plug"]
+	path = pkgbuilds/vim-plug
+	url = https://aur.archlinux.org/vim-plug.git
+[submodule "pkgbuilds/terraform-ls-bin"]
+	path = pkgbuilds/terraform-ls-bin
+	url = https://aur.archlinux.org/terraform-ls-bin.git
+[submodule "pkgbuilds/grm-git"]
+	path = pkgbuilds/grm-git
+	url = https://aur.archlinux.org/grm-git.git
+[submodule "pkgbuilds/screencfg-git"]
+	path = pkgbuilds/screencfg-git
+	url = https://aur.archlinux.org/screencfg-git.git
+[submodule "pkgbuilds/google-earth-pro"]
+	path = pkgbuilds/google-earth-pro
+	url = https://aur.archlinux.org/google-earth-pro.git
+[submodule "pkgbuilds/aws-sam-cli"]
+	path = pkgbuilds/aws-sam-cli
+	url = https://aur.archlinux.org/aws-sam-cli.git
+[submodule "pkgbuilds/python-boto3-stubs"]
+	path = pkgbuilds/python-boto3-stubs
+	url = https://aur.archlinux.org/python-boto3-stubs.git
+[submodule "pkgbuilds/python-botocore-stubs"]
+	path = pkgbuilds/python-botocore-stubs
+	url = https://aur.archlinux.org/python-botocore-stubs.git
+[submodule "pkgbuilds/python-chevron"]
+	path = pkgbuilds/python-chevron
+	url = https://aur.archlinux.org/python-chevron.git
+[submodule "pkgbuilds/python-aws-lambda-builders"]
+	path = pkgbuilds/python-aws-lambda-builders
+	url = https://aur.archlinux.org/python-aws-lambda-builders.git
+[submodule "pkgbuilds/python-vdf"]
+	path = pkgbuilds/python-vdf
+	url = https://aur.archlinux.org/python-vdf.git
+[submodule "pkgbuilds/protontricks"]
+	path = pkgbuilds/protontricks
+	url = https://aur.archlinux.org/protontricks.git
+[submodule "pkgbuilds/slack-desktop"]
+	path = pkgbuilds/slack-desktop
+	url = https://aur.archlinux.org/slack-desktop.git
+[submodule "pkgbuilds/backblaze-b2"]
+	path = pkgbuilds/backblaze-b2
+	url = https://aur.archlinux.org/backblaze-b2.git
+[submodule "pkgbuilds/python-class-registry"]
+	path = pkgbuilds/python-class-registry
+	url = https://aur.archlinux.org/python-class-registry.git
+[submodule "pkgbuilds/python-rst2ansi"]
+	path = pkgbuilds/python-rst2ansi
+	url = https://aur.archlinux.org/python-rst2ansi.git

Makefile

@@ -1,21 +1,16 @@
-venv = ./venv
-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}
+ansible_run = ansible-playbook --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
 
 .PHONY: all
-all: $(ansible)
+all:
 	$(ansible_run)
 
-.PHONY: dryrun
-dryrun: $(ansible)
-	$(ansible_run) --check
+.PHONY: config
+config:
+	$(ansible_run) --skip-tags system-update
 
-.PHONY: update
-update: $(ansible)
-	$(ansible_run) --tags update_system
+.PHONY: system-update
+system-update:
+	$(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,20 +1,38 @@
-font_size: 12
-letter_space: 0
-terminal_binary: alacritty
+font_size: 11
 
 gpu: amd
+cpu: amd
 
 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:
-    master_key: "0xB5C002530C6A2053"
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
 
@@ -31,14 +49,14 @@ screen:
   0: DisplayPort-0
 
 workspace:
+  1: ""
+  9: ""
+  10: ""
 
 environment:
   MACHINE_TYPE: "workstation"
-  MACHINE_HAS_KEEPASSX: "false"
+  MACHINE_HAS_KEEPASSXC: "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,78 @@
+font_size: 11
+
+gpu: nvidia
+cpu: intel
+
+users:
+- name: 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
+  ssh_agent: true
+  gpg_agent: false
+  gpg_agent_for_ssh: false
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "false"
+    MACHINE_HAS_KEEPASSXC: "true"
+
+- name: 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
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+    MACHINE_HAS_KEEPASSXC: "false"
+
+screen:
+  1: DP-4-1-6
+  2: DP-4-1-6
+  3: DP-4-1-6
+  4: DP-4-1-6
+  5: DP-4-1-6
+  6: DP-4-1-6
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
+
+workspace:
+  1: ""
+  2: ""
+  3: ""
+  4: ""
+  7: ""
+  8: ""
+  9: ""
+  10: ""
+
+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,40 @@
+[general]
+live_config_reload = true
+
+import = [
+    "~/.config/alacritty/themes/monokai.toml"
+]
+
+[env]
+TERM = "alacritty"
+WINIT_X11_SCALE_FACTOR = "1"
+
+[font]
+size = {{ machine.font_size }}
+
+[font.bold]
+family = "JetBrainsMono"
+style = "Bold"
+
+[font.bold_italic]
+family = "JetBrainsMono"
+style = "Bold Italic"
+
+[font.italic]
+family = "JetBrainsMono"
+style = "Italic"
+
+[font.normal]
+family = "JetBrainsMono"
+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

alacritty/themes/github_light.toml

@@ -0,0 +1,36 @@
+# github Alacritty Colors
+
+# Default colors
+[colors.primary]
+background = '#ffffff'
+foreground = '#24292f'
+
+# Normal colors
+[colors.normal]
+black   = '#24292e'
+red     = '#d73a49'
+green   = '#28a745'
+yellow  = '#dbab09'
+blue    = '#0366d6'
+magenta = '#5a32a3'
+cyan    = '#0598bc'
+white   = '#6a737d'
+
+# Bright colors
+[colors.bright]
+black   = '#959da5'
+red     = '#cb2431'
+green   = '#22863a'
+yellow  = '#b08800'
+blue    = '#005cc5'
+magenta = '#5a32a3'
+cyan    = '#3192aa'
+white   = '#d1d5da'
+
+[[colors.indexed_colors]]
+index = 16
+color = '#d18616'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#cb2431'

alacritty/themes/monokai.toml

@@ -0,0 +1,24 @@
+[colors.primary]
+background = "#272822"
+foreground = "#f8f8f2"
+
+[colors.normal]
+black = "#272822"
+red = "#f92672"
+green = "#a6e22e"
+yellow = "#f4bf75"
+blue = "#66d9ef"
+magenta = "#ae81ff"
+cyan = "#a1efe4"
+white = "#f8f8f2"
+
+[colors.bright]
+black = "#75715e"
+red = "#f92672"
+green = "#a6e22e"
+yellow = "#f4bf75"
+blue = "#66d9ef"
+magenta = "#ae81ff"
+cyan = "#a1efe4"
+white = "#f9f8f5"
+

ansible.cfg

@@ -1,3 +1,6 @@
 [defaults]
 retry_files_enabled = False
 nocows = 1
+roles_path = ./ansible_roles
+library = ./ansible_roles/firefox/library
+remote_tmp = ${XDG_CONFIG_HOME}/ansible/tmp

autostart/autostart.target.j2

@@ -0,0 +1,32 @@
+[Unit]
+BindsTo=windowmanager.target
+After=windowmanager.target
+
+Wants=dpms.service
+Wants=dunst.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=keepassxc.service
+Wants=keyboard.service
+Wants=laptop-lid.service
+Wants=nextcloud.service
+Wants=nm-applet.service
+Wants=pasystray.service
+Wants=redshift.service
+Wants=spotify.service
+Wants=steam.service
+Wants=touchpad.service
+Wants=xresources.service
+Wants=yubikey-touch-detector.service
+Wants=kdeconnect.service
+Wants=color-theme-dark.service

autostart/services/autostart.target

@@ -1,27 +0,0 @@
-[Unit]
-BindsTo=windowmanager.target
-After=windowmanager.target
-
-Wants=blueman.service
-Wants=discord.service
-Wants=dpms.service
-Wants=dunst.service
-Wants=firefox.service
-Wants=gpg-agent.service
-Wants=gnome-keyring.service
-Wants=keepassx.service
-Wants=keyboard.service
-Wants=laptop-lid.service
-Wants=nextcloud.service
-Wants=nm-applet.service
-Wants=pasystray.service
-Wants=redshift.service
-Wants=restic.timer
-Wants=screencfg.service
-Wants=spotify.service
-Wants=steam.service
-Wants=touchpad.service
-Wants=wallpaper.timer
-Wants=xresources.service
-Wants=yubikey-touch-detector.service
-

autostart/services/blueman.service

@@ -1,6 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Service]
-ExecStart=/usr/bin/blueman-applet

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=xset dpms 0 0 300
+ExecStart=/usr/bin/env xset s off
+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,11 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+ConditionPathExists=%t/features/gpg_agent
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/gpg-agent --homedir %h/.gnupg --no-detach --daemon
+ExecStart=/usr/bin/env gpg-agent --daemon
+PassEnvironment=DISPLAY GNUPGHOME
+
+Restart=always

autostart/services/i3.service

@@ -1,5 +1,6 @@
 [Service]
-Type=exec
-ExecStart=i3 --config %h/.i3/config
+Type=simple
+ExecStart=/usr/bin/env i3 --config %h/.config/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 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-ConditionEnvironment=MACHINE_HAS_KEEPASSX=true
-
-[Service]
-ExecStart=/usr/bin/keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx

autostart/services/keepassxc.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+ConditionPathExists=%t/features/keepassxc
+
+[Service]
+ExecStart=/usr/bin/env keepassxc --keyfile %h/.secrets/main.keyx %h/.secrets/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/xset r rate 150 50
+ExecStart=/usr/bin/env setxkbmap -layout de -variant nodeadkeys
+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
-
-ConditionEnvironment=MACHINE_TYPE=laptop
+ConditionPathExists=%t/features/machine_is_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 "^LID.*enabled" /proc/acpi/wakeup && echo " LID" | sudo tee /proc/acpi/wakeup || true'
+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=%t/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 +0,0 @@
-[Unit]
-ConditionEnvironment=MACHINE_HAS_RESTIC_BACKUP=true
-
-[Service]
-Type=oneshot
-ExecStart=%h/bin/restic-backup
-RemainAfterExit=true

autostart/services/restic.timer

@@ -1,8 +0,0 @@
-[Unit]
-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,13 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE
-
-[Service]
-Type=oneshot
-# systemd.service(5):
-
-# > The command to execute may contain spaces, but control characters are not
-# > allowed.
-ExecStart=bash -c '%h/.screencfg/${MACHINE_DEFAULT_SCREENPROFILE}.sh'
-RemainAfterExit=true

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,10 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=i3.service
 
-ConditionEnvironment=MACHINE_HAS_STEAM=true
+ConditionPathExists=%t/features/steam
 
 [Service]
-ExecStart=/usr/bin/steam
+# `-system-composer`: https://github.com/ValveSoftware/steam-for-linux/issues/10806
+ExecStart=/usr/bin/env steam -system-composer
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/touchpad.service

@@ -1,17 +1,18 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_TYPE=laptop
+ConditionPathExists=%t/features/machine_is_laptop
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/synclient VertEdgeScroll=0
-ExecStart=/usr/bin/synclient VertTwoFingerScroll=1
-ExecStart=/usr/bin/synclient MaxSpeed=2.2
-ExecStart=/usr/bin/synclient AccelFactor=0.08
-ExecStart=/usr/bin/synclient TapButton1=1
-ExecStart=/usr/bin/synclient CoastingSpeed=0
-ExecStart=/usr/bin/synclient PalmDetect=1
-ExecStart=/usr/bin/synclient PalmMinWidth=20
-ExecStart=/usr/bin/synclient PalmMinZ=1
+ExecStart=/usr/bin/env synclient VertEdgeScroll=0
+ExecStart=/usr/bin/env synclient VertTwoFingerScroll=1
+ExecStart=/usr/bin/env synclient MaxSpeed=2.2
+ExecStart=/usr/bin/env synclient AccelFactor=0.08
+ExecStart=/usr/bin/env synclient TapButton1=1
+ExecStart=/usr/bin/env synclient CoastingSpeed=0
+ExecStart=/usr/bin/env synclient PalmDetect=1
+ExecStart=/usr/bin/env synclient PalmMinWidth=20
+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/.config/Xresources
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/yubikey-touch-detector.service

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

bin/dunstctl

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-
-_logfile="$LOGDIR/dunstctl.log"
-
-log() {
-    printf '[%s] %s\n' "$(date -uIseconds)" "$*" >> "$_logfile"
-}
-
-case "$1" in
-    enable)
-        log "Enabling dunst"
-        systemctl --user --no-block kill --signal SIGUSR2 dunst
-
-        ;;
-    disable)
-        log "Disabling dunst"
-        systemctl --user --no-block kill --signal SIGUSR1 dunst
-        ;;
-    *)
-        >&2 printf 'Unknown command\n'
-        exit 1
-esac
-

bin/fuck-lxc

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-vagrant destroy -f
-killall vagrant
-killall -9 vagrant
-
-pgrep -fa lxc | grep -v fuck-lxc | awk '{print $1}' | xargs sudo kill -9
-
-sudo lxc-ls -1 | xargs -l1 sudo lxc-stop --kill --name ; sudo lxc-ls -1 | xargs -l1 sudo lxc-destroy --name
-
-pgrep -fa lxc | grep -v fuck-lxc | awk '{print $1}' | xargs sudo kill -9
-
-rm -rf .vagrant
-
-sudo systemctl restart nfs-kernel-server
-sudo systemctl restart lxc\*
-
-sudo apt-get install --reinstall lxc
-
-sudo systemctl restart nfs-kernel-server
-sudo systemctl restart lxc\*

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/git-sm-commit

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-
-submodule_count=$(git diff --staged --submodule=log | grep -c '^Submodule')
-
-if (( $submodule_count == 1 )) ; then
-    msg="Update submodule $(git diff --staged --submodule=log | grep '^Submodule' | cut -d ' ' -f 2)"
-else
-    msg="Update submodules"
-fi
-
-git commit --edit --no-status \
-    --message="$msg" \
-    --message "$(git diff --staged --color=never --submodule=log | sed 's/^S/\nS/' | sed 's/^Submodule /* /' | sed 's/  >/  */')"

bin/git-worktree-rm

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-
-rm -r "${1}"
-cd ./.gitdir
-git worktree remove "${1}"
-git branch -D "${1}"

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/markdown-to-pdf

@@ -43,7 +43,7 @@ pandoc \
     --variable papersize=a4 \
     --variable date=$(date --iso-8601=date) \
     --variable fontsize=12pt \
-    --variable fontfamily=libertine \
+    --variable fontfamily=libertinus \
     --variable familydefault=sfdefault \
     --variable documentclass=scrartcl \
     --variable fontfamilyoptions= \

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/pacman-remove-orphans

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+pacman -Qtdq | xargs --open-tty --no-run-if-empty sudo pacman -Rns

bin/pass

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+
+if [[ ! -e "${PASSWORD_STORE_DIR}" ]] ; 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_DIR}"
+
+  printf '%s\n' 'Done'
+fi
+
+command -p pass "${@}"

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/qr

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+qrencode "$*" -o - | imv -

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

@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import subprocess
-import time
-import argparse
-
-import yaml
-
-XRANDR = 'xrandr'
-
-def run(cmd):
-    print('>>> ' + ' '.join(cmd))
-    start = time.time()
-    ret = subprocess.run(
-        cmd,
-        stdout=sys.stdout,
-        stderr=sys.stderr)
-    end = time.time()
-    print("exit code: {}".format(ret.returncode))
-    print("exec time: {}".format(end - start))
-
-def fail(msg, code=1):
-    print(msg)
-    sys.exit(code)
-
-parser = argparse.ArgumentParser()
-parser.add_argument('config')
-
-args = parser.parse_args()
-config_path = args.config
-
-try:
-    config = yaml.load(open(config_path))
-except FileNotFoundError:
-    fail("File {0} not found".format(config_path))
-
-# reset
-for output in config['outputs']:
-    if config.get('reset') and output.get('reset'):
-        run([XRANDR, '--output', output['name'], '--off'])
-        run([XRANDR, '--delmode', output['name'], output['opts']['mode']])
-        run([XRANDR, '--addmode', output['name'], output['opts']['mode']])
-        run([XRANDR, '--output', output['name'], '--mode', output['opts']['mode']])
-
-cmd = [XRANDR]
-for output in config['outputs']:
-    cmd.extend(['--output', output['name']])
-    if output.get('disable'):
-        cmd.append('--off')
-    else:
-        if output.get('primary', False):
-            cmd.append("--primary")
-        # cmd.append('--auto')
-        for k, v in output['opts'].items():
-            cmd.extend(['--{}'.format(k), str(v)])
-
-run(cmd)
-run(['i3-msg', 'restart'])
-run(['systemctl', '--user', 'restart', 'keyboard'])

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)

bin/switch-color-mode

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -o nounset
+
+set -x
+
+apply() {
+    local mode="${1}"
+
+    case "${mode}" in
+        dark)
+            theme=monokai
+            ;;
+        light)
+            theme=github_light
+            ;;
+    esac
+
+    sed -i "s#themes/.*\.toml#themes/${theme}.toml#" "${XDG_CONFIG_HOME}/alacritty/config.toml"
+
+    sed -i "s#theme = .*\$#theme = \"${theme}\"#" "${XDG_CONFIG_HOME}/helix/config.toml"
+
+    pkill -SIGUSR1 helix
+
+    printf '%s' "${mode}" > "${XDG_RUNTIME_DIR}"/color_mode
+}
+
+case "${1:-}" in
+    dark)
+        apply dark
+        ;;
+    light)
+        apply light
+        ;;
+    *)
+        exit 1
+        ;;
+esac

bin/tasktrack

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

bin/terraform-get-targets

@@ -1,24 +1,24 @@
 #!/usr/bin/env bash
 # Stolen from https://devops.stackexchange.com/a/8984 and adapted to my use case
 
-if [[ -z "$@" ]]; then
+if (( $# == 0 )) ; then
   echo "Missing file input arguments"
   exit 1
 fi
 
 for FILE in "$@"
 do
-  RESOURCE=$(sed -n 's/^resource "\([^"]*\)" "\([^"]*\)".*/-target=\1.\2 /gp' $FILE)
-  MODULE=$(sed -n 's/^module "\([^"]*\)".*/-target=module.\1 /gp' $FILE)
+  RESOURCE=$(sed -n 's/^resource "\([^"]*\)" "\([^"]*\)".*/-target=\1.\2 /gp' "$FILE")
+  MODULE=$(sed -n 's/^module "\([^"]*\)".*/-target=module.\1 /gp' "$FILE")
   if [[ -z "$RESOURCE" ]] && [[ -z "$MODULE" ]]; then
     echo "Cannot detect terraform resource and module in $FILE"
     exit 1
   fi
 
-  if [[ ! -z "$RESOURCE" ]]; then
+  if [[ -n "$RESOURCE" ]]; then
     echo -e $"$RESOURCE"
   fi
-  if [[ ! -z "$MODULE" ]]; then
+  if [[ -n "$MODULE" ]]; then
     echo -e $"$MODULE"
   fi
 done

bin/yaml2json

@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+import sys, yaml, json
+
+json.dump([d for d in yaml.safe_load_all(sys.stdin)][-1], sys.stdout, indent=4)

cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustc-wrapper = "sccache"

detect-missing-packages.py

@@ -0,0 +1,20 @@
+#!/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.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)
+
+if missing_config:
+    print(yaml.dump(missing_config), end="")

dotfiles.yml

@@ -1,70 +1,116 @@
 empty_directories:
-  - name: .i3
-  - name: .gnupg
-    mode: '0700'
   - 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
+  - name: .config/git
+  - name: .config/tmux
+  - name: .config/i3
+  - name: .config/zsh
+  - name: .config/alacritty
+  - name: .local/state/gnupg/
+    mode: '0700'
+  - name: .local/state/cargo/
 dotfiles:
   - from: git/gitconfig
-    to: .gitconfig
+    to: .config/git/config
     template: true
   - from: gnupg/dirmngr.conf
-    to: .gnupg/dirmngr.conf
+    to: .local/state/gnupg/dirmngr.conf
+  - from: gnupg/scdaemon.conf
+    to: .local/state/gnupg/scdaemon.conf
   - from: gnupg/gpg-agent.conf
-    to: .gnupg/gpg-agent.conf
+    to: .local/state/gnupg/gpg-agent.conf
+    template: true
   - from: gnupg/gpg.conf
-    to: .gnupg/gpg.conf
+    to: .local/state/gnupg/gpg.conf
     template: true
   - from: i3/config
-    to: .i3/config
+    to: .config/i3/config
     template: true
-  - from: i3/i3status.conf
-    to: .i3/i3status.conf
+  - from: i3/i3status-rust/config.toml
+    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
+    to: .config/i3/scripts
+    dir: true
   - from: tmux/tmux.conf
-    to: .tmux.conf
+    to: .config/tmux/tmux.conf
   - from: vim/vimrc
     to: .config/nvim/init.vim
-  - from: vim/vimrc
-    to: .vimrc
   - from: x/Xresources
-    to: .Xresources
-    template: true
+    to: .config/Xresources
   - from: x/xinitrc
-    to: .xinitrc
+    to: .config/xinitrc
   - from: zsh/zprofile
-    to: .zprofile
+    to: .config/zsh/.zprofile
     template: true
   - from: zsh/zshrc
-    to: .zshrc
+    to: .config/zsh/.zshrc
     template: true
-  - from: zsh/zshrc.d
-    to: .zshrc.d
+  - from: zsh/zshenv
+    to: .zshenv
   - from: dunst/dunstrc
     to: .config/dunstrc
     template: true
   - from: redshift/redshift.conf
     to: .config/redshift.conf
-  - from: vscode/settings.json
-    to: .config/Code/User/settings.json
-  - from: vscode/keybindings.json
-    to: .config/Code/User/keybindings.json
-  - from: alacritty/alacritty.yml
-    to: .config/alacritty.yml
+  - from: vscodium/product.json
+    to: .config/VSCodium/product.json
+  - from: vscodium/settings.json
+    to: .config/VSCodium/User/settings.json
+  - from: vscodium/keybindings.json
+    to: .config/VSCodium/User/keybindings.json
+  - from: alacritty/alacritty.toml
+    to: .config/alacritty/config.toml
     template: true
+  - from: alacritty/themes
+    to: .config/alacritty/themes
+    dir: 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
+    to: .config/gtkrc-2.0
+    template: true
   - from: qt/qt5ct.conf
     to: .config/qt5ct/qt5ct.conf
-  - from: screencfg
-    to: .screencfg
   - from: scripts
     to: scripts
+    dir: true
+  - from: helix/config.toml
+    to: .config/helix/config.toml
+  - from: helix/languages.toml
+    to: .config/helix/languages.toml
+  - from: screencfg/screencfg.toml
+    to: .config/screencfg.toml
+  - from: cargo/config.toml
+    to: .local/state/cargo/config.toml
+dotfiles_remove:
+  - .gitconfig
+  - .vimrc
+  - .tmux.conf
+  - .i3
+  - .gtkrc-2.0
+  - .opt
+  - .optbin
+  - .usr
+  - .var
+  - .screenrc
+  - .zshrc.d

drivers.yml

@@ -0,0 +1,28 @@
+cpu:
+  amd:
+    - amd-ucode
+  intel:
+    - intel-ucode
+  
+gpu:
+  amd:
+    - mesa
+    - mesa-utils
+    - lib32-mesa
+    - xf86-video-amdgpu
+    - vulkan-radeon
+    - lib32-vulkan-radeon
+    - libva-mesa-driver
+    - lib32-libva-mesa-driver
+    - mesa-vdpau
+    - lib32-mesa-vdpau
+    - vulkan-headers
+    - vulkan-tools
+  nvidia:
+    - mesa
+    - mesa-utils
+    - lib32-mesa
+    - vulkan-nouveau
+    - lib32-vulkan-nouveau
+    - vulkan-headers
+    - vulkan-tools

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 = JetBrainsMono, Fontawesome {{ machine.font_size }}
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.

git/gitconfig.j2

@@ -2,9 +2,6 @@
     name = Hannes Körber
     email = {{ user.mail }}
     useConfigOnly = true
-{% if user.git_gpg_sign|bool %}
-    signingkey = {{ user.gpg_keys.master_key }}
-{% endif %}
 [github]
     user = hakoerber
 [alias]
@@ -71,14 +68,18 @@
     fileMode = true
     whitespace = "blank-at-eol,space-before-tab,blank-at-eof"
     abbrev = 8
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only
 [color]
     ui = true
 [column]
     ui = auto
 [push]
     default = simple
+    autoSetupRemote = true
 [merge]
-    tool = vimdiff
+    conflictstyle = diff3
 [gc]
     auto = 0
 [advice]
@@ -88,7 +89,7 @@
     commitBeforeMerge = false
     detachedHead = false
 [commit]
-    gpgSign = {{ user.git_gpg_sign|bool }}
+    gpgSign = false
     cleanup = strip
     status = true
 [status]
@@ -105,7 +106,6 @@
     autoStash = true
 [diff]
     submodule = log
-    mnemonicPrefix = true
     renameLimit = 1199
 [branch]
     autoSetupMerge = true
@@ -113,9 +113,20 @@
     requireForce = true
 [pull]
     rebase = true
+    ff = only
 
 [url "ssh://git@code.hkoerber.de:2222/"]
     insteadOf = https://code.hkoerber.de/
 
 [init]
-	defaultBranch = master
+	defaultBranch = main
+[safe]
+	directory = /var/lib/dotfiles
+[includeIf "gitdir:/var/lib/dotfiles"]
+    path = /var/lib/dotfiles/gitcfg
+[delta]
+    navigate = true    # use n and N to move between diff sections
+
+    # delta detects terminal colors automatically; set one of these to disable auto-detection
+    # dark = true
+    # light = true

gitcfg

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

gnupg/gpg-agent.conf.j2

@@ -4,6 +4,11 @@ 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
+
+extra-socket none
+browser-socket none

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

gnupg/scdaemon.conf

@@ -0,0 +1,2 @@
+# makes yubikey work more reliably
+disable-ccid

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
+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
+imtrGD9EhItdmZ8PBdC2kAx3vWEM
+=553W
+-----END PGP PUBLIC KEY BLOCK-----

grm/github.toml

@@ -0,0 +1,8 @@
+provider = "github"
+token_command = "pass show github | ~/bin/yaml2json | jq -r '.personal_access_token.grm.value'"
+root = "~/code/github.com"
+worktree = true
+force_ssh = true
+
+[filters]
+owner = true

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|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-font-name=Cantarell 11
+gtk-icon-theme-name=breeze
+gtk-font-name=DejaVu Sans {{ machine.font_size|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-font-name="Cantarell 11"
+gtk-icon-theme-name="breeze"
+gtk-font-name="DejaVu Sans {{ machine.font_size| 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

helix/languages.toml

@@ -0,0 +1,15 @@
+
+[[language]]
+name = "bash"
+indent = { unit = "    " , tab-width = 4 }
+
+[language-server.pylsp.config.pylsp.plugins]
+flake8 = {enabled = false}
+
+[[language]]
+name = "python"
+indent = { unit = "    " , tab-width = 4 }
+
+[[language]]
+name = "dockerfile"
+indent = { unit = "    " , tab-width = 4 }

i3/config.j2

@@ -17,10 +17,10 @@
     set $mod Mod4
 
     # The default terminal
-    set $terminal "{{ machine.terminal_binary }} --title terminal"
-    set $calc "{{ machine.terminal_binary }} --title calc -e $SHELL -i -c calc"
+    set $terminal "alacritty --config-file ~/.config/alacritty/config.toml"
+    set $calc "alacritty --config-file ~/.config/alacritty/config.toml -e $SHELL -i -c calc"
 
-    set $scriptdir ~/.i3/scripts
+    set $scriptdir ~/.config/i3/scripts
 
     # Keys for the exit mode
     set $key_lock      l
@@ -77,8 +77,8 @@
     set $focus_parent q
     set $focus_child  a
 
-    set $floating_toggle   Shift+space
-    set $focus_mode_toggle space
+    set $floating_toggle   Shift+p
+    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 ######################################################
@@ -110,7 +112,7 @@ workspace $workspace9 output {{ machine.screen.9 }}
 workspace $workspace10 output {{ machine.screen.0 }}
 
 
-assign [class="^Keepassx$"] $workspace8
+assign [class="^KeePassXC$"] $workspace8
 
 # See https://github.com/i3/i3/issues/2060
 for_window [class="^Spotify$"] move to workspace $workspace9
@@ -118,8 +120,8 @@ assign [class="^Spotify$"] $workspace9
 
 assign [class="^Google-chrome$"] $workspace7
 assign [class="^Chromium$"] $workspace7
-assign [class="^discord"] $workspace7
-assign [class="^Steam"] $workspace5
+assign [class="^[Ss]team$"] $workspace5
+for_window [class="^[Ss]team$"] move to workspace $workspace5
 
 assign [class="^dota2$"] $workspace10
 assign [class="^Wine$"] $workspace10
@@ -204,34 +206,23 @@ assign [class="^Wine$"] $workspace10
 
     ### START APPLICATIONS #####################################################
 
-    bindsym $mod+d exec --no-startup-id ~/.i3/scripts/appmenu
+    bindsym $mod+d exec --no-startup-id $scriptdir/appmenu
     bindsym $mod+Return exec $terminal
     bindsym $mod+Shift+Return exec $calc
 
-    bindsym F1 exec --no-startup-id ~/.i3/scripts/shutdown-menu
-    bindsym F2 exec --no-startup-id ~/.i3/scripts/screenmenu
+    bindsym F1 exec --no-startup-id $scriptdir/shutdown-menu
+    bindsym F2 exec --no-startup-id $scriptdir/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+F3 exec --no-startup-id screencfg ~/.screencfg/laptop.yml ; exec systemctl --user restart keyboard.service
-    bindsym $mod+F4 exec --no-startup-id ~/.i3/scripts/i3exit suspend
-    bindsym $mod+Home exec --no-startup-id ~/.i3/scripts/shutdown-menu
+    bindsym $mod+F1 exec --no-startup-id $scriptdir/i3exit lock
+    bindsym $mod+F4 exec --no-startup-id $scriptdir/i3exit suspend
+    bindsym $mod+Home exec --no-startup-id $scriptdir/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+$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;
+    bindsym $mod+$pim_toggle exec --no-startup-id $scriptdir/swap-from-workspace $workspace10
 
 ################################################################################
 ### MODES ######################################################################
@@ -297,17 +288,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:JetBrainsMono {{ machine.font_size }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
 ################################################################################
 
 # class                 border  backgr. text    indicator
-client.focused          #E16B40 #E16B40 #000000 #FF0000
-client.focused_inactive #333333 #5f676a #ffffff #484e50
-client.unfocused        #333333 #202020 #cccccc #292d2e
-client.urgent           #2f343a #900000 #ffffff #900000
+client.focused          #e5b567 #e5b567 #000000 #FF0000
+client.focused_inactive #272822 #5f676a #ffffff #484e50
+client.unfocused        #1C1C1C #272822 #cccccc #292d2e
+client.urgent           #272822 #ff7777 #000000 #900000
 
 ################################################################################
 ### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -324,34 +315,30 @@ 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 XF86AudioRaiseVolume exec --no-startup-id $scriptdir/pa-volume set-vol +3
-bindsym XF86AudioLowerVolume exec --no-startup-id $scriptdir/pa-volume set-vol -3
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute '@DEFAULT_SINK@' toggle
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume '@DEFAULT_SINK@' +5%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume '@DEFAULT_SINK@' -5%
 
-bindsym XF86AudioPlay exec $scriptdir/spotify-control toggle
-bindsym XF86AudioNext exec $scriptdir/spotify-control next
-bindsym XF86AudioPrev exec $scriptdir/spotify-control previous
+bindsym XF86AudioPlay exec --no-startup-id playerctl -p spotify play-pause
+bindsym XF86AudioNext exec --no-startup-id playerctl -p spotify next
+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+p exec --no-startup-id kill -SIGUSR1 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)
-
-bindsym $mod+m exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
+bindsym $mod+m exec     --no-startup-id pactl set-source-mute '@DEFAULT_SOURCE@' toggle
+bindsym $mod+space exec --no-startup-id pactl set-source-mute '@DEFAULT_SOURCE@' toggle
+bindsym KP_Enter   exec --no-startup-id pactl set-source-mute '@DEFAULT_SOURCE@' toggle
 
 ##############################################################################
 ### BARS #######################################################################
 ################################################################################
-#
+
 bar {
     mode dock
     position bottom
 
-
-#tray_output HDMI3
-    tray_output primary
     tray_padding 2
 
     strip_workspace_numbers no
@@ -362,24 +349,23 @@ bar {
 
     id bar-0
 
-    font pango:Inconsolata, FontAwesome {{ machine.font_size }}
+    font pango:JetBrainsMono, FontAwesome {{ machine.font_size }}
 
     colors {
         background #272822
         statusline #ffffff
-        separator #444444
-        # separator #e16b40
+        separator #555555
 
-        # focused_background #303030
-        # focused_separator #272822
+        focused_separator #e5b567
+        focused_background #272822
 
-        focused_workspace  #e16b40 #272822 #ffffff
-        active_workspace   #272822 #5f676a #ffffff
+        #                  border  bg      text
+        focused_workspace  #e5b567 #4f676a #ffffff
+        active_workspace   #272822 #4f676a #ffffff
         inactive_workspace #272822 #272822 #dddddd
-        urgent_workspace   #D00000 #D00000 #272822
-        binding_mode       #272822 #e16b40 #272822
+        urgent_workspace   #272822 #ff7777 #272822
+        binding_mode       #272822 #e5b567 #272822
     }
 
-    i3bar_command i3bar
-    status_command py3status --standalone --dbus-notify -c ~/.i3/i3status.conf
+    status_command i3status-rs ~/.config/i3status-rust/config.toml
 }

i3/i3status-rust/config.toml.j2

@@ -0,0 +1,110 @@
+icons_format = "{icon}"
+
+[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.str(max_width:10) | }"
+
+[[block]]
+block = "battery"
+interval = 10
+format = " $icon $percentage $time "
+charging_format = " $icon $percentage "
+missing_format = ""
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "$XDG_CONFIG_HOME/i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
+command_off = "$XDG_CONFIG_HOME/i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
+command_state = "[[ $($XDG_CONFIG_HOME/i3/scripts/presentation-mode status) == on ]] && echo active"
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "systemctl --user start color-theme-light"
+command_off = "systemctl --user start color-theme-dark"
+command_state = "[[ $(systemctl --user is-active color-theme-light) == active ]] && 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 = 3600
+
+[[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

@@ -2,10 +2,7 @@
 
 ### From http://www.archlinux.org/index.php/i3
 
-_logfile="$LOGDIR/i3/i3exit.log"
-LOCKSCREEN="$LIBDIR/lockscreen"
-
-_fallback_color="000000"
+_logfile="$XDG_RUNTIME_DIR/i3exit.log"
 
 touch "$_logfile"
 
@@ -18,27 +15,10 @@ log()
 lock()
 {
     set -x
-    playing=0
-    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)
-        convert "${LOCKSCREEN}" -resize "${MACHINE_RESOLUTION_X}x${MACHINE_RESOLUTION_Y}" "${resized_lockscreen}"
     i3lock --nofork --show-failed-attempts --ignore-empty-password \
-            --image "${resized_lockscreen}"
-        rm "${resized_lockscreen}"
-    else
-        i3lock --nofork --show-failed-attempts --ignore-empty-password \
-            --color "$_fallback_color"
-    fi
-    if (( $playing )) ; then
-        playerctl -p spotify play
-    fi
+        --color "000000"
 }
 
 screen_off() {
@@ -52,10 +32,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

@@ -9,33 +9,15 @@ set -o errexit
 set -o nounset
 
 DOTDIR="/var/lib/dotfiles"
-_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
-    if [[ -e "${DOTDIR}" ]] ; then
-        2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n"
-        exit 1
-    fi
-    printf "Moving directory to $DOTDIR ...\n"
-    sudo=""
-    if (( $(id -u ) != 0 )) ; then
-        sudo=sudo
-    fi
-    $sudo mv --no-target-directory "${_SCRIPT_DIR}" "${DOTDIR}"
-    printf "Done\n"
-else
-    printf "Already working in ${DOTDIR}, nothing to do\n"
-fi
-
-cd "${DOTDIR}"
 
 os_release_file=/etc/os-release
 if [[ ! -e "${os_release_file}" ]] ; then
-    2>&1 printf "Could not find ${os_release_file}, exiting"
+    2>&1 printf 'Could not find %, exiting\n' "${os_release_file}"
     exit 1
 fi
 
-source /etc/os-release
+# shellcheck source=/etc/os-release
+source "${os_release_file}"
 
 sudowrap() {
     if (( $(id -u) != 0 )) ; then
@@ -45,48 +27,23 @@ sudowrap() {
     fi
 }
 
-_install() {
-    _package="$1" ; shift
-    if [[ $NAME == "Fedora" ]] ; 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}"
+cache_updated=0
+install() {
+    local package="$1" ; shift
+
+    if [[ $NAME == "Arch Linux" ]] ; then
+        if (( ! cache_updated )) ; then
+            sudowrap pacman -Sy
+            cache_updated=1
+        fi
+        sudowrap pacman -S --needed --noconfirm "${package}"
     else
-        2>&1 printf "Unsupported distro $NAME, exiting"
+        2>&1 printf 'Unsupported distro %s, exiting\n' "$NAME"
         exit 1
     fi
 }
 
+command -v make    >/dev/null || install "make"
+command -v ansible >/dev/null || install "ansible"
 
-if ! command -v python3 >/dev/null ; then
-    printf 'Python3 not installed, installing ...\n'
-    _install "python3"
-    printf 'Done\n'
-fi
-
-if ! command -v make >/dev/null ; then
-    printf 'Make not installed, installing ...\n'
-    _install "make"
-    printf 'Done\n'
-fi
-
-# Required for compiling modules in venv.
-if ! command -v gcc >/dev/null ; then
-    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}"
+cd "${DOTDIR}" && make