From d4c499fce1c2b4c9a50c0989ddd976e771557250 Mon Sep 17 00:00:00 2001
From: marty <marty@marty.tf>
Date: Tue, 16 Dec 2025 17:55:19 +0100
Subject: [PATCH] dam hardware configuration is hard

---
 hardware-configuration.nix       | 57 ++++++++++++--------------------
 system/import_system.nix         |  1 +
 system/shell.nix                 |  9 +++--
 system/terminal.nix              |  9 +++++
 {modules/user => user}/marty.nix |  0
 5 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 system/terminal.nix
 rename {modules/user => user}/marty.nix (100%)

diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index ce6b7e3..99591c4 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -1,56 +1,41 @@
 # 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,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/C9B2-7254";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  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"; }
     ];
-  };
-
-  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;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/system/import_system.nix b/system/import_system.nix
index d16dbf1..9e4ccb8 100644
--- a/system/import_system.nix
+++ b/system/import_system.nix
@@ -9,5 +9,6 @@
   imports = [
     ./boot.nix
     ./shell.nix
+    ./terminal.nix
   ];
 }
diff --git a/system/shell.nix b/system/shell.nix
index b43c24f..d8b02d0 100644
--- a/system/shell.nix
+++ b/system/shell.nix
@@ -5,6 +5,11 @@
     systemPackages = with pkgs; [
       fish
       coreutils
-    ]
-  }
+    ];
+  };
+  programs = {
+    fish = {
+      enable = true;
+    };
+  };
 }
diff --git a/system/terminal.nix b/system/terminal.nix
new file mode 100644
index 0000000..4de526d
--- /dev/null
+++ b/system/terminal.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  environment = {
+    systemPackages = with pkgs; [
+      kitty
+    ];
+  };
+}
diff --git a/modules/user/marty.nix b/user/marty.nix
similarity index 100%
rename from modules/user/marty.nix
rename to user/marty.nix