From 58c421383c56a82907756d65cf1ad73872ba8069 Mon Sep 17 00:00:00 2001
From: Alex Davies <traverse.da@gmail.com>
Date: Sat, 11 May 2024 10:47:11 +0000
Subject: [PATCH] Hardware configuration

---
 flake.nix                        |  2 +-
 nixos/configuration.nix          |  3 ++-
 nixos/hardware-configuration.nix | 10 --------
 nixos/hardware/athame.nix        | 40 ++++++++++++++++++++++++++++++++
 nixos/kde-desktop.nix            |  5 ++--
 5 files changed, 46 insertions(+), 14 deletions(-)
 delete mode 100644 nixos/hardware-configuration.nix
 create mode 100644 nixos/hardware/athame.nix

diff --git a/flake.nix b/flake.nix
index bef3df2..6a9aa0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,7 +83,7 @@
     # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
       # FIXME replace with your username@hostname
-      "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
+      "traverseda@athame" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index c129bbf..3ca692f 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -14,7 +14,7 @@
     # ./users.nix
 
     # Import your generated (nixos-generate-config) hardware configuration
-    ./hardware-configuration.nix
+    ./hardware/${specialArgs.hostname}.nix
   ];
 
   nixpkgs = {
@@ -43,6 +43,7 @@
   };
 
   networking.hostName = specialArgs.hostname; # Define your hostname.
+  networking.networkmanager.enable = true;
 
   # This will add each flake input as a registry
   # To make nix3 commands consistent with your flake
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
deleted file mode 100644
index dd00939..0000000
--- a/nixos/hardware-configuration.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is just an example, you should generate yours with nixos-generate-config and put it in here.
-{
-  fileSystems."/" = {
-    device = "/dev/sda1";
-    fsType = "ext4";
-  };
-
-  # Set your system kind (needed for flakes)
-  nixpkgs.hostPlatform = "x86_64-linux";
-}
diff --git a/nixos/hardware/athame.nix b/nixos/hardware/athame.nix
new file mode 100644
index 0000000..656b8f7
--- /dev/null
+++ b/nixos/hardware/athame.nix
@@ -0,0 +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, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/91d9a91c-9c69-4d82-85dc-42598b9ceaec";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/BED6-71B3";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/693adc19-c9d6-43a2-8e80-044f93a73af9"; }
+    ];
+
+  # 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.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix
index c4cdc95..786587b 100644
--- a/nixos/kde-desktop.nix
+++ b/nixos/kde-desktop.nix
@@ -8,8 +8,8 @@
   services.displayManager.sddm.wayland.enable = true;
   services.displayManager.defaultSession = "plasma";
 
-  boot.plymouth.enable = true;
-  boot.plymouth.theme="breeze";
+  #boot.plymouth.enable = true;
+  #boot.plymouth.theme="breeze";
 
   hardware.opengl.enable = true;
 
@@ -27,6 +27,7 @@
     pkgs.openscad
     pkgs.inkscape
     pkgs.blender
+    pkgs.freecad
     pkgs.gimp
     pkgs.krita
   ];