chore: remove unnecessary tricks

2 files changed, 20 insertions, 32 deletions

diff --git a/flake.lock b/flake.lock
index eceb1ad..cce56a7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1644534280,
-        "narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=",
+        "lastModified": 1645244400,
+        "narHash": "sha256-o7KCd6ySFZ9/LbS62aTeuFmBWtP7Tt3Q3RcNjYgTgZU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476",
+        "rev": "0232fe1b75e6d7864fd82b5c72f6646f87838fc3",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1644535319,
-        "narHash": "sha256-Ssnv93xJvYVJ5E1TAqSoglPrehIjTIAHq6IX6iKKnlw=",
+        "lastModified": 1645322221,
+        "narHash": "sha256-X0p655pxc/v/XzWMI5m8Xri/3rCbdGFr3v1yeyOuJgA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1b4808c0d69c221895b4f92700daf228c8e5e078",
+        "rev": "103c44d03569918d7219aef3b71df416e218194e",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1644529849,
-        "narHash": "sha256-r5aDO3kdjZcxsFomxuJbkMUI0/ejOJl6rRp0oEVsz1c=",
+        "lastModified": 1645311555,
+        "narHash": "sha256-Va2UQFMSBYDuUbYOVKEPQj1PV1RxBHbhv0WTJTHqDvE=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "851252f79ddaaca5456b287342cd36130c76ff38",
+        "rev": "8b3799e2c33282bf417ddee15ae71b5aba613c16",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
     },
     "nixpkgs-2111": {
       "locked": {
-        "lastModified": 1644193793,
-        "narHash": "sha256-ggCI5LCXwkUJQwjpkr9qDFbQMiK3JvAfeNR4Uy0ny5Q=",
+        "lastModified": 1645010845,
+        "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e",
+        "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1644420267,
-        "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=",
+        "lastModified": 1644613700,
+        "narHash": "sha256-wLRPJclMH8vsHuFtyI78aF09lw5mbi3lMB6uiK5S2wE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1",
+        "rev": "23d785aa6f853e6cf3430119811c334025bbef55",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
     },
     "unstable-small": {
       "locked": {
-        "lastModified": 1644494270,
-        "narHash": "sha256-2AxKk/PvqAsq+v9J9VYsmfpfc43PkHkA0iJ98RP+Rbk=",
+        "lastModified": 1645072054,
+        "narHash": "sha256-I+HkWU1IpRb93VzjayAybj3L2CcJxNlZDhSeSpL3eSw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7dfba0cf2692db4cf6cf988ab8fe3a8f2b8a3a90",
+        "rev": "97777606991c3a78040c883fa97791ae77073022",
         "type": "github"
       },
       "original": {
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index 4ffacd1..9d25b12 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -100,23 +100,11 @@
   services.pipewire = {
     enable = true;
 
-    #alsa.enable = true;
-    #alsa.support32Bit = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
     pulse.enable = true;
   };
 
-  # TODO: https://github.com/NixOS/nixpkgs/pull/157631
-  environment.etc."alsa/conf.d/49-pipewire-modules.conf".text = ''
-    pcm_type.pipewire {
-      lib ${pkgs.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;
-    }
-    ctl_type.pipewire {
-      lib ${pkgs.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;
-    }
-  '';
-  environment.etc."alsa/conf.d/50-pipewire.conf".source = "${pkgs.pipewire}/share/alsa/alsa.conf.d/50-pipewire.conf";
-  environment.etc."alsa/conf.d/99-pipewire-default.conf".source = "${pkgs.pipewire}/share/alsa/alsa.conf.d/99-pipewire-default.conf";
-
   hardware.bluetooth.enable = true;
 
   services.greetd = {