diff --git a/flake.lock b/flake.lock
index aee0626..b922e6d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725001927,
-        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
+        "lastModified": 1728067476,
+        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
+        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a48e92c..6926d06 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
         specialArgs = { inherit inputs; };
         modules = [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
           ./hosts/laptop
         ];
       };
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index b87da0f..4e84fb3 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -22,6 +22,8 @@
     ../../modules/system/hardware/laptop.nix
     ../../modules/system/hardware/locale.nix
     ../../modules/system/hardware/printing.nix
+    ../../modules/system/hardware/fprint.nix
+    ../../modules/system/hardware/virt.nix
   ];
 
   nix.settings = {
@@ -57,6 +59,7 @@
   };
 
   services.libinput.enable = true;
+  services.fwupd.enable = true;
 
   system.stateVersion = "24.05";
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 00e8eb5..2ab17ad 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -38,17 +38,22 @@
       kdenlive
       unstable.prismlauncher
       unstable.joplin-desktop
-      unstable.moonlight-qt
       unstable.prusa-slicer
       signal-desktop
       unstable.vesktop
-      unstable.rnote
       unstable.blender
-      unstable.openscad-unstable
+      loupe
+      unstable.bottles
+
+      # Systemverilog
+      unstable.gtkwave
+      unstable.verilator
+      gnumake
 
       # Office
       libreoffice
-      unstable.onlyoffice-bin
+      onlyoffice-bin
+      papers
 
       # Image editing
       gimp
diff --git a/hosts/vnix-ctr/default.nix b/hosts/vnix-ctr/default.nix
deleted file mode 100644
index 18ffb29..0000000
--- a/hosts/vnix-ctr/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/podman.nix
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
-  # Bootloader
-  boot.loader.grub = {
-    enable = true;
-    device = "/dev/sda";
-    useOSProber = true;
-  };
-
-  # Networking
-  networking.networkmanager.enable = true;
-
-  networking.firewall = {
-    allowedTCPPorts = [ 80 443 1080 ];
-    allowedUDPPorts = [ 53 ];
-  };
-
-  # Configure user
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
-  };
-
-  system.stateVersion = "24.05";
-
-}
diff --git a/hosts/vnix-ctr/home.nix b/hosts/vnix-ctr/home.nix
deleted file mode 100644
index 191f5aa..0000000
--- a/hosts/vnix-ctr/home.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    # GUI
-    ../../modules/home/gui/theming.nix
-  
-    # CLI
-    ../../modules/home/cli/common
-  ];
-
-  guiTheming.enable = false;  
-
-  home = {
-    username = "xeovalyte";
-    homeDirectory = "/home/xeovalyte";
-  };
-
-  home.stateVersion = "24.05";
-}
diff --git a/modules/home/cli/common/helix.nix b/modules/home/cli/common/helix.nix
index 7f809f1..df4e1f0 100644
--- a/modules/home/cli/common/helix.nix
+++ b/modules/home/cli/common/helix.nix
@@ -3,6 +3,9 @@
 {
   home.packages = with pkgs; [
     unstable.marksman
+    unstable.svls
+    unstable.nil
+    unstable.nixpkgs-fmt
   ];
 
   programs.helix = {
@@ -16,11 +19,28 @@
       };
     };
     languages = {
+      # Rust
       language-server.rust-analyzer.config = {
         cargo = {
           features = "all";
         };
       };
+
+      # Systemverilog
+      language-server.svls = {
+        command = "svls";
+      };
+
+      language = [
+        {
+          name = "verilog";
+          language-servers = [ "svls" ];
+        }
+        {
+          name = "nix";
+          language-servers = [ "svls" ];
+        }
+      ];
     };
     themes = {
       base16 = let
diff --git a/modules/home/gui/common/firefox.nix b/modules/home/gui/common/firefox.nix
index 08cf548..d3f142f 100644
--- a/modules/home/gui/common/firefox.nix
+++ b/modules/home/gui/common/firefox.nix
@@ -1,6 +1,11 @@
 { inputs, pkgs, ... }:
 
 {
+  # about:policies
+  # Check about:support for extension/add-on ID strings.
+  # Check about:config for options.
+  
+
   home.packages = with pkgs; [
     unstable.firefoxpwa
   ];
@@ -42,6 +47,31 @@
       };
     };
     profiles.xeovalyte = {
+      bookmarks = [
+        {
+          name = "Toolbar";
+          toolbar = true;
+          bookmarks = [
+            {
+              name = "Brightspace";
+              bookmarks = [
+                {
+                  name = "LCA";
+                  url = "https://brightspace.tudelft.nl/d2l/le/content/681008/Home";
+                }
+                {
+                  name = "DSA";
+                  url = "https://brightspace.tudelft.nl/d2l/le/content/681012/Home";
+                }
+                {
+                  name = "iEE";
+                  url = "https://brightspace.tudelft.nl/d2l/le/content/681018/Home";
+                }
+              ];
+            }
+          ];
+        }
+      ];
       search.engines = {
         "Nix" = {
           urls = [{
@@ -93,7 +123,7 @@
         "browser.shell.defaultBrowserCheckCount" = 1;
         "dom.security.https_only_mode" = true;
         "privacy.trackingProtection.enabled" = true;
-        "browser.toolbars.bookmarks.visibility" = "never";
+        "browser.toolbars.bookmarks.visibility" = "newtab";
         "browser.translations.neverTranslateLanguages" = "nl";
         "browser.newtabpage.pinned" = [
           {
diff --git a/modules/system/cli/common.nix b/modules/system/cli/common.nix
index fba7103..582f7bc 100644
--- a/modules/system/cli/common.nix
+++ b/modules/system/cli/common.nix
@@ -4,7 +4,7 @@
   environment.systemPackages = with pkgs; [
     usbutils
     tree
-    neofetch
+    fastfetch
     btop
     git
   ];
diff --git a/modules/system/gui/hyprland.nix b/modules/system/gui/hyprland.nix
index 279e821..b718491 100644
--- a/modules/system/gui/hyprland.nix
+++ b/modules/system/gui/hyprland.nix
@@ -31,7 +31,6 @@
   };
 
   # Sound configuration
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/modules/system/hardware/firewall.nix b/modules/system/hardware/firewall.nix
index 40f5b1c..361d97b 100644
--- a/modules/system/hardware/firewall.nix
+++ b/modules/system/hardware/firewall.nix
@@ -3,7 +3,7 @@
 {
   networking.firewall = {
     enable = true;
-    allowedTCPPorts = [ 53317 3000 ];
-    allowedUDPPorts = [ 53317 ];
+    allowedTCPPorts = [ 53317 3000 24800 ];
+    allowedUDPPorts = [ 53317 24800 ];
   };
 }
diff --git a/modules/system/hardware/fprint.nix b/modules/system/hardware/fprint.nix
index 3ac4f77..ed90b20 100644
--- a/modules/system/hardware/fprint.nix
+++ b/modules/system/hardware/fprint.nix
@@ -3,31 +3,5 @@
 {
   services.fprintd.enable = true;
 
-  security.pam.services.hyprlock = {
-    text = ''
-      auth  sufficient  pam_unix.so try_first_pass likeauth nullok
-      auth  sufficient  ${pkgs.fprintd}/lib/security/pam_fprintd.so
-      auth  include     login
-    '';
-  };
-
-  security.pam.services.greetd = {
-    text = ''
-      account required pam_unix.so # unix (order 10900)
-
-      # Authentication management.
-      auth sufficient pam_unix.so likeauth nullok try_first_pass # unix (order 11600)
-      auth sufficient /nix/store/bz12s6mba297725i9y35p73lvsic8gd3-fprintd-1.94.2/lib/security/pam_fprintd.so # fprintd (order 11400)
-      auth required pam_deny.so # deny (order 12400)
-
-      # Password management.
-      password sufficient pam_unix.so nullok yescrypt # unix (order 10200)
-
-      # Session management.
-      session required pam_env.so conffile=/etc/pam/environment readenv=0 # env (order 10100)
-      session required pam_unix.so # unix (order 10200)
-      session required pam_loginuid.so # loginuid (order 10300)
-      session optional /nix/store/dzp7d4k1d94s1x49p9171mvcsfyxr7bj-systemd-254.6/lib/security/pam_systemd.so # systemd (order 12000)   login
-    '';
-  };
+  security.pam.services.login.fprintAuth = false;
 }
diff --git a/modules/system/hardware/laptop.nix b/modules/system/hardware/laptop.nix
index 29d47ac..48dbd88 100644
--- a/modules/system/hardware/laptop.nix
+++ b/modules/system/hardware/laptop.nix
@@ -1,17 +1,17 @@
 { ... }:
 
 {
-  services.auto-cpufreq.enable = true;
-  services.auto-cpufreq.settings = {
-    battery = {
-      governor = "powersave";
-      turbo = "never";
-    };
-    charger = {
-      governor = "performance";
-      turbo = "auto";
-    };
-  };
+  # services.auto-cpufreq.enable = true;
+  # services.auto-cpufreq.settings = {
+  #   battery = {
+  #     governor = "powersave";
+  #     turbo = "never";
+  #   };
+  #   charger = {
+  #     governor = "performance";
+  #     turbo = "auto";
+  #   };
+  # };
 
   services.power-profiles-daemon.enable = true;
 
diff --git a/modules/system/hardware/virt.nix b/modules/system/hardware/virt.nix
new file mode 100644
index 0000000..a08d6f9
--- /dev/null
+++ b/modules/system/hardware/virt.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  virtualisation.libvirtd.enable = true;
+  programs.virt-manager.enable = true;
+
+  users.users.xeovalyte.extraGroups = [ "libvirtd" ];
+
+  environment.systemPackages = with pkgs; [
+    quickemu
+  ];
+}