From 820e327ea390c09098f49aa8e81c4e1d4890ca04 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 7 Jun 2022 11:23:09 +0200
Subject: [PATCH 1/4] install ferdi for slack

---
 roles/desktop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index efea983..b2c6722 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -161,6 +161,7 @@ in
     numix-icon-theme
 
     alacritty
+    ferdi
     imv
     inkscape
     keepassxc

From cfd000a8e7007d1ffabf7c1b45a95353b728b9ad Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Tue, 7 Jun 2022 11:23:44 +0200
Subject: [PATCH 2/4] Revert "remove i3config"

This reverts commit 9d44ab40b1e428248476b1ddf191f7cbab7a12fe.
---
 roles/desktop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index b2c6722..ca0b359 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -52,6 +52,7 @@ in
 
   environment = {
     etc = {
+      "i3/config".source = ../dotfiles/i3/config;
       "sway/config".source = ../dotfiles/sway/config;
       "sway/status.toml".source = ../dotfiles/sway/status.toml;
       "xdg/alacritty/alacritty.yml".text = ''

From 788f405ed41d562d72c50bdecebbfb050244e549 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Wed, 13 Jul 2022 08:39:02 +0200
Subject: [PATCH 3/4] remove kerberos from nagstamon

---
 packages/nagstamon.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nagstamon.nix b/packages/nagstamon.nix
index cf9b903..86fe18f 100644
--- a/packages/nagstamon.nix
+++ b/packages/nagstamon.nix
@@ -25,13 +25,11 @@ in python39Packages.buildPythonApplication rec {
     beautifulsoup4
     configparser
     dateutil
-    kerberos
     keyring
     lxml
     psutil
     pyqt5_with_qtmultimedia
     requests
-    requests-kerberos
     setuptools
     xlib
   ];

From 665f3d1b7646fe2d1f8ac807176154465f848c02 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Mon, 1 Aug 2022 15:43:04 +0200
Subject: [PATCH 4/4] add terraform to default setup

---
 roles/admin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/admin.nix b/roles/admin.nix
index e93eb03..c0fbe8b 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -11,7 +11,9 @@ in {
     kubectl
     kubeseal
     pwgen
+    terraform
     whois
+
     unstable.argocd
     unstable.kubernetes-helm
     unstable.kustomize