diff --git a/common.nix b/common.nix
index fab7f75..9e74f7c 100644
--- a/common.nix
+++ b/common.nix
@@ -12,29 +12,10 @@
 with lib;
 with builtins; {
   imports = [lix-module.nixosModules.default];
-  nix = {
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      keep-outputs = true
-      keep-derivations = true
-    '';
-  };
-
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "electron-27.3.11"
-        "nodejs-16.20.0"
-      ];
-    };
-    overlays = [rs-programs niri.overlays.niri];
-  };
 
   environment = {
     systemPackages = with pkgs; [
       overskride
-      pulsemixer
 
       htmlq
 
@@ -88,18 +69,14 @@ with builtins; {
     ];
   };
 
-  networking = {
-    networkmanager = {
-      enable = true;
-    };
-  };
+  hardware.graphics.enable = true;
 
   services = {
     systemd-lock-handler.enable = true;
     openssh = {
       enable = true;
-      # settings.PasswordAuthentication = false;
-      # settings.KbdInteractiveAuthentication = false;
+      settings.PasswordAuthentication = false;
+      settings.KbdInteractiveAuthentication = false;
     };
   };
 
@@ -116,31 +93,11 @@ with builtins; {
 
   hardware.gpgSmartcards.enable = true;
 
-  time.timeZone = "Europe/Berlin";
-
-  home-manager.users.jade = {
-    nixosConfig,
-    pkgs,
-    ...
-  }: {
-    home.sessionVariables.TZ = nixosConfig.time.timeZone;
-  };
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    sudo = pkgs.sudo.override {withInsults = true;};
-  };
-  security.sudo.extraConfig = "Defaults insults";
-
   boot.kernel.sysctl."vm.max_map_count" = 2147483642;
 
   hardware = {
     uinput.enable = true;
     bluetooth.enable = true;
-    # keyboard.uhk.enable = true;
-  };
-
-  services.avahi = {
-    enable = true;
   };
 
   security.rtkit.enable = true;
@@ -154,12 +111,4 @@ with builtins; {
     enable = true;
     algorithm = "zstd";
   };
-
-  users.defaultUserShell = pkgs.nushell;
-
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 60d";
-  };
 }
diff --git a/hosts/denkbrett/configuration.nix b/hosts/denkbrett/configuration.nix
index c41ba1a..6ecfb45 100644
--- a/hosts/denkbrett/configuration.nix
+++ b/hosts/denkbrett/configuration.nix
@@ -1,12 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   nixpkgs.config.permittedInsecurePackages = [
     "electron-25.9.0"
     "electron-27.3.11"
@@ -46,7 +41,6 @@
 
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
 
-  hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
   environment.systemPackages = [
diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix
index c0bac2f..de708f8 100644
--- a/hosts/monosodium-glutamate-g/configuration.nix
+++ b/hosts/monosodium-glutamate-g/configuration.nix
@@ -47,7 +47,6 @@
     gnome.gnome-keyring.enable = true;
   };
   hardware = {
-    bluetooth.enable = true;
     keyboard.uhk.enable = true;
     enableRedistributableFirmware = true;
   };
diff --git a/modules/default.nix b/modules/default.nix
index 2f6e4d9..125b127 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,6 +7,7 @@
     ./net
     ./input
     ./media
+    ./nix.nix
     ./graphics.nix
   ];
 }
diff --git a/modules/desktop-legacy/default.nix b/modules/desktop-legacy/default.nix
index ad4114d..7a2f692 100644
--- a/modules/desktop-legacy/default.nix
+++ b/modules/desktop-legacy/default.nix
@@ -23,11 +23,6 @@ with lib; {
   };
 
   services.illum.enable = true;
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
   services.smartd = {
     enable = true;
     notifications.test = true;
diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix
index c26f679..c38403d 100644
--- a/modules/desktop/audio.nix
+++ b/modules/desktop/audio.nix
@@ -11,10 +11,8 @@
     };
   };
   environment.systemPackages = with pkgs; [
-    pavucontrol
-    volumeicon
     playerctl
-
+    pulsemixer
     helvum
   ];
 }
diff --git a/modules/desktop/locale.nix b/modules/desktop/locale.nix
index 7319975..9071f8d 100644
--- a/modules/desktop/locale.nix
+++ b/modules/desktop/locale.nix
@@ -1,4 +1,5 @@
 {...}: {
+  time.timeZone = "Europe/Berlin";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "de_DE.UTF-8";
     LC_IDENTIFICATION = "de_DE.UTF-8";
diff --git a/modules/graphics.nix b/modules/graphics.nix
deleted file mode 100644
index 910a0e2..0000000
--- a/modules/graphics.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  hardware.graphics.enable = true;
-}
diff --git a/modules/net/default.nix b/modules/net/default.nix
index de797b4..fba3d47 100644
--- a/modules/net/default.nix
+++ b/modules/net/default.nix
@@ -5,7 +5,9 @@
     ./eduroam.nix
     ./dispatchers
   ];
+  networking.networkmanager.enable = true;
   networking.networkmanager.wifi.backend = "wpa_supplicant";
+
   systemd.services."NetworkManager-wait-online".enable = false;
   services.mullvad-vpn.enable = true;
   home-manager.users.jade = {pkgs, ...}: {
diff --git a/modules/nix.nix b/modules/nix.nix
new file mode 100644
index 0000000..42160d2
--- /dev/null
+++ b/modules/nix.nix
@@ -0,0 +1,29 @@
+{
+  rs-programs,
+  niri,
+  ...
+}: {
+  nix = {
+    extraOptions = ''
+      experimental-features = nix-command flakes
+      keep-outputs = true
+      keep-derivations = true
+    '';
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 60d";
+    };
+  };
+
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "electron-27.3.11"
+        "nodejs-16.20.0"
+      ];
+    };
+    overlays = [rs-programs niri.overlays.niri];
+  };
+}
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index 9ce0499..180d1ab 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     ./helix.nix
     ./nu.nix
@@ -7,6 +7,7 @@
     ./git.nix
     ./mprocs.nix
     ./btop.nix
+    ./sudo.nix
   ];
   programs.mosh.enable = true;
   programs.bat.enable = true;
@@ -14,4 +15,6 @@
     programs.carapace.enable = true;
     programs.direnv.enable = true;
   };
+
+  users.defaultUserShell = pkgs.nushell;
 }
diff --git a/modules/shell/sudo.nix b/modules/shell/sudo.nix
new file mode 100644
index 0000000..bcc38cd
--- /dev/null
+++ b/modules/shell/sudo.nix
@@ -0,0 +1,6 @@
+{...}: {
+  nixpkgs.config.packageOverrides = pkgs: {
+    sudo = pkgs.sudo.override {withInsults = true;};
+  };
+  security.sudo.extraConfig = "Defaults insults";
+}