From 58319121abc3ece3124529cddf8c0a8c2c674812 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Sep 2024 04:20:36 +0000 Subject: [PATCH 1/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/a55b3f1ab41bb6d5025ebeebb4da5fd240b9b3b3?narHash=sha256-ETyDNLOF5YvFO2lVlKttXgdHTqSGdp9ZCRRCjv2gaoM%3D' (2024-09-05) → 'github:lnl7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80?narHash=sha256-Vop/VRi6uCiScg/Ic%2BYlwsdIrLabWUJc57dNczp0eBc%3D' (2024-09-13) • Updated input 'home-manager': 'github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb?narHash=sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo%3D' (2024-09-01) → 'github:nix-community/home-manager/da8406a6ff556b86dc368e96ca8bd81b2704a91a?narHash=sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw%3D' (2024-09-12) • Updated input 'jetbrains-updater': 'gitlab:genericnerdyusername/jetbrains-updater/8f7a46082915bb0279e7af809f7bdd5b9226345b?narHash=sha256-nlhutpYySRAatH4Yci2N5fbcMrlEpMBtCbBaX5swkC4%3D' (2024-09-03) → 'gitlab:genericnerdyusername/jetbrains-updater/ee18b0b6a4c902aba996a8c5260beaf2cdea2949?narHash=sha256-de4TH07nrkn1ueIXXlZ3o6LBVfwwSjGfileU2yKAV9Q%3D' (2024-09-10) • Updated input 'nix-index-database': 'github:Mic92/nix-index-database/32058e9138248874773630c846563b1a78ee7a5b?narHash=sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo%3D' (2024-09-01) → 'github:Mic92/nix-index-database/642275444c5a9defce57219c944b3179bf2adaa9?narHash=sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY%3D' (2024-09-08) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9bb1e7571aadf31ddb4af77fc64b2d59580f9a39?narHash=sha256-Yd0FK9SkWy%2BZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84%3D' (2024-09-05) → 'github:nixos/nixpkgs/111ed8812c10d7dc3017de46cbf509600c93f551?narHash=sha256-Ji5wO1lLG99grI0qCRb6FyRPpH9tfdfD1QP/r7IlgfM%3D' (2024-09-12) • Updated input 'nixvim': 'github:nix-community/nixvim/84249a9dabdf930d968d248024c4d6240ee14548?narHash=sha256-RQ9aKwXmqNHMBFOlHEUVrAFo7YHJSVn4nBgi2rcaCY4%3D' (2024-09-05) → 'github:nix-community/nixvim/27a0dd435dd3563f4cf9d788601fadfce8c59db6?narHash=sha256-bR7LFVtMjiVlO2OpmDSuLQ2XQr%2Bh%2BJtVFYObAbThZSs%3D' (2024-09-12) • Updated input 'nur': 'github:nix-community/NUR/30e28a3bd90e5f543d0b6f228874b71a6349a051?narHash=sha256-5L0Z0ibFUeOhfcYV4dXzXT8DUoLrr7N7J38FpeQZBL0%3D' (2024-09-06) → 'github:nix-community/NUR/c779218c72479aa645ea043a53a2251b6ec0682f?narHash=sha256-yoo1geP1T59yjT%2BRdEJda/FiX%2B3Qo%2BDNuGK4vuQmDXM%3D' (2024-09-13) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 6d77ed16..6168ca01 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1725544312, - "narHash": "sha256-ETyDNLOF5YvFO2lVlKttXgdHTqSGdp9ZCRRCjv2gaoM=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a55b3f1ab41bb6d5025ebeebb4da5fd240b9b3b3", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1726142087, + "narHash": "sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "da8406a6ff556b86dc368e96ca8bd81b2704a91a", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1725321765, - "narHash": "sha256-nlhutpYySRAatH4Yci2N5fbcMrlEpMBtCbBaX5swkC4=", + "lastModified": 1725926572, + "narHash": "sha256-de4TH07nrkn1ueIXXlZ3o6LBVfwwSjGfileU2yKAV9Q=", "owner": "genericnerdyusername", "repo": "jetbrains-updater", - "rev": "8f7a46082915bb0279e7af809f7bdd5b9226345b", + "rev": "ee18b0b6a4c902aba996a8c5260beaf2cdea2949", "type": "gitlab" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1725161148, - "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", + "lastModified": 1725765290, + "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "32058e9138248874773630c846563b1a78ee7a5b", + "rev": "642275444c5a9defce57219c944b3179bf2adaa9", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1726108120, + "narHash": "sha256-Ji5wO1lLG99grI0qCRb6FyRPpH9tfdfD1QP/r7IlgfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "111ed8812c10d7dc3017de46cbf509600c93f551", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725563454, - "narHash": "sha256-RQ9aKwXmqNHMBFOlHEUVrAFo7YHJSVn4nBgi2rcaCY4=", + "lastModified": 1726148694, + "narHash": "sha256-bR7LFVtMjiVlO2OpmDSuLQ2XQr+h+JtVFYObAbThZSs=", "owner": "nix-community", "repo": "nixvim", - "rev": "84249a9dabdf930d968d248024c4d6240ee14548", + "rev": "27a0dd435dd3563f4cf9d788601fadfce8c59db6", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nur": { "locked": { - "lastModified": 1725595561, - "narHash": "sha256-5L0Z0ibFUeOhfcYV4dXzXT8DUoLrr7N7J38FpeQZBL0=", + "lastModified": 1726200288, + "narHash": "sha256-yoo1geP1T59yjT+RdEJda/FiX+3Qo+DNuGK4vuQmDXM=", "owner": "nix-community", "repo": "NUR", - "rev": "30e28a3bd90e5f543d0b6f228874b71a6349a051", + "rev": "c779218c72479aa645ea043a53a2251b6ec0682f", "type": "github" }, "original": { From b6b56e87acbe6b282162abffe932aacaf1067233 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Tue, 17 Sep 2024 12:06:14 +0100 Subject: [PATCH 2/6] Set state version for darwin --- system/darwin/common/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/darwin/common/configuration.nix b/system/darwin/common/configuration.nix index b0f27928..057a535e 100644 --- a/system/darwin/common/configuration.nix +++ b/system/darwin/common/configuration.nix @@ -95,4 +95,6 @@ # configure system defaults system.defaults.".GlobalPreferences"."com.apple.mouse.scaling" = -1.0; + + system.stateVersion = 5; } From 7498c4ff87372382721b1bd30c42ad6904675427 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Tue, 17 Sep 2024 17:25:55 +0100 Subject: [PATCH 3/6] Add macos steps back --- .github/workflows/build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36b5b398..940daba3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: @@ -73,3 +75,15 @@ jobs: name: mindriot101-home authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix build .#homeConfigurations.${{ matrix.runtime.property }}.minimal.activationPackage + + 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' From 3bd53b5af5a1e905f7bc6b7345ecf15adc2174fd Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Tue, 17 Sep 2024 17:27:31 +0100 Subject: [PATCH 4/6] add nixvim step --- .github/workflows/build.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 940daba3..f92f6edc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,6 +76,24 @@ jobs: 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: From 0a43f0c70cd264ce86a79fc232e5a2cef79ba64f Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Tue, 17 Sep 2024 22:20:47 +0100 Subject: [PATCH 5/6] Pin nix-darwin for now --- flake.lock | 8 ++++---- flake.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6168ca01..bca6f3bf 100644 --- a/flake.lock +++ b/flake.lock @@ -46,17 +46,17 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1726032244, + "narHash": "sha256-3VvRGPkpBJobQrFD3slQzMAwZlo4/UwxT8933U5tRVM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", "type": "github" }, "original": { "owner": "lnl7", - "ref": "master", "repo": "nix-darwin", + "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 23d8cb9f..b4f4d2a3 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { From 4861b0773fb13af5bb06b125c08bdc526c45d77a Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Tue, 17 Sep 2024 22:21:12 +0100 Subject: [PATCH 6/6] Fix markdown-preview warning --- home/nixvim/markdown-preview.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/nixvim/markdown-preview.nix b/home/nixvim/markdown-preview.nix index a692a5aa..08ba10d2 100644 --- a/home/nixvim/markdown-preview.nix +++ b/home/nixvim/markdown-preview.nix @@ -1,6 +1,6 @@ {...}: { plugins.markdown-preview = { enable = true; - settings.auto_close = true; + settings.auto_close = 1; }; }