steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/qtile-more-python-modules' into 'master'

Browse source 
bump versions and fix qtile accordingly

See merge request steveeJ/infra!45
This commit is contained in:
steveej 2020-08-25 18:11:58 +00:00
commit 614aa63874
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -1,20 +1,20 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-20.03"; ref = "nixos-20.03";
rev = "cb1996818edf506c0d1665ab147c253c558a7426"; rev = "0c59c1296b23abc25a6383ff26db2eeb17ad8a81";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "16fc531784ac226fb268cc59ad573d2746c109c1"; rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38";
}; };
nixpkgsMaster = { nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "644ecea529209ad1a7b1a1c0db03c81d206d66c0"; rev = "a332da8588aeea4feb9359d23f58d95520899e3c";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "release-20.03"; ref = "release-20.03";
rev = "318bc0754ed6370cfcae13183a7f13f7aa4bc73f"; rev = "4a8d6280544d9b061c0b785d2470ad6eeda47b02";
}; };
} }

13
nix/overlays/overrides.nix
View file

@ -32,5 +32,16 @@ in {
# TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804) # TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804)
facetimehd-firmware = super.hello; 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
]);
});
} }