From ebd2c373bcdd4a2722c828967b6fc953fde042ec Mon Sep 17 00:00:00 2001
From: Elias Kohout <elias@kohout.de>
Date: Tue, 7 Apr 2026 06:59:16 +0200
Subject: [PATCH] Fix module system errors: wrap overlay in nixpkgs.overlays
 module and remove invalid programs.dash

---
 flake.nix                   | 16 ++++------------
 hosts/macvm-nix/default.nix |  3 ---
 nixos/modules/shell.nix     |  1 -
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index d411f8b..e41c1ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,17 +48,7 @@
       mkNixosSystem = { system, hostModule, enableHomeManager ? true }:
         let
           pkgs-unstable = mkPkgsUnstable system;
-          hmModules = if enableHomeManager then [
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = {
-                inherit sops-nix pkgs-unstable;
-              };
-              home-manager.users.youruser = import ./home/default.nix;
-            }
-          ] else [];
+          hmModules = [];
         in nixpkgs.lib.nixosSystem {
           inherit system;
 
@@ -67,7 +57,9 @@
           };
 
           modules = [
-            (mkOverlayUnstable system)
+            {
+              nixpkgs.overlays = [ (mkOverlayUnstable system) ];
+            }
             sops-nix.nixosModules.sops
             disko.nixosModules.disko
 
diff --git a/hosts/macvm-nix/default.nix b/hosts/macvm-nix/default.nix
index 298fedf..217a06a 100644
--- a/hosts/macvm-nix/default.nix
+++ b/hosts/macvm-nix/default.nix
@@ -1,9 +1,6 @@
 { config, lib, pkgs, disko, sops-nix, ... }:
 
 {
-  imports = [
-    disko.nixosModules.disko
-  ];
 
   # ============================================
   # Machine-Specific Configuration
diff --git a/nixos/modules/shell.nix b/nixos/modules/shell.nix
index ca1bc7e..5c01e63 100644
--- a/nixos/modules/shell.nix
+++ b/nixos/modules/shell.nix
@@ -15,7 +15,6 @@
   in lib.mkIf cfg.enable {
 
     programs.zsh.enable = cfg.defaultShell == "zsh";
-    programs.dash.enable = true;
     programs.fish.enable = cfg.defaultShell == "fish";
 
     # Common shell packages