From 323ebc6edb15d6a69f663cc10428caccaf4fb7ce Mon Sep 17 00:00:00 2001
From: Arnar Gauti Ingason <arnarg@fastmail.com>
Date: Wed, 3 Mar 2021 23:02:41 +0100
Subject: [PATCH] Temporarily use waybar from nixpkgs-wayland

https://github.com/NixOS/nixpkgs/issues/114870
---
 flake.lock                        | 69 +++++++++++++++++++++++++++++++
 flake.nix                         |  3 +-
 profiles/desktop/sway/default.nix |  4 +-
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 87c7e4b..4d202d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "cachix": {
+      "locked": {
+        "lastModified": 1614673811,
+        "narHash": "sha256-hO9pkXF9kIjI9p6dpOEF9eZrflpTMBaDYf+QCunfmfM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "8d82c865b416354a43cb30bd1945c3bbda27850d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-20.09",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -53,6 +69,26 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-wayland": {
+      "inputs": {
+        "cachix": "cachix",
+        "nixpkgs": "nixpkgs_3",
+        "unstableSmall": "unstableSmall"
+      },
+      "locked": {
+        "lastModified": 1614805419,
+        "narHash": "sha256-3bxvjQcrPksJw4h9/WEjuHQakn81G4CHhlzPArk1V5I=",
+        "owner": "colemickens",
+        "repo": "nixpkgs-wayland",
+        "rev": "c48cc640477d55b74bafced5e86db22c87c87d96",
+        "type": "github"
+      },
+      "original": {
+        "owner": "colemickens",
+        "repo": "nixpkgs-wayland",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1614535430,
@@ -69,11 +105,28 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1614535430,
+        "narHash": "sha256-kZwi0CooIOmFrk9eIteYSZIr4a4DVTEYV7UnURs6DSM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0aeba64fb26e4defa0842a942757144659c6e29f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home": "home",
         "nix": "nix",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-wayland": "nixpkgs-wayland",
         "stable": "stable"
       }
     },
@@ -92,6 +145,22 @@
         "repo": "nixpkgs",
         "type": "github"
       }
+    },
+    "unstableSmall": {
+      "locked": {
+        "lastModified": 1614777162,
+        "narHash": "sha256-k1TbDEcgqwEs4e/HAOsYZ8uVc+4RDhipw99PV0S8mBI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e061350a361df9667490c5914fb72a58dd927bca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 8db8368..34f96ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
 
     nix = { url = "github:nixos/nix"; };
     home = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nixpkgs-wayland  = { url = "github:colemickens/nixpkgs-wayland"; };
   };
 
   #############
@@ -109,7 +110,7 @@
                 '';
 
                 nixPath = [
-                  "pkgs=${inputs.self}/compat"
+                  "nixpkgs=${inputs.self}/compat"
                   "nixos-config=${inputs.self}/compat/nixos"
                 ];
 
diff --git a/profiles/desktop/sway/default.nix b/profiles/desktop/sway/default.nix
index b0edce2..1c33a68 100644
--- a/profiles/desktop/sway/default.nix
+++ b/profiles/desktop/sway/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, mypkgs, ... }:
+{ config, lib, pkgs, mypkgs, inputs, system, ... }:
 let
   cfg = config.local.desktop.sway;
 
@@ -59,7 +59,7 @@ in with pkgs.stdenv; with lib; {
 
     home-manager.users.arnar = {
       home.packages = with pkgs; [
-        (waybar.override { pulseSupport = true; })
+        inputs.nixpkgs-wayland.packages.${system}.waybar
       ];
 
       # Sway