From d76c294dcea7c208c4b9ecbb1178aa6eb60ca03c Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 7 Jun 2024 23:48:23 -0500
Subject: [PATCH] fix sound

---
 flake.lock                        | 36 +++++++++++++++----------------
 flake.nix                         |  2 +-
 hosts/mac-nixos/configuration.nix | 22 +++++++++++++------
 hosts/mac-nixos/home.nix          |  2 +-
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index ae1241a..d9ab0cb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,11 +54,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1717621462,
-        "narHash": "sha256-mXo0SRiedkQVZ9MOkWjT9PsIL7AOwjMlMu+KnTEiDZ8=",
+        "lastModified": 1717768958,
+        "narHash": "sha256-QMr+b1agCQ+eADJxOjROqsn/hx+dq41dn8Npt6GtPVU=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "56929432c95bd3569adc36b478be5aa0c9b46254",
+        "rev": "dddd825a5084628afe4d608b95081ccda2a1e4d0",
         "type": "github"
       },
       "original": {
@@ -754,17 +754,17 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1716699938,
-        "narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=",
-        "owner": "tpwrules",
-        "repo": "nixos-apple-silicon",
-        "rev": "842306255856d7f5677c113e699101eb253e2e3f",
-        "type": "github"
+        "lastModified": 1717784003,
+        "narHash": "sha256-EDhb+3uFVCnfsF8DSPd1F2Arza84vQvlzh/OPSUHUjc=",
+        "ref": "refs/heads/main",
+        "rev": "06fb62dd84841d1664a3a144d8877a956618401d",
+        "revCount": 457,
+        "type": "git",
+        "url": "file:///home/matt/nixos-apple-silicon"
       },
       "original": {
-        "owner": "tpwrules",
-        "repo": "nixos-apple-silicon",
-        "type": "github"
+        "type": "git",
+        "url": "file:///home/matt/nixos-apple-silicon"
       }
     },
     "nixos-hardware": {
@@ -785,11 +785,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717196966,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "lastModified": 1717602782,
+        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
         "type": "github"
       },
       "original": {
@@ -833,11 +833,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1717555607,
-        "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
+        "lastModified": 1717696253,
+        "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
+        "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d638e11..14c7f46 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     #Apple
-    nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
+    nixos-apple-silicon.url = "git+file:///home/matt/nixos-apple-silicon";
     nix-darwin.url = "github:LnL7/nix-darwin";
 
   };
diff --git a/hosts/mac-nixos/configuration.nix b/hosts/mac-nixos/configuration.nix
index fac70e0..4ea4033 100644
--- a/hosts/mac-nixos/configuration.nix
+++ b/hosts/mac-nixos/configuration.nix
@@ -19,9 +19,13 @@
   hardware.asahi.enable = true;
   hardware.asahi.useExperimentalGPUDriver = true;
   hardware.asahi.peripheralFirmwareDirectory = ./firmware;
+  hardware.asahi.setupAsahiSound = true;
+
+  sound.enable = true;
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.configurationLimit = 3;
   boot.loader.efi.canTouchEfiVariables = false;
 
   apps.discover-wrapped.enable = true;
@@ -39,15 +43,11 @@
       enable = true;
 
       desktopManager.gnome.enable = false;
-
       # Enable the Plasma 6 Desktop Environment.
-      displayManager = {
-        sddm.enable = true;
-        # defaultSession = "plasma";
-        gdm.enable = false;
-      };
+      displayManager.gdm.enable = false;
     };
-
+    
+    displayManager.sddm.enable = true;
     desktopManager.plasma6.enable = true;
 
     # enable auto discovery of printers
@@ -75,11 +75,15 @@
       #minecraft
       prismlauncher
       #vmware-horizon-client
+      distrobox
+      podman
     ];
   };
 
   programs.java.enable = true;
 
+  virtualisation.containers.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -87,6 +91,10 @@
     wget
   ];
 
+  environment.sessionVariables = rec {
+    DBX_CONTAINER_MANAGER  = "podman";
+  };
+
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
   # accidentally delete configuration.nix.
diff --git a/hosts/mac-nixos/home.nix b/hosts/mac-nixos/home.nix
index 055afa2..b46a5f5 100644
--- a/hosts/mac-nixos/home.nix
+++ b/hosts/mac-nixos/home.nix
@@ -30,7 +30,7 @@
   programs.command-not-found.enable = true;
 
   home.packages = with pkgs; [
-    nixfmt
+    nixfmt-rfc-style
     deadnix
     gnomeExtensions.dash-to-dock
     gnomeExtensions.arcmenu