From 956165c4e37609c9c1cdb4ceb1aa552a5e9dc0bb Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob@jhink.org>
Date: Wed, 13 Sep 2023 07:18:29 -0400
Subject: [PATCH] More updates for no-external monitor

---
 machines/buck/configuration.nix          | 46 +++++++++++++++---------
 machines/buck/hardware-configuration.nix |  2 +-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/machines/buck/configuration.nix b/machines/buck/configuration.nix
index 0ca215b..3e23513 100644
--- a/machines/buck/configuration.nix
+++ b/machines/buck/configuration.nix
@@ -53,15 +53,17 @@
     };
   };
 
-  networking.hostName = "buck"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.wireless = {
-    enable = true;
-    userControlled.enable = true;
-    environmentFile = "/run/secrets/wifi/env";
-    networks = {
-      "@SSID_HOME@" = {
-        pskRaw = "@PSKRAW_HOME@";
+  networking = {
+    hostName = "buck"; # Define your hostname.
+    enableIPv6 = true;
+    wireless = {
+      enable = true;
+      userControlled.enable = true;
+      environmentFile = "/run/secrets/wifi/env";
+      networks = {
+        "@SSID_HOME@" = {
+          pskRaw = "@PSKRAW_HOME@";
+        };
       };
     };
   };
@@ -97,6 +99,8 @@
       enable = true;
       enableSSHSupport = true;
     };
+    # This is needed in case users set zsh as their default shell
+    zsh.enable = true;
   };
 
   # List services that you want to enable:
@@ -108,16 +112,26 @@
   # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.jacob = {
-    isNormalUser = true;
-    extraGroups = [ "video" "wheel" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.zsh;
+  users = {
+    groups.plugdev = {};
+    users.jacob = {
+      isNormalUser = true;
+      extraGroups = [ "audio" "jackaudio" "plugdev" "video" "wheel" ]; # Enable ‘sudo’ for the user.
+      shell = pkgs.zsh;
+    };
   };
 
   security.rtkit.enable = true; # recommended for pipewire
 
   # List services that you want to enable:
   services = {
+    # If you want to use JACK applications, uncomment this
+    jack = {
+      alsa.enable = false;
+      jackd.enable = true;
+      loopback.enable = true;
+    };
+
     logind = {
       extraConfig = ''
       [Login]
@@ -134,12 +148,10 @@
     openssh.enable = true;
 
     pipewire = {
-      enable = true;
-      alsa.enable = true;
+      enable = false;
+      alsa.enable = false;
       alsa.support32Bit = true;
       pulse.enable = true;
-      # If you want to use JACK applications, uncomment this
-      #jack.enable = true;
 
       # use the example session manager (no others are packaged yet so this is enabled by default,
       # no need to redefine it in your config for now)
diff --git a/machines/buck/hardware-configuration.nix b/machines/buck/hardware-configuration.nix
index 1899fe0..c4f8941 100644
--- a/machines/buck/hardware-configuration.nix
+++ b/machines/buck/hardware-configuration.nix
@@ -42,7 +42,7 @@
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
-  hardware.video.hidpi.enable = true;
+  #hardware.video.hidpi.enable = true;
 
   powerManagement.cpuFreqGovernor = "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;