From 45762681d9a2858111a63d66913813056e6ff754 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Sat, 14 Sep 2024 16:39:16 -0600
Subject: [PATCH] Add firmware-manager and keyboard-configurator for garrus

---
 configuration.nix                     | 17 ++++++++---------
 flake.nix                             |  3 +--
 hosts/x86_64/galp4.nix                |  9 ---------
 hosts/x86_64/garrus/configuration.nix |  8 ++++++++
 4 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 hosts/x86_64/galp4.nix

diff --git a/configuration.nix b/configuration.nix
index b2e207b..8b4e298 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: 
+{ config, pkgs, ... }:
 
 {
    imports =
@@ -45,13 +45,13 @@
            hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx.";
 
    };
-    
+
    # Allow Unfree
    nixpkgs.config.allowUnfree = true;
 
    # Install some packages
-   environment.systemPackages = 
-           with pkgs; 
+   environment.systemPackages =
+           with pkgs;
            [
             # Packages from nixpkgs
                avahi
@@ -59,7 +59,7 @@
                dmidecode
                fira
                git
-               git-lfs         
+               git-lfs
                libcamera
                lshw
                restic
@@ -71,17 +71,16 @@
                zlib
 
             # Packages from Flake Inputs
-              inputs.system76-keyboard-configurator.packages.${system}.system76-keyboard-configurator
               inputs.nix-software-center.packages.${system}.nix-software-center
 
-            ]; 
+            ];
 
    programs.nix-ld.enable = true;
    programs.nix-ld.libraries = with pkgs; [
      # Add any missing dynamic libraries for unpackaged programs
      # here, NOT in environment.systemPackages
    ];
- 
+
    # Enable/Disable hardware
    ## Turn off PulseAudio
    hardware.pulseaudio.enable = false;
@@ -129,7 +128,7 @@
      '';
    };
 
-   # System 
+   # System
    system.stateVersion = "24.05";
    system.autoUpgrade.enable = true;
 }
diff --git a/flake.nix b/flake.nix
index c13b3b7..5adc869 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,6 @@
          url = github:nix-community/disko;
          inputs.nixpkgs.follows = "nixpkgs";
       };
-      system76-keyboard-configurator.url = "github:pop-os/keyboard-configurator/fix-flake-input";
       nix-software-center.url = "github:snowfallorg/nix-software-center";
       home-manager = {
          url = "github:nix-community/home-manager";
@@ -99,7 +98,7 @@
                ./hardware-configuration.nix
             ];
          };
-         
+
       };
    };
 }
diff --git a/hosts/x86_64/galp4.nix b/hosts/x86_64/galp4.nix
deleted file mode 100644
index 0203dc3..0000000
--- a/hosts/x86_64/galp4.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }: 
-
-{
-    # Name your host machine
-    networking.hostName = "galp4"; 
-
-    # System76
-    hardware.system76.enableAll = true;
-}
diff --git a/hosts/x86_64/garrus/configuration.nix b/hosts/x86_64/garrus/configuration.nix
index da82e5a..fba1d88 100644
--- a/hosts/x86_64/garrus/configuration.nix
+++ b/hosts/x86_64/garrus/configuration.nix
@@ -8,6 +8,14 @@
     hardware.system76.enableAll = true;
     environment.systemPackages = with pkgs; [
         system76-keyboard-configurator
+        firmware-manager
     ];
 
+    # NVIDIA
+#    services.xserver.videoDrivers = [ "nvidia" ];   
+#    hardware.opengl.enable = true;
+#    hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
+
+    # Allow Unfree
+    nixpkgs.config.allowUnfree = true;
 }