tested and confirms it works

This commit is contained in:
2026-11-09 18:15:45 -05:00
parent 1991b48f98
commit bf40b1d4a6
8 changed files with 18 additions and 18 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
result

View File

@@ -28,9 +28,9 @@
}; };
in in
{ {
darwinConfigurations."Brians-MacBook-Air" = nix-darwin.lib.darwinSystem { darwinConfigurations = {
personal = mkDarwin { profile = "personal"; user = "briannelson"; }; personal = mkDarwin { profile = "personal"; user = "briannelson"; };
work = mkDarwin { profile = "work"; user = "briannelson"; }; work = mkDarwin { profile = "work"; user = "YOUR-WORK-USERNAME"; };
}; };
}; };
} }

View File

@@ -1,4 +1,4 @@
{ ... }: { pkgs, ... }:
{ {
# This file installs these apps on all configurations # This file installs these apps on all configurations

View File

@@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, lib, config, ... }:
let let
cfg = config.archiveApps; cfg = config.archiveApps;
@@ -30,12 +30,12 @@ let
''; '';
in in
{ {
optiosn.archiveApps = lib.mkOption { options.archiveApps = lib.mkOption {
type = lib.types.typesOf (lib.types.attrsOf lib.types.str); type = lib.types.listOf (lib.types.attrsOf lib.types.str);
default = [ ]; default = [ ];
description = "Apps distributed as .zip archives to install into /Applications"; description = "Apps distributed as .zip archives to install into /Applications";
} };
system.activationScripts.postActivation.text = config.system.activationScripts.postActivation.text =
lib.concatMapStringsSep "\n" appScript cfg; lib.concatMapStringsSep "\n" appScript cfg;
} }

View File

@@ -22,10 +22,10 @@ in
{ {
options.pkgInstalls = lib.mkOption { options.pkgInstalls = lib.mkOption {
type = lib.types.listOf (lib.types.attrsOf lib.types.str); type = lib.types.listOf (lib.types.attrsOf lib.types.str);
default = [ ];' default = [ ];
description = "PKG files to install on activation"; description = "PKG files to install on activation";
}; };
system.activationScripts.postActivation.text = config.system.activationScripts.postActivation.text =
lib.concatMapStringsSep "\n" installScript cfg; lib.concatMapStringsSep "\n" installScript cfg;
} }

View File

@@ -31,5 +31,5 @@
"libreoffice" "libreoffice"
"protonvpn" "protonvpn"
"rustdesk" "rustdesk"
] ];
} }

View File

@@ -4,6 +4,5 @@
imports = [ imports = [
./cli-tools.nix ./cli-tools.nix
./apps.nix ./apps.nix
./archive-installs.nix ];
]
} }

View File

@@ -4,5 +4,5 @@
imports = [ imports = [
./apps.nix ./apps.nix
./cli-tools.nix ./cli-tools.nix
] ];
} }