Compare commits

..

6 Commits

Author SHA1 Message Date
reed 4b3685018d chore: sign commits from gitea actions 2026-05-07 22:06:47 -05:00
reed 2f3caf8562 chore: use https urls for private flake inputs 2026-05-07 15:17:47 -05:00
reed 3652da8f93 chore!: use homeModules instead of homeManagerModules
Flake.lock: update Nix dependencies for development environment only / nix-flake-update (push) Failing after 1m33s
2026-04-26 02:24:19 -05:00
reed bb5e2a0d72 ops: correct the cron expression to match the comment and run on the first day of the month 2026-04-26 01:36:36 -05:00
reed 97505c9ad4 chore: instead of using crane directly use the reed/project-templates rust module 2026-04-26 01:18:14 -05:00
reed add6e0ad0d ops: add flake-update.yaml workflow 2026-04-19 18:25:09 -05:00
3 changed files with 112 additions and 91 deletions
+33
View File
@@ -0,0 +1,33 @@
name: "Flake.lock: update Nix dependencies for development environment only"
on:
workflow_dispatch: # allows manual triggering
schedule:
- cron: '00 00 02 1/2 *' # runs the first of day the month every 2 months at 7:00pm local time (midnight UTC)
jobs:
nix-flake-update:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: "install nix"
uses: cachix/install-nix-action@v31
- uses: photostructure/git-ssh-signing-action@v1
with:
ssh-signing-key: ${{ secrets.SSH_SIGNING_KEY }}
git-user-name: ${{ vars.GIT_USER_NAME }}
git-user-email: ${{ vars.GIT_USER_EMAIL }}
- name: "update flake.lock"
run: |
nix flake update --commit-lock-file
- name: "check flake for errors"
run: |
nix flake check
- name: "push update"
run: |
git push
Generated
+30 -5
View File
@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1775839657, "lastModified": 1777149905,
"narHash": "sha256-SPm9ck7jh3Un9nwPuMGbRU04UroFmOHjLP56T10MOeM=", "narHash": "sha256-WMC5ktOHtCyJL/jtlf46P+I4Vhw938+oLlSpM8gwQwU=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "7cf72d978629469c4bd4206b95c402514c1f6000", "rev": "60c829383710f7e26454e6677c4d3adbc56dd3b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -64,17 +64,42 @@
"type": "github" "type": "github"
} }
}, },
"root": { "project-templates": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1777183464,
"narHash": "sha256-aKh428176wYLo4KBAcadw5sqseSPAQ64pN0Qi8f2tXs=",
"ref": "refs/heads/master",
"rev": "b1a2a8d97b6beae0cbea89908306a496425c610c",
"revCount": 14,
"type": "git",
"url": "ssh://gitea@git.krantz.one/reed/project-templates"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.krantz.one/reed/project-templates"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix" "project-templates": "project-templates"
} }
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"project-templates",
"nixpkgs" "nixpkgs"
] ]
}, },
+49 -86
View File
@@ -6,135 +6,98 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
treefmt-nix = { project-templates = {
url = "github:numtide/treefmt-nix"; url = "git+https://git.krantz.one/reed/project-templates";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
}; };
crane.url = "github:ipetkov/crane";
}; };
outputs = { outputs = {
self, self,
flake-parts, flake-parts,
treefmt-nix, project-templates,
crane,
... ...
} @ inputs: } @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} { flake-parts.lib.mkFlake {inherit inputs;} {
imports = [ imports = [
treefmt-nix.flakeModule project-templates.flakeModules.rust
]; ];
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
perSystem = { perSystem = {
pkgs,
lib, lib,
config,
pkgs,
self',
... ...
}: let }: {
craneLib = crane.mkLib pkgs; krantz.rust = let
src = let craneLib = config.krantz.rust.craneLib;
unfilteredRoot = ./.;
in # pkgs.qt6.env already includes pkgs.qt6.qtbase
lib.fileset.toSource { # And using `with` to prevent a lot of typing.
root = unfilteredRoot; qtEnv = with pkgs.qt6;
fileset = lib.fileset.unions [ env "qt-rshell-${qtbase.version}" [
# Default files from crane (Rust and cargo files) qtdeclarative
(craneLib.fileset.commonCargoSources unfilteredRoot) qttools
(lib.fileset.maybeMissing ./qt-plugin.version)
]; ];
}; in {
manifest = (lib.importTOML "${src}/Cargo.toml").package; enable = true;
srcFiltered = let
unfilteredRoot = ./.;
in
lib.fileset.toSource {
root = unfilteredRoot;
fileset = lib.fileset.unions [
# Default files from crane (Rust and cargo files)
(craneLib.fileset.commonCargoSources unfilteredRoot)
(lib.fileset.maybeMissing ./qt-plugin.version)
];
};
# pkgs.qt6.env already includes pkgs.qt6.qtbase runtimeDeps = [
# And using `with` to prevent a lot of typing. qtEnv
qtEnv = with pkgs.qt6;
env "qt-rshell-${qtbase.version}" [
qtdeclarative
qttools
]; ];
devDeps = with pkgs; [
# runtime dependencies
buildInputs = with pkgs; [
qtEnv
];
# build dependencies
nativeBuildInputs = with pkgs; [
# pkg-config
# rustPlatform.bindgenHook
];
# Build *just* the cargo dependencies, so we can reuse
# all of that work (e.g. via cachix) when running in CI
cargoArtifacts = craneLib.buildDepsOnly {
inherit src buildInputs nativeBuildInputs;
};
in rec {
# Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow'
devShells.default = craneLib.devShell {
inherit checks;
# extra tooling dependencies
packages = with pkgs; [
rust-analyzer rust-analyzer
quickshell quickshell
]; ];
shellHook = devShell.extraAttrs = {
/* shellHook =
bash /*
*/ bash
'' */
export QML2_IMPORT_PATH=$(git rev-parse --show-toplevel)/result/:$QML2_IMPORT_PATH ''
''; export QML2_IMPORT_PATH=$(git rev-parse --show-toplevel)/result/:$QML2_IMPORT_PATH
'';
inputsFrom = [packages.default];
};
# Formatter for nix files, available through 'nix fmt'
treefmt = {
programs.alejandra.enable = true;
programs.rustfmt = {
enable = true;
edition = manifest.edition;
}; };
package.name = "lib";
}; };
# Your custom packages # Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc # Accessible through 'nix build', 'nix shell', 'nix run', etc
packages = rec { packages = {
lib = craneLib.buildPackage {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
};
qmlModule = pkgs.runCommand "rshell-qml-dir" {} '' qmlModule = pkgs.runCommand "rshell-qml-dir" {} ''
mkdir -p $out mkdir -p $out
cat << EOF > $out/qmldir cat << EOF > $out/qmldir
${'' ${''
module one.krantz.rshell module one.krantz.rshell
plugin rshell ${lib}/lib plugin rshell ${self'.packages.lib}/lib
''} ''}
EOF EOF
''; '';
default = qmlModule; default = self'.packages.qmlModule;
};
checks = {
clippy = craneLib.cargoClippy {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
cargoClippyExtraArgs = "-- --deny warnings";
};
}; };
}; };
flake = { flake = {
homeManagerModules.default = { homeModules.default = {
lib, lib,
config, config,
pkgs, pkgs,