diff --git a/hardware-configuration.nix b/hardware-configuration.nix
new file mode 100644
index 0000000..ce6b7e3
--- /dev/null
+++ b/hardware-configuration.nix
@@ -0,0 +1,56 @@
+# 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,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C9B2-7254";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/24ecde92-b41b-4e41-8ebc-950d321db477"; }
+  ];
+
+  # 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.enp42s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/marty-latitude.nix b/marty-latitude.nix
index d8ebe4c..5b39f64 100644
--- a/marty-latitude.nix
+++ b/marty-latitude.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  modulesPath,
   ...
 }:
 
@@ -10,41 +9,4 @@
   networking = {
     hostName = "marty-latitude";
   };
-
-  # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C8A8-A568";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/a1838708-fb00-4ecb-8010-432d06182591"; }
-    ];
-
-  # 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.wlp2s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
 }
diff --git a/modules/development/vscodium.nix b/modules/development/vscodium.nix
index 9095356..e239e80 100644
--- a/modules/development/vscodium.nix
+++ b/modules/development/vscodium.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  enable_vscodium =
+  enable_vscode =
     if config.networking.hostName == "marty-pc" then
       true
     else if config.networking.hostName == "marty-latitude" then
@@ -19,9 +19,9 @@ in
 
 {
   programs.vscode = {
-    enable = enable_vscodium;
+    enable = enable_vscode;
     package = pkgs.vscodium;
-    defaultEditor = enable_vscodium;
+    defaultEditor = enable_vscode;
     extensions = with pkgs.vscode-extensions; [
       catppuccin.catppuccin-vsc
       catppuccin.catppuccin-vsc-icons
diff --git a/user/marty.nix b/modules/user/marty.nix
similarity index 100%
rename from user/marty.nix
rename to modules/user/marty.nix
diff --git a/system/import_system.nix b/system/import_system.nix
index 3eee286..d16dbf1 100644
--- a/system/import_system.nix
+++ b/system/import_system.nix
@@ -9,7 +9,5 @@
   imports = [
     ./boot.nix
     ./shell.nix
-    ./terminal.nix
-    ./networking.nix
   ];
 }
diff --git a/system/networking.nix b/system/networking.nix
deleted file mode 100644
index de9f756..0000000
--- a/system/networking.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  networking = {
-    networkmanager.enable = true;
-    firewall = {
-      enable = true;
-      allowedUDPPorts = [ config.services.tailscale.port ];
-      trustedInterfaces = [ "tailscale0" ];
-    };
-  };
-  hardware = {
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-      settings = {
-        General = {
-          Experimental = true;
-        };
-      };
-    };
-  };
-}
-
-
-
-
-
-
-
-
diff --git a/system/shell.nix b/system/shell.nix
index d8b02d0..b43c24f 100644
--- a/system/shell.nix
+++ b/system/shell.nix
@@ -5,11 +5,6 @@
     systemPackages = with pkgs; [
       fish
       coreutils
-    ];
-  };
-  programs = {
-    fish = {
-      enable = true;
-    };
-  };
+    ]
+  }
 }
diff --git a/system/terminal.nix b/system/terminal.nix
deleted file mode 100644
index 938d0cc..0000000
--- a/system/terminal.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment = {
-    systemPackages = with pkgs; [
-      kitty
-      rofi
-    ];
-  };
-}