From c97a5887dfa15901ede8cfa21dfa763e8fbf4982 Mon Sep 17 00:00:00 2001
From: kenji <kenji@hakase>
Date: Mon, 7 Jul 2025 16:25:40 -0500
Subject: [PATCH] test

---
 config.nix                              |  2 +-
 hosts/hakase/configuration.nix          | 11 +++++++++--
 hosts/hakase/hardware-configuration.nix |  8 +-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config.nix b/config.nix
index ba129b7..9b1cddc 100644
--- a/config.nix
+++ b/config.nix
@@ -20,7 +20,7 @@
       Timezone = "America/Chicago";
 
       Boot = {
-        mode = "grub"; # systemd or grub
+        mode = "systemd"; # systemd or grub
       };
       Gaming = {
         enable = true;
diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix
index a9debf9..162ecce 100644
--- a/hosts/hakase/configuration.nix
+++ b/hosts/hakase/configuration.nix
@@ -3,6 +3,7 @@
   myConfig,
   inputs,
   lib,
+  specialArgs,
   ...
 }: {
   imports = [
@@ -27,8 +28,10 @@
     };
   };
   home-manager = {
+    backupFileExtension = "backup";
     useGlobalPkgs = true;
     useUserPackages = true;
+    extraSpecialArgs = specialArgs;
     users.${myConfig.essentials.Username} = import ../../home/hakase.nix;
   };
 
@@ -44,18 +47,21 @@
 
   boot.loader = {
     systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") {
-      enable = false;
+      enable = true;
     };
     grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") {
+      efiSupport = true;
       enable = true;
       device = "nodev";
+      useOSProber = true;
     };
     efi = {
       canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot";
     };
   };
 
-  programs.ssh.extraConfig = myConfig.general.ssh.extraConfig;
+  programs.ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
 
   programs.bash = {
     interactiveShellInit = ''
@@ -104,6 +110,7 @@
   };
 
   networking = {
+    networkmanager.enable = true;
     firewall = {
       enable = false;
       allowedTCPPorts = [22 80];
diff --git a/hosts/hakase/hardware-configuration.nix b/hosts/hakase/hardware-configuration.nix
index 40341fe..f252abb 100644
--- a/hosts/hakase/hardware-configuration.nix
+++ b/hosts/hakase/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -19,12 +19,6 @@
       options = [ "subvol=@" ];
     };
 
-  fileSystems."/nix/store" =
-    { device = "/@/nix/store";
-      fsType = "none";
-      options = [ "bind" ];
-    };
-
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/1368-D3F3";
       fsType = "vfat";