retry

.github/workflows/deploy.yml

@@ -1,11 +1,6 @@
-on:
+on: [push]
-  push:
-    branches:
-      - master
 jobs:
-  build:
+  test:
     runs-on: nixos-latest
     steps:
-      - uses: actions/checkout@v4
+      - run: echo All good!
-      - run: nix develop
-      - run: colmena build -v --on @fili

.github/workflows/lint.yml

@@ -1,7 +0,0 @@
-on: [push]
-jobs:
-  lint:
-    runs-on: nixos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix fmt -- --check .

fili/configuration.nix

@@ -16,6 +16,7 @@ _: {
     networkmanager.enable = true;
   };
 
+
   nix.settings = {
     # users that can interact with nix
     trusted-users = [

fili/lib/auth.nix

@@ -1,5 +1,4 @@
-{ baseUrl, clientId }:
+{ baseUrl, clientId }: {
-{
   inherit clientId;
 
   userAuthUrl = "${baseUrl}/ui/oauth2";

fili/services/auth/kanidm.nix

@@ -1,11 +1,9 @@
-{ pkgs, config, ... }:
+{pkgs, config, ...}: let
-let
   lib = pkgs.lib;
   domain = "auth.donsz.nl";
   port = 3013;
   backupsDir = "/var/lib/kanidm/backup";
-in
+in {
-{
   services.kanidm.enableServer = true;
   services.kanidm.package = pkgs.kanidm_1_6;
   services.kanidm.serverSettings = {
@@ -28,11 +26,12 @@ in
       mkdir -p "${backupsDir}"
     '';
     serviceConfig = {
-      SupplementaryGroups = [ config.security.acme.certs.${domain}.group ];
+      SupplementaryGroups =
+        [ config.security.acme.certs.${domain}.group ];
     };
   };
 
-  environment.systemPackages = [ pkgs.kanidm ];
+  environment.systemPackages = [pkgs.kanidm];
 
   services.nginx.virtualHosts.${domain} = {
     forceSSL = true;

fili/services/auth/oauth2-proxy.nix

@@ -1,17 +1,12 @@
-{ pkgs, config, ... }:
+{pkgs, config, ...}: {
-{
   sops.secrets.oauth2-proxy = {
     sopsFile = ../../../secrets/oauth2-proxy.env;
   };
 
   services.oauth2-proxy =
     let
-      auth = import ../../lib/auth.nix {
+      auth = import ../../lib/auth.nix { baseUrl = "https://auth.donsz.nl"; clientId = "homeserver"; };
-        baseUrl = "https://auth.donsz.nl";
+    in {
-        clientId = "homeserver";
-      };
-    in
-    {
     enable = true;
 
     provider = "oidc";
@@ -39,7 +34,7 @@
     };
 
     extraConfig = {
-        whitelist-domain = [ "*.donsz.nl" ];
+      whitelist-domain = ["*.donsz.nl"];
     };
 
     nginx.domain = "oauth2.donsz.nl";

fili/services/forgejo.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 let
   cfg = config.services.forgejo;
   srv = cfg.settings.server;
@@ -11,7 +6,7 @@ in
 {
   sops.secrets.forgejo = {
     sopsFile = ../../secrets/forgejo.yaml;
-    key = "email_password";
+    key="email_password";
     format = "yaml";
   };
 
@@ -38,7 +33,7 @@ in
     lfs.enable = true;
     user = "forgejo";
     group = "forgejo";
-    repositoryRoot = "/storage/storage/git";
+    repositoryRoot="/storage/storage/git";
 
     database = {
       type = "postgres";
@@ -48,8 +43,8 @@ in
 
     settings = {
       DEFAULT = {
-        APP_NAME = "jana's git server";
+        APP_NAME="jana's git server";
-        APP_SLOGAN = "meow!";
+        APP_SLOGAN="meow!";
       };
       server = {
         DOMAIN = "git.donsz.nl";
@@ -67,7 +62,7 @@ in
         DEFAULT_ACTIONS_URL = "github";
       };
       repository = {
-        DEFAULT_PRIVATE = "private";
+        DEFAULT_PRIVATE="private";
       };
       mailer = {
         ENABLED = true;
@@ -90,7 +85,7 @@ in
       labels = [
         "nixos-latest:docker://nixos/nix"
       ];
-      settings = { };
+      settings = {};
     };
   };
 

fili/services/nginx.nix

@@ -1,5 +1,4 @@
-{ pkgs, config, ... }:
+{pkgs, config, ...}: {
-{
   services.nginx = {
     enable = true;
     statusPage = true;

fili/services/websites/homepage.nix

@@ -1,5 +1,4 @@
-{ flakes, pkgs, ... }:
+{flakes, pkgs, ...}: {
-{
   services.nginx = {
     virtualHosts."donsz.nl" = {
       forceSSL = true;

fili/services/websites/mapf.nix

@@ -1,5 +1,4 @@
-{ flakes, ... }:
+{flakes,...}: {
-{
   # imports = [
   #   flakes.mapf.nixosModules.default
   # ];

fili/services/websites/totpal.nix

@@ -1,6 +1,8 @@
-{ flakes, pkgs, ... }:
+{ flakes, pkgs,... }:
 let
-  totpal = flakes.totpal.packages.${pkgs.system}.default;
+  totpal =
+    flakes.totpal.packages.${pkgs.system}.default
+  ;
 in
 {
   services.nginx = {
@@ -15,7 +17,8 @@ in
     };
   };
 
-  systemd.services.totpal = {
+  systemd.services.totpal =
+    {
       description = "totpal";
       serviceConfig = {
         Type = "simple";