From b8273ae5509c10c65d34853987d7d0b05b6cf39f Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 17 Feb 2022 17:35:32 +0100
Subject: [PATCH 1/6] document sections

---
 configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration.nix b/configuration.nix
index ca4a3ca..e2e0a3a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,11 +6,13 @@
 
 {
   imports = [
+    # custom modules
     ./modules/colors.nix
 
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
 
+    # roles
     ./roles/admin.nix
     ./roles/base.nix
     ./roles/desktop.nix

From 437196a6e0fa71d1f551f6f5067b3042f1b877af Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 17 Feb 2022 17:35:50 +0100
Subject: [PATCH 2/6] fix current alacritty version

---
 dotfiles/alacritty.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/alacritty.yml b/dotfiles/alacritty.yml
index eac8077..4d524b9 100644
--- a/dotfiles/alacritty.yml
+++ b/dotfiles/alacritty.yml
@@ -3,7 +3,6 @@ font:
     family: CaskaydiaCove Nerd Font
   size: 12
 
-background_opacity: 0.9
 draw_bold_text_with_bright_colors: true
 
 colors:
@@ -23,6 +22,7 @@ colors:
 
 window:
   dynamic_title: true
+  opacity: 0.9
 
 env:
   TERM: xterm-256color

From 140df0d25887806acc21babc8c14e55816bdc437 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 17 Feb 2022 17:36:01 +0100
Subject: [PATCH 3/6] allow systemd user services to access keyring

---
 dotfiles/sway/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index b3bd122..c2a76dd 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -148,6 +148,7 @@ exec emacs --daemon
 exec swayidle before-sleep "$lock"
 exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1
 exec redshift -l 49.8988135:10.9027636
+exec systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
 
 # pastebin
 exec wl-paste --primary -t text --watch clipman store

From ffb330106c49d7ffb7de55fde6c9b29ef12e9dc8 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 17 Feb 2022 17:36:16 +0100
Subject: [PATCH 4/6] fix battery default icon

---
 dotfiles/sway/status.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml
index 60ef6eb..90c512f 100644
--- a/dotfiles/sway/status.toml
+++ b/dotfiles/sway/status.toml
@@ -23,7 +23,7 @@ backlight_full = ""
 backlight_partial1 = ""
 backlight_partial2 = ""
 backlight_partial3 = ""
-bat = ""
+bat = ""
 bat_charging = ""
 bat_discharging = ""
 bat_empty = ""

From 8b6b8f07ffd6850369ed919c4f6426bddae7d73c Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Mon, 21 Mar 2022 13:47:46 +0100
Subject: [PATCH 5/6] fix cloudstation startup

---
 packages/cloudstation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cloudstation.nix b/packages/cloudstation.nix
index 3196d59..745c4e4 100644
--- a/packages/cloudstation.nix
+++ b/packages/cloudstation.nix
@@ -57,6 +57,7 @@ in buildFHSUserEnv {
   runScript = writeScript "cloudstation" ''
     #!/usr/bin/env bash
     export QT_PLUGIN_PATH="${pkgs.qt5.qtbase.bin}/${pkgs.qt5.qtbase.qtPluginPrefix}"
+    export QT_QPA_PLATFORM=xcb
     ${cloudstation}/bin/launcher
 
     export LD_LIBRARY_PATH="/home/stefan/.CloudStation/CloudStation.app/lib:$LD_LIBRARY_PATH"

From f03c408d70061486f074b53b89cc8da4b243d5bc Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Mon, 21 Mar 2022 13:48:10 +0100
Subject: [PATCH 6/6] add umlaut layer with wtype

---
 dotfiles/sway/config | 13 +++++++++++++
 roles/desktop.nix    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index c2a76dd..4fdd32b 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -115,6 +115,19 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
+mode "umlaut" {
+    bindsym s exec wtype ß
+    bindsym a exec wtype ä
+    bindsym o exec wtype ö
+    bindsym u exec wtype ü
+    bindsym Shift+a exec wtype Ä
+    bindsym Shift+o exec wtype Ö
+    bindsym Shift+u exec wtype Ü
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+u mode "umlaut"
+
 bar {
   font $font
   position bottom
diff --git a/roles/desktop.nix b/roles/desktop.nix
index c4a159e..36313d3 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -186,7 +186,7 @@ in
     xdg_utils
     xfce.thunar
     xfce.thunar-volman
-    ydotool
+    wtype
     (pkgs.writeTextFile {
       name = "startsway";
       destination = "/bin/startsway";