From bfbc64b611592f6507679e7b9fc3ea2be0bd92a5 Mon Sep 17 00:00:00 2001
From: marty <marty@marty.tf>
Date: Tue, 16 Dec 2025 21:18:31 +0000
Subject: [PATCH] oh wow it's actually functional now

and so fast

vroom vrooom
---
 hardware-configuration.nix       | 41 --------------------------------
 marty-latitude.nix               | 38 +++++++++++++++++++++++++++++
 modules/development/vscodium.nix |  6 ++---
 system/import_system.nix         |  1 +
 system/networking.nix            | 31 ++++++++++++++++++++++++
 system/terminal.nix              |  1 +
 6 files changed, 74 insertions(+), 44 deletions(-)
 delete mode 100644 hardware-configuration.nix
 create mode 100644 system/networking.nix

diff --git a/hardware-configuration.nix b/hardware-configuration.nix
deleted file mode 100644
index 99591c4..0000000
--- a/hardware-configuration.nix
+++ /dev/null
@@ -1,41 +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, ... }:
-
-{
-  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/marty-latitude.nix b/marty-latitude.nix
index 5b39f64..d8ebe4c 100644
--- a/marty-latitude.nix
+++ b/marty-latitude.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  modulesPath,
   ...
 }:
 
@@ -9,4 +10,41 @@
   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 e239e80..9095356 100644
--- a/modules/development/vscodium.nix
+++ b/modules/development/vscodium.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  enable_vscode =
+  enable_vscodium =
     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_vscode;
+    enable = enable_vscodium;
     package = pkgs.vscodium;
-    defaultEditor = enable_vscode;
+    defaultEditor = enable_vscodium;
     extensions = with pkgs.vscode-extensions; [
       catppuccin.catppuccin-vsc
       catppuccin.catppuccin-vsc-icons
diff --git a/system/import_system.nix b/system/import_system.nix
index 9e4ccb8..3eee286 100644
--- a/system/import_system.nix
+++ b/system/import_system.nix
@@ -10,5 +10,6 @@
     ./boot.nix
     ./shell.nix
     ./terminal.nix
+    ./networking.nix
   ];
 }
diff --git a/system/networking.nix b/system/networking.nix
new file mode 100644
index 0000000..de9f756
--- /dev/null
+++ b/system/networking.nix
@@ -0,0 +1,31 @@
+{ 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/terminal.nix b/system/terminal.nix
index 4de526d..938d0cc 100644
--- a/system/terminal.nix
+++ b/system/terminal.nix
@@ -4,6 +4,7 @@
   environment = {
     systemPackages = with pkgs; [
       kitty
+      rofi
     ];
   };
 }