cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

system/packages: fix infinite recursion

Browse source
This commit is contained in:
LavaDesu 2025-03-23 13:21:46 +11:00
parent 571f0f6f3e
commit f1e9e140d6
Signed by: cilly
GPG key ID: 6500251E087653C9
2 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/system/packages-gui.nix Normal file
View 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;
};
}

27
modules/system/packages.nix
View file

@ -1,4 +1,5 @@
{ config, lib, pkgs, ... }: { { pkgs, ... }: {
imports = [ ./packages-gui.nix ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
comma comma
ecryptfs ecryptfs
@ -16,30 +17,6 @@
sshfs sshfs
rsync rsync
wget wget
] ++ lib.optionals config.me.gui [
gparted
nautilus
]; ];
environment.variables.EDITOR = "nvim"; 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;
})