From da8ac33ed27d0a057dab3464cce2fefc068f364c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 31 Aug 2021 12:37:14 +0200
Subject: [PATCH] steveej-t14: keep using master's qtile

---
 .gitignore                                  |  1 +
 nix/home-manager/profiles/qtile-desktop.nix |  3 +-
 nix/os/devices/default.nix                  |  3 +-
 nix/overlays/overrides.nix                  | 33 +++++++++++----------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e0fed2..06f83d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.qcow2
 .*.log
 .env
+**/result
diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix
index 02eda67..789e915 100644
--- a/nix/home-manager/profiles/qtile-desktop.nix
+++ b/nix/home-manager/profiles/qtile-desktop.nix
@@ -333,7 +333,7 @@ in {
 
   xsession = {
     enable = true;
-    windowManager.command = "${pkgs.qtile}/bin/qtile -c ${qtileConfig}";
+    windowManager.command = "${pkgs.qtile}/bin/qtile start -c ${qtileConfig}";
     initExtra = ''
       ${pkgs.xorg.xinput}/bin/xinput set-prop "ZSA Moonlander Mark I Mouse" "libinput Natural Scrolling Enabled" 1
       ${pkgs.autorandr}/bin/autorandr -c
@@ -351,7 +351,6 @@ in {
   home.packages = with pkgs; [
     # X Tools/Libraries
     lightdm
-    qtile
     gnome3.networkmanagerapplet
     autorandr
     arandr
diff --git a/nix/os/devices/default.nix b/nix/os/devices/default.nix
index fc6bc71..9cb063d 100644
--- a/nix/os/devices/default.nix
+++ b/nix/os/devices/default.nix
@@ -33,10 +33,11 @@ let
       else
         ""
     }
-    nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
+
     if test -L result; then
       rm result
     fi
+    nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
   '';
 
 
diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix
index ddc2b5e..9168378 100644
--- a/nix/overlays/overrides.nix
+++ b/nix/overlays/overrides.nix
@@ -4,9 +4,11 @@ self: super:
 
 let
   nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
+  nixpkgs-unstable = import <channels-nixos-unstable> { inherit (super) config; };
 
 in {
   inherit nixpkgs-master;
+  inherit nixpkgs-unstable;
 
   # alacritty = nixpkgs-master.alacritty;
   alacritty = super.stdenv.mkDerivation {
@@ -32,28 +34,27 @@ in {
   # TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804)
   facetimehd-firmware = super.hello;
 
-  qtile = super.qtile.overrideAttrs(oldAttrs: {
-    pythonPath = oldAttrs.pythonPath ++ (with self.python37Packages; [
-      psutil
-      dbus-python
-      pyxdg
-      mpd2
-      # python-wifi
-      # iwlib
-      dateutil
-      keyring
-    ]);
-  });
-
-  # master is currently not compatible with the 21.05 channel
-  # qtile = self.nixpkgs-master.qtile.overrideAttrs(oldAttrs: {
-  #   propagatedBuildInputs = oldAttrs.passthru.unwrapped.propagatedBuildInputs ++ (with self.python3Packages; [
+  # qtile = super.qtile.overrideAttrs(oldAttrs: {
+  #   pythonPath = oldAttrs.pythonPath ++ (with self.python37Packages; [
+  #     psutil
+  #     dbus-python
+  #     pyxdg
+  #     mpd2
   #     # python-wifi
   #     # iwlib
+  #     dateutil
   #     keyring
   #   ]);
   # });
 
+  qtile = self.nixpkgs-unstable.qtile.overrideAttrs(oldAttrs: {
+    propagatedBuildInputs = oldAttrs.passthru.unwrapped.propagatedBuildInputs ++ (with self.python3Packages; [
+      # python-wifi
+      # iwlib
+      keyring
+    ]);
+  });
+
   btrbk = super.btrbk.overrideAttrs(attrs: rec {
     version = "0.30.0";
     src =  builtins.fetchurl {