flake.nix

@@ -13,19 +13,14 @@
     agenix.url = "github:yaxitech/ragenix";
   };
 
-  outputs = inputs @ {
+  outputs = inputs@{ self, nixpkgs, home-manager, microvm, agenix, ... }:
-    self,
+    let
-    nixpkgs,
-    home-manager,
-    microvm,
-    agenix,
-    ...
-  }: let
       system     = "x86_64-linux";
       username   = "tbarnouin";
       proxy_host = "192.168.1.40";
       pgsql_host = "192.168.1.13";
-  in {
+    in
+    {
       nixosConfigurations = {
         nixmox-curiosity = nixpkgs.lib.nixosSystem {
           inherit system;

hosts/nixmox-curiosity/configuration.nix

@@ -1,10 +1,6 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
+
-  lib,
+{ imports = [ ./hardware-configuration.nix ];
-  pkgs,
-  ...
-}: {
-  imports = [./hardware-configuration.nix];
 
   nix = {
     settings = {
@@ -108,4 +104,5 @@
   };
 
   system.stateVersion = "24.11"; # Did you read the comment?
+
 }

hosts/nixmox-curiosity/hardware-configuration.nix

@@ -1,8 +1,6 @@
+{ lib, system, ... }:
+
 {
-  lib,
-  system,
-  ...
-}: {
   boot = {
     # use latest kernel
     # kernelPackages = pkgs.linuxPackages_latest;
@@ -47,6 +45,7 @@
     };
   };
 
+
   services.fstrim = {
     enable = true;
     interval = "weekly";

hosts/nixmox-curiosity/home.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   home = {
     username = "tbarnouin";
     stateVersion = "24.11";
@@ -78,7 +75,8 @@
       };
       oh-my-zsh = {
         enable = true;
-        plugins = [
+        plugins =
+          [
             "git"
             "terraform"
             "sudo"

hosts/nixmox-perseverance/configuration.nix

@@ -1,10 +1,6 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
+
-  lib,
+{ imports = [ ./hardware-configuration.nix ];
-  pkgs,
-  ...
-}: {
-  imports = [./hardware-configuration.nix];
 
   nix = {
     settings = {
@@ -108,4 +104,5 @@
   };
 
   system.stateVersion = "24.11"; # Did you read the comment?
+
 }

hosts/nixmox-perseverance/hardware-configuration.nix

@@ -1,8 +1,6 @@
+{ lib, system, ... }:
+
 {
-  lib,
-  system,
-  ...
-}: {
   boot = {
     # use latest kernel
     # kernelPackages = pkgs.linuxPackages_latest;

hosts/nixmox-perseverance/home.nix

@@ -1,8 +1,5 @@
+{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  ...
-}: {
   home = {
     username = "tbarnouin";
     stateVersion = "24.11";
@@ -78,7 +75,8 @@
       };
       oh-my-zsh = {
         enable = true;
-        plugins = [
+        plugins =
+          [
             "git"
             "terraform"
             "sudo"

secrets.nix

@@ -7,7 +7,8 @@ let
   onlyoffice = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGbnzv2/Or4XdQXLDjIbr7oIDTQEvgSMTX4aiNCQk4tC root@onlyoffice";
 
   systems    = [ forgejo grafana ];
-in {
+in
+{
   "secrets/initialPassword.age".publicKeys = users ++ systems;
   "services/grafana/secrets/grafana-db.age".publicKeys = [ tbarnouin grafana ];
   "services/grafana/secrets/grafana-oauth_secret.age".publicKeys = [ tbarnouin grafana ];
@@ -15,3 +16,4 @@ in {
   "services/onlyoffice/secrets/office-dbpass.age".publicKeys  = [ tbarnouin onlyoffice ];
   "services/onlyoffice/secrets/office-jwtpass.age".publicKeys = [ tbarnouin onlyoffice ];
 }
+

services/authentik/default.nix

@@ -1,12 +1,8 @@
-{
+{ inputs, config, lib, authentik-nix, ... }:
-  inputs,
+let
-  config,
-  lib,
-  authentik-nix,
-  ...
-}: let
   cfg = config.services.vm_authentik;
-in {
+in
+{
   options.services.vm_authentik = {
     enable = lib.mkEnableOption "Enable minimal config";
   };

services/default.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   imports = [
     ./nginx
     ./gitea

services/gitea/default.nix

@@ -1,11 +1,8 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let
-  pkgs,
-  lib,
-  ...
-}: let
   cfg = config.services.vm_gitea;
-in {
+in
+{
   options.services.vm_gitea = {
     enable = lib.mkEnableOption "Enable minimal config";
     db_ip = lib.mkOption {

services/grafana/default.nix

@@ -1,11 +1,8 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
+let
-  config,
-  pkgs,
-  ...
-}: let
   cfg = config.services.vm_grafana;
-in {
+in
+{
   options.services.vm_grafana = {
     enable = lib.mkEnableOption "Enable minimal config";
     vm_ip = lib.mkOption {
@@ -91,125 +88,95 @@ in {
           job_name = "kuma";
           scrape_interval = "30s";
           scheme = "http";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.90:3001" ];
-            }
+          }];
-          ];
           basic_auth.username = "tbarnouin";
           basic_auth.password_file = config.age.secrets.kuma-token.path;
         }
         {
           job_name = "grafana";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "127.0.0.1:9002" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "openmediavault_cadvisor";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.125:8080" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "opportunity";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.125:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "nginx";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "${cfg.proxy_ip}:9002" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "redis";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.16:9002" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "ingenuity";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.90:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "gitea";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.14:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "postgresql";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.13:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "nextcloud";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.44:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "deluge";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.18:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "netbox";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.45:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "jellyfin";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.42:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "authentik-ldap";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.41:9100" ];
-            }
+          }];
-          ];
         }
         {
           job_name = "authentik";
-          static_configs = [
+          static_configs = [{
-            {
             targets = [ "192.168.1.25:9002" ];
-            }
+          }];
-          ];
         }
       ];
     };
@@ -235,8 +202,7 @@ in {
           chunk_retain_period = "30s";
         };
         schema_config = {
-          configs = [
+          configs = [{
-            {
             from = "2022-06-06";
             store = "boltdb-shipper";
             object_store = "filesystem";
@@ -245,8 +211,7 @@ in {
               prefix = "index_";
               period = "24h";
             };
-            }
+          }];
-          ];
         };
         storage_config = {
           boltdb_shipper = {
@@ -290,11 +255,9 @@ in {
         positions = {
           filename = "/tmp/positions.yaml";
         };
-        clients = [
+        clients = [{
-          {
           url = "http://127.0.0.1:3100/loki/api/v1/push";
-          }
+        }];
-        ];
         scrape_configs = [
           {
             job_name = "syslog";

services/jellyfin/default.nix

@@ -1,11 +1,8 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
+let
-  config,
-  pkgs,
-  ...
-}: let
   cfg = config.services.vm_jellyfin;
-in {
+in
+{
   options.services.vm_jellyfin = {
     enable = lib.mkEnableOption "Enable minimal config";
   };

services/minimalConfig/default.nix

@@ -1,11 +1,6 @@
+{ config, pkgs, lib, inputs, modulesPath, ... }:
 {
-  config,
+
-  pkgs,
-  lib,
-  inputs,
-  modulesPath,
-  ...
-}: {
   imports = [
     ./lxc.nix
     ./vm.nix

services/minimalConfig/lxc.nix

@@ -1,11 +1,8 @@
-{
+{lib, config, modulesPath, ...}:
-  lib,
+let
-  config,
-  modulesPath,
-  ...
-}: let
   cfg = config.services.lxc;
-in {
+in
+{
   options.services.lxc = {
     enable = lib.mkEnableOption "Enable LXC container config";
   };

services/minimalConfig/vm.nix

@@ -1,11 +1,8 @@
-{
+{lib, config, modulesPath, ...}:
-  lib,
+let
-  config,
-  modulesPath,
-  ...
-}: let
   cfg = config.services.vm;
-in {
+in
+{
   options.services.vm = {
     enable = lib.mkEnableOption "Enable LXC container config";
   };

services/nextcloud/default.nix

@@ -1,11 +1,8 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
+let
-  config,
-  pkgs,
-  ...
-}: let
   cfg = config.services.vm_nextcloud;
-in {
+in
+{
   options.services.vm_nextcloud = {
     enable = lib.mkEnableOption "Enable minimal config";
     proxy_ip = lib.mkOption {

services/nginx/default.nix

@@ -1,11 +1,8 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let
-  pkgs,
-  lib,
-  ...
-}: let
   cfg = config.services.vm_nginx;
-in {
+in
+{
   options.services.vm_nginx = {
     enable = lib.mkEnableOption "Enable minimal config";
   };
@@ -149,15 +146,6 @@ in {
               proxyWebsockets = true;
             };
           };
-          "actual.le43.eu" = {
-            forceSSL = true;
-            enableACME = true;
-            locations."/" = {
-              proxyPass = "http://192.168.1.125:5006";
-              recommendedProxySettings = true;
-              proxyWebsockets = true;
-            };
-          };
         };
       };
     };

services/onlyoffice/default.nix

@@ -1,11 +1,8 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let
-  pkgs,
-  lib,
-  ...
-}: let
   cfg = config.services.vm_onlyoffice;
-in {
+in
+{
   options.services.vm_onlyoffice = {
     enable = lib.mkEnableOption "Enable OnlyOffice service";
     pgsql_ip = lib.mkOption {

services/postgresql/default.nix

@@ -1,11 +1,8 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
+let
-  config,
-  pkgs,
-  ...
-}: let
   cfg = config.services.vm_postgresql;
-in {
+in
+{
   options.services.vm_postgresql = {
     enable = lib.mkEnableOption "Enable minimal config";
   };

services/redis/default.nix

@@ -1,11 +1,8 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+let
-  pkgs,
-  lib,
-  ...
-}: let
   cfg = config.services.vm_redis;
-in {
+in
+{
   options.services.vm_redis = {
     enable = lib.mkEnableOption "Enable minimal config";
   };

systems/minimalLXCConfig.nix

@@ -1,11 +1,6 @@
+{ config, pkgs, lib, inputs, modulesPath, ... }:
 {
-  config,
+
-  pkgs,
-  lib,
-  inputs,
-  modulesPath,
-  ...
-}: {
   nix = {
     settings.experimental-features = [ "nix-command" "flakes" ];
     settings.trusted-users = [ "root" "@wheel" ];

systems/minimalMicrovmConfig.nix

@@ -1,14 +1,8 @@
-{
+{ config, pkgs, lib, inputs, modulesPath, microvm, ... }:
-  config,
+let
-  pkgs,
-  lib,
-  inputs,
-  modulesPath,
-  microvm,
-  ...
-}: let
   cfg = config.services.micro_vm;
-in {
+in
+{
   options.services.micro_vm = {
     enable = lib.mkEnableOption "Enable NixOS microvm config";
     hostname = lib.mkOption {
@@ -59,13 +53,11 @@ in {
           mountPoint = "/run/secrets/${cfg.hostname}";
         }
       ];
-      interfaces = [
+      interfaces = [ {
-        {
         type = "tap";
         id = "vm-${cfg.hostname}";
         mac = "${cfg.macAddr}";
-        }
+      } ];
-      ];
 
       hypervisor = "qemu";
       socket = "control.socket";
@@ -200,3 +192,4 @@ in {
     };
   };
 }
+

systems/minimalVMConfig.nix

@@ -1,11 +1,6 @@
+{ config, pkgs, lib, inputs, modulesPath, ... }:
 {
-  config,
+
-  pkgs,
-  lib,
-  inputs,
-  modulesPath,
-  ...
-}: {
   nix = {
     settings.experimental-features = [ "nix-command" "flakes" ];
     settings.trusted-users = [ "root" "@wheel" ];