From bf40b1d4a6e0f89f63a64091139597d3ce6a6a4b Mon Sep 17 00:00:00 2001 From: Brian Nelson Date: Mon, 9 Nov 2026 18:15:45 -0500 Subject: [PATCH] tested and confirms it works --- .gitignore | 1 + flake.nix | 4 ++-- modules/apps.nix | 4 ++-- modules/archive-installs.nix | 10 +++++----- modules/pkg-installs.nix | 4 ++-- profiles/personal/apps.nix | 4 ++-- profiles/personal/default.nix | 5 ++--- profiles/work/default.nix | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/flake.nix b/flake.nix index 2b154d4..50679be 100644 --- a/flake.nix +++ b/flake.nix @@ -28,9 +28,9 @@ }; in { - darwinConfigurations."Brians-MacBook-Air" = nix-darwin.lib.darwinSystem { + darwinConfigurations = { personal = mkDarwin { profile = "personal"; user = "briannelson"; }; - work = mkDarwin { profile = "work"; user = "briannelson"; }; + work = mkDarwin { profile = "work"; user = "YOUR-WORK-USERNAME"; }; }; }; } diff --git a/modules/apps.nix b/modules/apps.nix index cf617fd..07703d0 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { # This file installs these apps on all configurations @@ -39,4 +39,4 @@ "vscodium" "firefox" ]; -} \ No newline at end of file +} diff --git a/modules/archive-installs.nix b/modules/archive-installs.nix index 828cf94..08804d8 100644 --- a/modules/archive-installs.nix +++ b/modules/archive-installs.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, config, ... }: let cfg = config.archiveApps; @@ -30,12 +30,12 @@ let ''; in { - optiosn.archiveApps = lib.mkOption { - type = lib.types.typesOf (lib.types.attrsOf lib.types.str); + options.archiveApps = lib.mkOption { + type = lib.types.listOf (lib.types.attrsOf lib.types.str); default = [ ]; description = "Apps distributed as .zip archives to install into /Applications"; - } + }; - system.activationScripts.postActivation.text = + config.system.activationScripts.postActivation.text = lib.concatMapStringsSep "\n" appScript cfg; } diff --git a/modules/pkg-installs.nix b/modules/pkg-installs.nix index 041691b..df8fc28 100644 --- a/modules/pkg-installs.nix +++ b/modules/pkg-installs.nix @@ -22,10 +22,10 @@ in { options.pkgInstalls = lib.mkOption { type = lib.types.listOf (lib.types.attrsOf lib.types.str); - default = [ ];' + default = [ ]; description = "PKG files to install on activation"; }; - system.activationScripts.postActivation.text = + config.system.activationScripts.postActivation.text = lib.concatMapStringsSep "\n" installScript cfg; } diff --git a/profiles/personal/apps.nix b/profiles/personal/apps.nix index 50f420c..04c42e6 100644 --- a/profiles/personal/apps.nix +++ b/profiles/personal/apps.nix @@ -31,5 +31,5 @@ "libreoffice" "protonvpn" "rustdesk" - ] -} \ No newline at end of file + ]; +} diff --git a/profiles/personal/default.nix b/profiles/personal/default.nix index a121e2b..54aad5f 100644 --- a/profiles/personal/default.nix +++ b/profiles/personal/default.nix @@ -4,6 +4,5 @@ imports = [ ./cli-tools.nix ./apps.nix - ./archive-installs.nix - ] -} \ No newline at end of file + ]; +} diff --git a/profiles/work/default.nix b/profiles/work/default.nix index 54a0b0a..ae75d3c 100644 --- a/profiles/work/default.nix +++ b/profiles/work/default.nix @@ -4,5 +4,5 @@ imports = [ ./apps.nix ./cli-tools.nix - ] -} \ No newline at end of file + ]; +}