diff --git a/configuration.nix b/configuration.nix
index 5449b30..9abcaf0 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -85,7 +85,7 @@
     windowManager.i3 = {
       enable = true;
       extraPackages = with pkgs; [
-        i3-auto-layout
+        autotiling
       ];
     };
   };
@@ -94,7 +94,9 @@
   console.keyMap = "us";
 
   # Enable CUPS to print documents.
-  services.printing.enable = true;
+  # services.printing.enable = true;
+
+  programs.seahorse.enable = true;
 
   # Enable sound with pipewire.
   sound.enable = true;
diff --git a/i3/config.nix b/i3/config.nix
new file mode 100644
index 0000000..fea322d
--- /dev/null
+++ b/i3/config.nix
@@ -0,0 +1,42 @@
+{ pkgs, lib, ... }:
+let
+  mod = "Mod4";
+  term = "kitty";
+in
+{
+  modifier = mod;
+  terminal = term;
+  fonts = {
+    names = [ "CaskaydiaCove Nerd Font" ];
+    size = 10.0;
+  };
+  keybindings = lib.mkOptionDefault {
+    # defaults
+    # launch programs
+    ## start a rofi launcher
+    "${mod}+d" = "exec rofi -combi-modi window#drun#ssh -show-icons -show combi -modi combi";
+    ## run a terminal
+    "${mod}+Returnm" = "exec ${term}";
+
+    # windows
+    ## focus
+    "${mod}+h" = "focus left";
+    "${mod}+j" = "focus down";
+    "${mod}+k" = "focus up";
+    "${mod}+l" = "focus right";
+
+    # move
+    "${mod}+Shift+h" = "move left";
+    "${mod}+Shift+j" = "move down";
+    "${mod}+Shift+k" = "move up";
+    "${mod}+Shift+l" = "move right";
+
+    # split
+    "${mod}+q" = "split toggle";
+
+
+  };
+  startup = [
+    { command = "--no-startup-id autotiling"; always = true; }
+  ];
+}
diff --git a/i3/settings.nix b/i3/settings.nix
index c7959d4..45740b8 100644
--- a/i3/settings.nix
+++ b/i3/settings.nix
@@ -1,17 +1,8 @@
 { pkgs, lib, ... }:
 let
-  mod = "Mod4";
+  myConfig = import ./config.nix;
 in
 {
   enable = true;
-  config = {
-    modifier = mod;
-    keybindings = lib.mkOptionDefault {
-      "${mod}+d" = "rofi -combi-modi window,drun,ssh, -show-icons -show combi -modi combi";
-      "${mod}+Enter" = "kitty";
-    };
-    startup = [
-      { command = "i3-auto-layout"; always = true; }
-    ];
-  };
+  config = myConfig;
 }
diff --git a/rofi/settings.nix b/rofi/settings.nix
index b54675e..f54329c 100644
--- a/rofi/settings.nix
+++ b/rofi/settings.nix
@@ -8,6 +8,6 @@
   theme = "gruvbox-light-hard";
   font = "CaskaydiaCove Nerd Font 12";
   extraConfig = {
-    modi = "drun,emoji,ssh,calc,window";
+    modi = "drun,ssh,calc,window";
   };
 }
diff --git a/services.nix b/services.nix
index 4369ef4..ab86ef5 100644
--- a/services.nix
+++ b/services.nix
@@ -2,11 +2,5 @@
 {
   services = {
     gnome.gnome-keyring.enable = true;
-    upower.enable = true;
-
-    dbus = {
-      enable = true;
-      packages = with pkgs; [ dconf ];
-    };
   };
 }
diff --git a/user.nix b/user.nix
index 486c54a..d65111a 100644
--- a/user.nix
+++ b/user.nix
@@ -14,6 +14,7 @@
       git
       wireguard-tools
       networkmanagerapplet
+      thunderbird
 
       # files
       xfce.thunar