From d0abc1e98c147ef960268c7f8642c56a36e544ee Mon Sep 17 00:00:00 2001 From: iofq Date: Fri, 20 Mar 2026 20:46:27 -0500 Subject: [PATCH] let's try CI images again --- .forgejo/workflows/images.yaml | 23 ++++++++++++++++++++++ clusters/lab/minecraft/minecraft-helm.yaml | 2 +- flake.lock | 17 ++++++++++++++++ flake.nix | 5 +++++ home-manager/shared/wayland/default.nix | 8 ++++---- pkgs/default.nix | 2 ++ pkgs/images/nix-with-node.nix | 10 ++++++++++ 7 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 .forgejo/workflows/images.yaml create mode 100644 pkgs/images/nix-with-node.nix diff --git a/.forgejo/workflows/images.yaml b/.forgejo/workflows/images.yaml new file mode 100644 index 0000000..5d8655f --- /dev/null +++ b/.forgejo/workflows/images.yaml @@ -0,0 +1,23 @@ +on: + push: + paths: + - 'pkgs/images/**' + - '.forgejo/workflows/**' + - 'flake.lock' +jobs: + check: + runs-on: nix-upstream-latest + steps: + - run: echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf + - uses: actions/checkout@v4 + - run: nix-env -i curl nodejs skopeo # bootstrap + - run: curl -sLo /etc/containers/policy.json https://github.com/containers/skopeo/blob/879dbc3757610a574f9fcc44ea23ef9e8e2b6fe3/default-policy.json + - run: |- + echo < tags.txt + nix-with-node:nix + EOF + - run: |- + for line in $(cat tags.txt); do + IFS=: read -r pkg tag <<< $line + skopeo copy --dest-creds="${{ secrets.FJ_USER }}:${{ secrets.FJ_PASS }}" docker-image://$(nix build .#$pkg --print-out-paths) docker://git.10110110.xyz/ci/$tag:latest + done diff --git a/clusters/lab/minecraft/minecraft-helm.yaml b/clusters/lab/minecraft/minecraft-helm.yaml index a9b4758..3ba97b4 100644 --- a/clusters/lab/minecraft/minecraft-helm.yaml +++ b/clusters/lab/minecraft/minecraft-helm.yaml @@ -80,7 +80,7 @@ spec: levelType: DEFAULT worldSaveName: world-gims-7 forceReDownload: false - memory: 3000M + memory: 5000M serviceAnnotations: {} serviceType: LoadBalancer servicePort: 25565 diff --git a/flake.lock b/flake.lock index 7ec09cf..2384973 100755 --- a/flake.lock +++ b/flake.lock @@ -157,6 +157,22 @@ "url": "https://install.determinate.systems/determinate-nixd/tag/v3.17.0/x86_64-linux" } }, + "docker-nixpkgs": { + "flake": false, + "locked": { + "lastModified": 1764690098, + "narHash": "sha256-dCcMzcKlI9hB0EL2/odCyrouVKHmi9m/K2awJGho3oc=", + "owner": "nix-community", + "repo": "docker-nixpkgs", + "rev": "10b83cdcf12c7d37db50cd8d2c68b336881b91de", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "docker-nixpkgs", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -629,6 +645,7 @@ "dart": "dart", "deploy-rs": "deploy-rs", "determinate": "determinate", + "docker-nixpkgs": "docker-nixpkgs", "home-manager": "home-manager", "jj-nvim": "jj-nvim", "jj-vine": "jj-vine", diff --git a/flake.nix b/flake.nix index a508c25..9d5873a 100755 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,10 @@ url = "github:NicolasGB/jj.nvim"; flake = false; }; + docker-nixpkgs = { + url = "github:nix-community/docker-nixpkgs"; + flake = false; + }; }; outputs = { @@ -70,6 +74,7 @@ inputs.neovim-nightly-overlay.overlays.default inputs.llm-agents.overlays.default inputs.self.overlays.stable-packages + (import "${inputs.docker-nixpkgs}/overlay.nix") ( final: prev: import ./pkgs { diff --git a/home-manager/shared/wayland/default.nix b/home-manager/shared/wayland/default.nix index 6006ca7..06c698f 100644 --- a/home-manager/shared/wayland/default.nix +++ b/home-manager/shared/wayland/default.nix @@ -29,16 +29,16 @@ services = { gammastep = { enable = true; - dawnTime = "6:00-8:00"; - duskTime = "20:00-22:00"; + dawnTime = "6:00-7:00"; + duskTime = "18:00-19:00"; latitude = 43.0; longitude = -89.0; temperature.day = 5000; - temperature.night = 3000; + temperature.night = 2000; }; mako.enable = true; mako.settings = { - default-timeout = 5; + default-timeout = 5000; }; udiskie.enable = true; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 19572c1..f2ba90e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -7,5 +7,7 @@ nativeBuildInputs = [ pkgs.jujutsu ]; doCheck = false; }; + + nix-with-node = import ./images/nix-with-node.nix { inherit pkgs; }; } // import ./nvim { inherit inputs pkgs; } diff --git a/pkgs/images/nix-with-node.nix b/pkgs/images/nix-with-node.nix new file mode 100644 index 0000000..da651c5 --- /dev/null +++ b/pkgs/images/nix-with-node.nix @@ -0,0 +1,10 @@ +{ + pkgs, +}: +(pkgs.docker-nixpkgs.nix.override { + nix = pkgs.nixVersions.latest; + extraContents = with pkgs; [ + attic-client + nodejs + ]; +})