nix: update to 24.05 (#72)

dd-ix · Jun 7, 2024 · 8171cba · 8171cba
1 parent 117fde5
commit 8171cba
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 56 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,8 +2,7 @@
   description = "dresden internet exchange nixos config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-    nixpkgs-24-05.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     ifstate = {
       url = "git+https://codeberg.org/m4rc3l/ifstate.nix";
@@ -42,7 +41,7 @@
     };
 
     authentik = {
-      url = "github:nix-community/authentik-nix";
+      url = "github:nix-community/authentik-nix/node-22";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -64,12 +63,6 @@
           sops-nix.nixosModules.default
           microvm.nixosModules.host
         ];
-        nixpkgs-24-05 = import inputs.nixpkgs-24-05 {
-          system = "x86_64-linux";
-          config = {
-            allowUnfree = true;
-          };
-        };
       in
       {
         svc-hv01 = nixpkgs.lib.nixosSystem {
@@ -140,7 +133,7 @@
           specialArgs = { inherit inputs self; };
           modules = [
             ifstate.nixosModules.default
-            { nixpkgs.overlays = [ ifstate.overlays.default (_:_: { inherit (nixpkgs-24-05) mrtg; }) ]; }
+            { nixpkgs.overlays = [ ifstate.overlays.default ]; }
             microvm.nixosModules.microvm
             sops-nix.nixosModules.default
             ixp-manager.nixosModules.default
@@ -260,7 +253,7 @@
           specialArgs = { inherit inputs self; };
           modules = [
             ifstate.nixosModules.default
-            { nixpkgs.overlays = [ ifstate.overlays.default (_:_: { inherit (nixpkgs-24-05) listmonk; }) ]; }
+            { nixpkgs.overlays = [ ifstate.overlays.default ]; }
             microvm.nixosModules.microvm
             sops-nix.nixosModules.default
             ./hosts/svc-lists01

diff --git a/modules/dd-ix/base.nix b/modules/dd-ix/base.nix
@@ -71,15 +71,18 @@ in
 
   users.motd = prodMotd;
 
-  programs.screen.screenrc = ''
-    defscrollback 10000
+  programs.screen = {
+    enable = true;
+    screenrc = ''
+      defscrollback 10000
 
-    startup_message off
+      startup_message off
 
-    hardstatus on
-    hardstatus alwayslastline
-    hardstatus string "%w"
-  '';
+      hardstatus on
+      hardstatus alwayslastline
+      hardstatus string "%w"
+    '';
+  };
 
   environment.interactiveShellInit = /* sh */ ''
     # raise some awareness torwards failed services

diff --git a/modules/management/authentik.nix b/modules/management/authentik.nix
@@ -81,9 +81,9 @@ in
   };
 
   systemd.services.authentik.environment = {
-    AUTHENTIK_ERROR_REPORTING__ENABLED = false;
-    AUTHENTIK_DISABLE_UPDATE_CHECK = true;
-    AUTHENTIK_DISABLE_STARTUP_ANALYTICS = true;
+    AUTHENTIK_ERROR_REPORTING__ENABLED = "false";
+    AUTHENTIK_DISABLE_UPDATE_CHECK = "true";
+    AUTHENTIK_DISABLE_STARTUP_ANALYTICS = "true";
     AUTHENTIK_AVATARS = "initials";
   };
 }
diff --git a/modules/management/listmonk.nix b/modules/management/listmonk.nix
@@ -1,4 +1,4 @@
-{ self, lib, config, pkgs, inputs, ... }:
+{ self, lib, config, pkgs, ... }:
 let
   cfg = config.services.listmonk;
   tomlFormat = pkgs.formats.toml { };

diff --git a/modules/management/netbox.nix b/modules/management/netbox.nix
@@ -21,7 +21,7 @@
     postgresql.enable = lib.mkForce false;
     netbox = {
       enable = true;
-      package = pkgs.netbox_3_6.overrideAttrs (old: {
+      package = pkgs.netbox_3_7.overrideAttrs (old: {
         installPhase = old.installPhase + ''
           ln -s ${self + "/resources/netbox/pipeline.py"} $out/opt/netbox/netbox/netbox/ddix_pipeline.py
         '';

diff --git a/modules/management/postgres.nix b/modules/management/postgres.nix
@@ -2,15 +2,22 @@
 let
   systems = lib.attrValues self.nixosConfigurations;
   users = lib.flatten (map (system: system.config.dd-ix.postgres) systems);
-  # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/databases/postgresql.nix#L7-L21
+
+  # https://github.com/NixOS/nixpkgs/blob/nixos-24.05/nixos/modules/services/databases/postgresql.nix#L30C1-L44
+  cfg = config.services.postgresql;
   postgresql =
     let
-      cfg = config.services.postgresql;
-      base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package;
+      # ensure that
+      #   services.postgresql = {
+      #     enableJIT = true;
+      #     package = pkgs.postgresql_<major>;
+      #   };
+      # works.
+      base = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT;
     in
     if cfg.extraPlugins == [ ]
     then base
-    else base.withPackages (_: cfg.extraPlugins);
+    else base.withPackages cfg.extraPlugins;
 
   startPostgres = pkgs.writeShellScript "postgres.sh" ''
     exec ${postgresql}/bin/postgres \