From 6d7bd478b4c341fff56b49728661eb5f7d6027f3 Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Wed, 7 Jun 2023 21:44:31 -0400
Subject: [PATCH] one more try, if no then fuck this

---
 flake.nix                      | 20 +++++++-------------
 sysConfig/desktop/hardware.nix | 27 ++++++++++++++-------------
 sysConfig/desktop/system.nix   |  6 ++++++
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4f725eb..7a408e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,9 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, home-manager, disko }:
+  outputs = { self, nixpkgs, home-manager }:
   let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
@@ -30,14 +26,12 @@
       inherit system pkgs;
       modules = [
         ./sysConfig/desktop
-        disko.nixosModules.disko
-      ];
-    };
-
-    homeConfigurations.bryan = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      modules = [
-        ./homeConfig/home.nix
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.bryan = import ./homeConfig/home.nix;
+        }
       ];
     };
   };
diff --git a/sysConfig/desktop/hardware.nix b/sysConfig/desktop/hardware.nix
index 86fe39e..3ff86cb 100644
--- a/sysConfig/desktop/hardware.nix
+++ b/sysConfig/desktop/hardware.nix
@@ -7,9 +7,10 @@
   boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "intel_iommu=on" ];
-  boot.kernelModules = [ "kvm-intel" "virtio" "vfio-pci" "coretemp" ];
+  boot.kernelModules = [ "coretemp" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
+#  boot.kernelParams = [ "intel_iommu=on" ];
+#  boot.kernelModules = [ "kvm-intel" "virtio" "vfio-pci" "coretemp" ];
   
 # Bootloader
   boot.loader = {
@@ -54,17 +55,17 @@
 #  };
 
 # Virtualisation
-  nix.settings.system-features = [ "kvm" ];
-  environment.systemPackages = [ pkgs.virt-manager ];
-
-  virtualisation.libvirtd = {
-    enable = true;
-    qemu = {
-      package = pkgs.qemu_kvm;
-      runAsRoot = true;
-      ovmf.enable = true;
-    };
-  };
+#  nix.settings.system-features = [ "kvm" ];
+#  environment.systemPackages = [ pkgs.virt-manager ];
+#
+#  virtualisation.libvirtd = {
+#    enable = true;
+#    qemu = {
+#      package = pkgs.qemu_kvm;
+#      runAsRoot = true;
+#      ovmf.enable = true;
+#    };
+#  };
 
 # CPU
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/sysConfig/desktop/system.nix b/sysConfig/desktop/system.nix
index 814b51a..14f6ffd 100644
--- a/sysConfig/desktop/system.nix
+++ b/sysConfig/desktop/system.nix
@@ -18,6 +18,12 @@
   };
   environment.systemPackages = with pkgs; [ nix-init pavucontrol ];
 
+# DE
+  programs.sway = {
+    enable = true;
+    package = null;
+  };
+
 # Fonts
   fonts.fonts = with pkgs; [
     terminus_font