refactor(desktop): conditionally import modules based on useHomeManager

4 files changed, 21 insertions, 37 deletions

diff --git a/modules/hosts/desktop/default.nix b/modules/hosts/desktop/default.nix
index 137b68c..7d7f3ae 100644
--- a/modules/hosts/desktop/default.nix
+++ b/modules/hosts/desktop/default.nix
@@ -1,14 +1,17 @@
-{ ... }:
+{ useHomeManager ? true, ... }:
 
 {
   imports = [
-    #./sway
-    #./dunst.nix
-    #./waybar.nix
-    #./gnome
+    # NixOS-only modules (no home-manager)
     ./cinnamon
+    ./gnome
     ./kde
-    #./labwc
-    #./hyprland
-  ];
+  ] ++ (if useHomeManager then [
+    # Modules that require home-manager
+    ./hyprland
+    ./labwc
+    ./sway
+    ./dunst.nix
+    ./waybar.nix
+  ] else [ ]);
 }
diff --git a/modules/hosts/system/users.nix b/modules/hosts/system/users.nix
index 5ecdfba..9550e8d 100644
--- a/modules/hosts/system/users.nix
+++ b/modules/hosts/system/users.nix
@@ -1,22 +1,5 @@
-{
-  config,
-  username,
-  pkgs,
-  lib,
-  ...
-}:
+{ ... }:
 
 {
-  users.users."${username}" = {
-    isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "video"
-      "input"
-      (lib.mkIf config.networking.networkmanager.enable "networkmanager")
-    ];
-    shell = pkgs.zsh;
-    ignoreShellProgramCheck = true;
-  };
   security.sudo.wheelNeedsPassword = false;
 }
diff --git a/modules/users/productivity/anki/default.nix b/modules/users/productivity/anki/default.nix
index efe4ab5..58d8f49 100644
--- a/modules/users/productivity/anki/default.nix
+++ b/modules/users/productivity/anki/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  options,
   lib,
   ...
 }:
@@ -17,14 +16,13 @@ in
     };
   };
   config = mkIf cfg.enable {
-    # Marked as broken
-    #home-manager.users.${username}.programs.anki = {
-    #enable = true;
-    #style = "native";
-    #addons = with pkgs.ankiAddons; [
-    #  anki-connect
-    #  review-heatmap
-    #];
-    #};
+    programs.anki = {
+    enable = true;
+			#style = "native";
+			#addons = with pkgs.ankiAddons; [
+			#  anki-connect
+			#  review-heatmap
+			#];
+    };
   };
 }
diff --git a/modules/users/terminal/default.nix b/modules/users/terminal/default.nix
index 4a9b254..937c086 100644
--- a/modules/users/terminal/default.nix
+++ b/modules/users/terminal/default.nix
@@ -30,7 +30,7 @@ in
         "bash"
         "zsh"
       ];
-      default = "zsh";
+      default = "bash";
     };
   };
 }