boxes/mlg.nix

@@ -1,23 +0,0 @@
-{ 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";
-}

common/minecraft.nix

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

common/nvidia.nix

@@ -1,28 +0,0 @@
-{ 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,7 +5,6 @@
 wallpaper
 disp
 polybar &
-dunst &
 
 # set up the color scheme
 bspc config normal_border_color "#161510"

config/gnupg/gpg-agent.conf

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

config/polybar/config.ini

@@ -1,25 +1,25 @@
 [colors]
 background = #161510
 background-alt = #161510
-foreground = #8D8363
+foreground = #CCCCCC
-primary = #727A18
+primary = #CCCCCC
-secondary = #CCCCCC
+secondary = #727A18
 alert = #A37720
 disabled = #161510
 
-[bar/test]
+[bar/example]
 width = 100%
-height = 14pt
+height = 16pt
+radius = 1
 
-override-redirect = false
 ; dpi = 96
 
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 5pt
+line-size = 3pt
 
-border-size = 3pt
+border-size = 4pt
 border-color = #00000000
 
 padding-left = 0
@@ -32,17 +32,21 @@ separator-foreground = ${colors.disabled}
 
 font-0 = Fantasque Sans Mono;1
 
-modules-left = xworkspaces
+modules-left = xworkspaces battery
-modules-right = pulseaudio date battery
+modules-right = pulseaudio date
 
 cursor-click = pointer
 cursor-scroll = ns-resize
 
 enable-ipc = true
 
-tray-position = right
+; tray-position = right
 
-wm-restack = bspwm
+; wm-restack = generic
+; wm-restack = bspwm
+; wm-restack = i3
+
+; override-redirect = true
 
 [module/xworkspaces]
 type = internal/xworkspaces
@@ -81,7 +85,6 @@ 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}
@@ -94,7 +97,7 @@ date = %H:%M
 date-alt = %Y-%m-%d %H:%M:%S
 
 label = %date%
-label-foreground = ${colors.foreground}
+label-foreground = ${colors.primary}
 
 [settings]
 screenchange-reload = true

desktop.nix

@@ -5,10 +5,6 @@ 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")
@@ -20,7 +16,9 @@ in {
     libinput.enable = true;
     layout = "us";
 
-    displayManager.sx.enable = true;
+    # 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;
   };
 
   sound.enable = true;
@@ -33,16 +31,13 @@ in {
   environment.systemPackages = with pkgs; [
     sx
     fzy
+    gnupg
     xclip
     xcape
+    polybar
     ffmpeg
 
-    pciutils
-    xscreensaver
     ncpamixer
-    gpick
-    dunst
-    libnotify
     tig
     cmus
     neomutt
@@ -57,15 +52,13 @@ in {
     ledger
     remind
     python3
-    pinentry-curses
 
     ungoogled-chromium
     discord
 
-    customPolybar
+    (pkgs.callPackage ./builds/utils.nix {})
-    (pkgs.callPackage ../builds/utils.nix {})
+    (pkgs.callPackage ./builds/st.nix {})
-    (pkgs.callPackage ../builds/st.nix {})
+    (pkgs.callPackage ./builds/pash.nix {})
-    (pkgs.callPackage ../builds/pash.nix {})
   ];
 
   fonts.fonts = with pkgs; [
@@ -74,7 +67,7 @@ in {
 
   programs.gnupg.agent = {
     enable = true;
-    pinentryFlavor = "gtk2";
+    pinentryFlavor = "curses";
     enableSSHSupport = true;
   };
 
@@ -153,55 +146,51 @@ 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;
       };
     };
@@ -209,10 +198,7 @@ in {
 
   environment.etc = {
     "profile.local" = {
-      text = "source /home/usr/.config/bash/profile";
+      text = "source $HOME/.config/bash/profile";
-    };
-    "bashrc.local" = {
-      text = "source /home/usr/.config/bash/bashrc";
     };
   };
 

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;

netbox.nix

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

virtbox.nix

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

xps.nix

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