Merge branch '24.05'

modules/base/default.nix

@@ -48,7 +48,7 @@ in {
         "kernel.kptr_restrict" = "0";
       };
 
-      kernelPackages = lib.mkDefault pkgs.zfs.latestCompatibleLinuxPackages;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages;
 
       supportedFilesystems = ["btrfs"];
     };

modules/profiles/desktop/default.nix

@@ -53,25 +53,27 @@ in {
 
       avahi = {
         enable = true;
-        nssmdns = true;
+        nssmdns4 = true;
         openFirewall = true;
       };
 
       xserver = {
         enable = true;
-        layout = "us,lt";
-        xkbOptions = "grp:alt_shift_toggle";
+        xkb = {
+          layout = "us,lt";
+          options = "grp:alt_shift_toggle";
+        };
 
         desktopManager.xfce.enable = true;
         windowManager.awesome.enable = true;
+        displayManager.lightdm.enable = true;
+      };
 
-        displayManager = {
-          lightdm.enable = true;
-          defaultSession = "none+awesome";
-          autoLogin = {
-            enable = true;
-            user = username;
-          };
+      displayManager = {
+        defaultSession = "none+awesome";
+        autoLogin = {
+          enable = true;
+          user = username;
         };
       };
 
@@ -238,19 +240,15 @@ in {
         ]
         (lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") [
           i7z
-          (nvtop.override {
-            amd = true;
-            intel = true;
-            msm = false;
-            nvidia = false;
-          })
+          nvtopPackages.amd
+          nvtopPackages.intel
           joplin-desktop
           intel-gpu-tools
 
           winetricks
           wineWowPackages.full
         ])
-        [pkgs.pkgs-unstable.undocker]
+        [pkgs.undocker]
       ];
 
     # https://discourse.nixos.org/t/nixos-rebuild-switch-upgrade-networkmanager-wait-online-service-failure/30746

modules/services/default.nix

@@ -12,7 +12,6 @@
     ./nsd-acme
     ./postfix
     ./remote-builder
-    ./snmp_exporter
     ./sshguard
     ./syncthing
     ./tailscale

modules/services/snmp_exporter/README.md

@@ -1,8 +0,0 @@
-How to upgrade snmp.yml
-
-1. Extend generator.yml from the upstream generator.yml in snmp_exporter/generator/generator.yml
-2. Generate snmp.yml:
-
-    snmp_exporter/generator$ make mibs
-    packages/snmp-yaml $ MIBDIRS=$HOME/code/snmp_exporter/generator/mibs /nix/store/wmymig1r9jfiaffbdpv1lyaj32rydbzc-snmp_exporter-0.21.0/bin/generator generate
-

modules/services/snmp_exporter/default.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  myData,
-  ...
-}: {
-  options.mj.services.snmp_exporter = with lib.types; {
-    enable = lib.mkEnableOption "Enable prometheus snmp_exporter";
-  };
-
-  config = lib.mkIf config.mj.services.snmp_exporter.enable {
-    mj.services.friendlyport.ports = [
-      {
-        subnets = [myData.subnets.tailscale.cidr];
-        tcp = [config.services.prometheus.exporters.snmp.port];
-      }
-    ];
-
-    services.prometheus.exporters.snmp = {
-      enable = true;
-      configurationPath = pkgs.concatTextFile {
-        name = "snmp.yml";
-        files = [./snmp.yml];
-      };
-    };
-  };
-}

modules/services/snmp_exporter/generator.yml

@@ -1,50 +0,0 @@
-modules:
-  # Default IF-MIB interfaces table with ifIndex.
-  if_mib:
-    walk: [sysUpTime, interfaces, ifXTable]
-    lookups:
-      - source_indexes: [ifIndex]
-        lookup: ifAlias
-      - source_indexes: [ifIndex]
-        # Uis OID to avoid conflict with PaloAlto PAN-COMMON-MIB.
-        lookup: 1.3.6.1.2.1.2.2.1.2 # ifDescr
-      - source_indexes: [ifIndex]
-        # Use OID to avoid conflict with Netscaler NS-ROOT-MIB.
-        lookup: 1.3.6.1.2.1.31.1.1.1.1 # ifName
-    overrides:
-      ifAlias:
-        ignore: true # Lookup metric
-      ifDescr:
-        ignore: true # Lookup metric
-      ifName:
-        ignore: true # Lookup metric
-      ifType:
-        type: EnumAsInfo
-
-# Mikrotik Router
-#
-# http://download2.mikrotik.com/Mikrotik.mib
-  mikrotik:
-    walk:
-      - interfaces
-      - ifMIB
-      - laIndex
-      - sysUpTime
-      - sysDescr
-      - host
-      - mikrotik
-    lookups:
-      - source_indexes: [ifIndex]
-        lookup: ifName
-      - source_indexes: [mtxrInterfaceStatsIndex]
-        lookup: ifName
-      - source_indexes: [hrStorageIndex]
-        lookup: hrStorageDescr
-      - source_indexes: [laIndex]
-        lookup: laNames
-        drop_source_indexes: true
-    overrides:
-      ifName:
-        ignore: true # Lookup metric
-      ifType:
-        type: EnumAsInfo