From d0f9c504e3ff296b6d8011a0f68ffddbb0310376 Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Mon, 15 Sep 2025 19:19:42 +0200 Subject: [PATCH] restructure --- modules/apps/default.nix | 16 +++++----------- modules/apps/{dev.nix => dev/default.nix} | 0 modules/apps/{gaming.nix => gaming/default.nix} | 0 modules/apps/{server.nix => server/default.nix} | 0 .../apps/{terminal.nix => terminal/default.nix} | 6 +++++- modules/apps/{visual.nix => visual/default.nix} | 0 6 files changed, 10 insertions(+), 12 deletions(-) rename modules/apps/{dev.nix => dev/default.nix} (100%) rename modules/apps/{gaming.nix => gaming/default.nix} (100%) rename modules/apps/{server.nix => server/default.nix} (100%) rename modules/apps/{terminal.nix => terminal/default.nix} (93%) rename modules/apps/{visual.nix => visual/default.nix} (100%) diff --git a/modules/apps/default.nix b/modules/apps/default.nix index a5f32af..d55b32c 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -1,15 +1,9 @@ {...}: { imports = [ - ./dev.nix - - ./terminal.nix - ./terminal/zsh.nix - - ./visual.nix - ./visual/firefox.nix - - ./server.nix - - ./gaming.nix + ./dev + ./terminal + ./visual + ./server + ./gaming ]; } diff --git a/modules/apps/dev.nix b/modules/apps/dev/default.nix similarity index 100% rename from modules/apps/dev.nix rename to modules/apps/dev/default.nix diff --git a/modules/apps/gaming.nix b/modules/apps/gaming/default.nix similarity index 100% rename from modules/apps/gaming.nix rename to modules/apps/gaming/default.nix diff --git a/modules/apps/server.nix b/modules/apps/server/default.nix similarity index 100% rename from modules/apps/server.nix rename to modules/apps/server/default.nix diff --git a/modules/apps/terminal.nix b/modules/apps/terminal/default.nix similarity index 93% rename from modules/apps/terminal.nix rename to modules/apps/terminal/default.nix index c922dc7..140dc9f 100644 --- a/modules/apps/terminal.nix +++ b/modules/apps/terminal/default.nix @@ -14,9 +14,13 @@ in { }; }; + imports = [ + ./zsh.nix + ]; + config = mkIf cfg.enable { home-manager.users.${homeCfg.username} = { - imports = [./terminal/helix.nix]; + imports = [./helix.nix]; }; environment.variables = { diff --git a/modules/apps/visual.nix b/modules/apps/visual/default.nix similarity index 100% rename from modules/apps/visual.nix rename to modules/apps/visual/default.nix