diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index e655411..5ac66e5 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -1,4 +1,4 @@ -name: Validate NixOS Configurations +name: Validate Nix Configurations on: push: @@ -24,6 +24,9 @@ jobs: extra_nix_config: | experimental-features = nix-command flakes + - name: Cache Nix store + uses: DeterminateSystems/magic-nix-cache-action@v8 + - name: Run flake check working-directory: nixos run: nix flake check @@ -51,3 +54,33 @@ jobs: run: | echo "Building home-lab..." nix build .#nixosConfigurations.home-lab.config.system.build.toplevel --dry-run + + validate-darwin: + name: Validate Darwin configurations + if: github.event_name == 'pull_request' + runs-on: macos-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install Nix + uses: cachix/install-nix-action@v30 + with: + nix_path: nixpkgs=channel:nixos-unstable + extra_nix_config: | + experimental-features = nix-command flakes + + - name: Cache Nix store + uses: DeterminateSystems/magic-nix-cache-action@v8 + + - name: Validate dungeon + working-directory: nixos + run: | + echo "Building dungeon..." + nix build .#darwinConfigurations.dungeon.config.system.build.toplevel --dry-run + + - name: Validate moria + working-directory: nixos + run: | + echo "Building moria..." + nix build .#darwinConfigurations.moria.config.system.build.toplevel --dry-run diff --git a/nixos/modules/darwin/common.nix b/nixos/modules/darwin/common.nix index b80d7e4..1aebc2a 100644 --- a/nixos/modules/darwin/common.nix +++ b/nixos/modules/darwin/common.nix @@ -136,6 +136,11 @@ echo "NOTE: There are manual steps that may need to be applied for an initial setup." echo " See nixos/modules/darwin/README.md" echo "" + + # Reduce spacing between menu bar icons to fit more items + # https://news.ycombinator.com/item?id=47618946 + defaults -currentHost write -globalDomain NSStatusItemSpacing -int 2 + defaults -currentHost write -globalDomain NSStatusItemSelectionPadding -int 2 ''; # nix-darwin state version