diff --git a/services/default.nix b/services/default.nix
index 8fa267b..59263b0 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -6,7 +6,5 @@
     ./nextcloud.nix
     ./owncast.nix
     ./uptime-kuma.nix
-#   ./iceshrimp.nix
-    ./inspircd.nix
   ];
 }
diff --git a/services/iceshrimp.nix b/services/iceshrimp.nix
deleted file mode 100644
index 9c35865..0000000
--- a/services/iceshrimp.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ inputs, ... }:
-
-{
-  services = {
-    iceshrimp = {
-      enable = true; # Actually enable the module
-      createDb = true;
-      configureNginx.enable = false; 
-      stateDir = "/var/lib/iceshrimp";
-      mediaDir = "/var/lib/iceshrimp/files";
-      settings = {
-        url = "https://mastodon.hermitcollective.net";
-        maxNoteLength = 35124; # Length of the GPL3 + long;
-        maxCaptionLength = 5000; # We did it HermitCollective!! We solved accesibility!
-      };
-    };
-
-    nginx.virtualHosts."mastodon.hermitcollective.net" = {
-      forceSSL = true;
-      enableACME = true;
-      locations."/" = {
-        proxyPass = "http://localhost:3000";
-        proxyWebsockets = true; # needed if you need to use WebSocket
-        extraConfig =
-          # required when the target is also TLS server with multiple hosts
-          "proxy_ssl_server_name on;" +
-          # required when the server wants to use HTTP Authentication
-          "proxy_pass_header Authorization;"
-          ;
-      };
-    };
-  };
-}
diff --git a/services/inspircd.nix b/services/inspircd.nix
deleted file mode 100644
index 2d21cb2..0000000
--- a/services/inspircd.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.inspircd = {
-    enable = true;
-    package = pkgs.inspircd;
-    config = builtins.readFile "/etc/inspircd.conf";
-  };
-}
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index cfb662a..b476b4f 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -6,7 +6,12 @@
     package = pkgs.nextcloud28;
     appstoreEnable = true;
     hostName = "cloud.hermitcollective.net";
-    config.adminpassFile = "/etc/nextcloud-admin-pass";
+    config = {
+	adminpassFile = "/etc/nextcloud-admin-pass";
+	dbhost = "192.168.178.193";
+	dbtype = "pgsql";
+	dbpassFile = "/etc/nextcloud-db-pass";
+    };
     https = true;
   };
   services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
diff --git a/services/tt-rss.nix b/services/tt-rss.nix
index 724104f..3033eaa 100644
--- a/services/tt-rss.nix
+++ b/services/tt-rss.nix
@@ -1,26 +1,17 @@
 {
   services.tt-rss = {
-    enable = true;                                           # Enable TT-RSS
-    database = {                                             # Configure the database
-      type = "pgsql";                                        # Database type
-      passwordFile = "/etc/tt-rss-pass";                     # Where to find the password
+    enable = true;                                           
+    database = {
+      host = "192.168.178.193";                                       
+      type = "pgsql";                                        
+      passwordFile = "/etc/tt-rss-pass";                     
     };
     email = {
-      fromAddress = "feeds@hermitcollective.net"; # Address for outgoing email
-      fromName = "Feeds from HermitCollective";   # Display name for outgoing email
+      fromAddress = "feeds@hermitcollective.net"; 
+      fromName = "Feeds from HermitCollective";   
     };
-    selfUrlPath = "https://feeds.hermitcollective.net/"; # Root web URL
-    virtualHost = "feeds.hermitcollective.net";          # Setup a virtualhost
-  };
-
-  services.postgresql = {
-    enable = true;                            # Ensure postgresql is enabled
-    authentication = ''
-      local tt_rss all ident map=tt_rss-users
-    '';
-    identMap = ''                              
-        tt_rss-users tt_rss tt_rss
-      '';
+    selfUrlPath = "https://feeds.hermitcollective.net/"; 
+    virtualHost = "feeds.hermitcollective.net";          
   };
 
   services.nginx.virtualHosts."feeds.hermitcollective.net" = {                              
diff --git a/sites/default.nix b/sites/default.nix
index 991876d..fecc88c 100644
--- a/sites/default.nix
+++ b/sites/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./hermitcollective.net
-    ./irc.hermitcollective.net
+#   ./irc.hermitcollective.net
     ./blog.hermitcollective.net
     ./hertog.hermitcollective.net
   ];
diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index 15fb640..39147da 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -5,12 +5,12 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
@@ -18,11 +18,6 @@
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B7A8-E52E";
-      fsType = "vfat";
-    };
-
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -30,9 +25,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/system/packages.nix b/system/packages.nix
index 4043259..cbb896e 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -9,6 +9,7 @@
       git
       btop
       wget
+      zulu
     ];
   };
 }
diff --git a/users/default.nix b/users/default.nix
index e7768f4..6a55aa2 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./hertog.nix
     ./sara.nix
+    ./jo.nix
   ];
 }
diff --git a/users/jo.nix b/users/jo.nix
new file mode 100644
index 0000000..10589f8
--- /dev/null
+++ b/users/jo.nix
@@ -0,0 +1,12 @@
+{
+  users.users.jo = {
+    initialPassword = "";
+    isNormalUser = true;
+    description = "Jo";
+    extraGroups = [ "networkmanager" "wheel" "sudo" "adm" "video" "audio" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIF+U7vBUNxPIOdnFOZ29QWCeYMKNYoeoNC93XXKtbQK jo@jo.wtf"
+    ];
+  };
+}
+