diff --git a/roles/desktop.nix b/roles/desktop.nix
index bd0ae20..2bdd01a 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -47,7 +47,6 @@ in {
 
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  security.polkit.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -56,7 +55,7 @@ in {
 
     config.pipewire = {
       "context.properties" = {
-        "default.clock.rate" = 44100;
+        "default.clock.rate" = 48000;
       };
     };
   };
@@ -75,9 +74,6 @@ in {
 
   nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
-    polkit
-    polkit_gnome
-
     # firefox also needs:
     #
     # gfx.webrenderer.enabled = true
@@ -116,18 +112,13 @@ in {
     pavucontrol
     pcmanfm
     pulseeffects-pw
-    unstable.alacritty
-    unstable.keepassxc
-    unstable.noisetorch
-
-    solaar
-    gdk-pixbuf
-
     wl-clipboard
     xdg_utils
     xfce.thunar
     xfce.thunar-volman
     ydotool
+    unstable.alacritty
+    unstable.keepassxc
     (
       pkgs.writeTextFile {
         name = "startsway";
diff --git a/roles/dev.nix b/roles/dev.nix
index d046695..4bc6583 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -12,10 +12,14 @@ in {
     unstable.golangci-lint
     unstable.gopls
     unstable.rust-analyzer
-    #unstable.esphome
+    unstable.esphome
 
-    nodePackages.pyright
-    (python39.withPackages(python-packages: with python-packages; [
+    (python38.withPackages(python-packages: with python-packages; [
+      dnspython
+      pyls-black
+      pyls-isort
+      pyls-mypy
+      python-language-server
       pyyaml
       requests
     ]))
diff --git a/roles/network.nix b/roles/network.nix
index c56b4bf..20dd4a5 100644
--- a/roles/network.nix
+++ b/roles/network.nix
@@ -2,6 +2,7 @@
 
 let
   unstable = import <nixos-unstable> { config.allowUnfree = true; };
+  cloudstation = pkgs.libsForQt5.callPackage (import ../packages/cloudstation.nix) {};
 in {
 
   networking.networkmanager.enable = true;
diff --git a/roles/work.nix b/roles/work.nix
index 6535389..c82fc31 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -3,7 +3,6 @@
 let
   unstable = import <nixos-unstable> { config.allowUnfree = true; };
   cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) {};
-  nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {};
 in {
 
   security.pki.certificateFiles = [
@@ -14,32 +13,22 @@ in {
   networking.extraHosts = ''
     35.234.109.94 fsi.thomann.de
     10.100.7.11 mon.netzmarkt.de
-
-    172.23.0.2 api.kube.local
-    172.23.0.2 hubble.kube.local
-    172.23.0.2 bonedo.kube.local
-    172.23.0.2 linkerd.kube.local
-    172.23.0.2 argo.kube.local
-
   '';
 
   environment.systemPackages = with pkgs; [
     (import ../packages/oc311.nix)
     (import ../packages/oc46.nix)
     (import ../packages/openshift-install-4.5.nix)
-    # (import ../packages/vaultsink.nix) needs opensource verson
     cloudstation
-    nagstamon
-
     astroid
+    (pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {})
     drone-cli
-    go-jira
     govc
-    ttyd
-    unstable.discord
+    go-jira
     unstable.google-cloud-sdk
     unstable.slack
     unstable.velero
+    unstable.discord
 
     unstable.obs-studio
     unstable.obs-studio-plugins.wlrobs