diff --git a/flake.lock b/flake.lock
index 5a5510a..7b4e49a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1677533532,
-        "narHash": "sha256-2Ie47MONhIFOxvbLmwhmCCe/IoVDVd7YnoK61vu5Xy8=",
+        "lastModified": 1677704978,
+        "narHash": "sha256-3ijjQ5Vb51NdHvslbCpG8/UZ61ECcogxguRqgknlejc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "305daba44a9df57738cffc67c08129005a25579a",
+        "rev": "f8077880359b72bbd290ee216b105f200a6f7cc7",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1677574432,
-        "narHash": "sha256-1Aun3MQ5T/HCw1ClzAiY+6boLQNY8Cg6jTOILrLkaJs=",
+        "lastModified": 1677591639,
+        "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "dcbf93d500c54cfee7a7c854c4669d404236a821",
+        "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce",
         "type": "github"
       },
       "original": {
diff --git a/packages/common.nix b/packages/common.nix
index 757d56c..fc10fc4 100644
--- a/packages/common.nix
+++ b/packages/common.nix
@@ -9,35 +9,35 @@ in {
   # System-wide packages to install.
   environment.systemPackages = with pkgs; let
     common = [
-      # essentials
+      # classics
       colordiff
       curl
       gcc
       git-crypt
+      gnumake
       gnupg
       imagemagick
       jq
-      ripgrep
       unzip
       viddy
-      xclip
       wget
+      xclip
       xdg-utils
-      yq-go
       zip
 
-      # productivity
+      # modern cli
       bat
       drone-cli
       exa
       fd
       github-cli
-      gnumake
       hadolint
       nodePackages.eslint
       oha
       postman
       pre-commit
+      ripgrep
+      yq-go
       shellcheck
       shfmt
       starship
@@ -123,7 +123,6 @@ in {
       rnix-lsp
 
       # cloud
-      # awscli2 # broken
       azure-cli
       cloud-sql-proxy
 
diff --git a/packages/linux-desktop.nix b/packages/linux-desktop.nix
index 90ad51c..163c6ee 100644
--- a/packages/linux-desktop.nix
+++ b/packages/linux-desktop.nix
@@ -17,7 +17,7 @@ in {
       firefox
       foliate
       ghostscript
-      # gimp-with-plugins
+      gimp-with-plugins
       gnome.gnome-sound-recorder
       gnome.gnome-tweaks
       gnome.seahorse