From f1169c4b2b8a363ba7d41bacfc76d103b938f8fd Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 30 Aug 2024 11:04:17 -0500 Subject: [PATCH] Builds in CI, update flake --- .forgejo/workflows/nix-build.yaml | 37 +++++++ .../{nix.yaml => nix-flake-check.yaml} | 0 flake.lock | 96 +++++++++---------- flake.nix | 25 ++--- modules/home-manager/default.nix | 1 + packages/iosevkaLyteTerm.nix | 2 +- readme.md | 2 +- 7 files changed, 101 insertions(+), 62 deletions(-) create mode 100644 .forgejo/workflows/nix-build.yaml rename .forgejo/workflows/{nix.yaml => nix-flake-check.yaml} (100%) diff --git a/.forgejo/workflows/nix-build.yaml b/.forgejo/workflows/nix-build.yaml new file mode 100644 index 0000000..ba97aa5 --- /dev/null +++ b/.forgejo/workflows/nix-build.yaml @@ -0,0 +1,37 @@ +on: [push] +jobs: + check: + runs-on: nixos-host + steps: + - name: Checkout + uses: actions/checkout@v3 + + # cache not needed since we now run on the host directly + # - name: Load cached nix store + # id: cache-nix-store + # uses: actions/cache/restore@v4 + # with: + # path: /nix/store + # key: ${{ runner.os }}-nix-store + + - name: Build server + run: | + nixos-rebuild .#beefcake + + - name: Build router + run: | + nixos-rebuild .#router + + - name: Build desktop + run: | + nixos-rebuild .#dragon + + - name: Build laptop + run: | + nixos-rebuild .#foxtrot + + # - name: Save nix store + # uses: actions/cache/save@v4 + # with: + # path: /nix/store + # key: ${{ steps.cache-nix-store.outputs.cache-primary-key }} diff --git a/.forgejo/workflows/nix.yaml b/.forgejo/workflows/nix-flake-check.yaml similarity index 100% rename from .forgejo/workflows/nix.yaml rename to .forgejo/workflows/nix-flake-check.yaml diff --git a/flake.lock b/flake.lock index e6ec8b2..0481d06 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1721992626, - "narHash": "sha256-GFDSPWxOqEkNrbuSfyoQHGIaRhJNapn2Rv0EEmBGR9A=", + "lastModified": 1724850097, + "narHash": "sha256-3BHxvFb3NJzch1X8puRMkVZujOoarQ1llu3ZcwuvsKU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f95d1509370b7f40ef356ff69a332bd0356ab044", + "rev": "23c7925dd31e79e8c06086ace3edb129a070ac01", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1722028105, - "narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=", + "lastModified": 1724895876, + "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", "owner": "nix-community", "repo": "disko", - "rev": "5b01cea8b5753de9c2febd27203c530be14745ff", + "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -217,11 +217,11 @@ }, "hardware": { "locked": { - "lastModified": 1722017959, - "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -238,11 +238,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722007233, - "narHash": "sha256-iS7yGpnaY7sAojvNeTav7fFiwz7aWT4MAZipkK6mDUM=", + "lastModified": 1724856988, + "narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=", "owner": "helix-editor", "repo": "helix", - "rev": "229784ccc7833a52bc88c7a8b60ecb1d56303593", + "rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc", "type": "github" }, "original": { @@ -280,11 +280,11 @@ ] }, "locked": { - "lastModified": 1722203588, - "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "792757f643cedc13f02098d8ed506d82e19ec1da", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -309,11 +309,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1722623071, + "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722085443, - "narHash": "sha256-TOmy/PQI0DuV/AbuGKzsnO3L4Yby0mn4qL+oRIy96L4=", + "lastModified": 1724938863, + "narHash": "sha256-CxVxeKpXWm5Jl5wkJFwDnmU/EhJ95/NPiTGKdjrpaLM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "963816b9a6524a99a6716fa1aa30b2c4f369d2f0", + "rev": "92a0dd164e9cc74060b63abae67b0204b6b6074c", "type": "github" }, "original": { @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1718746314, - "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", + "lastModified": 1721326555, + "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", + "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1724174162, + "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1724863980, + "narHash": "sha256-7Ke9wFRYPUIXwm5ZndGHkWBKj6BsFTkSEXUNXQRHE54=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "aadf9a27dddd2272ca354ba5a22a0c2d1f919039", "type": "github" }, "original": { @@ -503,11 +503,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722040881, - "narHash": "sha256-NMDotPxtCNvmRnUo/YuxNOpN8+UMONBlNBnRFsGHADQ=", + "lastModified": 1724999960, + "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48bacf585a51d953def8bff32087970f273052e2", + "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", "type": "github" }, "original": { @@ -519,11 +519,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721924956, - "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ad6a14c6bf098e98800b091668718c336effc95", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -535,11 +535,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", + "lastModified": 1724727824, + "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", + "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1721755049, - "narHash": "sha256-O17b38bQnmfxv7It3OnVYx7fp1seEdI7xxnw5vJFv30=", + "lastModified": 1724073926, + "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5555f467f68ce7cdf1060991c24263073b95e9da", + "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 901dbfd..128c8fa 100644 --- a/flake.nix +++ b/flake.nix @@ -215,18 +215,19 @@ final.helix = helix; # TODO: would love to use a current wezterm build so I can make use of ssh/mux functionality without breakage # source: https://github.com/wez/wezterm/issues/3771 - # wezterm = prev.wezterm.overrideAttrs rec { - # version = "56a27e93a9ee50aab50ff4d78308f9b3154b5122"; - # src = prev.fetchFromGitHub { - # owner = "wez"; - # repo = "wezterm"; - # rev = version; - # fetchSubmodules = true; - # hash = "sha256-zl0Me24ncrpXUCvkQHlbgUucf0zrkhFFI242wsSQKLw="; - # }; - # cargoLockFile = null; - # cargoHash = ""; - # }; + wezterm = prev.wezterm.overrideAttrs rec { + version = "56a27e93a9ee50aab50ff4d78308f9b3154b5122"; + src = prev.fetchFromGitHub { + owner = "wez"; + repo = "wezterm"; + rev = version; + fetchSubmodules = true; + hash = "sha256-zl0Me24ncrpXUCvkQHlbgUucf0zrkhFFI242wsSQKLw="; + }; + # cargoLockFile = null; + cargoHash = ""; + }; + final.wezterm = wezterm; }; unstable-packages = final: _prev: { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index e117d42..3512334 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1249,6 +1249,7 @@ # docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors programs.wezterm = with colors.withHashPrefix; { enable = true; + package = pkgs.wezterm; extraConfig = builtins.readFile ./wezterm/config.lua; colorSchemes = { catppuccin-mocha-sapphire = { diff --git a/packages/iosevkaLyteTerm.nix b/packages/iosevkaLyteTerm.nix index ab023b6..e466b8d 100644 --- a/packages/iosevkaLyteTerm.nix +++ b/packages/iosevkaLyteTerm.nix @@ -12,7 +12,7 @@ in ((iosevka.override { [buildPlans.Iosevka${set}.ligations] inherits = "dlig" - disables = [ "exeqeqeq", "exeqeq", "exeqeq-dl", "exeq", "ineq", "connected-underscore", "connected-tilde-as-wave" ] + disables = [ "exeqeqeq", "exeqeq", "eqexeq-dl", "exeq", "tildeeq" ] [buildPlans.Iosevka${set}.weights.regular] shape = 400 diff --git a/readme.md b/readme.md index 952f498..a10040f 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Nix -[![build status](https://git.lyte.dev/lytedev/nix/badges/workflows/nix.yaml/badge.svg)](https://git.lyte.dev/lytedev/nix/actions?workflow=nix.yaml) +[![build status](https://git.lyte.dev/lytedev/nix/badges/workflows/nix-flake-check.yaml/badge.svg)](https://git.lyte.dev/lytedev/nix/actions?workflow=nix-flake-check.yaml) My grand, declarative, and unified application, service, environment, and machine configuration, secret, and package management in a single flake. ❤️ ❄️