From c55b07e0af269d1ad2fa3cb444da8b338d874bda Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sat, 25 Nov 2023 01:57:31 +0000 Subject: [PATCH] Never mind, iwd+networkmanager sucks --- flake.lock | 18 +++++++++--------- sets/sway.nix | 7 ++++++- sets/wifi.nix | 1 - 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 4a8920f..935044a 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1700553346, - "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", + "lastModified": 1700847865, + "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", + "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1700659845, - "narHash": "sha256-nU3fHWd/YKPtnJ+PVqtooVNlFtkSQIfrsq14wyufUXA=", + "lastModified": 1700831612, + "narHash": "sha256-4rjt03g847UpPYshwItJqFqxHJ6l4aoXqDVT9CNOCu4=", "owner": "nix-community", "repo": "nixvim", - "rev": "796e7391cec5134fd36951d275e7a0809e2107c8", + "rev": "bacdae2c508defccdff1af8511e4d639d26d3d47", "type": "github" }, "original": { diff --git a/sets/sway.nix b/sets/sway.nix index ade180a..91b4ef0 100644 --- a/sets/sway.nix +++ b/sets/sway.nix @@ -8,7 +8,12 @@ }; xdg.portal = { enable = true; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ]; + wlr.enable = true; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + config = { + common.default = [ "gtk" ]; + sway.default = [ "wlr" "gtk" ]; + }; }; sound.enable = true; environment.systemPackages = with pkgs; [ diff --git a/sets/wifi.nix b/sets/wifi.nix index 497abe7..80ae83f 100644 --- a/sets/wifi.nix +++ b/sets/wifi.nix @@ -3,7 +3,6 @@ networking.networkmanager = { enable = true; wifi.macAddress = "stable"; - wifi.backend = "iwd"; }; users.users.artemis.extraGroups = [ "networkmanager" ]; }