Fix module system errors: wrap overlay in nixpkgs.overlays module and remove invalid programs.dash

This commit is contained in:
2026-04-07 06:59:16 +02:00
parent 6a49d2c028
commit ebd2c373bc
3 changed files with 4 additions and 16 deletions

View File

@@ -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

View File

@@ -1,9 +1,6 @@
{ config, lib, pkgs, disko, sops-nix, ... }:
{
imports = [
disko.nixosModules.disko
];
# ============================================
# Machine-Specific Configuration

View File

@@ -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