diff --git a/flake.nix b/flake.nix
index b34e1cf..f47f7d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,6 @@
       rockhole = import ./hosts/rockhole64 {inherit inputs configLib;};
       cirrus = import ./hosts/cirrus {inherit inputs configLib;};
       cirrostratus = import ./hosts/cirrostratus {inherit inputs configLib;};
-      worklaptop = import ./hosts/worklaptop {inherit inputs configLib;};
     };
 
     # Standalone home-manager configuration entrypoint
@@ -101,8 +100,7 @@
     homeConfigurations = {
       "gabe@archlaptop" = import ./hosts/home-laptop.nix {inherit inputs configLib;};
       "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs configLib;};
-      "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs configLib;};
-      "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs configLib;};
+      "gabe@gvworklaptop" = import ./hosts/work-laptop.nix {inherit inputs configLib;};
     };
 
     deploy = {
diff --git a/hosts/work-laptop.nix b/hosts/work-laptop.nix
new file mode 100644
index 0000000..c37779d
--- /dev/null
+++ b/hosts/work-laptop.nix
@@ -0,0 +1,55 @@
+{
+  inputs,
+  configLib,
+  ...
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+  extraSpecialArgs = {inherit inputs configLib;};
+  modules = [
+    ({
+      config,
+      pkgs,
+      lib,
+      configLib,
+      ...
+    }: {
+      # machine specific options
+      user = {
+        enable-speech = true;
+        git = {
+          profile = {
+            name = "Gabe Venberg";
+            email = "gabevenberg@gmail.com";
+          };
+          workProfile = {
+            enable = true;
+            email = "gabriel.venberg@assistme.io";
+          };
+        };
+      };
+      host.isLaptop = true;
+
+      targets.genericLinux.enable = true;
+      home.username = "gabe";
+      home.homeDirectory = /home/gabe;
+      imports = [
+        ../roles/home-manager/terminal.nix
+        ../roles/home-manager/music.nix
+        ../configs/home-manager/common.nix
+        ../configs/home-manager/email.nix
+        ../configs/home-manager/tiny-irc.nix
+        ../configs/home-manager/secrets.nix
+        inputs.sops-nix.homeManagerModules.sops
+      ];
+
+      sops = lib.mkIf (inputs ? nix-secrets) {
+        secrets = {
+          gmail-password.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
+          irc-cert.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
+        };
+      };
+    })
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
+}
diff --git a/hosts/worklaptop/default.nix b/hosts/worklaptop/default.nix
deleted file mode 100644
index d7df077..0000000
--- a/hosts/worklaptop/default.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  inputs,
-  configLib,
-  ...
-}:
-# Hetzner cloud multipurpouse server
-inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
-  specialArgs = {inherit inputs configLib;};
-  # > Our main nixos configuration file <
-  modules = [
-    inputs.home-manager.nixosModules.home-manager
-    inputs.disko.nixosModules.disko
-    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t14s
-    ./disk-config.nix
-    ./hardware-configuration.nix
-    ../../configs/nixos/common.nix
-    ../../configs/nixos/tailscale.nix
-    ../../configs/nixos/sshd.nix
-    ../../configs/nixos/secrets.nix
-    ../../configs/nixos/i3
-    ../../configs/nixos/sound.nix
-    ../../configs/nixos/printing.nix
-    ../../configs/nixos/touchpad.nix
-    ../../configs/nixos/syncthing.nix
-    ../../configs/nixos/interactive-networking.nix
-    ../../roles/nixos/power-saving.nix
-    ({
-      config,
-      pkgs,
-      configLib,
-      lib,
-      ...
-    }: {
-      host = {
-        user = "gabe";
-        fullName = "Gabe Venberg";
-        gui.enable = false;
-        isVm = true;
-      };
-      networking.hostName = "gvenbergworklaptop"; # Define your hostname.
-      networking.hostId = "ab8aa83e";
-
-      home-manager.sharedModules = [
-        inputs.sops-nix.homeManagerModules.sops
-      ];
-
-      home-manager.users.${config.host.user} = {
-        inputs,
-        osConfig,
-        lib,
-        ...
-      }: {
-        host = osConfig.host;
-        user = {
-          git = {
-            profile = {
-              name = config.host.fullName;
-              email = "gabevenberg@gmail.com";
-            };
-            workProfile.enable = true;
-            workProfile.email = "gabriel.venberg@assistme.io";
-          };
-        };
-        sops = lib.mkIf (inputs ? nix-secrets) {
-          secrets = {
-            gmail-password.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
-            irc-cert.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
-          };
-        };
-        imports = [
-          ../../roles/home-manager/terminal.nix
-          ../../configs/home-manager/common.nix
-          ../../configs/home-manager/secrets.nix
-          ../../roles/home-manager/music.nix
-          ../../configs/home-manager/email.nix
-          ../../configs/home-manager/tiny-irc.nix
-          inputs.nixvim.homeManagerModules.nixvim
-        ];
-      };
-
-      boot.loader.systemd-boot.enable = true;
-      boot.loader.efi.canTouchEfiVariables = true;
-      hardware.enableRedistributableFirmware = true;
-
-      # Open ports in the firewall.
-      # networking.firewall.allowedTCPPorts = [ ... ];
-      # networking.firewall.allowedUDPPorts = [ ... ];
-      # Or disable the firewall altogether.
-      # networking.firewall.enable = false;
-
-      # This value determines the NixOS release from which the default
-      # settings for stateful data, like file locations and database versions
-      # on your system were taken. It‘s perfectly fine and recommended to leave
-      # this value at the release version of the first install of this system.
-      # Before changing this value read the documentation for this option
-      # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-      system.stateVersion = "24.05"; # Did you read the comment?
-    })
-  ];
-}
diff --git a/hosts/worklaptop/disk-config.nix b/hosts/worklaptop/disk-config.nix
deleted file mode 100644
index 2765708..0000000
--- a/hosts/worklaptop/disk-config.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              priority = 1;
-              name = "ESP";
-              start = "1M";
-              end = "128M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ]; # Override existing partition
-                mountpoint = "/";
-                mountOptions = [ "compress=zstd" "noatime" ];
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hosts/worklaptop/hardware-configuration.nix b/hosts/worklaptop/hardware-configuration.nix
deleted file mode 100644
index 025a97a..0000000
--- a/hosts/worklaptop/hardware-configuration.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # 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.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wwan0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}