diff --git a/flake.nix b/flake.nix
index 5b04ab0..5f12c87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,6 +125,7 @@
           nixfmt.enable = true;
           jsonfmt.enable = true;
           prettier.enable = true;
+          keep-sorted.enable = true;
         };
       };
       forAllSystems =
@@ -226,17 +227,18 @@
 
             ./nixosConfigurations/${device}
 
-            self.nixosModules.default
-            self.nixosModules.lix-is-nix
-            self.nixosModules.globalinstalls
-            self.nixosModules.autoupdate
-            self.nixosModules.openssh
-            self.nixosModules.tailscale
+            # keep-sorted start
             self.nixosModules.allowed-unfree-list
+            self.nixosModules.autoupdate
+            self.nixosModules.default
             self.nixosModules.extra-caches
+            self.nixosModules.globalinstalls
+            self.nixosModules.lix-is-nix
+            self.nixosModules.openssh
             self.nixosModules.systemd-boot
-
+            self.nixosModules.tailscale
             zerforschen-plus.nixosModules.default
+            # keep-sorted end
           ]
           ++ (nixpkgs.lib.optionals (home-manager-users != { }) [
             {
@@ -250,33 +252,37 @@
 
               home-manager.sharedModules = [
                 { home.stateVersion = "22.11"; }
+                # keep-sorted start
                 self.homeModules.adwaita
                 self.homeModules.git
+                self.homeModules.gnome-extensions
+                self.homeModules.nano
                 self.homeModules.templates
                 self.homeModules.zsh-basics
-                self.homeModules.nano
-                self.homeModules.gnome-extensions
                 self.homeModules.zsh-powerlevel10k
+                # keep-sorted end
               ];
 
               home-manager.users = home-manager-users;
             }
 
-            self.nixosModules.pkgs-unstable
-            self.nixosModules.pkgs-vscode-extensions
-            self.nixosModules.niri
-            self.nixosModules.kdeconnect
-            self.nixosModules.en-de
-            self.nixosModules.gnome
-            self.nixosModules.modern-desktop
-            self.nixosModules.nix-ld
-            self.nixosModules.quiet-boot
-            self.nixosModules.firmware-updates
+            # keep-sorted start
 
             home-manager.nixosModules.home-manager
-            servicepoint-simulator.nixosModules.default
+            self.nixosModules.en-de
+            self.nixosModules.firmware-updates
+            self.nixosModules.gnome
+            self.nixosModules.kdeconnect
+            self.nixosModules.modern-desktop
+            self.nixosModules.niri
+            self.nixosModules.nix-ld
+            self.nixosModules.pkgs-unstable
+            self.nixosModules.pkgs-vscode-extensions
+            self.nixosModules.quiet-boot
             servicepoint-cli.nixosModules.default
+            servicepoint-simulator.nixosModules.default
             servicepoint-tanks.nixosModules.default
+            # keep-sorted end
           ])
           ++ additional-modules;
         }
diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix
index 50287b7..4a2ff59 100644
--- a/homeConfigurations/vinzenz/default.nix
+++ b/homeConfigurations/vinzenz/default.nix
@@ -1,18 +1,21 @@
 { pkgs, ... }:
 {
   imports = [
+    # keep-sorted start
     ./editorconfig.nix
+    ./fonts.nix
     ./fuzzel.nix
     ./git.nix
     ./gnome.nix
-    ./ssh.nix
-    ./vscode.nix
-    ./zsh.nix
-    ./starship.nix
-    ./fonts.nix
+    ./mako.nix
     ./niri.nix
+    ./ssh.nix
+    ./starship.nix
     ./swaylock.nix
+    ./vscode.nix
     ./waybar.nix
+    ./zsh.nix
+    # keep-sorted end
   ];
 
   config = {
@@ -56,6 +59,7 @@
 
       wireguard-tools
       wirelesstools
+      tailscale
 
       kdiff3
       jetbrains-toolbox
diff --git a/homeConfigurations/vinzenz/mako.nix b/homeConfigurations/vinzenz/mako.nix
new file mode 100644
index 0000000..b8052a4
--- /dev/null
+++ b/homeConfigurations/vinzenz/mako.nix
@@ -0,0 +1,3 @@
+{
+  services.mako.enable = true;
+}
diff --git a/homeConfigurations/vinzenz/niri.nix b/homeConfigurations/vinzenz/niri.nix
index 64cb58f..ba835c9 100644
--- a/homeConfigurations/vinzenz/niri.nix
+++ b/homeConfigurations/vinzenz/niri.nix
@@ -9,7 +9,6 @@
     home.sessionVariables.NIXOS_OZONE_WL = "1";
     home.packages = with pkgs; [
       xwayland-satellite
-      alacritty
     ];
 
     qt.style = {
@@ -17,8 +16,6 @@
       name = "adwaita-dark";
     };
 
-    services.mako.enable = true;
-
     programs.niri.settings = {
       outputs = {
         "BOE 0x0A3B Unknown" = {
@@ -61,7 +58,6 @@
         {
           background-color = "#000000";
           gaps = gap-size;
-          #default-column-display = "tabbed";
           border = {
             enable = true;
             width = gap-size / 2;