From 1debd48cebf2119c3dc1860f1d1713c6b24654cf Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sun, 30 Jul 2023 10:26:24 -0400
Subject: [PATCH] pipewire sound in VM is fixed

various fixes
---
 flake.nix                        |  1 -
 hosts/gerg-desktop/disko.nix     | 10 ++--------
 hosts/gerg-desktop/spicetify.nix |  2 +-
 hosts/gerg-desktop/vfio.nix      |  6 ++----
 hosts/gerg-desktop/zfs.nix       | 10 ++--------
 modules/theming.nix              |  4 ++--
 6 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/flake.nix b/flake.nix
index 807bcbb..69ac3d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,6 @@
     master.url = "github:nixos/nixpkgs";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-23.05";
-    pipewire_fix.url = "github:nixos/nixpkgs/45a55711fe12d0aada3aa04746082cf1b83dfbf3";
     #nix 2.17
     nix.url = "github:nixos/nix/7b39a388b382e7912de3c5951faad42fe2d72f48";
 
diff --git a/hosts/gerg-desktop/disko.nix b/hosts/gerg-desktop/disko.nix
index 6cd3909..631a54a 100644
--- a/hosts/gerg-desktop/disko.nix
+++ b/hosts/gerg-desktop/disko.nix
@@ -90,10 +90,7 @@ in {
             type = "zfs_fs";
             options.mountpoint = "legacy";
             mountpoint = "/";
-            postCreateHook = ''
-              zfs snapshot rpool/root@empty
-              zfs snapshot rpool/root@lastboot
-            '';
+            postCreateHook = "zfs snapshot rpool/root@empty";
           };
           "nix" = {
             type = "zfs_fs";
@@ -105,10 +102,7 @@ in {
             type = "zfs_fs";
             options.mountpoint = "legacy";
             mountpoint = "/var";
-            postCreateHook = ''
-              zfs snapshot rpool/var@empty
-              zfs snapshot rpool/var@lastboot
-            '';
+            postCreateHook = "zfs snapshot rpool/var@empty";
           };
           "persist" = {
             type = "zfs_fs";
diff --git a/hosts/gerg-desktop/spicetify.nix b/hosts/gerg-desktop/spicetify.nix
index 04956e7..4f6dc5c 100644
--- a/hosts/gerg-desktop/spicetify.nix
+++ b/hosts/gerg-desktop/spicetify.nix
@@ -2,7 +2,7 @@
   spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
   ex = spicePkgs.extensions;
 in {
-  imports = [spicetify-nix.nixosModule];
+  imports = [spicetify-nix.nixosModules.default];
   local.allowedUnfree = ["spotify"];
   programs.spicetify = {
     enable = true;
diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix
index 3e3be02..9480bb3 100644
--- a/hosts/gerg-desktop/vfio.nix
+++ b/hosts/gerg-desktop/vfio.nix
@@ -1,4 +1,4 @@
-{pipewire_fix, ...}: {
+{...}: {
   pkgs,
   lib,
   config,
@@ -9,7 +9,7 @@ let
   xcfg = config.services.xserver;
   xserverbase = let
     fontsForXServer =
-      config.fonts.fonts
+      config.fonts.packages
       ++ [
         pkgs.xorg.fontadobe100dpi
         pkgs.xorg.fontadobe75dpi
@@ -52,8 +52,6 @@ in {
       ''
     );
   };
-  ####VM SOUND BORKED
-  services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire;
   boot = {
     kernelParams = [
       "amd_iommu=on"
diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix
index 92f5ceb..711ed0f 100644
--- a/hosts/gerg-desktop/zfs.nix
+++ b/hosts/gerg-desktop/zfs.nix
@@ -30,15 +30,9 @@ _: {
       availableKernelModules = ["hid_generic"];
       #wipe / and /var on boot
       postDeviceCommands = lib.mkAfter ''
-        #destroy last snapshot
-        zfs destroy rpool/root@lastboot
-        zfs destroy rpool/var@lastboot
-        #create new snapshot
-        zfs snapshot rpool/root@lastboot
-        zfs snapshot rpool/var@lastboot
         #wipe everything
-        zfs rollback -r rpool/root@empty
-        zfs rollback -r rpool/var@empty
+         zfs rollback -r rpool/root@empty
+         zfs rollback -r rpool/var@empty
       '';
     };
     plymouth.enable = false;
diff --git a/modules/theming.nix b/modules/theming.nix
index 6eb413e..c971295 100644
--- a/modules/theming.nix
+++ b/modules/theming.nix
@@ -58,8 +58,8 @@ in {
           xrdb -load /etc/xdg/Xresources
         '';
         fonts = {
-          fonts = [pkgs.overpass];
-          enableDefaultFonts = false;
+          packages = [pkgs.overpass];
+          enableDefaultPackages = false;
           fontDir.enable = true;
           fontconfig = {
             enable = true;