5 files changed, 13 insertions, 16 deletions
diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix
index 3f10d92..5ac17ec 100644
--- a/modules/desktop/nixos/fonts.nix
+++ b/modules/desktop/nixos/fonts.nix
@@ -1,8 +1,7 @@
 {pkgs, ...}: {
   fonts = {
     enableDefaultPackages = false;
-    # fontDir.enable = true;
     fontconfig.enable = true;
-    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot)
+    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot or ghostty)
   };
 }
diff --git a/modules/nix/nixos/default.nix b/modules/nix/nixos/default.nix
index 7116371..c817859 100644
--- a/modules/nix/nixos/default.nix
+++ b/modules/nix/nixos/default.nix
@@ -1,12 +1,9 @@
 {
-  inputs,
   config,
   pkgs,
   ...
 }: {
   nix = {
-    # package = inputs.determinate.packages.${pkgs.system}.default;
-
     gc.automatic = false; # use nh cleaner instead
 
     # Make builds run with low priority so my system stays responsive
@@ -27,9 +24,12 @@
 
   programs.nh = {
     enable = true;
-    flake = "/home/collin/nixos";
+    flake = "/home/${config.collinux.user.name}/nixos";
     clean.enable = true;
   };
 
-  hjem.users."${config.collinux.user.name}".packages = [pkgs.cached-nix-shell];
+  environment.systemPackages = [pkgs.cached-nix-shell];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "25.05";
 }
diff --git a/modules/services/nixos/audio.nix b/modules/services/nixos/audio.nix
index 93f8289..8f2f23e 100644
--- a/modules/services/nixos/audio.nix
+++ b/modules/services/nixos/audio.nix
@@ -12,9 +12,10 @@ in
       enable = true;
       wireplumber.enable = true;
       alsa.enable = true;
-
-      pulse.enable = cfg.pulse.enable;
+      pulse.enable = false;
     };
 
+    boot.blacklistedKernelModules = ["snd_seq_dummy"]; # remove extraneous alsa midi devices
+
     environment.systemPackages = [pkgs.pwvucontrol];
   }
diff --git a/modules/services/options.nix b/modules/services/options.nix
index df8bc52..16bf5ac 100644
--- a/modules/services/options.nix
+++ b/modules/services/options.nix
@@ -46,11 +46,9 @@ in {
           };
         };
       };
-      audio = {
-        enable = mkEnableOption "pipewire + wireplumber";
-        pulse.enable = mkEnableOption "pipewire-pulse";
-        # some config to make audio work with wine (TODO for jupiter)
-      };
+
+      audio.enable = mkEnableOption "pipewire + wireplumber";
+
       bluetooth = {
         enable = mkEnableOption "bluetooth";
         blueman.enable = mkEnableOption "graphical bluetooth manager";
diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix
index b14e52d..0b0ae41 100644
--- a/modules/user/nixos/default.nix
+++ b/modules/user/nixos/default.nix
@@ -1,13 +1,12 @@
 {
   config,
-  hostname,
   lib,
   ...
 }: let
   cfg = config.collinux.user;
 in {
   users = {
-    mutableUsers = true;
+    mutableUsers = true; # system passwords stored mutably
 
     users."${cfg.name}" = {
       isNormalUser = true;