Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update flake.lock #143

Merged
merged 6 commits into from
Sep 17, 2024
Merged

Update flake.lock #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5831912
flake.lock: Update
github-actions[bot] Sep 13, 2024
b6b56e8
Set state version for darwin
simonrw Sep 17, 2024
7498c4f
Add macos steps back
simonrw Sep 17, 2024
3bd53b5
add nixvim step
simonrw Sep 17, 2024
0a43f0c
Pin nix-darwin for now
simonrw Sep 17, 2024
4861b07
Fix markdown-preview warning
simonrw Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ jobs:
runtime:
- os: ubuntu-latest
property: x86_64-linux
- os: macos-latest
property: x86_64-darwin
fail-fast: true
runs-on: ${{ matrix.runtime.os }}
steps:
Expand All @@ -73,3 +75,33 @@ jobs:
name: mindriot101-home
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build .#homeConfigurations.${{ matrix.runtime.property }}.minimal.activationPackage

nixvim:
strategy:
matrix:
runtime:
- os: ubuntu-latest
- os: macos-latest
runs-on: ${{ matrix.runtime.os }}
steps:
- uses: actions/checkout@v4
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main
- uses: cachix/cachix-action@v14
with:
name: mindriot101-home
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build .#nixvim


macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main
- uses: cachix/cachix-action@v14
with:
name: mindriot101-home
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build '.#homeConfigurations.x86_64-darwin.simon.activationPackage'
44 changes: 22 additions & 22 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = "github:nix-community/NUR";
# TEMP: pin nix-darwin due to https://github.com/LnL7/nix-darwin/issues/1082
darwin = {
url = "github:lnl7/nix-darwin/master";
url = "github:lnl7/nix-darwin/f4f18f3d7229845e1c9d517457b7a0b90a38b728";
inputs.nixpkgs.follows = "nixpkgs";
};
jetbrains-updater = {
Expand Down
2 changes: 1 addition & 1 deletion home/nixvim/markdown-preview.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{...}: {
plugins.markdown-preview = {
enable = true;
settings.auto_close = true;
settings.auto_close = 1;
};
}
2 changes: 2 additions & 0 deletions system/darwin/common/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,6 @@

# configure system defaults
system.defaults.".GlobalPreferences"."com.apple.mouse.scaling" = -1.0;

system.stateVersion = 5;
}