diff --git a/common/tooling/default.nix b/common/tooling/default.nix
index 04ed1f9..9b6ebe2 100644
--- a/common/tooling/default.nix
+++ b/common/tooling/default.nix
@@ -85,7 +85,7 @@ in
     services.dbus.implementation = "broker";
 
     boot.tmp.cleanOnBoot = true;
-    zramSwap.enable = false;
+   # zramSwap.enable = false;
   };
 
   options.grimmShared.tooling = {
diff --git a/flake.lock b/flake.lock
index 19461fe..ce801eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -362,16 +362,17 @@
         ]
       },
       "locked": {
-        "dirtyRev": "0d7908bd09165db6699908b7e3970f137327cbf0-dirty",
-        "dirtyShortRev": "0d7908bd-dirty",
-        "lastModified": 1736013363,
-        "narHash": "sha256-1UN8758BA6XDgte9AfHu5fZ35zqVPPq3GGuca3JJOZU=",
+        "lastModified": 1736941558,
+        "narHash": "sha256-Q7o9lUoKqw94IhmlhwguhPZX9AJNLnkVb56XHa0W5/I=",
+        "ref": "refs/heads/master",
+        "rev": "1ffbc5166cf74f9e5342fca7e3f2257c8d96b5df",
+        "revCount": 3997,
         "type": "git",
-        "url": "file:///home/grimmauld/coding/home-manager"
+        "url": "https://git.grimmauld.de/Grimmauld/home-manager"
       },
       "original": {
         "type": "git",
-        "url": "file:///home/grimmauld/coding/home-manager"
+        "url": "https://git.grimmauld.de/Grimmauld/home-manager"
       }
     },
     "jovian": {
diff --git a/flake.nix b/flake.nix
index 5fe6211..77e5b4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,8 @@
       # https://github.com/nix-community/home-manager/issues/3415
       # https://github.com/nix-community/home-manager/pull/2548
       # url = "github:nix-community/home-manager";
-      url = "git+file:///home/grimmauld/coding/home-manager";
+      # url = "git+file:///home/grimmauld/coding/home-manager";
+      url = "git+https://git.grimmauld.de/Grimmauld/home-manager";
       # url = "github:pasqui23/home-manager/nixos-late-start";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -150,6 +151,21 @@
             ./modules
           ];
         };
+        grimm-nixos-server-2 = customNixosSystem "x86_64-linux" {
+          modules = [
+            agenix.nixosModules.default
+            # agenix.nixosModules.default
+            # nixos-matrix-modules.nixosModules.default
+            # nixos-mailserver.nixosModules.default
+
+            ./configuration.nix
+
+            ./specific/grimm-nixos-server-2/configuration.nix
+            # ./modules
+            home-manager.nixosModules.home-manager
+            ./hm
+          ];
+        };
       };
     };
 }
diff --git a/hm/grimmauld/default.nix b/hm/grimmauld/default.nix
index 6268946..0714b8b 100644
--- a/hm/grimmauld/default.nix
+++ b/hm/grimmauld/default.nix
@@ -7,8 +7,8 @@ in
       inherit username;
       homeDirectory = "/home/${username}";
 
-      file.".ssh/id_ed25519_sk".source = ../../ssh/id_ed25519_sk;
-      file.".ssh/id_ed25519_sk.pub".source = ../../ssh/id_ed25519_sk.pub;
+#      file.".ssh/id_ed25519_sk".source = ../../ssh/id_ed25519_sk;
+#      file.".ssh/id_ed25519_sk.pub".source = ../../ssh/id_ed25519_sk.pub;
       file.".cups/lpoptions".text = "Default pdf\n";
     };
   };
diff --git a/specific/grimm-nixos-server-2/configuration.nix b/specific/grimm-nixos-server-2/configuration.nix
new file mode 100644
index 0000000..0e56021
--- /dev/null
+++ b/specific/grimm-nixos-server-2/configuration.nix
@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }: {
+  imports = [
+    ./hardware-configuration.nix    
+  ];
+
+  environment.systemPackages = with pkgs; [
+    helix
+  ];
+
+  programs.git.enable = true;
+  programs.nh.flake = lib.mkForce "/home/grimmauld/grimm-nixos-laptop";
+
+  boot.tmp.cleanOnBoot = true;
+  zramSwap.enable = true;
+  networking.hostName = "grimm-nixos-server-2";
+  networking.domain = "grimmauld.de";
+  services.openssh.enable = true;
+  users.users.root.openssh.authorizedKeys.keys = [''sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMgGKExPve3tsl0/kjV5rCo5wb46CapnUaA1ZdZWpgXTAAAAC3NzaDpnZW5lcmFs grimmauld@grimm-nixos-ssd'' ];
+  system.stateVersion = "23.11";
+}
diff --git a/specific/grimm-nixos-server-2/hardware-configuration.nix b/specific/grimm-nixos-server-2/hardware-configuration.nix
new file mode 100644
index 0000000..5e7b44e
--- /dev/null
+++ b/specific/grimm-nixos-server-2/hardware-configuration.nix
@@ -0,0 +1,9 @@
+{ modulesPath, ... }:
+{
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+  boot.loader.grub.device = "/dev/sda";
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+  boot.initrd.kernelModules = [ "nvme" ];
+  fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
+  
+}