From 5153dc64f66302d51a6f10f604a4054667e041fb Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotrip.com>
Date: Mon, 23 Jan 2023 08:57:22 -0800
Subject: [PATCH] working on home manager spreading though the nix files

---
 flake.nix             |  3 +--
 systems/common.nix    | 10 ++++++++++
 systems/framework.nix | 15 ++++++++++++++-
 user-jsutter.nix      | 22 +++++++++++-----------
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 25e5633..86d3059 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,14 +9,13 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager }: {
+  outputs = { self, nixpkgs, home-manager, ... }: {
 
     nixosConfigurations = {
       framework =  nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [ ./systems/common.nix
         ./systems/framework.nix
-        /etc/nixos/hardware-configuration.nix
         ./user-jsutter.nix
         ];
       };
diff --git a/systems/common.nix b/systems/common.nix
index 11d9832..eb6db3f 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -3,6 +3,16 @@
 
 {
 
+  fileSystems."/" =
+    { device = "/dev/disk/by-partlabel/primary";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-partlabel/ESP";
+      fsType = "vfat";
+    };
+
   nixpkgs.config.allowUnfree = true;
 
   users.users.jsutter = {
diff --git a/systems/framework.nix b/systems/framework.nix
index 8307595..e91958a 100644
--- a/systems/framework.nix
+++ b/systems/framework.nix
@@ -1,11 +1,24 @@
 
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, modulesPath, ... }: {
 
   # CPU Stuff
 
   hardware.cpu.amd.updateMicrocode =
     lib.mkDefault config.hardware.enableRedistributableFirmware;
 
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault           
+  config.hardware.enableRedistributableFirmware;
+
   # From Flakes
 
   boot.kernelParams = [
diff --git a/user-jsutter.nix b/user-jsutter.nix
index 6a61d2f..0a5824c 100644
--- a/user-jsutter.nix
+++ b/user-jsutter.nix
@@ -1,11 +1,11 @@
-{ config, pkgs, ... }:
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
+{ config, pkgs, home-manager, ... }:
+#let
+#  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+#in
 {
-  imports = [
-    (import "${home-manager}/nixos")
-  ];
+#  imports = [
+#    (import "${home-manager}/nixos")
+#  ];
 
   home-manager.users.jsutter = {
 
@@ -25,10 +25,10 @@ in
     };
 
 # Add Firefox GNOME theme directory
-  home.file."firefox-gnome-theme" = {
-        target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
-        source = (fetchTarball "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz");
-  };
+#  home.file."firefox-gnome-theme" = {
+#        target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
+#        source = (fetchTarball "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz");
+#  };
 
   programs.firefox = {
         enable = true;