From 61e22ba0e039b93265954d98aa9b20ca1a8c4f14 Mon Sep 17 00:00:00 2001 From: Felix Suchert Date: Mon, 30 Sep 2024 11:13:33 +0200 Subject: [PATCH] Switch to Pipewire, Bump flake.lock --- entropy/nixos/flake.lock | 18 ++++++------- entropy/nixos/modules/audio.nix | 46 +++++++++++++++++++++------------ entropy/nvim/lazy-lock.json | 34 ++++++++++++------------ 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/entropy/nixos/flake.lock b/entropy/nixos/flake.lock index e67fcfe..ba8503a 100644 --- a/entropy/nixos/flake.lock +++ b/entropy/nixos/flake.lock @@ -21,11 +21,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726650330, - "narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "abb448608a56a60075468e90d8acec2a7cb689b1", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "unstable": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { diff --git a/entropy/nixos/modules/audio.nix b/entropy/nixos/modules/audio.nix index 7e19305..08b7bed 100644 --- a/entropy/nixos/modules/audio.nix +++ b/entropy/nixos/modules/audio.nix @@ -15,11 +15,25 @@ security.rtkit.enable = true; services.pipewire = { enable = true; - #alsa.enable = true; - #alsa.support32Bit = true; - #pulse.enable = true; - ## If you want to use JACK applications, uncomment this - ##jack.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = 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" + ]; + }; + }; ## use the example session manager (no others are packaged yet so this is enabled by default, ## no need to redefine it in your config for now) @@ -99,17 +113,17 @@ # configure pulseaudio to work with bluetooth headsets using aptx - hardware.pulseaudio = { - enable = true; - # the full package is necessary for BT support - package = pkgs.pulseaudioFull; - # switch to bluetooth automatically if they are connected - extraConfig = " - load-module module-switch-on-connect - load-module module-bluetooth-policy auto_switch=2 - "; - }; - nixpkgs.config.pulseaudio = true; + #hardware.pulseaudio = { + #enable = true; + ## the full package is necessary for BT support + #package = pkgs.pulseaudioFull; + ## switch to bluetooth automatically if they are connected + #extraConfig = " + #load-module module-switch-on-connect + #load-module module-bluetooth-policy auto_switch=2 + #"; + #}; + #nixpkgs.config.pulseaudio = true; # enable bluetooth in general and add a simple tool for connecting devices hardware.bluetooth = { diff --git a/entropy/nvim/lazy-lock.json b/entropy/nvim/lazy-lock.json index 9919397..4578cb5 100644 --- a/entropy/nvim/lazy-lock.json +++ b/entropy/nvim/lazy-lock.json @@ -1,38 +1,38 @@ { "Nvim-R": { "branch": "stable", "commit": "346fda8ade9f743f65a6805136deb3db70dc5fae" }, "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" }, - "cmake-tools.nvim": { "branch": "master", "commit": "4be3c229fe932043fd83ad52fdf0ba9af7297789" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "385a44f133f4145e3a3da1a2a557225dccc3e1f8" }, + "cmake-tools.nvim": { "branch": "master", "commit": "f1f917b584127b673c25138233cebf1d61a19f35" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" }, - "fzf": { "branch": "master", "commit": "e28f5aa45baf20ffdba469e11a998d3016c8cb42" }, - "fzf.vim": { "branch": "master", "commit": "6f28c8c7bb551161a0315a76488522204f39c1f4" }, + "fzf": { "branch": "master", "commit": "30a8ef28cdc1d23cf6956f57ca05bd28db515014" }, + "fzf.vim": { "branch": "master", "commit": "c5ce7908ee86af7d4090d2007086444afb6ec1c9" }, "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, - "hledger-vim": { "branch": "master", "commit": "165eb483a10fd610bd9cad5d5246e457bf5fe285" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "hledger-vim": { "branch": "master", "commit": "303c7296a22daf269b1dca0c30030faf7fb461ec" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lingua-franca.vim": { "branch": "main", "commit": "439b92a13744ee21cb3cd9c399e179efbcaa2967" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, "nerdcommenter": { "branch": "master", "commit": "3f860f2d981547c18f2c9599e3c358ea488c3be4" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "ff97d376b1d22b2eaf9274605531babf0cd0cf21" }, - "nvim-treesitter": { "branch": "master", "commit": "e5a05ba5e298cc1e1dad8eb8095b8d4d89a7f793" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, + "nvim-lspconfig": { "branch": "master", "commit": "dd329912c8d446240584a2dbcd3802af3a19105a" }, + "nvim-treesitter": { "branch": "master", "commit": "6511cd984ab4b21e28f83af488f38dc89c3b0586" }, + "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, - "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, - "vim-llvm": { "branch": "master", "commit": "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, + "vim-llvm": { "branch": "master", "commit": "7bb02ef3c6c41aa5510d4aa9817fd40936be8209" }, "vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, - "vimtex": { "branch": "master", "commit": "93448dd2617c1407f66b08610db520ecb8a28073" } -} \ No newline at end of file + "vimtex": { "branch": "master", "commit": "b9cc11536a4e726c58c4776e9bcecff26fc454cb" } +}