diff --git a/home-manager/modules/programs/ssh-agent.nix b/home-manager/modules/programs/ssh-agent.nix
index 2911ad7..c4954e2 100644
--- a/home-manager/modules/programs/ssh-agent.nix
+++ b/home-manager/modules/programs/ssh-agent.nix
@@ -11,6 +11,6 @@
   # Setup fish init
   programs.fish.shellInit = ''
     set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent
-    ssh-add
+    ssh-add >/dev/null 2>&1
   '';
 }
diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix
index 29c80e9..6b109da 100644
--- a/nixos/machines/swarm/configuration.nix
+++ b/nixos/machines/swarm/configuration.nix
@@ -54,6 +54,8 @@
         device = "nodev";
         efiSupport = true;
         useOSProber = true;
+        default = "saved";
+        gfxmodeEfi = "1600x1200";
       };
       efi.canTouchEfiVariables = true;
     };
@@ -150,6 +152,17 @@
     # System tools
     gparted
     f2fs-tools
+    (dislocker.overrideAttrs (prev: {
+      src = fetchFromGitHub {
+        owner = "aorimn";
+        repo = "dislocker";
+        rev = "3e7aea196eaa176c38296a9bc75c0201df0a3679";
+        sha256 = "sha256-jKk+okSQJ54R17EiUk9NnjLxGi6RrwFrGFVi8ekckww=";
+      };
+      patches = [];
+    }))
+    # Test driving
+    freecad-wayland
   ];
 
   virtualisation.podman = {enable = true;};
diff --git a/nixos/modules/base.nix b/nixos/modules/base.nix
index a8da9b8..5871267 100644
--- a/nixos/modules/base.nix
+++ b/nixos/modules/base.nix
@@ -14,14 +14,19 @@
   ];
 
   environment.systemPackages = with pkgs; [
+    # Basic text editing and git
     neovim
     git
+    # Basic terminal and cli utilities
     tmux
+    just
+    # Basic nix utilities
     alejandra
     nix-index
+    # Basic networking utilities
     curl
     wget
-    just
+    dig
   ];
 
   system.stateVersion = "24.11";