From 3980e568d721aa97c9740e68d6e1f296b2e3cc67 Mon Sep 17 00:00:00 2001 From: bad Date: Sat, 15 Apr 2023 13:57:28 +0200 Subject: [PATCH] Update flake.lock --- flake.lock | 90 +++++++++++++++++++++-------------- profiles/pipewire/default.nix | 29 +---------- suites/default.nix | 2 +- users/mae/default.nix | 1 + 4 files changed, 57 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index e657994..b0e47a0 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1677969766, - "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", + "lastModified": 1680281360, + "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", "owner": "ryantm", "repo": "agenix", - "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", + "rev": "e64961977f60388dd0b49572bb0fc453b871f896", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1681154394, + "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1679207026, - "narHash": "sha256-3BrBOSwYGlgTq69+OeHCQoFBGTzpDp9PkKjWkxpA108=", + "lastModified": 1681280529, + "narHash": "sha256-WDPFJQpnkFFpWW2OSiR0hfPovmpeP004DIq89q6GyLs=", "owner": "nix-community", "repo": "fenix", - "rev": "efc838bd45cfdfd21836f239605f2082d7245464", + "rev": "0d8c62bb906470782a4aa36d93044e660088a3f8", "type": "github" }, "original": { @@ -318,12 +318,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -387,11 +390,11 @@ ] }, "locked": { - "lastModified": 1679067095, - "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", + "lastModified": 1681250798, + "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", + "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", "type": "github" }, "original": { @@ -434,11 +437,11 @@ }, "latest_2": { "locked": { - "lastModified": 1679232602, - "narHash": "sha256-O7dj7MvfhN0G5BQxMjPEUh13iGGjLT87Wxc4U6EH20E=", + "lastModified": 1681419904, + "narHash": "sha256-X9CmNZ2g6fCoZY9tw+odl1/jCp5Zw2RiJOm7n+lRD4U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb661ff785b95dfbfe780143b66ad21814218fc", + "rev": "17e5b5248329d0d628b9c29112b2ea98d900f2ab", "type": "github" }, "original": { @@ -455,11 +458,11 @@ ] }, "locked": { - "lastModified": 1671096816, - "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", + "lastModified": 1679567394, + "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", "owner": "nmattia", "repo": "naersk", - "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", + "rev": "88cd22380154a2c36799fe8098888f0f59861a15", "type": "github" }, "original": { @@ -489,11 +492,11 @@ }, "nixos": { "locked": { - "lastModified": 1679081381, - "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { @@ -505,11 +508,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1679224149, - "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -520,11 +523,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679081381, - "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=", + "lastModified": 1681126633, + "narHash": "sha256-evQ3Ct/yJDSHej16Hiq+JfxRjgm9FXu/2LBxsyorGdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5", + "rev": "db24d86dd8a4769c50d6b7295e81aa280cd93f35", "type": "github" }, "original": { @@ -658,11 +661,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1679123187, - "narHash": "sha256-Jf9hN2BIHdZ2Of4A0zAyB0fhe1EFujLa9XjWRC9ZKiY=", + "lastModified": 1681234995, + "narHash": "sha256-QQxQAG5QZG8z/uRREhWnq4215Asl7Gh6a8zj7swDyP4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "7c05f55f0c9e9bec28464b329194fe244ca2c7a9", + "rev": "7501d3b721560637e27f904d9fce79182c41bef7", "type": "github" }, "original": { @@ -674,11 +677,11 @@ }, "stable": { "locked": { - "lastModified": 1679139072, - "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", + "lastModified": 1681269223, + "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", + "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9", "type": "github" }, "original": { @@ -688,6 +691,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1637014545, diff --git a/profiles/pipewire/default.nix b/profiles/pipewire/default.nix index 1548f13..a9d34f3 100644 --- a/profiles/pipewire/default.nix +++ b/profiles/pipewire/default.nix @@ -10,33 +10,6 @@ pulse.enable = true; # If you want to use JACK applications, uncomment this #jack.enable = true; - - #bluetooth config - media-session.config.bluez-monitor.rules = [ - { - # Matches all cards - matches = [{ "device.name" = "~bluez_card.*"; }]; - actions = { - "update-props" = { - "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ]; - # mSBC is not expected to work on all headset + adapter combinations. - "bluez5.msbc-support" = true; - # SBC-XQ is not expected to work on all headset + adapter combinations. - "bluez5.sbc-xq-support" = true; - }; - }; - } - { - matches = [ - # Matches all sources - { "node.name" = "~bluez_input.*"; } - # Matches all outputs - { "node.name" = "~bluez_output.*"; } - ]; - actions = { - "node.pause-on-idle" = false; - }; - } - ]; + wireplumber.enable = true; }; } diff --git a/suites/default.nix b/suites/default.nix index c1421b8..80642ec 100644 --- a/suites/default.nix +++ b/suites/default.nix @@ -1,7 +1,7 @@ { profiles, ... }: with profiles; rec { base = [ users.root core dns ]; - workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae ]; + workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak tailscale users.mae ]; desktop = workstation ++ [ amd ]; lap = workstation ++ [ laptop bluetooth print ]; } diff --git a/users/mae/default.nix b/users/mae/default.nix index d66ca13..e37f7e7 100644 --- a/users/mae/default.nix +++ b/users/mae/default.nix @@ -1,5 +1,6 @@ { pkgs, ... }: { + programs.zsh.enable = true; users.users.mae = { uid = 1000;