diff --git a/machines/congenital-optimist/configuration.nix b/machines/congenital-optimist/configuration.nix
index c914c7f..8fb1bda 100644
--- a/machines/congenital-optimist/configuration.nix
+++ b/machines/congenital-optimist/configuration.nix
@@ -33,6 +33,9 @@
     # Development tools
     ../../modules/development/tools.nix
 
+    # AI tools
+    ../../modules/ai/claude-code.nix
+
     # User configuration
     ../../modules/users/geir.nix
     ../../modules/users/sma.nix
diff --git a/modules/ai/claude-code.nix b/modules/ai/claude-code.nix
index dee414f..8e8d205 100644
--- a/modules/ai/claude-code.nix
+++ b/modules/ai/claude-code.nix
@@ -1,5 +1,9 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  unstable,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
-    pkgs.unstable.claude-code
+    unstable.claude-code
   ];
 }
diff --git a/modules/common/emacs.nix b/modules/common/emacs.nix
index 2ba8cf4..5b07da6 100644
--- a/modules/common/emacs.nix
+++ b/modules/common/emacs.nix
@@ -1,19 +1,11 @@
 # Common Emacs Configuration
 # Shared Emacs setup for all machines
-
 {
   config,
   pkgs,
   ...
 }: {
-  # System-wide Emacs configuration
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs;
-    defaultEditor = true;
-  };
-
-  # Emacs packages and configuration
+  # System-wide Emacs installation
   environment.systemPackages = with pkgs; [
     emacs
     # Basic Emacs utilities
@@ -25,4 +17,4 @@
     EDITOR = "emacs";
     VISUAL = "emacs";
   };
-}
\ No newline at end of file
+}
diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index ac60049..a72be25 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -9,5 +9,23 @@
     # Niri scrolling window manager
     niri
     alacritty
+
+    # Core Sway tools
+    swaylock
+    swayidle
+    swaybg
+
+    # Wayland utilities
+    waybar # Status bar
+    fuzzel # Application launcher
+    gammastep # Blue light filter
+    mako # Notification daemon
+    flameshot # Screenshot tool
+    wl-clipboard # Clipboard utilities
+
+    # Additional Wayland tools
+    grim # Screenshot utility
+    slurp # Screen area selection
+    wf-recorder # Screen recorder
   ];
 }