a grabbag of update

boxes/mlg.nix

@@ -0,0 +1,23 @@
+{ lib, config, pkgs, ...}:
+
+{
+  imports = [
+    ../common/desktop.nix
+    ../common/steam.nix
+    ../common/minecraft.nix
+#    ../common/nvidia.nix
+  ];
+
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot";
+    };
+    grub = {
+      efiSupport = true;
+      device = "nodev";
+    };
+  };
+
+  networking.hostName = "mlg";
+}

boxes/netbox.nix

@@ -3,8 +3,8 @@
 {
   imports =
     [
-      ./modules/mail.nix
+      ../modules/mail.nix
-      ./main.nix
+      ../common/main.nix
     ];
 
   boot.loader.grub.enable = true;

boxes/virtbox.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./desktop.nix
+    ../common/desktop.nix
   ];
 
   boot.loader.grub.enable = true;

boxes/xps.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./desktop.nix
+    ../common/desktop.nix
   ];
 
   boot.loader.grub.enable = true;

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
+    displayManager.sx.enable = true;
-    # we don't actually use startx, it just gets lightdm out of the way
-    displayManager.startx.enable = true;
   };
 
   sound.enable = true;
@@ -31,13 +33,16 @@ in {
   environment.systemPackages = with pkgs; [
     sx
     fzy
-    gnupg
     xclip
     xcape
-    polybar
     ffmpeg
 
+    pciutils
+    xscreensaver
     ncpamixer
+    gpick
+    dunst
+    libnotify
     tig
     cmus
     neomutt
@@ -52,13 +57,15 @@ in {
     ledger
     remind
     python3
+    pinentry-curses
 
     ungoogled-chromium
     discord
 
-    (pkgs.callPackage ./builds/utils.nix {})
+    customPolybar
-    (pkgs.callPackage ./builds/st.nix {})
+    (pkgs.callPackage ../builds/utils.nix {})
-    (pkgs.callPackage ./builds/pash.nix {})
+    (pkgs.callPackage ../builds/st.nix {})
+    (pkgs.callPackage ../builds/pash.nix {})
   ];
 
   fonts.fonts = with pkgs; [
@@ -67,7 +74,7 @@ in {
 
   programs.gnupg.agent = {
     enable = true;
-    pinentryFlavor = "curses";
+    pinentryFlavor = "gtk2";
     enableSSHSupport = true;
   };
 
@@ -146,51 +153,55 @@ in {
 
     file = {
       ".config/bash" = {
-        source = ./config/bash;
+        source = ../config/bash;
         recursive = true;
       };
       ".config/bspwm" = {
-        source = ./config/bspwm;
+        source = ../config/bspwm;
         recursive = true;
       };
       ".config/git" = {
-        source = ./config/git;
+        source = ../config/git;
         recursive = true;
       };
       ".config/htop" = {
-        source = ./config/htop;
+        source = ../config/htop;
         recursive = true;
       };
       ".config/nvim" = {
-        source = ./config/nvim;
+        source = ../config/nvim;
         recursive = true;
       };
       ".config/python" = {
-        source = ./config/python;
+        source = ../config/python;
         recursive = true;
       };
       ".config/polybar" = {
-        source = ./config/polybar;
+        source = ../config/polybar;
         recursive = true;
       };
       ".config/sx" = {
-        source = ./config/sx;
+        source = ../config/sx;
         recursive = true;
       };
       ".config/sxhkd" = {
-        source = ./config/sxhkd;
+        source = ../config/sxhkd;
         recursive = true;
       };
       ".config/tridactyl" = {
-        source = ./config/tridactyl;
+        source = ../config/tridactyl;
         recursive = true;
       };
       ".config/zathura" = {
-        source = ./config/zathura;
+        source = ../config/zathura;
         recursive = true;
       };
       ".local/share/wallpapers" = {
-        source = ./wallpapers;
+        source = ../wallpapers;
+        recursive = true;
+      };
+      ".local/share/gnupg" = {
+        source = ../config/gnupg;
         recursive = true;
       };
     };
@@ -198,7 +209,10 @@ in {
 
   environment.etc = {
     "profile.local" = {
-      text = "source $HOME/.config/bash/profile";
+      text = "source /home/usr/.config/bash/profile";
+    };
+    "bashrc.local" = {
+      text = "source /home/usr/.config/bash/bashrc";
     };
   };
 

common/main.nix

@@ -3,7 +3,7 @@
 {
   imports =
     [
-      ./hardware-configuration.nix # include the results of the hardware scan
+      ../hardware-configuration.nix # include the results of the hardware scan
     ];
 
   networking.networkmanager.enable = true;

common/minecraft.nix

@@ -0,0 +1,6 @@
+{ config, lib, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    prismlauncher
+  ];
+}

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;
+  };
+}

config/bspwm/bspwmrc

@@ -5,6 +5,7 @@
 wallpaper
 disp
 polybar &
+dunst &
 
 # set up the color scheme
 bspc config normal_border_color "#161510"

config/gnupg/gpg-agent.conf

@@ -0,0 +1 @@
+pinentry-program /run/current-system/sw/bin/pinentry

config/polybar/config.ini

@@ -1,25 +1,25 @@
 [colors]
 background = #161510
 background-alt = #161510
-foreground = #CCCCCC
+foreground = #8D8363
-primary = #CCCCCC
+primary = #727A18
-secondary = #727A18
+secondary = #CCCCCC
 alert = #A37720
 disabled = #161510
 
-[bar/example]
+[bar/test]
 width = 100%
-height = 16pt
+height = 14pt
-radius = 1
 
+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
@@ -32,21 +32,17 @@ separator-foreground = ${colors.disabled}
 
 font-0 = Fantasque Sans Mono;1
 
-modules-left = xworkspaces battery
+modules-left = xworkspaces
-modules-right = pulseaudio date
+modules-right = pulseaudio date battery
 
 cursor-click = pointer
 cursor-scroll = ns-resize
 
 enable-ipc = true
 
-; tray-position = right
+tray-position = right
 
-; wm-restack = generic
+wm-restack = bspwm
-; wm-restack = bspwm
-; wm-restack = i3
-
-; override-redirect = true
 
 [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