treewide: systems modificationsHEADmaster

8 files changed, 20 insertions, 37 deletions

diff --git a/nixos/modules/autounlock.nix b/nixos/modules/autounlock.nix
index d7d6a7c..912f55f 100644
--- a/nixos/modules/autounlock.nix
+++ b/nixos/modules/autounlock.nix
@@ -18,6 +18,7 @@ in {
   config = mkIf (cnf != {}) {
     environment.systemPackages = [pkgs.luks-hw-password];
     boot.initrd = {
+      systemd.enable = false;
       extraFiles."/luks-hw-password".source = pkgs.luks-hw-password;
       luks.devices =
         mapAttrs (name: value: {
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index c39f9d2..575b85e 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -172,7 +172,7 @@ in {
             freecad
             kicad
             sweethome3d.application
-            qelectrotech
+            #qelectrotech
             super-slicer
           ]
           ++ (optionals cnf.laptop [
@@ -291,7 +291,7 @@ in {
         enable = true;
         discovery = true;
       };
-      davfs2.enable = true;
+      #davfs2.enable = true; TODO!!!
 
       locate.enable = true;
 
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 587477f..69c58bc 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -30,7 +30,7 @@ in {
       openssl
       tio
       vim-vint
-      nodePackages.vim-language-server
+      vim-language-server
       vale
       can-utils
 
@@ -64,7 +64,7 @@ in {
 
       # C
       clang-tools
-      massif-visualizer
+      #massif-visualizer
       elf-size-analyze
 
       # Python
@@ -164,6 +164,9 @@ in {
       linux-manual
       stdmanpages
 
+      # Writing documentation
+      docstrfmt
+
       # SHV
       (shvcli.withPlugins [python3Packages.shvcli-ell])
 
@@ -173,10 +176,10 @@ in {
       # S3
       rclone
     ];
-    programs.wireshark = {
-      enable = true;
-      package = pkgs.wireshark;
-    };
+    #programs.wireshark = {
+    #  enable = true;
+    #  package = pkgs.wireshark;
+    #};
 
     documentation = {
       nixos = {
diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix
index 6d901e0..0263d1c 100644
--- a/nixos/modules/hosts.nix
+++ b/nixos/modules/hosts.nix
@@ -73,10 +73,8 @@ in {
         "omnia2" = "10.8.3.3";
         # Local
         "3dprint" = "10.8.3.80";
-        "mpd" = "10.8.3.51";
-        "printer" = "192.168.1.20";
+        "printer" = "10.8.3.20";
         # Portable
-        "albert" = "10.8.3.61";
         "binky" = "10.8.3.63";
       };
     };
@@ -109,10 +107,8 @@ in {
       "${cnf.adm.omnia}" = ["omnia.adm"];
       "10.8.3.2" = ["redmi.adm"];
       "${cnf.adm.omnia2}" = ["omnia2.adm"];
-      "${cnf.adm.albert}" = ["albert.adm"];
       "${cnf.adm.binky}" = ["binky.adm"];
-      "${cnf.adm."3dprint"}" = ["3dprint"];
-      "${cnf.adm.mpd}" = ["mpd.adm"];
+      "${cnf.adm.printer}" = ["printer.adm"];
     };
   };
 }
diff --git a/nixos/modules/monitoring.nix b/nixos/modules/monitoring.nix
index e8ba2a9..481854c 100644
--- a/nixos/modules/monitoring.nix
+++ b/nixos/modules/monitoring.nix
@@ -150,6 +150,7 @@ in {
             security = {
               admin_user = "cynerd";
               admin_password = "$__file{/run/secrets/grafana.admin.pass}";
+              secret_key = "SW2YcwTIb9zpOOhoPsMm";
             };
             server = {
               domain = "grafana.cynerd.cz";
diff --git a/nixos/modules/openwrtone.nix b/nixos/modules/openwrtone.nix
index 40c1ed6..c70dcbc 100644
--- a/nixos/modules/openwrtone.nix
+++ b/nixos/modules/openwrtone.nix
@@ -56,7 +56,7 @@ in {
       };
 
       # Use OpenWrt One specific kernel. It fixes SError with patch.
-      kernelPackages = mkDefault (pkgs.linuxPackagesFor pkgs.linuxOpenWrtOne);
+      kernelPackages = mkDefault (pkgs.linuxPackagesFor pkgs.linux_7_0);
       kernelParams = [
         "fw_devlink=permissive"
         "clk_ignore_unused"
diff --git a/nixos/modules/packages.nix b/nixos/modules/packages.nix
index e97229f..a85f14a 100644
--- a/nixos/modules/packages.nix
+++ b/nixos/modules/packages.nix
@@ -63,7 +63,7 @@ in {
       wakeonlan
       speedtest-cli
       librespeed-cli
-      termshark
+      #termshark
       w3m
 
       lm_sensors
diff --git a/nixos/modules/wifi-adm.nix b/nixos/modules/wifi-adm.nix
index 56ca65a..e69afd1 100644
--- a/nixos/modules/wifi-adm.nix
+++ b/nixos/modules/wifi-adm.nix
@@ -16,16 +16,8 @@
         saePasswordsFile = "/run/secrets/hostapd-TurrisAdamkovi.pass";
       };
     };
-    "${cnf."${name}".interface}.nela" = {
-      bssid = elemAt cnf."${name}".bssids 1;
-      ssid = "Nela";
-      authentication = {
-        mode = "wpa2-sha256";
-        wpaPasswordFile = "/run/secrets/hostapd-Nela.pass";
-      };
-    };
     "${cnf."${name}".interface}.milan" = {
-      bssid = elemAt cnf."${name}".bssids 2;
+      bssid = elemAt cnf."${name}".bssids 1;
       ssid = "MILAN-AC";
       authentication = {
         mode = "wpa2-sha1";
@@ -48,23 +40,13 @@
         }
       ];
     };
-    "lan-${cnf."${name}".interface}.nela" = {
-      matchConfig.Name = "${cnf."${name}".interface}-nela";
-      networkConfig.Bridge = "brlan";
-      bridgeVLANs = [
-        {
-          EgressUntagged = 2;
-          PVID = 2;
-        }
-      ];
-    };
     "lan-${cnf."${name}".interface}.milan" = {
       matchConfig.Name = "${cnf."${name}".interface}.milan";
       networkConfig.Bridge = "brlan";
       bridgeVLANs = [
         {
-          EgressUntagged = 2;
-          PVID = 2;
+          EgressUntagged = 1;
+          PVID = 1;
         }
       ];
     };