diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-04-26 13:54:42 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-05-01 16:41:18 +0200 |
| commit | c385cc1c05efd2d44a02fd729a6a0241adf9004c (patch) | |
| tree | 3bdf062805ad87c38e7ddca13e319b1be8324257 /nixos | |
| parent | 22b1fcfeb53e0f712315c8008c8be9500832f6f7 (diff) | |
| download | nixturris-c385cc1c05efd2d44a02fd729a6a0241adf9004c.tar.gz nixturris-c385cc1c05efd2d44a02fd729a6a0241adf9004c.tar.bz2 nixturris-c385cc1c05efd2d44a02fd729a6a0241adf9004c.zip | |
Switch to unstable
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/default.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/turris-defaults.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/turris-wifi.nix | 33 |
3 files changed, 5 insertions, 35 deletions
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") [ - ]; - - }; -} |