diff options
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/turris-defaults.nix | 6 | ||||
-rw-r--r-- | nixos/modules/turris-wifi.nix | 33 |
2 files changed, 5 insertions, 34 deletions
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") [ - ]; - - }; -} |