From 6e99b9e9c9b0ac6ac4c320676a40104de549ff95 Mon Sep 17 00:00:00 2001
From: Greg Leyda <isnortpennies@protonmail.com>
Date: Tue, 31 Jan 2023 16:48:36 -0500
Subject: [PATCH] set laptop up again

---
 flake.nix            | 12 ++++++++++++
 modules/fonts.nix    |  6 +++---
 modules/packages.nix |  2 --
 modules/prime.nix    | 16 ++++++++--------
 modules/xserver.nix  |  2 +-
 systems/desktop.nix  |  4 ++++
 systems/laptop.nix   |  6 ------
 7 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index b289272..1b14877 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,6 +62,18 @@
           ./nix.nix
         ];
       };
+      gerg-laptop = lib.nixosSystem {
+        inherit system pkgs;
+        specialArgs = {inherit inputs settings;};
+        modules = [
+          inputs.sxhkd-flake.nixosModules.sxhkd
+          inputs.home-manager.nixosModules.home-manager
+          ./home-manager
+          ./configuration.nix
+          ./systems/laptop.nix
+          ./nix.nix
+        ];
+      };
     };
   };
 }
diff --git a/modules/fonts.nix b/modules/fonts.nix
index cd847e1..62ba12d 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -4,9 +4,9 @@
       overpass
       material-design-icons
       (nerdfonts.override
-      {
-        fonts = ["Overpass"];
-      })
+        {
+          fonts = ["Overpass"];
+        })
     ];
     fontDir.enable = true;
     fontconfig = {
diff --git a/modules/packages.nix b/modules/packages.nix
index 6a0bf12..b51a4bc 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -14,8 +14,6 @@
       alsa-utils #volume control
       btrfs-progs #for external harddrive
       vlc #play stuff
-      bitwarden #store stuff
-      qbittorrent #steal stuff
       webcord # talk to people (gross)
       feh #for wallpaper
       xfce.mousepad
diff --git a/modules/prime.nix b/modules/prime.nix
index 2fb3c12..a558d31 100644
--- a/modules/prime.nix
+++ b/modules/prime.nix
@@ -1,13 +1,13 @@
 {
-  hardware.nvidia.prime = {
-    sync.enable = true;
-    amdgpuBusId = "PCI:5:0:0";
-    nvidiaBusId = "PCI:1:0:0";
-    nvidia = {
-      nvidiaPersistenced = false;
-      nvidiaSettings = false;
-      modesetting.enable = true;
+  hardware.nvidia = {
+    prime = {
+      sync.enable = true;
+      amdgpuBusId = "PCI:5:0:0";
+      nvidiaBusId = "PCI:1:0:0";
     };
+    nvidiaPersistenced = false;
+    nvidiaSettings = false;
+    modesetting.enable = true;
   };
   services.xserver = {
     videoDrivers = ["modesetting" "nvidia"];
diff --git a/modules/xserver.nix b/modules/xserver.nix
index 85b702f..8cf74be 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -14,7 +14,7 @@
     windowManager.dwm.enable = true;
     displayManager = {
       sessionCommands = ''
-      feh --bg-scale ${../images/recursion.png}
+        feh --bg-scale ${../images/recursion.png}
       '';
       defaultSession = "none+dwm";
       lightdm = {
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 294ed79..7865ae2 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -25,6 +25,10 @@
       m:
         ../modules + ("/" + m + ".nix")
     );
+  environment.systemPackages = with pkgs; [
+    bitwarden #store stuff
+    qbittorrent #steal stuff
+  ];
   networking.hostName = "gerg-desktop";
   boot.kernelPackages = pkgs.linuxPackages_latest;
   hardware.cpu.amd.updateMicrocode = true;
diff --git a/systems/laptop.nix b/systems/laptop.nix
index 8b252a9..583c232 100644
--- a/systems/laptop.nix
+++ b/systems/laptop.nix
@@ -25,12 +25,6 @@
   networking.hostName = "gerg-laptop";
   boot.kernelPackages = pkgs.linuxPackages_latest;
   hardware.cpu.amd.updateMicrocode = true;
-
-  #environment.systemPackages = with pkgs; [
-  #  xorg.xf86videoamdgpu
-  #];
-  #don't think i need this^
-  # user managment
   users = {
     defaultUserShell = pkgs.zsh;
     users."${settings.username}" = {