feat(sway): Switch to using nixpkgs-wayland

TLATER · Aug 31, 2024 · 764c4c7 · 764c4c7
1 parent b20aa35
commit 764c4c7
Show file tree

Hide file tree

Showing 3 changed files with 221 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,6 @@
   inputs = {
     # NixOS related inputs
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     sops-nix = {
@@ -19,6 +18,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
+
     nix-gaming = {
       url = "github:fufexan/nix-gaming";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/nixos-config/hosts/yui/nvidia/default.nix b/nixos-config/hosts/yui/nvidia/default.nix
@@ -1,7 +1,4 @@
 { pkgs, flake-inputs, config, lib, ... }:
-let
-  unstable = flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
-in
 {
   imports = [ ./vaapi.nix ];
 
@@ -32,39 +29,9 @@ in
     };
   };
 
-  nixpkgs.overlays = [
-    (final: _prev: {
-      sway-unwrapped = unstable.sway-unwrapped.overrideAttrs (attrs: {
-        version = "0-unstable-2024-08-28";
-        src = final.fetchFromGitHub {
-          owner = "swaywm";
-          repo = "sway";
-          rev = "980a4e02113789d0cca94aa023557c6f6e87ec73";
-          hash = "sha256-qciZeQghlLV5aMuOnex3LvFU9vTa941RMlUkdvj0QTU=";
-        };
-        buildInputs = attrs.buildInputs ++ [ final.wlroots ];
-        mesonFlags =
-          let
-            inherit (lib.strings) mesonEnable mesonOption;
-          in
-          [
-            (mesonOption "sd-bus-provider" "libsystemd")
-            (mesonEnable "tray" attrs.trayEnabled)
-          ];
-      });
-
-      wlroots = unstable.wlroots.overrideAttrs (_attrs: {
-        version = "0-unstable-2024-08-29";
-        src = final.fetchFromGitLab {
-          domain = "gitlab.freedesktop.org";
-          owner = "wlroots";
-          repo = "wlroots";
-          rev = "beb9a9ad0a38867154b7606911c33ffa5ecf759f";
-          hash = "sha256-ZlNFxwj3c5zKiSfokA27zhJ+Yar8cma4fj6N/ulI0VM=";
-        };
-      });
-    })
-  ];
+  programs.sway.package = pkgs.sway.override {
+    inherit (flake-inputs.nixpkgs-wayland.packages.${pkgs.system}) sway-unwrapped;
+  };
 
   boot = {
     kernelParams = [