From 2ff88307eb077ed19f6d09bbf0b37ce1a46d9bdc Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sat, 28 Sep 2024 21:03:16 -0400
Subject: [PATCH] configuring a bit closer

---
 flake.lock                     | 33 +++++++++++++++++++++++++++------
 flake.nix                      | 10 ++++++++--
 home/home.nix                  |  4 ++--
 system/eddie/configuration.nix | 12 +++++++++++-
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1a701b2..88c4b69 100644
--- a/flake.lock
+++ b/flake.lock
@@ -87,6 +87,26 @@
         "url": "https://github.com/kmonad/kmonad?dir=nix"
       }
     },
+    "musnix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727037144,
+        "narHash": "sha256-pxV+e/IGccFn4VcLJ4buEj6yOmoqmdqaLMoFzUbijvs=",
+        "owner": "musnix",
+        "repo": "musnix",
+        "rev": "45250275206d366c8328ed1c57ceebffc945ba43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "musnix",
+        "repo": "musnix",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1721549352,
@@ -104,11 +124,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727528503,
-        "narHash": "sha256-wZd8OqPeQt9h7VU2VxsW4Vx0Ze+3hDLHql3pNbIMYEU=",
+        "lastModified": 1727540359,
+        "narHash": "sha256-U+225h1kJZpWb23+RaX1sBkqC4fA7aa7eBbgiQ5HcO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c1f051bf032273b9f0e707c8826eb25122d279fa",
+        "rev": "fb08bde00c20252b892a3e57fb094eb62b65ba61",
         "type": "github"
       },
       "original": {
@@ -136,11 +156,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1727397532,
-        "narHash": "sha256-pojbL/qteElw/nIXlN8kmHn/w6PQbEHr7Iz+WOXs0EM=",
+        "lastModified": 1727540905,
+        "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f65141456289e81ea0d5a05af8898333cab5c53d",
+        "rev": "fbca5e745367ae7632731639de5c21f29c8744ed",
         "type": "github"
       },
       "original": {
@@ -155,6 +175,7 @@
         "affinity-nix": "affinity-nix",
         "home-manager": "home-manager",
         "kmonad": "kmonad",
+        "musnix": "musnix",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index b263749..3fa2d3d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,16 +22,22 @@
       url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    musnix  = {
+      url = "github:musnix/musnix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, affinity-nix, kmonad, ... }: {
+  outputs = inputs@{self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... }: {
     nixosConfigurations = {
       eddie = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [ 
           nix-flatpak.nixosModules.nix-flatpak
           kmonad.nixosModules.default
-	  ./system/eddie/configuration.nix 
+          musnix.nixosModules.musnix
+	        ./system/eddie/configuration.nix
         ];
       };
     };
diff --git a/home/home.nix b/home/home.nix
index f2873b0..17e71b9 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -67,10 +67,10 @@
       via
       #bitwarden-cli
       #bitwarden-desktop
-      goldenwarden
+      goldwarden
       rbw
       #bws
-      tailscale
+      #tailscale
       protonplus
       gnomeExtensions.just-perfection
       gnomeExtensions.dash-to-dock
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index a948ea7..840c726 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ nixos-hardware, config, pkgs, ... }:
+{ nixos-hardware, config, pkgs, musnix, ... }:
 
 {
   imports =
@@ -79,6 +79,16 @@
     };
   };
 
+  musnix = {
+    enable = true;
+    alsaSeq.enable = true;
+    rtcqs.enable = true;
+  };
+
+  services.udev.extraRules = ''
+    DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660"
+  '';
+
   services.xserver.videoDrivers = [ "nvidia" ];
 
   networking.hostName = "eddie";