diff --git a/common/packages.nix b/common/packages.nix
index c2c9a5b..e20281d 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -7,31 +7,40 @@ in
   environment.systemPackages = with pkgs;
     let
       common = [
-        # utils
+        # essentials
         curl
         gcc
+        git
+        git-crypt
         gnupg
         imagemagick
-        iotop
+        jq
+        ripgrep
         unzip
+        xclip
         xdg_utils
         zip
 
-        # dev tools
+        # dev productivity
         ansible-lint
+        bat
         checkov
+        colordiff
         drone-cli
-        git
-        git-crypt
+        exa
+        fd
         github-cli
         gnumake
+        go-jira
         hadolint
+        httpie
         nodePackages.eslint
         pre-commit
         shellcheck
         shfmt
         starship
-        sumneko-lua-language-server
+        tldr
+        tmux-sessionizer
 
         # automation
         ansible
@@ -47,20 +56,10 @@ in
 
         # language servers
         nodePackages.bash-language-server
-        nodePackages.yaml-language-server
         nodePackages.pyright
-
-        # productivity
-        bat
-        colordiff
-        exa
-        fd
-        go-jira
-        jq
-        ripgrep
-        tldr
-        tmux-sessionizer
-        xclip
+        nodePackages.yaml-language-server
+        rubyPackages.solargraph
+        sumneko-lua-language-server
 
         # blog
         hugo
@@ -72,6 +71,7 @@ in
         ctop
         glances
         htop
+        iotop
         procs
 
         # data tools
@@ -135,7 +135,7 @@ in
         aws-role-play
         aws-vault
         awscli2
-        /* awslogs */
+        awslogs
         ssm-session-manager-plugin
 
         # python
@@ -154,7 +154,6 @@ in
         ruby_2_7
         ruby_3_1
         rufo
-        rubyPackages.solargraph
 
         # news
         srv
diff --git a/flake.lock b/flake.lock
index 16220fd..2c1b8b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651262513,
-        "narHash": "sha256-5iW1fevaAD0Rbtbgb4I++7fyaND3oarGs3mAjyadE0Y=",
+        "lastModified": 1651415224,
+        "narHash": "sha256-O/EzwxUMa1OawWEwhS10Xki7RX3+hSgaJJziHeI4d7c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f8b51be7149a0735e87b232d21ae4f852619eac7",
+        "rev": "26858fc0dbed71fa0609490fc2f2643e0d175328",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1651306471,
-        "narHash": "sha256-Znl24HXhxJ6rb79QeUFZQn2YaCiZF4ggaQqGeJktNEw=",
+        "lastModified": 1651381075,
+        "narHash": "sha256-jVU1WolekCTYM6O/8hpVVkpff+sT1EHPHu11ckdx08Q=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "df09e03cf74337675751c3240069a26aec75fa3b",
+        "rev": "07660193a38918aa6a17ec691c4e8b021436ed67",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1651306524,
-        "narHash": "sha256-+hek8qaHW4kztmhgcQiacA8u/R5znXzjfX31kbBO3Sk=",
+        "lastModified": 1651392941,
+        "narHash": "sha256-Gv377HY45bPZj0cKPo5BJGxDHI+TN62MNWF/n/iO0Q8=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "3edbbcf631a94557c3bc599ec270c1cfe01a27d2",
+        "rev": "efb684030fa093f0a5f0327994fea1ab790859e6",
         "type": "github"
       },
       "original": {