feat: Remove gui-programs import and make imports normal

This commit is contained in:
uttarayan21
2025-03-26 01:20:55 +05:30
parent ceaf555686
commit 11ade0d192
3 changed files with 24 additions and 26 deletions

View File

@@ -2,7 +2,8 @@
lib, lib,
device, device,
... ...
}: { }:
lib.optionalAttrs device.hasGui {
imports = [ imports = [
./bambu-studio.nix ./bambu-studio.nix
./cursor.nix ./cursor.nix

View File

@@ -6,19 +6,16 @@
device, device,
... ...
}: { }: {
imports = imports = [
[ inputs.nix-index-database.hmModules.nix-index
inputs.nix-index-database.hmModules.nix-index ../modules
../modules ./apps
./auth.nix ./auth.nix
./programs ./linux
./scripts.nix ./programs
./services ./scripts.nix
] ./services
++ lib.optionals device.isLinux [./linux] ];
++ lib.optionals device.hasGui [./gui-programs ./apps];
# ++ lib.optionals.device.isDarwin [./macos];
xdg.enable = true; xdg.enable = true;
xdg.userDirs = { xdg.userDirs = {

View File

@@ -1,19 +1,19 @@
{ {
lib, lib,
device, device,
pkgs,
... ...
}: { }:
imports = lib.optionalAttrs (pkgs.stdenv.isLinux && device.hasGui) {
[] imports = [
++ (lib.optionals device.hasGui [ ./hyprland.nix
./hyprland.nix ./gtk.nix
./gtk.nix ./anyrun.nix
./anyrun.nix ./ironbar
./ironbar ./foot.nix
./foot.nix ./mpd.nix
./mpd.nix ./gui.nix
./gui.nix ];
]);
services.kdeconnect.enable = device.hasGui; services.kdeconnect.enable = device.hasGui;
services.kdeconnect.indicator = device.hasGui; services.kdeconnect.indicator = device.hasGui;