From bebfd6f5b3dc53aa6c9831710f6ecc0cc4ab7ca7 Mon Sep 17 00:00:00 2001 From: Adam0 Date: Fri, 3 Jul 2026 21:51:34 +0200 Subject: [PATCH] test pipelines --- .envrc | 1 - .tangled/workflows/checks.yml | 14 ++++++++++ .tangled/workflows/update-flake-lock.yml | 25 +++++++++++++++++ flake.lock | 35 ++++++++++++++++++------ flake.nix | 2 +- modules/development/treefmt.nix | 1 + modules/programs/gui/zen/chrome.nix | 2 +- modules/programs/ssh.nix | 2 ++ 8 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 .tangled/workflows/checks.yml create mode 100644 .tangled/workflows/update-flake-lock.yml diff --git a/.envrc b/.envrc index af0cc93..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1 @@ -#!/usr/bin/env bash use flake diff --git a/.tangled/workflows/checks.yml b/.tangled/workflows/checks.yml new file mode 100644 index 0000000..f39603d --- /dev/null +++ b/.tangled/workflows/checks.yml @@ -0,0 +1,14 @@ +when: + - event: ["push", "manual"] + branch: ["main"] + - event: ["pull_request"] + branch: ["main"] +engine: "nixery" +dependencies: + nixpkgs: + - nix +steps: + - name: "Run checks" + command: | + set -euo pipefail + nix flake check diff --git a/.tangled/workflows/update-flake-lock.yml b/.tangled/workflows/update-flake-lock.yml new file mode 100644 index 0000000..5135685 --- /dev/null +++ b/.tangled/workflows/update-flake-lock.yml @@ -0,0 +1,25 @@ +when: + - event: ["manual"] +engine: "nixery" +dependencies: + nixpkgs: + - git + - nix +steps: + - name: "Update flake.lock" + command: | + set -euo pipefail + + git config user.name "spindle" + git config user.email "spindle@zezura.xyz" + + nix flake update + + if git diff --quiet -- flake.lock; then + echo "flake.lock is already up to date" + exit 0 + fi + + git add flake.lock + git commit -m "flake.lock: update" + git push origin "HEAD:${TANGLED_REPO_DEFAULT_BRANCH:-main}" diff --git a/flake.lock b/flake.lock index c522c93..d2b90b8 100644 --- a/flake.lock +++ b/flake.lock @@ -1231,22 +1231,23 @@ "nixpkgs" ], "systems": "systems_4", + "tangled-catppuccin": "tangled-catppuccin", "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "lastModified": 1781880690, - "narHash": "sha256-kd14Sz9ymzOg+OarvHLY1I2V8L34iPYdDg0BbdYmVLs=", - "owner": "adam01110", - "repo": "nix-userstyles", - "rev": "a0a2faac9f6df36a1f1c000dc4ef78aa7b65ec37", - "type": "github" + "lastModified": 1783101455, + "narHash": "sha256-4E+DNHGPLuLU0gq4fiFNqj0p+IdIrCzL1tH5F12iFpc=", + "ref": "refs/heads/main", + "rev": "a3c2693d9f5244f6ecd32e74602a2363bb76f01c", + "revCount": 80, + "type": "git", + "url": "https://tangled.org/adam0.dev/nix-userstyles" }, "original": { - "owner": "adam01110", - "repo": "nix-userstyles", - "type": "github" + "type": "git", + "url": "https://tangled.org/adam0.dev/nix-userstyles" } }, "nixcord": { @@ -1962,6 +1963,22 @@ "type": "github" } }, + "tangled-catppuccin": { + "flake": false, + "locked": { + "lastModified": 1783094318, + "narHash": "sha256-B7kn9bplozrpusIn6RM75Wk41XTBKINy8xeTv9acI8M=", + "ref": "refs/heads/main", + "rev": "16892445aad8938903cdf63e24000d046dd041c0", + "revCount": 21, + "type": "git", + "url": "https://tangled.org/csw.im/tangled-catppuccin" + }, + "original": { + "type": "git", + "url": "https://tangled.org/csw.im/tangled-catppuccin" + } + }, "tinted-kitty": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1b8f4c3..025bfc1 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-userstyles = { - url = "github:adam01110/nix-userstyles"; + url = "git+https://tangled.org/adam0.dev/nix-userstyles"; inputs = { flake-parts.follows = "flake-parts"; import-tree.follows = "import-tree"; diff --git a/modules/development/treefmt.nix b/modules/development/treefmt.nix index 39416ea..fdcce8e 100644 --- a/modules/development/treefmt.nix +++ b/modules/development/treefmt.nix @@ -47,6 +47,7 @@ global.excludes = [ # keep-sorted start ".direnv/*" + ".envrc" ".sops.yaml" "flake.nix" "secrets.yaml" diff --git a/modules/programs/gui/zen/chrome.nix b/modules/programs/gui/zen/chrome.nix index e379994..4cd5cd7 100644 --- a/modules/programs/gui/zen/chrome.nix +++ b/modules/programs/gui/zen/chrome.nix @@ -1,7 +1,7 @@ { flake-file.inputs = { nix-userstyles = { - url = "github:adam01110/nix-userstyles"; + url = "git+https://tangled.org/adam0.dev/nix-userstyles"; inputs = { # keep-sorted start flake-parts.follows = "flake-parts"; diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix index 4b2b94b..b2722ca 100644 --- a/modules/programs/ssh.nix +++ b/modules/programs/ssh.nix @@ -3,8 +3,10 @@ inherit (vars) groundDomain username; in { sops.secrets = { + # keep-sorted start "servers/euclid/private_ssh_key".path = "/home/${username}/.ssh/euclid"; "servers/euclid/public_ssh_key".path = "/home/${username}/.ssh/euclid.pub"; + # keep-sorted end }; programs.ssh = { -- 2.51.2