From a9aee64bc69e25c43fdcf2dc20b6a40c5b3f70d6 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jurnwubben@gmail.com>
Date: Thu, 27 Mar 2025 19:31:42 +0000
Subject: [PATCH] Lapserv hardwareconfig. neovim to default packages.

---
 hosts/lapserv/hardware-configuration.nix | 50 +++++++++++-------------
 system/core/default.nix                  |  1 +
 system/core/defaultPackages.nix          |  4 +-
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/hosts/lapserv/hardware-configuration.nix b/hosts/lapserv/hardware-configuration.nix
index e7192b8..07af40e 100644
--- a/hosts/lapserv/hardware-configuration.nix
+++ b/hosts/lapserv/hardware-configuration.nix
@@ -1,44 +1,40 @@
 # 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" "thunderbolt" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/59540469-ecb9-4a68-829b-4cd3ad6e95c3";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/83C9-84B1";
-    fsType = "vfat";
-    options = ["fmask=0077" "dmask=0077"];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0BEA-7525";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/65190d84-4e34-4905-a317-d750591933e2";}
-  ];
+  swapDevices = [ ];
 
   # 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.wlp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.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/core/default.nix b/system/core/default.nix
index cfc0580..7d17299 100644
--- a/system/core/default.nix
+++ b/system/core/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./boot.nix
     ./users.nix
+    ./defaultPackages.nix
   ];
 }
diff --git a/system/core/defaultPackages.nix b/system/core/defaultPackages.nix
index e03f027..6748032 100644
--- a/system/core/defaultPackages.nix
+++ b/system/core/defaultPackages.nix
@@ -1,3 +1,3 @@
-{
-  environment.defaultPackages = [];
+{pkgs,...}: {
+  environment.defaultPackages = [pkgs.neovim]; # Still have to be able to edit configs.
 }