From 0677189e4f4017fbe994332b1302edc7203adc4f Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Thu, 3 Aug 2023 00:05:35 -0500
Subject: [PATCH] a grabbag of update

---
 boxes/mlg.nix               |  3 +++
 common/desktop.nix          | 19 +++++++++++++++----
 common/minecraft.nix        |  6 ++++++
 common/nvidia.nix           | 28 ++++++++++++++++++++++++++++
 config/bspwm/bspwmrc        |  1 +
 config/gnupg/gpg-agent.conf |  1 +
 config/polybar/config.ini   | 27 ++++++++++++---------------
 7 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 common/minecraft.nix
 create mode 100644 common/nvidia.nix
 create mode 100644 config/gnupg/gpg-agent.conf

diff --git a/boxes/mlg.nix b/boxes/mlg.nix
index 0c9a9e7..5c9146e 100644
--- a/boxes/mlg.nix
+++ b/boxes/mlg.nix
@@ -3,6 +3,9 @@
 {
   imports = [
     ../common/desktop.nix
+    ../common/steam.nix
+    ../common/minecraft.nix
+#    ../common/nvidia.nix
   ];
 
   boot.loader = {
diff --git a/common/desktop.nix b/common/desktop.nix
index d427140..e78e04b 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -5,6 +5,10 @@ let
     url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
     sha256 = "0dfshsgj93ikfkcihf4c5z876h4dwjds998kvgv7sqbfv0z6a4bc";
   };
+  customPolybar = pkgs.polybar.override {
+    alsaSupport = true;
+    pulseSupport = true;
+  };
 in {
   imports = [
     (import "${home-manager}/nixos")
@@ -16,9 +20,7 @@ in {
     libinput.enable = true;
     layout = "us";
 
-    # we're going to be pulling a sneaky
-    # we don't actually use startx, it just gets lightdm out of the way
-    displayManager.startx.enable = true;
+    displayManager.sx.enable = true;
   };
 
   sound.enable = true;
@@ -33,10 +35,14 @@ in {
     fzy
     xclip
     xcape
-    polybar
     ffmpeg
 
+    pciutils
+    xscreensaver
     ncpamixer
+    gpick
+    dunst
+    libnotify
     tig
     cmus
     neomutt
@@ -56,6 +62,7 @@ in {
     ungoogled-chromium
     discord
 
+    customPolybar
     (pkgs.callPackage ../builds/utils.nix {})
     (pkgs.callPackage ../builds/st.nix {})
     (pkgs.callPackage ../builds/pash.nix {})
@@ -193,6 +200,10 @@ in {
         source = ../wallpapers;
         recursive = true;
       };
+      ".local/share/gnupg" = {
+        source = ../config/gnupg;
+        recursive = true;
+      };
     };
   };
 
diff --git a/common/minecraft.nix b/common/minecraft.nix
new file mode 100644
index 0000000..673cbbd
--- /dev/null
+++ b/common/minecraft.nix
@@ -0,0 +1,6 @@
+{ config, lib, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    prismlauncher
+  ];
+}
diff --git a/common/nvidia.nix b/common/nvidia.nix
new file mode 100644
index 0000000..31338da
--- /dev/null
+++ b/common/nvidia.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+{
+  # Make sure opengl is enabled
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  # Tell Xorg to use the nvidia driver (also valid for Wayland)
+  services.xserver.videoDrivers = ["nvidia"];
+
+  hardware.nvidia = {
+
+    # Modesetting is needed for most Wayland compositors
+    modesetting.enable = true;
+
+    # Use the open source version of the kernel module
+    # Only available on driver 515.43.04+
+    open = false;
+
+    # Enable the nvidia settings menu
+    nvidiaSettings = true;
+
+    # Optionally, you may need to select the appropriate driver version for your specific GPU.
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+}
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index dc09177..b2b7f18 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -5,6 +5,7 @@
 wallpaper
 disp
 polybar &
+dunst &
 
 # set up the color scheme
 bspc config normal_border_color "#161510"
diff --git a/config/gnupg/gpg-agent.conf b/config/gnupg/gpg-agent.conf
new file mode 100644
index 0000000..2c94603
--- /dev/null
+++ b/config/gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+pinentry-program /run/current-system/sw/bin/pinentry
diff --git a/config/polybar/config.ini b/config/polybar/config.ini
index 7ee36b8..7d8eebe 100644
--- a/config/polybar/config.ini
+++ b/config/polybar/config.ini
@@ -1,25 +1,25 @@
 [colors]
 background = #161510
 background-alt = #161510
-foreground = #CCCCCC
-primary = #CCCCCC
-secondary = #727A18
+foreground = #8D8363
+primary = #727A18
+secondary = #CCCCCC
 alert = #A37720
 disabled = #161510
 
-[bar/example]
+[bar/test]
 width = 100%
-height = 16pt
-radius = 1
+height = 14pt
 
+override-redirect = false
 ; dpi = 96
 
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 3pt
+line-size = 5pt
 
-border-size = 4pt
+border-size = 3pt
 border-color = #00000000
 
 padding-left = 0
@@ -40,13 +40,9 @@ cursor-scroll = ns-resize
 
 enable-ipc = true
 
-; tray-position = right
+tray-position = right
 
-; wm-restack = generic
-; wm-restack = bspwm
-; wm-restack = i3
-
-; override-redirect = true
+wm-restack = bspwm
 
 [module/xworkspaces]
 type = internal/xworkspaces
@@ -85,6 +81,7 @@ format-volume-prefix-foreground = ${colors.primary}
 format-volume = <label-volume>
 
 label-volume = %percentage%%
+label-foreground = ${colors.foreground}
 
 label-muted = muted
 label-muted-foreground = ${colors.disabled}
@@ -97,7 +94,7 @@ date = %H:%M
 date-alt = %Y-%m-%d %H:%M:%S
 
 label = %date%
-label-foreground = ${colors.primary}
+label-foreground = ${colors.foreground}
 
 [settings]
 screenchange-reload = true