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

steveej-t14: keep using master's qtile

Browse source
This commit is contained in:
steveej 2021-08-31 12:37:14 +02:00
parent 768ea36d85
commit da8ac33ed2
4 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
*.qcow2 *.qcow2
.*.log .*.log
.env .env
**/result

3
nix/home-manager/profiles/qtile-desktop.nix
View file

@ -333,7 +333,7 @@ in {
xsession = { xsession = {
enable = true; enable = true;
windowManager.command = "${pkgs.qtile}/bin/qtile -c ${qtileConfig}"; windowManager.command = "${pkgs.qtile}/bin/qtile start -c ${qtileConfig}";
initExtra = '' initExtra = ''
${pkgs.xorg.xinput}/bin/xinput set-prop "ZSA Moonlander Mark I Mouse" "libinput Natural Scrolling Enabled" 1 ${pkgs.xorg.xinput}/bin/xinput set-prop "ZSA Moonlander Mark I Mouse" "libinput Natural Scrolling Enabled" 1
${pkgs.autorandr}/bin/autorandr -c ${pkgs.autorandr}/bin/autorandr -c
@ -351,7 +351,6 @@ in {
home.packages = with pkgs; [ home.packages = with pkgs; [
# X Tools/Libraries # X Tools/Libraries
lightdm lightdm
qtile
gnome3.networkmanagerapplet gnome3.networkmanagerapplet
autorandr autorandr
arandr arandr

3
nix/os/devices/default.nix
View file

@ -33,10 +33,11 @@ let
else else
"" ""
} }
nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
if test -L result; then if test -L result; then
rm result rm result
fi fi
nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
''; '';

33
nix/overlays/overrides.nix
View file

@ -4,9 +4,11 @@ self: super:
let let
nixpkgs-master = import <nixpkgs-master> { inherit (super) config; }; nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
nixpkgs-unstable = import <channels-nixos-unstable> { inherit (super) config; };
in { in {
inherit nixpkgs-master; inherit nixpkgs-master;
inherit nixpkgs-unstable;
# alacritty = nixpkgs-master.alacritty; # alacritty = nixpkgs-master.alacritty;
alacritty = super.stdenv.mkDerivation { alacritty = super.stdenv.mkDerivation {
@ -32,28 +34,27 @@ 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 = super.qtile.overrideAttrs(oldAttrs: { # qtile = super.qtile.overrideAttrs(oldAttrs: {
pythonPath = oldAttrs.pythonPath ++ (with self.python37Packages; [ # pythonPath = oldAttrs.pythonPath ++ (with self.python37Packages; [
psutil # psutil
dbus-python # dbus-python
pyxdg # pyxdg
mpd2 # 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; [
# # python-wifi # # python-wifi
# # iwlib # # iwlib
# dateutil
# keyring # 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 { btrbk = super.btrbk.overrideAttrs(attrs: rec {
version = "0.30.0"; version = "0.30.0";
src = builtins.fetchurl { src = builtins.fetchurl {