From 191ce8ed67b077dc32675ef73967383952bb2f29 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 2 Jun 2022 10:58:07 +0200
Subject: [PATCH 1/5] fix typo

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

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 4fdd32b..5d86c6c 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -152,7 +152,7 @@ exec_always {
     gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White'
 }
 
-# autostarts 
+# autostarts
 exec mako --font "$font" \
   --background-color=$black \
   --border-color=$violet \

From 91d385c41738be612de73cffcc25f8b39e89343f Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 2 Jun 2022 10:58:14 +0200
Subject: [PATCH 2/5] remove redshift (22.05)

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

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 5d86c6c..df2b422 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -160,7 +160,6 @@ exec mako --font "$font" \
 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

From 125778ba150e1ae5b9a1356ef43a1a44c4cca28f Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 2 Jun 2022 10:58:26 +0200
Subject: [PATCH 3/5] start cloudstation on work machine

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

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index df2b422..1ae619f 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -161,6 +161,7 @@ exec emacs --daemon
 exec swayidle before-sleep "$lock"
 exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1
 exec systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+exec bash -c '[ "$HOSTNAME" == sphere ] && cloudstation'
 
 # pastebin
 exec wl-paste --primary -t text --watch clipman store

From 125c5fe0a5b447e6014e80b19b3f34660d2ff2be Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 2 Jun 2022 10:58:48 +0200
Subject: [PATCH 4/5] use latest kernel

---
 hardware/xps15-sphere.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hardware/xps15-sphere.nix b/hardware/xps15-sphere.nix
index 8b5d78b..d2299a1 100644
--- a/hardware/xps15-sphere.nix
+++ b/hardware/xps15-sphere.nix
@@ -51,7 +51,6 @@ in {
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   # custom
-  #boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.loader.systemd-boot.enable = true;
   hardware.cpu.intel.updateMicrocode = true;
   networking.hostId = "eff291c4";

From 46d58735cc73a28546492a3c28f3c9b315601e7b Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 2 Jun 2022 10:59:21 +0200
Subject: [PATCH 5/5] nixos 22.05 fixes

---
 packages/cloudstation.nix |  2 +-
 roles/desktop.nix         | 10 ++++------
 roles/vpn.nix             |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/cloudstation.nix b/packages/cloudstation.nix
index 745c4e4..8532b00 100644
--- a/packages/cloudstation.nix
+++ b/packages/cloudstation.nix
@@ -35,7 +35,7 @@ in buildFHSUserEnv {
     with xorg; [
       cloudstation
       curl
-      dbus_libs
+      dbus
       fontconfig
       freetype
       glib
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 355f909..efea983 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -16,11 +16,11 @@ in
     extraPackages = with pkgs; [
       bemenu
       brightnessctl
+      gammastep
       grim
       i3status-rust
       kanshi
       mako
-      redshift-wlr
       slurp
       swayidle
       swaylock
@@ -160,9 +160,10 @@ in
     lxappearance
     numix-icon-theme
 
+    alacritty
     imv
     inkscape
-    libqrencode
+    keepassxc
     libreoffice
     libsecret
     mpv
@@ -172,15 +173,12 @@ in
     pavucontrol
     pcmanfm
     pulseeffects-pw
-    alacritty
-    unstable.keepassxc
-    unstable.noisetorch
+    qrencode
 
     solaar
     gdk-pixbuf
 
     clipman
-    gebaar-libinput
     wdisplays
     wl-clipboard
     xdg_utils
diff --git a/roles/vpn.nix b/roles/vpn.nix
index 79bcd23..b3a801a 100644
--- a/roles/vpn.nix
+++ b/roles/vpn.nix
@@ -2,5 +2,5 @@
 
 {
   networking.wireguard.enable = true;
-  environment.systemPackages = with pkgs; [ wireguard ];
+  environment.systemPackages = with pkgs; [ wireguard-tools ];
 }