From 135a0d44ff524e2fe0b079624c55bf51247d57dd Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Tue, 16 Jul 2024 11:12:32 +0200
Subject: [PATCH] flake: update

---
 flake.lock                                  | 24 ++++++++++-----------
 flake.nix                                   |  6 +++++-
 hosts/voyager/default.nix                   |  2 +-
 system/shared/multimedia/sound/default.nix  | 12 +++--------
 system/shared/multimedia/sound/pipewire.nix |  1 -
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index 28dacfd..12472b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -306,11 +306,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720327769,
-        "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=",
+        "lastModified": 1720734513,
+        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71",
+        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
         "type": "github"
       },
       "original": {
@@ -391,11 +391,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720059538,
-        "narHash": "sha256-6CTyQ37ywENn59pVEVuYh2HFpX11RcMil8OaGKuoo90=",
+        "lastModified": 1720665315,
+        "narHash": "sha256-pjKVWqSBBLLF3RpN1wh9SiaMEAMIKb4qvK15FQu7QwA=",
         "owner": "nixpak",
         "repo": "nixpak",
-        "rev": "196d621ef861d285a1e5407ef7ee723e60e2b28c",
+        "rev": "88bca521109d209094be6467eb2a6dccb9a47989",
         "type": "github"
       },
       "original": {
@@ -432,11 +432,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720031269,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "lastModified": 1720957393,
+        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
         "type": "github"
       },
       "original": {
@@ -671,11 +671,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720452943,
-        "narHash": "sha256-YWIdYLBfd3XTdTJV2A12kmDmLh1YdhVnWsyqAvv8iT8=",
+        "lastModified": 1720969601,
+        "narHash": "sha256-oESu3KD4Y1AWMCd+J4EGPcJ2tZidRPG4OP/HuRxAAfc=",
         "owner": "abenz1267",
         "repo": "walker",
-        "rev": "23a6cfee69a9040f763f079aba56119dcbafb263",
+        "rev": "2cd3e8c265a02fbaf13a77f8fd428d22bc273b9b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 76b361e..8a3b5ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,11 @@
     };
   };
 
-  outputs = {self, nixpkgs, ...} @ inputs: {
+  outputs = {
+    self,
+    nixpkgs,
+    ...
+  } @ inputs: {
     nixosConfigurations = import ./hosts {inherit inputs;};
     devShells = import ./shells {inherit inputs;};
   };
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index 0999736..8862612 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -196,7 +196,7 @@
           hyfetch.enable = true;
         };
         applications = {
-          spotify.enable = true;
+          #spotify.enable = true; # https://github.com/the-argus/spicetify-nix/issues/62
           stremio.enable = true;
           vesktop = {
             enable = true;
diff --git a/system/shared/multimedia/sound/default.nix b/system/shared/multimedia/sound/default.nix
index af213e9..aca2aa8 100644
--- a/system/shared/multimedia/sound/default.nix
+++ b/system/shared/multimedia/sound/default.nix
@@ -4,22 +4,16 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.myOptions.system.sound;
 in {
-  imports = [ ./pipewire.nix ];
+  imports = [./pipewire.nix];
   config = mkIf cfg.enable {
-    sound = {
-      enable = mkDefault false; # this just enables ALSA, which we don't really care abouyt
-      mediaKeys.enable = true;
-    };
-
     environment.systemPackages = with pkgs; [
       # TUI tool to manage sound devices & levels
-      # It's made for pulseaudio, but it will work with pipewire too since we 
+      # It's made for pulseaudio, but it will work with pipewire too since we
       # run a compatibility layer for pulse
       pulsemixer
     ];
   };
 }
-
diff --git a/system/shared/multimedia/sound/pipewire.nix b/system/shared/multimedia/sound/pipewire.nix
index 5444256..96822eb 100644
--- a/system/shared/multimedia/sound/pipewire.nix
+++ b/system/shared/multimedia/sound/pipewire.nix
@@ -123,4 +123,3 @@ in {
     };
   };
 }
-