From 30f8b544cb22d1c220e5c0a07197a27501a56267 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Thu, 14 Mar 2024 20:04:17 +0000 Subject: [PATCH] okay how about sway instead --- flake.lock | 12 ++++++------ system/pearbutter/gui.nix | 12 ++---------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 54088eb..c39a25f 100644 --- a/flake.lock +++ b/flake.lock @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1710397390, - "narHash": "sha256-mE7/DVmC/MoNRtJb8HlSx9zwlFY77SQM6FbANbgxOIo=", + "lastModified": 1710446551, + "narHash": "sha256-W2jabm8XVnMsPFfp22Pymk6xJPT0xG13+6fNvvwT7Cg=", "owner": "nixos-bsd", "repo": "nixbsd", - "rev": "c71e3cf6ec171841b6cc22ba5edbb0b43a2fd2fd", + "rev": "c6c3dc93ee1e686c08408390303793ca4170c512", "type": "github" }, "original": { @@ -180,11 +180,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710397339, - "narHash": "sha256-nI1h0mgg7gh3dF6xl/D1QfR0rpHeazi/sB/9MKL/Dhw=", + "lastModified": 1710446334, + "narHash": "sha256-CD+ytDUT0KtkVeWkcV+T5I4mcaSKUOmUW5o/x3Qgsb8=", "owner": "rhelmot", "repo": "nixpkgs", - "rev": "e27b890e9621f978f74936a41109c979cd6daeb5", + "rev": "98b385abb3bf61aca2df04123c041caedcd4b36c", "type": "github" }, "original": { diff --git a/system/pearbutter/gui.nix b/system/pearbutter/gui.nix index 60564ab..2a0aca0 100644 --- a/system/pearbutter/gui.nix +++ b/system/pearbutter/gui.nix @@ -2,19 +2,11 @@ { environment.etc.machine-id.text = "4e9ae0575ebb420e8031ff82db7a37fb"; - boot.extraModulePackages = with pkgs.freebsd; [ - drm-kmod - drm-kmod-firmware - ]; # Intel kmod firmware is unfree, allow all unfree firmware nixpkgs.config.allowUnfreePredicate = pkg: ((pkg.meta or { }).sourceProvenance or [ ]) == [ lib.sourceTypes.binaryFirmware ]; + hardware.opengl.enable = true; services.dbus.enable = true; - services.xserver = { - enable = true; - desktopManager.xfce.enable = true; - exportConfiguration = true; - libinput.enable = true; - }; + programs.sway.enable = true; }