From d66a08f8f26e55ae68f100fa6fa69c7aa96762d8 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 1 Jan 2025 17:59:05 +0100
Subject: [PATCH] bump: updated home-manager and goober config

---
 flake.lock                                  | 33 ++++++++++++++++-----
 flake.nix                                   |  8 +++--
 hosts/goober/configuration.nix              |  2 +-
 hosts/goober/features/hardware/pipewire.nix | 29 ++----------------
 hosts/goober/features/software/flatpak.nix  |  1 -
 5 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/flake.lock b/flake.lock
index a2b340c..9139315 100644
--- a/flake.lock
+++ b/flake.lock
@@ -256,16 +256,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1735344290,
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -414,13 +414,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgsSmall": {
       "locked": {
-        "lastModified": 1734927162,
-        "narHash": "sha256-egJAEOe61A3FFU1KkG7GW51Q9uq39L4yfkrGfA2p2Eo=",
+        "lastModified": 1735640024,
+        "narHash": "sha256-4I5qiwYmZFygUC3numWaMhStwRYX+Lk0ISddJIoHEwE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d28f9301c35e66751872254b8029f31fa9e0da20",
+        "rev": "bc130b5a632d110d76f1584213eab6e029fd7802",
         "type": "github"
       },
       "original": {
@@ -430,6 +430,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1735531152,
+        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_3": {
       "locked": {
         "lastModified": 1731763621,
@@ -457,6 +473,7 @@
         "nix-secrets": "nix-secrets",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgsSmall": "nixpkgsSmall",
         "sops-nix": "sops-nix"
       }
     },
diff --git a/flake.nix b/flake.nix
index 77793e4..15320f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,11 @@
   description = "the silliest NixOS config!";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgsSmall.url = "github:NixOS/nixpkgs/nixos-24.11-small";
     sops-nix.url = "github:Mic92/sops-nix";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     alejandra.url = "github:kamadorueda/alejandra/3.0.0";
@@ -36,6 +37,7 @@
     {
       self,
       nixpkgs,
+      nixpkgsSmall,
       sops-nix,
       nixos-generators,
       nix-darwin,
@@ -56,7 +58,7 @@
     in
     {
       nixosConfigurations = {
-        sisyphe = nixpkgs.lib.nixosSystem {
+        sisyphe = nixpkgsSmall.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = specialArgs;
           modules = [
diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix
index 0d5e89c..ec48d21 100644
--- a/hosts/goober/configuration.nix
+++ b/hosts/goober/configuration.nix
@@ -65,7 +65,7 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.harry123 = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "audio" "video" ]; # Enable ‘sudo’ for the user.
     packages = with pkgs; [
       firefox
       tailscale
diff --git a/hosts/goober/features/hardware/pipewire.nix b/hosts/goober/features/hardware/pipewire.nix
index 80d289d..08ba1e1 100644
--- a/hosts/goober/features/hardware/pipewire.nix
+++ b/hosts/goober/features/hardware/pipewire.nix
@@ -1,33 +1,10 @@
 {config, pkgs, ...}:
 {
-  sound.enable = false;
   security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    #jack.enable = true;
+  services.pipewire.enable = false;
+  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.support32Bit = true;
 
-    wireplumber.extraConfig."10-bluez" = {
-        "monitor.bluez.properties" = {
-          "bluez5.enable-sbc-xq" = true;
-          "bluez5.enable-msbc" = true;
-          "bluez5.enable-hw-volume" = true;
-          "bluez5.roles" = [
-            "hsp_hs"
-            "hsp_ag"
-            "hfp_hf"
-            "hfp_ag"
-          ];
-        };
-      };
-  };
- services.pipewire.wireplumber.extraConfig."11-bluetooth-policy" = {
-    "wireplumber.settings" = {
-      "bluetooth.autoswitch-to-headset-profile" = false;
-    };
-  };
   environment.systemPackages = [
     pkgs.pwvucontrol
   ];
diff --git a/hosts/goober/features/software/flatpak.nix b/hosts/goober/features/software/flatpak.nix
index 5e16022..20da69a 100644
--- a/hosts/goober/features/software/flatpak.nix
+++ b/hosts/goober/features/software/flatpak.nix
@@ -3,7 +3,6 @@
 
   services.flatpak.packages = [
     "io.github.zen_browser.zen"
-    "dev.vencord.Vesktop"
     "com.unicornsonlsd.finamp"
   ];