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
use flake

View file

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

View file

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

View file

@ -3,6 +3,7 @@ on:
workflow_dispatch: # allows manual triggering
schedule:
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
jobs:
lockfile:
runs-on: ubuntu-latest
@ -15,6 +16,6 @@ jobs:
uses: DeterminateSystems/update-flake-lock@v21
with:
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
automated

View file

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

View file

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

View file

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
{
imports = [
@ -128,8 +123,8 @@
snapshotInterval = "hourly";
configs = {
home = {
SUBVOLUME = "/home/dadada";
ALLOW_USERS = [ "dadada" ];
SUBVOLUME = "/dadada";
ALLOW_USERS= "dadada";
TIMELINE_CREATE = true;
TIMELINE_CLEANUP = true;
TIMELINE_MIN_AGE = "1800";
@ -151,7 +146,7 @@
TIMELINE_LIMIT_YEARLY = "0";
};
paperless = {
SUBVOLUME = "/var/lib/paperless";
SUBVOLUME = "/paperless";
TIMELINE_CREATE = true;
TIMELINE_CLEANUP = true;
TIMELINE_MIN_AGE = "3600";
@ -218,7 +213,7 @@
# owner = "paperless";
# };
# };
# Create compressing swap space in RAM
zramSwap.enable = true;
}

View file

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

View file

@ -1,4 +1,3 @@
{ pkgs }:
{
citizen-cups = pkgs.callPackage ./citizen-cups.nix { };
{ pkgs }: {
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;
}