system/packages: fix infinite recursion
This commit is contained in:
parent
571f0f6f3e
commit
f1e9e140d6
2 changed files with 29 additions and 25 deletions
27
modules/system/packages-gui.nix
Normal file
27
modules/system/packages-gui.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
config = lib.mkIf config.me.gui {
|
||||
environment.systemPackages = with pkgs; [
|
||||
gparted
|
||||
nautilus
|
||||
];
|
||||
programs.adb.enable = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
vaapiIntel
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
programs.light.enable = true;
|
||||
hardware.opentabletdriver.enable = true;
|
||||
hardware.keyboard.qmk.enable = true;
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
package = pkgs.steam.override {
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
};
|
||||
};
|
||||
services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
|
||||
services.gnome.sushi.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
imports = [ ./packages-gui.nix ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
comma
|
||||
ecryptfs
|
||||
|
|
@ -16,30 +17,6 @@
|
|||
sshfs
|
||||
rsync
|
||||
wget
|
||||
] ++ lib.optionals config.me.gui [
|
||||
gparted
|
||||
nautilus
|
||||
];
|
||||
environment.variables.EDITOR = "nvim";
|
||||
}
|
||||
// (if !config.me.gui then {} else {
|
||||
programs.adb.enable = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
vaapiIntel
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
programs.light.enable = true;
|
||||
hardware.opentabletdriver.enable = true;
|
||||
hardware.keyboard.qmk.enable = true;
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
package = pkgs.steam.override {
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
};
|
||||
};
|
||||
services.dbus.packages = [ pkgs.dconf pkgs.gcr ];
|
||||
services.gnome.sushi.enable = true;
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue