From 05701706bede2ddd576dfdd9e34c4a0f1f310498 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 19 Feb 2025 11:57:58 -0600
Subject: [PATCH] fix: some wifi enabling wrong for some hosts, slippi defaults

---
 lib/modules/home/default.nix | 15 ++++++++++++++-
 packages/hosts/bigtower.nix  |  4 +---
 packages/hosts/default.nix   |  1 +
 packages/hosts/rascal.nix    | 36 +++++++++---------------------------
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/lib/modules/home/default.nix b/lib/modules/home/default.nix
index 8d238ed..ae419ce 100644
--- a/lib/modules/home/default.nix
+++ b/lib/modules/home/default.nix
@@ -14,6 +14,7 @@ in
     {
       imports = with homeManagerModules; [
         slippi.homeManagerModules.default
+        shell
         fish
         helix
         git
@@ -36,6 +37,19 @@ in
         */
       ];
 
+      config = {
+        slippi-launcher.enable = lib.mkDefault false;
+      };
+    };
+
+  shell =
+    {
+      pkgs,
+      lib,
+      config,
+      ...
+    }:
+    {
       options = {
         lyte = {
           shell = {
@@ -49,7 +63,6 @@ in
         programs.helix.enable = true;
         programs.zellij.enable = true;
         programs.eza.enable = true;
-        slippi-launcher.enable = lib.mkDefault false;
         programs.bat = {
           enable = true;
           config = {
diff --git a/packages/hosts/bigtower.nix b/packages/hosts/bigtower.nix
index fbe0e04..8ee8578 100644
--- a/packages/hosts/bigtower.nix
+++ b/packages/hosts/bigtower.nix
@@ -1,7 +1,5 @@
 {
   hardware,
-  pkgs,
-  lib,
   config,
   ...
 }:
@@ -9,7 +7,7 @@
   system.stateVersion = "24.05";
   networking = {
     hostName = "bigtower";
-    wifi = true;
+    wifi.enable = true;
   };
 
   fileSystems."/" = {
diff --git a/packages/hosts/default.nix b/packages/hosts/default.nix
index 382440e..6bcba04 100644
--- a/packages/hosts/default.nix
+++ b/packages/hosts/default.nix
@@ -10,5 +10,6 @@ in
   htpc = stableHost ./htpc.nix { };
   router = stableHost ./router.nix { };
   bigtower = stableHost ./bigtower.nix { };
+  rascal = stableHost ./rascal.nix { };
   # arm-dragon = host ./dragon.nix { system = "aarch64-linux"; };
 }
diff --git a/packages/hosts/rascal.nix b/packages/hosts/rascal.nix
index b58d1a2..333f444 100644
--- a/packages/hosts/rascal.nix
+++ b/packages/hosts/rascal.nix
@@ -1,12 +1,11 @@
 {
+  hardware,
   config,
-  modulesPath,
   ...
 }:
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  system.stateVersion = "24.05";
+  networking.hostName = "rascal";
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"
@@ -33,6 +32,11 @@
     device = "/dev/sda";
   };
 
+  imports = with hardware; [
+    common-cpu-amd
+    common-pc-ssd
+  ];
+
   users.groups.beefcake = { };
   users.users = {
     beefcake = {
@@ -46,25 +50,6 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOEI82VdbyR1RYqSnFtlffHBtHFdXO0v9RmQH7GkfXo restic@beefcake"
       ];
     };
-
-    daniel = {
-      # used for restic backups
-      isNormalUser = true;
-      extraGroups = [
-        "users"
-        "wheel"
-        "video"
-        "dialout"
-        "uucp"
-      ];
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPLXOjupz3ScYjgrF+ehrbp9OvGAWQLI6fplX6w9Ijb daniel@lyte.dev"
-      ];
-    };
-
-    root = {
-      openssh.authorizedKeys.keys = config.users.users.daniel.openssh.authorizedKeys.keys;
-    };
   };
 
   services.openssh.extraConfig = ''
@@ -75,8 +60,7 @@
   '';
 
   networking = {
-    hostName = "rascal";
-    networkmanager.enable = true;
+    wifi.enable = true;
     firewall = {
       enable = true;
       allowPing = true;
@@ -85,6 +69,4 @@
   };
 
   services.tailscale.useRoutingFeatures = "server";
-
-  system.stateVersion = "24.05";
 }