Compare commits

..

2 commits

10 changed files with 38 additions and 51 deletions

2
.envrc
View file

@ -1,5 +1,3 @@
#!/bin/sh
watch_file devshell.nix watch_file devshell.nix
use flake use flake

View file

@ -4,4 +4,4 @@ updates:
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
assignees: ["dadada"] assignees: [ "dadada" ]

View file

@ -1,24 +1,26 @@
name: Continuous Integration name: Continuous Integration
on: on:
pull_request: pull_request:
push: push:
branches: [main] branches: [main]
jobs: jobs:
checks: checks:
name: "Checks" name: "Checks"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v26 - uses: cachix/install-nix-action@v26
with: with:
nix_path: nixpkgs=channel:nixos-stable nix_path: nixpkgs=channel:nixos-stable
extra_nix_config: | extra_nix_config: |
experimental-features = nix-command flakes experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
system-features = nixos-test benchmark big-parallel kvm system-features = nixos-test benchmark big-parallel kvm
- uses: cachix/cachix-action@v14 - uses: cachix/cachix-action@v14
with: with:
name: dadada name: dadada
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix flake check - run: nix flake check

View file

@ -3,6 +3,7 @@ on:
workflow_dispatch: # allows manual triggering workflow_dispatch: # allows manual triggering
schedule: schedule:
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00 - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
jobs: jobs:
lockfile: lockfile:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -15,6 +16,6 @@ jobs:
uses: DeterminateSystems/update-flake-lock@v21 uses: DeterminateSystems/update-flake-lock@v21
with: with:
pr-title: "Update flake.lock" # Title of PR to be created pr-title: "Update flake.lock" # Title of PR to be created
pr-labels: | # Labels to be set on the PR pr-labels: | # Labels to be set on the PR
dependencies dependencies
automated automated

View file

@ -24,7 +24,7 @@
name = "format"; name = "format";
help = "Format the project"; help = "Format the project";
command = '' command = ''
treefmt . nixpkgs-fmt .
''; '';
category = "dev"; category = "dev";
} }

View file

@ -21,14 +21,15 @@ let
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules =
{ [
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; {
} nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
] }
++ (nixpkgs.lib.attrValues self.nixosModules) ]
++ [ agenix.nixosModules.age ] ++ (nixpkgs.lib.attrValues self.nixosModules)
++ extraModules; ++ [ agenix.nixosModules.age ]
++ extraModules;
}; };
in in
{ {

View file

@ -1,9 +1,4 @@
{ { config, lib, pkgs, ... }:
config,
lib,
pkgs,
...
}:
{ {
imports = [ imports = [
@ -128,8 +123,8 @@
snapshotInterval = "hourly"; snapshotInterval = "hourly";
configs = { configs = {
home = { home = {
SUBVOLUME = "/home/dadada"; SUBVOLUME = "/dadada";
ALLOW_USERS = [ "dadada" ]; ALLOW_USERS= "dadada";
TIMELINE_CREATE = true; TIMELINE_CREATE = true;
TIMELINE_CLEANUP = true; TIMELINE_CLEANUP = true;
TIMELINE_MIN_AGE = "1800"; TIMELINE_MIN_AGE = "1800";
@ -151,7 +146,7 @@
TIMELINE_LIMIT_YEARLY = "0"; TIMELINE_LIMIT_YEARLY = "0";
}; };
paperless = { paperless = {
SUBVOLUME = "/var/lib/paperless"; SUBVOLUME = "/paperless";
TIMELINE_CREATE = true; TIMELINE_CREATE = true;
TIMELINE_CLEANUP = true; TIMELINE_CLEANUP = true;
TIMELINE_MIN_AGE = "3600"; TIMELINE_MIN_AGE = "3600";

View file

@ -5,14 +5,12 @@
nixpkgs, nixpkgs,
agenix, agenix,
devshell, devshell,
treefmt-nix,
... ...
}@inputs: }@inputs:
(flake-utils.lib.eachDefaultSystem ( (flake-utils.lib.eachDefaultSystem (
system: system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
in in
{ {
devShells.default = devShells.default =
@ -28,7 +26,7 @@
in in
import ./devshell.nix { inherit pkgs extraModules; }; import ./devshell.nix { inherit pkgs extraModules; };
formatter = treefmtEval.config.build.wrapper; formatter = pkgs.nixfmt-tree;
packages = import ./pkgs { inherit pkgs; } // { packages = import ./pkgs { inherit pkgs; } // {
installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage; installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
@ -36,6 +34,7 @@
} }
)) ))
// { // {
hmModules = import ./home/modules.nix { lib = nixpkgs.lib; }; hmModules = import ./home/modules.nix { lib = nixpkgs.lib; };
nixosConfigurations = import ./nixos/configurations.nix inputs; nixosConfigurations = import ./nixos/configurations.nix inputs;

View file

@ -1,4 +1,3 @@
{ pkgs }: { pkgs }: {
{ citizen-cups = pkgs.callPackage ./citizen-cups.nix {};
citizen-cups = pkgs.callPackage ./citizen-cups.nix { };
} }

View file

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
projectRootFile = "flake.nix";
programs.nixfmt.enable = true;
programs.shellcheck.enable = pkgs.hostPlatform.system != "riscv64-linux";
programs.shfmt.enable = pkgs.hostPlatform.system != "riscv64-linux";
programs.yamlfmt.enable = true;
}