diff --git a/flake.lock b/flake.lock
index 5b5fa90..fbc2e7d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -471,6 +471,28 @@
         "type": "github"
       }
     },
+    "kmonad": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "nix",
+        "lastModified": 1673185501,
+        "narHash": "sha256-uEtWPpl9nH7QqochHo1z+giPga1zXR1Ko3dOXHIapFY=",
+        "owner": "kmonad",
+        "repo": "kmonad",
+        "rev": "3413f1be996142c8ef4f36e246776a6df7175979",
+        "type": "github"
+      },
+      "original": {
+        "dir": "nix",
+        "owner": "kmonad",
+        "repo": "kmonad",
+        "type": "github"
+      }
+    },
     "landingpage": {
       "inputs": {
         "flake-utils": "flake-utils_4",
@@ -858,6 +880,7 @@
         "grocy-scanner": "grocy-scanner",
         "home-manager": "home-manager",
         "home-manager-utils": "home-manager-utils",
+        "kmonad": "kmonad",
         "landingpage": "landingpage",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
diff --git a/flake.nix b/flake.nix
index b43747b..77e5cfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,10 @@
       #url = "git+file:///home/palo/dev/landingpage";
       url = "github:mrVanDalo/landingpage";
     };
+    kmonad = {
+      url = "github:kmonad/kmonad?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -89,6 +93,7 @@
     , sops-nix
     , retiolum
     , landingpage
+    , kmonad
     }:
     let
       system = "x86_64-linux";
@@ -186,7 +191,16 @@
               grocy-scanner.nixosModule
               nixos-hardware.nixosModules.framework-12th-gen-intel
               #retiolum.nixosModules.retiolum
+              #kmonad.nixosModules.default
             ];
+            # todo : check out => https://github.com/terlar/nix-config/blob/ad35fbfc20e58626eb9fbd5f67716bc07bb98fc9/home-manager/modules/profiles/user/terje/keyboards.nix
+            #services.kmonad = {
+            #  enable = false;
+            #  keyboards.laptop-keyboard = {
+            #    name = "laptop-keyboard";
+            #    device = "";
+            #  };
+            #};
 
             home-manager.users.mainUser = {
               imports = [
diff --git a/nixos/components/gui/default.nix b/nixos/components/gui/default.nix
index 8e45c4d..f164c06 100644
--- a/nixos/components/gui/default.nix
+++ b/nixos/components/gui/default.nix
@@ -6,9 +6,12 @@ with lib;
   };
 
   imports = [
+    # todo : structure with home-manager and such is not cool, create another structure
     ./xorg
     ./home-manager
     ./browser.nix
+    ./suspend.nix
+    ./pass.nix
   ];
 
   config = mkIf config.components.gui.enable {
diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix
index 8ad2a42..c65dd02 100644
--- a/nixos/machines/cream/configuration.nix
+++ b/nixos/machines/cream/configuration.nix
@@ -43,9 +43,8 @@
     };
   };
 
-  programs.custom.steam.enable = true;
   programs.custom.video.enable = false;
-
+  programs.custom.steam.enable = true;
   services.printing.enable = true;
 
   # fonts
@@ -86,11 +85,9 @@
 
   # for congress and streaming
   hardware.opengl = {
-    enable = true; # todo I actually want opengl
-    #driSupport = true;
-    #driSupport32Bit = true;
+    enable = true;
   };
 
-  system.stateVersion = "22.11"; # Did you read the comment?
+  system.stateVersion = "22.11";
 
 }
diff --git a/nixos/machines/cream/hardware-configuration.nix b/nixos/machines/cream/hardware-configuration.nix
index 4f0e964..d694a30 100644
--- a/nixos/machines/cream/hardware-configuration.nix
+++ b/nixos/machines/cream/hardware-configuration.nix
@@ -70,4 +70,5 @@
 
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
+
 }
diff --git a/nixos/machines/pepe/configuration.nix b/nixos/machines/pepe/configuration.nix
index 0bc0ea9..642d12f 100644
--- a/nixos/machines/pepe/configuration.nix
+++ b/nixos/machines/pepe/configuration.nix
@@ -34,23 +34,12 @@
 
   sops.defaultSopsFile = ../../secrets/pepe.yaml;
 
-
   networking.hostName = "pepe";
 
-  # fonts
-  # -----
-  programs.custom.urxvt.fontSize = 12;
-  programs.custom.xterm.fontSize = 12;
-  system.custom.fonts.dpi = 100;
-
-  # networking
-  # ----------
-  #system.custom.wifi = {
-  #enable = false;
-  #interfaces = [ "wlp3s0" ];
-  #configurationFile = <secrets/wpa_supplicant>;
-  #};
+  programs.custom. zsh.enable = true;
+  users.users.root.shell = pkgs.zsh;
 
+  # todo : rename to component.init.ssh
   configuration.init-ssh = {
     enable = "enabled";
     kernelModules = [ "e1000e" ];
@@ -74,7 +63,5 @@
   # todo move to some place else
   home-manager.users.mailUser.home.stateVersion = "22.11";
 
-
-
 }
 
diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix
index 2572c02..5a60707 100644
--- a/nixos/machines/robi/configuration.nix
+++ b/nixos/machines/robi/configuration.nix
@@ -70,10 +70,8 @@
 
   # Shell configuration
   # -------------------
-  programs.custom = {
-    bash.enable = true;
-    zsh.enable = true;
-  };
+  programs.custom. zsh.enable = true;
+  users.users.root.shell = pkgs.zsh;
 
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "contact@ingolf-wagner.de";
diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix
index 81a93bb..e8848d6 100644
--- a/nixos/machines/sterni/configuration.nix
+++ b/nixos/machines/sterni/configuration.nix
@@ -2,6 +2,7 @@
 
   imports = [
 
+    ../../components
     ../../system/desktop
     ../../system/server/netdata.nix
 
@@ -18,10 +19,10 @@
 
   ];
 
+  components.gui.enable = true;
 
   services.nginx.enable = true;
 
-
   #sops.defaultSopsFile = ../../secrets/sterni.yaml;
   networking.hostName = "sterni";
 
@@ -47,11 +48,12 @@
 
   services.printing.enable = true;
 
+  home-manager.users.mainUser.home.stateVersion = "22.11";
+
   # fonts
   # -----
   programs.custom.urxvt.fontSize = 12;
   programs.custom.xterm.fontSize = 12;
-  system.custom.fonts.dpi = 100;
 
   virtualisation = {
     docker.enable = true;
diff --git a/nixos/modules/programs/shell-zsh.nix b/nixos/modules/programs/shell-zsh.nix
index af9d10e..0ac83f6 100644
--- a/nixos/modules/programs/shell-zsh.nix
+++ b/nixos/modules/programs/shell-zsh.nix
@@ -1,17 +1,12 @@
 { config, pkgs, lib, ... }:
-
 with lib;
-
 let
-
   cfg = config.programs.custom.zsh;
-
 in
 {
 
   options.programs.custom.zsh = {
     enable = mkEnableOption "enable zsh";
-
     mainUser = mkOption {
       type = with types; nullOr str;
       default = null;
@@ -19,7 +14,6 @@ in
         the main User if available
       '';
     };
-
   };
 
   config = mkIf cfg.enable {