From 3ea248b397b206ecd78f0477e0a7fef3e0504f58 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 24 Aug 2020 09:05:03 +0200 Subject: [PATCH 1/2] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index a6882f3..1e5db2a 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { ref = "nixos-20.03"; - rev = "cb1996818edf506c0d1665ab147c253c558a7426"; + rev = "0c59c1296b23abc25a6383ff26db2eeb17ad8a81"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "16fc531784ac226fb268cc59ad573d2746c109c1"; + rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "644ecea529209ad1a7b1a1c0db03c81d206d66c0"; + rev = "a332da8588aeea4feb9359d23f58d95520899e3c"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "release-20.03"; - rev = "318bc0754ed6370cfcae13183a7f13f7aa4bc73f"; + rev = "4a8d6280544d9b061c0b785d2470ad6eeda47b02"; }; } From 0f5137627536126ffb1ec58572daaa231aff606e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 25 Aug 2020 20:00:39 +0200 Subject: [PATCH 2/2] nix/overlays: add more python packages to qtile _psutil_ is required with my current config, and the others are inserted precautiously. --- nix/overlays/overrides.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix index ac0fcb2..92516fc 100644 --- a/nix/overlays/overrides.nix +++ b/nix/overlays/overrides.nix @@ -32,5 +32,16 @@ in { # TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804) facetimehd-firmware = super.hello; - qtile = self.nixpkgs-master.qtile; + qtile = self.nixpkgs-master.qtile.overrideAttrs(oldAttrs: { + pythonPath = oldAttrs.pythonPath ++ (with self.python37Packages; [ + psutil + dbus-python + pyxdg + mpd2 + # python-wifi + # iwlib + dateutil + keyring + ]); + }); }