From 7fdca49b75b85a41da9dae34b01a01c88f38c142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 22 Aug 2022 10:46:35 +0200
Subject: Update and few changes for routers

---
 nixos/machine/adm-omnia.nix |  7 +------
 nixos/machine/dean.nix      |  2 +-
 nixos/machine/spt-mox2.nix  | 14 +++++++-------
 nixos/modules/desktop.nix   |  2 ++
 nixos/modules/develop.nix   |  2 +-
 nixos/modules/generic.nix   |  2 +-
 6 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'nixos')

diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix
index c7c2063..48af6fa 100644
--- a/nixos/machine/adm-omnia.nix
+++ b/nixos/machine/adm-omnia.nix
@@ -8,6 +8,7 @@ with lib;
     cynerd = {
       #openvpn.oldpersonal = true;
     };
+    boot.kernelPackages = pkgs.linuxPackages;
 
     networking = {
       # TODO we need vlan filtering to filter out guest and adm network
@@ -40,12 +41,6 @@ with lib;
       enable = true;
       environmentFile = "/run/secrets/hostapd.env";
       interfaces = {
-        "mlan0" = {
-          countryCode = "CZ";
-          ssid = "TurrisRules";
-          wpa = true;
-          wpaPassphrase = "@PASS_TURRIS_RULES@";
-        };
         "wlp1s0" = {
           countryCode = "CZ";
           hwMode = "a";
diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index b34bb0b..f2d5459 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -37,7 +37,7 @@ with lib;
     }];
 
     environment.systemPackages = with pkgs; [
-      openocd
+      #openocd
       sterm
     ];
 
diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index a3de15d..65748fb 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -24,16 +24,16 @@ with lib;
       enable = true;
       environmentFile = "/run/secrets/hostapd.env";
       interfaces = {
-        "mlan0" = {
-          countryCode = "CZ";
-          ssid = "TurrisRules";
-          wpa = true;
-          wpaPassphrase = "@PASS_TURRIS_RULES@";
-        };
+        #"mlan0" = {
+          #countryCode = "CZ";
+          #ssid = "TurrisRules";
+          #wpa = true;
+          #wpaPassphrase = "@PASS_TURRIS_RULES@";
+        #};
         "wlp1s0" = {
           countryCode = "CZ";
           hwMode = "a";
-          channel = 36;
+          channel = 40;
           ieee80211ac = true;
           ht_capab = ["HT40+" "LDPC" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"];
           vht_capab = ["RXLDPC" "SHORT-GI-80" "TX-STBC-2BY1" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7"];
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 500e3de..bff2c1e 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -229,5 +229,7 @@ in {
     services.xserver.xkbOptions = "grp:alt_shift_toggle,caps:escape";
     services.gpm.enable = true;
 
+    services.locate.enable = true;
+
   };
 }
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 310eaa3..51e106a 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -77,7 +77,7 @@ in {
       qemu
 
       # U-Boot
-      ubootTools
+      #ubootTools
       tftp-hpa
 
       # Network
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 29c2155..6469a9d 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -34,7 +34,7 @@ in {
 
     boot.loader.systemd-boot.enable = mkOverride 1100 true;
     boot.loader.efi.canTouchEfiVariables = mkDefault true;
-    boot.kernelPackages = pkgs.linuxPackages_latest;
+    boot.kernelPackages = mkOverride 1100 pkgs.linuxPackages_latest;
     boot.kernelParams = ["boot.shell_on_fail"];
     hardware.enableAllFirmware = true;
 
-- 
cgit v1.2.3