diff --git a/flake.nix b/flake.nix
index cac3686..600df10 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,20 +3,20 @@
 
   inputs = {
     # keep-sorted start block=yes
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     copyparty.url = "github:9001/copyparty";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     vscode-server.url = "github:nix-community/nixos-vscode-server";
     # keep-sorted end
   };
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 20c467d..6130c89 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -33,10 +33,10 @@
   users.users.${userName} = {
     extraGroups = [
       # keep-sorted start
-      "networkmanager"
-      "wheel"
-      "scanner"
       "lp"
+      "networkmanager"
+      "scanner"
+      "wheel"
       # keep-sorted end
     ];
     isNormalUser = true;
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index df774d4..42e564a 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -29,10 +29,10 @@
   users.users.${userName} = {
     extraGroups = [
       # keep-sorted start
-      "networkmanager"
-      "wheel"
-      "scanner"
       "lp"
+      "networkmanager"
+      "scanner"
+      "wheel"
       # keep-sorted end
     ];
     isNormalUser = true;
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index ab2bb69..8fd8fb8 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -30,8 +30,8 @@
     users.${userName} = {
       extraGroups = [
         # keep-sorted start
-        "wheel"
         "docker"
+        "wheel"
         # keep-sorted end
       ];
       home = "/home/srv";
diff --git a/modules/home-manager/features/git.nix b/modules/home-manager/features/git.nix
index 1f8dbd5..daed51d 100644
--- a/modules/home-manager/features/git.nix
+++ b/modules/home-manager/features/git.nix
@@ -26,17 +26,17 @@ in
         ap = "add -p";
         c = "commit --verbose";
         ca = "commit -a --verbose";
-        cm = "commit -m";
         cam = "commit -a -m";
-        m = "commit --amend --verbose";
-        d = "diff";
-        ds = "diff --stat";
-        dc = "diff --cached";
-        s = "status -s";
+        cm = "commit -m";
         co = "checkout";
         cob = "checkout -b";
-        ps = "push";
+        d = "diff";
+        dc = "diff --cached";
+        ds = "diff --stat";
+        m = "commit --amend --verbose";
         pl = "pull";
+        ps = "push";
+        s = "status -s";
         # keep-sorted end
       };
 
diff --git a/modules/home-manager/features/obsidian.nix b/modules/home-manager/features/obsidian.nix
index 54e2b90..8384df1 100644
--- a/modules/home-manager/features/obsidian.nix
+++ b/modules/home-manager/features/obsidian.nix
@@ -26,14 +26,14 @@ in
         };
         communityPlugins = [
           # keep-sorted start
-          "obsidian-livesync"
-          "oz-clear-unused-images"
           "obsidian-editor-shortcuts"
+          "obsidian-excalidraw-plugin"
+          "obsidian-livesync"
+          "obsidian-relative-line-numbers"
+          "oz-clear-unused-images"
+          "pdf-plus"
           "tag-wrangler"
           "virtual-linker"
-          "pdf-plus"
-          "obsidian-excalidraw-plugin"
-          "obsidian-relative-line-numbers"
           # keep-sorted end
         ];
         corePlugins = [
diff --git a/modules/nixos/bundles/dev.nix b/modules/nixos/bundles/dev.nix
index 559a1e8..143731c 100644
--- a/modules/nixos/bundles/dev.nix
+++ b/modules/nixos/bundles/dev.nix
@@ -14,13 +14,13 @@ in
       (
         [
           # keep-sorted start
+          bacon
+          cargo-info
           devenv
           just
           mask
-          vscode
-          bacon
-          cargo-info
           rusty-man
+          vscode
           # keep-sorted end
         ]
         ++ (with jetbrains; [
diff --git a/modules/nixos/bundles/server.nix b/modules/nixos/bundles/server.nix
index df5c524..963381b 100644
--- a/modules/nixos/bundles/server.nix
+++ b/modules/nixos/bundles/server.nix
@@ -5,8 +5,8 @@ in
 {
   config = lib.mkIf config.${feature}.enable {
     # keep-sorted start
-    couchdb.enable = true;
     copyparty.enable = true;
+    couchdb.enable = true;
     flaresolverr.enable = true;
     homepage-dashboard.enable = true;
     immich.enable = true;
@@ -17,10 +17,10 @@ in
     ntfy-sh.enable = true;
     paperless.enable = true;
     prowlarr.enable = true;
+    qbittorrent.enable = true;
     radarr.enable = true;
     sonarr.enable = true;
     syncthing.enable = true;
-    qbittorrent.enable = true;
     vaultwarden.enable = true;
     vscode-server.enable = true;
     # keep-sorted end
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 23f659b..77b67b6 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -26,14 +26,14 @@ in
 
   environment.systemPackages = with pkgs; [
     # keep-sorted start
-    keep-sorted
     dua # disk use analyser
     fd # find
     hyperfine # benchmarking tool
+    keep-sorted
     lazygit # git tui
     mprocs # run long running commands and monitor output
-    nom
     nixfmt-rfc-style
+    nom
     presenterm # presentations
     ripgrep-all # grep
     ripunzip
diff --git a/modules/nixos/features/gaming.nix b/modules/nixos/features/gaming.nix
index 0784b92..a653586 100644
--- a/modules/nixos/features/gaming.nix
+++ b/modules/nixos/features/gaming.nix
@@ -15,11 +15,11 @@ in
       lutris
       mangohud
       nexusmods-app
+      prismlauncher
       protonup-qt
       wine
       wine64
       winetricks
-      prismlauncher
       # keep-sorted end 
     ];
 
diff --git a/modules/nixos/features/gnome.nix b/modules/nixos/features/gnome.nix
index 3ab290a..a3ac99e 100644
--- a/modules/nixos/features/gnome.nix
+++ b/modules/nixos/features/gnome.nix
@@ -22,18 +22,16 @@ in
         # cheese # photo booth
         # eog # image viewer
         epiphany # web browser
-        gedit # text editor
-        # simple-scan # document scanner
-        totem # video player
-        yelp # help viewer
         evince # document viewer
         # file-roller # archive manager
         geary # email client
-        seahorse # password manager
+        gedit # text editor
         gnome-calculator
         gnome-calendar
         gnome-characters
         gnome-clocks
+        # gnome-disk-utility
+        gnome-connections
         gnome-contacts
         gnome-font-viewer
         gnome-logs
@@ -44,8 +42,10 @@ in
         # gnome-system-monitor
         gnome-terminal
         gnome-weather
-        # gnome-disk-utility
-        gnome-connections
+        seahorse # password manager
+        # simple-scan # document scanner
+        totem # video player
+        yelp # help viewer
         # keep-sorted end 
       ];
     };
diff --git a/modules/nixos/features/homepage-dashboard.nix b/modules/nixos/features/homepage-dashboard.nix
index 7494d9e..9ecbb23 100644
--- a/modules/nixos/features/homepage-dashboard.nix
+++ b/modules/nixos/features/homepage-dashboard.nix
@@ -43,6 +43,52 @@ in
         allowedHosts = "homepage-dashboard.fi33.buzz";
         services = [
           # keep-sorted start block=yes
+          {
+            "Cloud Services" = [
+              {
+                "copyparty" = {
+                  "description" = "Cloud file manager";
+                  "icon" = "sh-copyparty.svg";
+                  "href" = "https://copyparty.fi33.buzz/";
+                };
+              }
+              {
+                "CouchDB" = {
+                  "description" = "Obsidian sync database";
+                  "icon" = "couchdb.svg";
+                  "href" = "https://couchdb.fi33.buzz/_utils/";
+                };
+              }
+              {
+                "ntfy" = {
+                  "description" = "Notification service";
+                  "icon" = "ntfy.svg";
+                  "href" = "https://ntfy-sh.fi33.buzz/";
+                };
+              }
+              {
+                "Syncthing" = {
+                  "description" = "Decentralised file synchronisation";
+                  "icon" = "syncthing.svg";
+                  "href" = "https://syncthing.fi33.buzz/";
+                };
+              }
+              {
+                "qBittorrent" = {
+                  "description" = "BitTorrent client";
+                  "icon" = "qbittorrent.svg";
+                  "href" = "https://qbittorrent.fi33.buzz/";
+                };
+              }
+              {
+                "Vaultwarden" = {
+                  "description" = "Password manager";
+                  "icon" = "vaultwarden.svg";
+                  "href" = "https://vaultwarden.fi33.buzz/";
+                };
+              }
+            ];
+          }
           {
             "Media Management" = [
               {
@@ -163,52 +209,6 @@ in
               }
             ];
           }
-          {
-            "Cloud Services" = [
-              {
-                "copyparty" = {
-                  "description" = "Cloud file manager";
-                  "icon" = "sh-copyparty.svg";
-                  "href" = "https://copyparty.fi33.buzz/";
-                };
-              }
-              {
-                "CouchDB" = {
-                  "description" = "Obsidian sync database";
-                  "icon" = "couchdb.svg";
-                  "href" = "https://couchdb.fi33.buzz/_utils/";
-                };
-              }
-              {
-                "ntfy" = {
-                  "description" = "Notification service";
-                  "icon" = "ntfy.svg";
-                  "href" = "https://ntfy-sh.fi33.buzz/";
-                };
-              }
-              {
-                "Syncthing" = {
-                  "description" = "Decentralised file synchronisation";
-                  "icon" = "syncthing.svg";
-                  "href" = "https://syncthing.fi33.buzz/";
-                };
-              }
-              {
-                "qBittorrent" = {
-                  "description" = "BitTorrent client";
-                  "icon" = "qbittorrent.svg";
-                  "href" = "https://qbittorrent.fi33.buzz/";
-                };
-              }
-              {
-                "Vaultwarden" = {
-                  "description" = "Password manager";
-                  "icon" = "vaultwarden.svg";
-                  "href" = "https://vaultwarden.fi33.buzz/";
-                };
-              }
-            ];
-          }
           {
             "Utilities" = [
               {
diff --git a/modules/nixos/features/intel-gpu.nix b/modules/nixos/features/intel-gpu.nix
index 744eb0b..08809d5 100644
--- a/modules/nixos/features/intel-gpu.nix
+++ b/modules/nixos/features/intel-gpu.nix
@@ -15,11 +15,11 @@ in
         enable = true;
         extraPackages = with pkgs; [
           # keep-sorted start 
-          intel-media-driver
-          libva-vdpau-driver
           intel-compute-runtime
-          vpl-gpu-rt
+          intel-media-driver
           intel-ocl
+          libva-vdpau-driver
+          vpl-gpu-rt
           # keep-sorted end 
         ];
       };
diff --git a/modules/nixos/features/plasma.nix b/modules/nixos/features/plasma.nix
index 3df312d..72e8b08 100644
--- a/modules/nixos/features/plasma.nix
+++ b/modules/nixos/features/plasma.nix
@@ -21,16 +21,16 @@ in
       with pkgs.kdePackages;
       [
         # keep-sorted start
+        kget
         kontact
         ktorrent
-        kget
         kzones
         # keep-sorted end
       ]
       ++ (with pkgs; [
         # keep-sorted start
-        kile
         haruna
+        kile
         # keep-sorted end
       ]);
   };