Cleanup a bit

5 files changed, 25 insertions, 21 deletions

diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index a4c6895..c058d16 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -13,11 +13,11 @@ with nixpkgs.lib; let
         networking.hostName = hostname;
         nixpkgs.overlays = [
           self.overlays.default
+          sterm.overlay
           agenix.overlays.default
-          nixd.overlays.default
           shvspy.overlays.default
           flatline.overlays.default
-          sterm.overlay
+          shvcli.overlays.default
         ];
         system.configurationRevision = self.rev or "dirty";
       }
@@ -64,11 +64,15 @@ with nixpkgs.lib; let
     system = "aarch64-linux";
     extra_modules = [
       ({pkgs, ...}: {
-        boot.kernelPackages = pkgs.linuxPackages_rpi3;
-        boot.initrd.includeDefaultModules = false;
-        boot.loader.grub.enable = false;
-        boot.loader.systemd-boot.enable = false;
-        boot.loader.generic-extlinux-compatible.enable = true;
+        boot = {
+          kernelPackages = pkgs.linuxPackages_rpi3;
+          initrd.includeDefaultModules = false;
+          loader = {
+            grub.enable = false;
+            systemd-boot.enable = false;
+            generic-extlinux-compatible.enable = true;
+          };
+        };
       })
     ];
   };
@@ -76,9 +80,11 @@ with nixpkgs.lib; let
     system = "armv7l-linux";
     extra_modules = [
       {
-        boot.loader.grub.enable = false;
-        boot.loader.systemd-boot.enable = false;
-        boot.loader.generic-extlinux-compatible.enable = true;
+        boot.loader = {
+          grub.enable = false;
+          systemd-boot.enable = false;
+          generic-extlinux-compatible.enable = true;
+        };
       }
     ];
   };
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 934eaf9..093a9c2 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -147,7 +147,7 @@ in {
 
         # CAD
         freecad
-        kicad-with-packages3d
+        kicad
         sweethome3d.application
         qelectrotech
       ]
@@ -248,10 +248,7 @@ in {
     };
 
     documentation = {
-      man = {
-        enable = true;
-        generateCaches = true;
-      };
+      man.enable = true;
       info.enable = true;
     };
 
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 96900d2..6cd7645 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -27,6 +27,7 @@ with lib; {
       cloc
       openssl
       sterm
+      tio
       parted
       vim-vint
       nodePackages.vim-language-server
@@ -41,8 +42,7 @@ with lib; {
       nixd
       alejandra
       statix
-      nixfmt
-      nixpkgs-fmt
+      deadnix
       agenix
 
       # Shell
@@ -119,6 +119,7 @@ with lib; {
       # SHV
       shvspy
       flatline
+      shvcli
 
       # Images
       imagemagick
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index d88618d..8688732 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -8,7 +8,7 @@ with lib; let
   isNative = config.nixpkgs.hostPlatform == config.nixpkgs.buildPlatform;
 in {
   config = {
-    system.stateVersion = "22.05";
+    system.stateVersion = "23.11";
 
     nix = {
       extraOptions = "experimental-features = nix-command flakes";
@@ -111,7 +111,7 @@ in {
     users.groups.cynerd.gid = 1000;
     users.users = {
       root = {
-        passwordFile = "/run/secrets/root.pass";
+        hashedPasswordFile = "/run/secrets/root.pass";
       };
       cynerd = {
         group = "cynerd";
@@ -135,7 +135,7 @@ in {
           if isNative
           then pkgs.zsh.out
           else pkgs.bash.out;
-        passwordFile = "/run/secrets/cynerd.pass";
+        hashedPasswordFile = "/run/secrets/cynerd.pass";
         openssh.authorizedKeys.keyFiles = [
           (config.personal-secrets + "/unencrypted/git-private.pub")
         ];
diff --git a/nixos/modules/home-assistant.nix b/nixos/modules/home-assistant.nix
index 813b41b..abe8c1a 100644
--- a/nixos/modules/home-assistant.nix
+++ b/nixos/modules/home-assistant.nix
@@ -73,7 +73,7 @@ in {
     services.telegraf.extraConfig = {
       outputs.influxdb_v2 = [
         {
-          urls = ["http://errol:8086"];
+          urls = ["http://cynerd.cz:8086"];
           token = "$INFLUX_TOKEN";
           organization = "personal";
           bucket = "bigclown";