From c385cc1c05efd2d44a02fd729a6a0241adf9004c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 26 Apr 2022 13:54:42 +0200
Subject: Switch to unstable

---
 nixos/default.nix                 |  1 -
 nixos/modules/turris-defaults.nix |  6 +++++-
 nixos/modules/turris-wifi.nix     | 33 ---------------------------------
 3 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 nixos/modules/turris-wifi.nix

(limited to 'nixos')

diff --git a/nixos/default.nix b/nixos/default.nix
index 05d804d..e7c8f00 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,5 +1,4 @@
 {
   turris-board = import ./modules/turris-board.nix;
   turris-defaults = import ./modules/turris-defaults.nix;
-  turris-wifi = import ./modules/turris-wifi.nix;
 }
diff --git a/nixos/modules/turris-defaults.nix b/nixos/modules/turris-defaults.nix
index fe9c4be..01c3deb 100644
--- a/nixos/modules/turris-defaults.nix
+++ b/nixos/modules/turris-defaults.nix
@@ -44,6 +44,10 @@ in {
 
     # Use the latest kernel
     boot.kernelPackages = mkDefault pkgs.linuxPackages_latest;
+    #boot.kernelPackages = mkDefault (if (config.turris.board == "mox") then
+    #  pkgs.linuxPackages_latest
+    #else
+    #  pkgs.linuxPackages_5_15);
 
     # The supported deployment is on BTRFS
     boot.supportedFilesystems = [ "btrfs" ];
@@ -77,7 +81,7 @@ in {
     environment.systemPackages =  with pkgs; [
       htop
     ] ++ optionals (config.turris.board == "mox") [
-      libatsha204
+      mox-otp
     ] ++ optionals (config.turris.board == "omnia") [
       libatsha204
     ];
diff --git a/nixos/modules/turris-wifi.nix b/nixos/modules/turris-wifi.nix
deleted file mode 100644
index bd74523..0000000
--- a/nixos/modules/turris-wifi.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cnf = config.turris.wifi;
-
-in {
-
-  options = {
-    turris.wifi = {
-      enable = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Enable Turris WiFi configuration";
-      };
-    };
-  };
-
-  config = mkIf cnf.enable {
-    # Needed for Ath10k firmware
-    hardware.firmware = with pkgs; [ firmwareLinuxNonfree ];
-
-    # The additional administration packages
-    environment.systemPackages =  with pkgs; [
-      iw
-    ] ++ optionals (config.turris.board == "mox") [
-    ] ++ optionals (config.turris.board == "omnia") [
-    ];
-
-  };
-}
-- 
cgit v1.2.3