From 90f4fe847ae608f526b9a3df21f8023d839c29dd Mon Sep 17 00:00:00 2001
From: ISnortPennies <ISnortPennies@protonmail.com>
Date: Thu, 11 Aug 2022 00:10:27 -0400
Subject: [PATCH] refactoring

---
 configuration.nix                         |  1 -
 flake.nix                                 |  2 --
 hardware-configuration.nix                |  1 +
 home-manager/config/discord/settings.json |  3 +++
 home-manager/neovim.nix                   |  3 +++
 modules/boot.nix                          |  1 +
 modules/packages.nix                      |  2 +-
 systems/desktop.nix                       | 16 +++++++++++++++-
 systems/laptop.nix                        |  2 +-
 9 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 hardware-configuration.nix
 create mode 100644 home-manager/config/discord/settings.json

diff --git a/configuration.nix b/configuration.nix
index 8cf728e..c152d97 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:
 {
   system.stateVersion = "22.11";
-  boot.kernelPackages = pkgs.linuxPackages_latest;
   environment = {
     defaultPackages = [];
     binsh = "${pkgs.dash}/bin/dash";
diff --git a/flake.nix b/flake.nix
index 966e8b9..0c9427b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,6 @@
         inherit system pkgs;
         modules = [
           ./configuration.nix
-          ./hardware-configuration.nix
           ./systems/laptop.nix
         ];
       };
@@ -61,7 +60,6 @@
         inherit system pkgs;
         modules = [
           ./configuration.nix
-          ./hardware-configuration.nix
           ./systems/desktop.nix
         ];
       };
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
new file mode 100644
index 0000000..ea30561
--- /dev/null
+++ b/hardware-configuration.nix
@@ -0,0 +1 @@
+#empty
diff --git a/home-manager/config/discord/settings.json b/home-manager/config/discord/settings.json
new file mode 100644
index 0000000..ff7ea0f
--- /dev/null
+++ b/home-manager/config/discord/settings.json
@@ -0,0 +1,3 @@
+{
+  "SKIP_HOST_UPDATE": true
+}
diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix
index c6ec8ca..51e8638 100644
--- a/home-manager/neovim.nix
+++ b/home-manager/neovim.nix
@@ -15,12 +15,15 @@
       vim-nix
       vim-polyglot
       vim-smoothie
+      nvim-tree-lua
+      nvim-web-devicons
       tokyonight-nvim
       rainbow
       indentLine
       undotree
     ];
     extraConfig = ''
+      :lua require("nvim-tree").setup()
       set tabstop=2
       set expandtab
       set shiftwidth=2
diff --git a/modules/boot.nix b/modules/boot.nix
index 6333cc9..c5a029a 100644
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -1,4 +1,5 @@
 {
+  hardware.enableRedistributableFirmware = true;
   boot = {
     blacklistedKernelModules = [ "nouveau" "lbm-nouveau" "pcspkr" ];
     kernelParams = [ "fbcon=nodefer" "bgrt_disable" "quiet" "splash" ];
diff --git a/modules/packages.nix b/modules/packages.nix
index 324560c..c2216d4 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -16,7 +16,7 @@ environment.systemPackages = with pkgs; [
      alsa-utils
      btrfs-progs #for external harddrive
      #user/gui
-     discord
+     (discord.override { nss = nss_latest; })
      spotify-tray
      vlc
      bitwarden
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 51ac463..797dc95 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -16,7 +16,7 @@
       ../modules/zsh.nix
     ];
   networking.hostName = "gerg-desktop";
-
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   hardware.cpu.amd.updateMicrocode = true;  
 #end important stuff
   environment.systemPackages = with pkgs; [
@@ -31,5 +31,19 @@
       extraGroups = [ "wheel" "audio" "networkmanager" "kvm" "libvirtd" ];
     };
   };
+  boot = {
+    initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ];
+    kernelModules = [ "kvm-amd" ];
+  };
+  fileSystems = {
+    "/" ={
+      device = "/dev/disk/by-uuid/f0f46e34-874f-4052-855c-38c88bd7987a";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/5F00-1D91";
+      fsType = "vfat";
+    };
+  };
 }
 
diff --git a/systems/laptop.nix b/systems/laptop.nix
index 53d6480..f1fabb1 100644
--- a/systems/laptop.nix
+++ b/systems/laptop.nix
@@ -14,7 +14,7 @@
       ../modules/zsh.nix
     ];
   networking.hostName = "gerg-laptop";
-
+  boot.kernelPackages = pkgs.linuxPackages_5_18;
   hardware.cpu.amd.updateMicrocode = true;  
   
   # end important stuff