From 331a21e2e2c613c170d9bd79a6be2274ca8c76fb Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 20 Mar 2023 16:51:48 -0400
Subject: [PATCH] misc changes

---
 modules/hardware.nix | 16 ++++++++--------
 modules/packages.nix |  1 -
 modules/shell.nix    |  3 +--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/hardware.nix b/modules/hardware.nix
index 42180c4..c0652a5 100644
--- a/modules/hardware.nix
+++ b/modules/hardware.nix
@@ -24,12 +24,10 @@ in {
   config = mkMerge [
     (
       mkIf (! cfg.gpuAcceleration.disable) {
-        hardware = {
-          opengl = {
-            enable = true;
-            driSupport = true;
-            driSupport32Bit = true;
-          };
+        hardware.opengl = {
+          enable = true;
+          driSupport = true;
+          driSupport32Bit = true;
         };
       }
     )
@@ -41,8 +39,10 @@ in {
         enable = true;
         audio.enable = true;
         wireplumber.enable = true;
-        alsa.enable = true;
-        alsa.support32Bit = true;
+        alsa = {
+          enable = true;
+          support32Bit = true;
+        };
         pulse.enable = true;
         jack.enable = true;
       };
diff --git a/modules/packages.nix b/modules/packages.nix
index 8e0bf3a..05f2c22 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -7,7 +7,6 @@ _: {pkgs, ...}: {
       pkgs.alsa-utils #volume control
       pkgs.xclip #commandline clipboard access
       pkgs.bottom #view tasks
-      pkgs.bc #terminal calculator
       pkgs.nix-tree #view packages
       pkgs.nix-output-monitor
     ];
diff --git a/modules/shell.nix b/modules/shell.nix
index fad06ea..84d87b9 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -18,7 +18,6 @@
       VISUAL = "nvim";
       PAGER = "page";
       SYSTEMD_PAGERSECURE = "true";
-      TERMINAL = "st";
       DIRENV_LOG_FORMAT = "";
     };
     shellAliases = {
@@ -57,7 +56,7 @@
     execWheelOnly = true;
     extraConfig = ''
       Defaults env_keep += "${builtins.concatStringsSep " " (builtins.attrNames environment.variables)}"
-      Defaults        lecture = never
+      Defaults lecture = never
     '';
   };