diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4ee7651..39cc1bd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,8 +14,8 @@ jobs: - macos-latest template: - templates/minimal - # - templates/private-configuration - # - templates/expose-configuration + - templates/private-configuration + - templates/expose-configuration runs-on: ${{ matrix.os }} env: NIX_CONFIG: extra-access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} diff --git a/templates/expose-configuration/configuration/home-manager/fortune.nix b/templates/expose-configuration/configuration/home-manager/fortune.nix index 117482f..0795bb0 100644 --- a/templates/expose-configuration/configuration/home-manager/fortune.nix +++ b/templates/expose-configuration/configuration/home-manager/fortune.nix @@ -4,7 +4,7 @@ pkgs, ... }: -lib.mkIf config.squirmy.fortune.enable { +lib.mkIf config.mine.fortune.enable { home.packages = [ pkgs.fortune ]; diff --git a/templates/expose-configuration/configuration/nix-darwin/macos.nix b/templates/expose-configuration/configuration/nix-darwin/macos.nix index 30a27d2..575e74d 100644 --- a/templates/expose-configuration/configuration/nix-darwin/macos.nix +++ b/templates/expose-configuration/configuration/nix-darwin/macos.nix @@ -3,6 +3,6 @@ config, ... }: -lib.mkIf config.squirmy.macos.enable { +lib.mkIf config.mine.macos.enable { security.pam.enableSudoTouchIdAuth = true; } diff --git a/templates/expose-configuration/configuration/options.nix b/templates/expose-configuration/configuration/options.nix index 744f8b3..75349ee 100644 --- a/templates/expose-configuration/configuration/options.nix +++ b/templates/expose-configuration/configuration/options.nix @@ -4,7 +4,7 @@ macos.enable = lib.options.mkEnableOption "macos"; }; in { - options.squirmy = lib.mkOption { + options.mine = lib.mkOption { type = lib.types.submodule {options = configurationOptions;}; default = {}; }; diff --git a/templates/expose-configuration/flake.nix b/templates/expose-configuration/flake.nix index 8b3504b..ace277d 100644 --- a/templates/expose-configuration/flake.nix +++ b/templates/expose-configuration/flake.nix @@ -22,6 +22,12 @@ username = "username"; homeDirectory = "/Users/username"; nixpkgs.hostPlatform = "aarch64-darwin"; + shells.zsh.enable = true; + }; + + mine = { + fortune.enable = true; + macos.enable = true; }; }; diff --git a/templates/private-configuration/flake.nix b/templates/private-configuration/flake.nix index 03e5e00..8c7be62 100644 --- a/templates/private-configuration/flake.nix +++ b/templates/private-configuration/flake.nix @@ -22,6 +22,7 @@ username = "username"; homeDirectory = "/Users/username"; nixpkgs.hostPlatform = "aarch64-darwin"; + shells.zsh.enable = true; }; }; };