diff --git a/configuration.nix b/configuration.nix
index be089b1..3cc4281 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,11 +10,11 @@
     efi.canTouchEfiVariables = true;
   };
 
-  # Define your hostname.
-  networking.hostName = "eliasLaptop";
-
-  # Use NetworkManager for networking.
-  networking.networkmanager.enable = true;
+  # Chose NetworkManager and hostname.
+  networking = {
+    hostName = "eliasLaptop";
+    networkmanager.enable = true;
+  };
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
@@ -23,39 +23,37 @@
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
     font = "Lat2-Terminus16";
-    useXkbConfig = true; # use xkb.options in tty.
-  };
-
-  services.xserver = {
-    enable = true;
-    displayManager = {
-      sddm = {
-        enable = true;
-        theme = "catppuccin-mocha";
-      };
-      defaultSession = "none+xmonad";
-    };
-    windowManager.xmonad = { enable = true; };
-    xkb = { layout = "de"; };
+    # Use xkb.options in tty.
+    useXkbConfig = true;
   };
 
+  # Activate Flakes.
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
   # Enable sound.
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  services = {
+    # Set XServer Options.
+    xserver = {
+      enable = true;
+      displayManager = {
+        sddm = {
+          enable = true;
+          theme = "catppuccin-mocha";
+        };
+        defaultSession = "none+xmonad";
+      };
+      libinput.enable = true; # Enable touchpad.
+      windowManager.xmonad.enable = true;
+      xkb.layout = "de";
+    };
+    # Enable CUPS to print.
+    printing.enable = true;
+  };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
+  # Define a user account.
   users = {
     mutableUsers = false;
     users.elias = {
@@ -68,6 +66,7 @@
     };
   };
 
+  # Basic Packages.
   environment.systemPackages = with pkgs; [
     (libsForQt5.callPackage ./home/themes/catppuccin-sddm.nix { })
 
@@ -77,6 +76,7 @@
     alacritty
     dmenu
   ];
+
   # Enable zsh for setting it as shell for users.
   programs.zsh.enable = true;
 
diff --git a/flake.nix b/flake.nix
index dbadc07..99614ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "My chaos NixOS flake";
+  description = "My NixOS Flake";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
@@ -8,12 +8,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # The xmonad-contrib flake depends upon and re-exports from the xmonad
-    # flake. As such, you don't need to use the latter directly. If you wish to
-    # use /only/ the xmonad flake, you should beware that the version of
-    # contrib you get from nixpkgs might not build against it.
     xmonad-contrib.url = "github:xmonad/xmonad-contrib";
-
   };
 
   inputs.neovim-nightly-overlay.url =
@@ -26,9 +21,11 @@
           ./configuration.nix
           home-manager.nixosModules.home-manager
           {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.elias = import ./home/default.nix;
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.elias = import ./home/default.nix;
+            };
             nixpkgs.overlays = [ inputs.neovim-nightly-overlay.overlay ];
           }
         ];
diff --git a/home/default.nix b/home/default.nix
index 93c198f..048b9c4 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -18,7 +18,7 @@
       lm_sensors
 
       # extras
-      openssh
+      #    openssh
       #betterbird
       #bitwarden
       # dropbox
diff --git a/home/programs/alacritty/default.nix b/home/programs/alacritty/default.nix
index 4cc1c11..133d112 100644
--- a/home/programs/alacritty/default.nix
+++ b/home/programs/alacritty/default.nix
@@ -9,7 +9,7 @@
       env = { "TERM" = "xterm-256color"; };
 
       font = {
-        size = 10;
+        size = 9;
         normal.family = "Fira Code";
         bold.family = "Fira Code";
         italic.family = "Fira Code";
diff --git a/home/programs/zsh/default.nix b/home/programs/zsh/default.nix
index b8aa648..a295965 100644
--- a/home/programs/zsh/default.nix
+++ b/home/programs/zsh/default.nix
@@ -1,16 +1,9 @@
 { pkgs, config, ... }:
 
 {
-  home.packages = with pkgs; [
-    #zsh
-    fzf
-    python3
-    zsh-nix-shell
-    nix-zsh-completions
-  ];
+  home.packages = with pkgs; [ fzf python3 zsh-nix-shell nix-zsh-completions ];
 
   programs.zsh = {
-    enable = true;
     dotDir = ".config/zsh";
     shellAliases = { update = "sudo nixos-rebuild switch"; };
     enableAutosuggestions = true;
diff --git a/home/services/default.nix b/home/services/default.nix
index fb073c2..3b635dc 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -1,5 +1 @@
-{
-  imports = [
-    ./ssh-agent.nix
-  ];
-}
+{ imports = [ ./openssh.nix ./ssh-agent.nix ]; }
diff --git a/home/services/ssh.nix b/home/services/openssh.nix
similarity index 80%
rename from home/services/ssh.nix
rename to home/services/openssh.nix
index d6f5028..c781d45 100644
--- a/home/services/ssh.nix
+++ b/home/services/openssh.nix
@@ -2,9 +2,7 @@
 
 {
   services = {
-    ssh-agent = {
-      enable = true;
-    };
+    ssh-agent = { enable = true; };
     openssh = {
       enable = true;
       settings = {
diff --git a/home/services/ssh-agent.nix b/home/services/ssh-agent.nix
index 50c1653..4ad4f40 100644
--- a/home/services/ssh-agent.nix
+++ b/home/services/ssh-agent.nix
@@ -1,8 +1,6 @@
 { ... }:
 
 {
-  services.ssh-agent = {
-    enable = true;
-  };
+  services.ssh-agent = { enable = true; };
 }