update to nixos-23.05

Author: disassembler

flake.lock

@@ -2,8 +2,8 @@
   description = "Disassembler Network";
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nix.url = "github:NixOS/nix/2.15.0";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nix.url = "github:NixOS/nix/2.14.1";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
     #nixpkgs-2111.follows = "cardano-node/haskellNix/nixpkgs-2111";
     #nixpkgs-2105.follows = "cardano-node/haskellNix/nixpkgs-2105";
     cardano-node.url = "github:input-output-hk/cardano-node/cardano-node-service-ipv6";

flake.nix

@@ -21,7 +21,6 @@ in
       xtrlock-pam
       rxvt_unicode-with-plugins
       xsel
-      keepassx-community
       virtmanager
       xclip
       gnome3.gnome_session

modules/profiles/xapps.nix

@@ -12,7 +12,7 @@ with lib;
     users.mutableUsers = mkDefault true;
 
     # clean tmp on boot
-    boot.cleanTmpDir = mkDefault true;
+    boot.tmp.cleanOnBoot = mkDefault true;
 
     programs = {
       bash.enableCompletion = mkDefault true;
@@ -23,19 +23,17 @@ with lib;
 
     # sane dnsmasq defaults
     services = {
-      dnsmasq.extraConfig = ''
-        strict-order # obey order of dns servers
-      '';
-
       # sane journald defaults
       journald.extraConfig = ''
         SystemMaxUse=256M
       '';
       locate.enable = true;
       openssh = {
         enable = true;
-        passwordAuthentication = false;
-        permitRootLogin = "without-password";
+        settings = {
+          PasswordAuthentication = false;
+          PermitRootLogin = "without-password";
+        };
       };
     };
 

modules/roles/base.nix

@@ -238,7 +238,6 @@ in
     rxvt_unicode-with-plugins
     termite
     xsel
-    keepassx2
     tcpdump
     inetutils
     p11-kit

nixos/irkutsk/configuration.nix

@@ -42,7 +42,7 @@ in
   boot.zfs.enableUnstable = true;
 
   boot.supportedFilesystems = [ "exfat" "zfs" ];
-  boot.cleanTmpDir = true;
+  boot.tmp.cleanOnBoot = true;
   boot.zfs.devNodes = "/dev";
 
   boot.extraModprobeConfig = ''
@@ -222,7 +222,7 @@ in
     strace
     mplayer
     gpgme.dev
-    yubioath-desktop
+    yubioath-flutter
     yubikey-manager
     pinentry-gtk2
     bat
@@ -255,7 +255,6 @@ in
     termite
     wezterm
     xsel
-    keepassx2
     tcpdump
     inetutils
     p11-kit
@@ -513,22 +512,24 @@ in
     };
     dnsmasq = {
       enable = true;
-      extraConfig = ''
-        address=/portal.wedlake.lan/10.40.33.1
-        address=/crate.wedlake.lan/10.40.33.20
-        address=/hydra.wedlake.lan/10.40.33.20
-        address=/unifi.wedlake.lan/10.40.33.20
-        address=/server.lan.bower-law.com/192.168.0.254
-        server=/wedlake.lan/10.40.33.1
-        server=/lan.centrallakerealty.com/10.37.3.2
-        server=/lan.bower-law.com/192.168.0.254
-        server=/bower.local/192.168.0.254
-        server=/lan.centrallakerealty.com/10.37.3.2
-      '';
-      servers = [
-        "8.8.4.4"
-        "8.8.8.8"
-      ];
+      settings = {
+        address = [
+          "/portal.wedlake.lan/10.40.33.1"
+          "/crate.wedlake.lan/10.40.33.20"
+          "/hydra.wedlake.lan/10.40.33.20"
+          "/unifi.wedlake.lan/10.40.33.20"
+          "/server.lan.bower-law.com/192.168.0.254"
+        ];
+        server = [
+          "8.8.4.4"
+          "8.8.8.8"
+          "/wedlake.lan/10.40.33.1"
+          "/lan.centrallakerealty.com/10.37.3.2"
+          "/lan.bower-law.com/192.168.0.254"
+          "/bower.local/192.168.0.254"
+          "/lan.centrallakerealty.com/10.37.3.2"
+        ];
+      };
       resolveLocalQueries = false;
     };
 
@@ -598,7 +599,7 @@ in
   virtualisation.podman.enable = true;
   virtualisation.podman.dockerCompat = true;
   virtualisation.podman.dockerSocket.enable = true;
-  virtualisation.podman.defaultNetwork.dnsname.enable = true;
+  virtualisation.podman.defaultNetwork.settings.dnsenabled = true;
   systemd.services.podman.path = [pkgs.zfs];
   systemd.services.podman.serviceConfig.ExecStart = lib.mkForce [
     ""
@@ -692,4 +693,5 @@ in
     };
 
   systemd.user.services = { };
+  system.stateVersion = "23.05";
 }

nixos/pskov/configuration.nix

@@ -83,9 +83,11 @@
   #
   services.cardano-node = {
     enable = true;
+    useNewTopology = true;
     environment = "mainnet";
     package = cardano-node.packages.x86_64-linux.cardano-node;
-    systemdSocketActivation = true;
+    shareIpv6port = false;
+    hostAddr = "0.0.0.0";
     environments = cardano-node.environments.x86_64-linux;
     nodeConfig = cardano-node.environments.x86_64-linux.mainnet.nodeConfig // {
       hasPrometheus = [ "0.0.0.0" 12798 ];
@@ -103,8 +105,7 @@
       ];
     };
   };
-  systemd.sockets.cardano-node.partOf = [ "cardano-node.socket" ];
-  systemd.services.cardano-node.after = lib.mkForce [ "network-online.target" "cardano-node.socket" ];
+  systemd.services.cardano-node.after = lib.mkForce [ "network-online.target" ];
   services.trezord.enable = true;
   services.udev.extraRules = ''
     ACTION=="add", SUBSYSTEM=="thunderbolt", ATTR{authorized}=="0", ATTR{authorized}="1"

nixos/sarov/configuration.nix

@@ -26,6 +26,12 @@
       fsType = "zfs";
     };
 
+  fileSystems."/iog" =
+    {
+      device = "sarov/iog";
+      fsType = "zfs";
+    };
+
   fileSystems."/boot" =
     {
       device = "/dev/disk/by-uuid/67E3-17ED";

nixos/sarov/hardware-configuration.nix

@@ -8,7 +8,7 @@ return {
   automatically_reload_config = true,
   audible_bell = "Disabled",
   font_size = 14,
-  color_scheme = "Gruvbox Dark",
+  color_scheme = "Gruvbox dark, medium (base16)",
   hide_tab_bar_if_only_one_tab = true,
   font = wezterm.font_with_fallback({
     "Fira Code",