diff --git a/modules/nixos/hardware/asahi/default.nix b/modules/nixos/hardware/asahi/default.nix index 51f783a..4f1d598 100644 --- a/modules/nixos/hardware/asahi/default.nix +++ b/modules/nixos/hardware/asahi/default.nix @@ -1,7 +1,7 @@ { config, lib, inputs, namespace, ... }: let inherit (lib) types optionalAttrs; - inherit (lib.${namespace}) mkOpt mkBoolOpt; + inherit (lib.${namespace}) mkOpt; cfg = config.${namespace}.hardware.asahi; in @@ -12,7 +12,6 @@ in options.${namespace}.hardware.asahi = { enable = lib.mkEnableOption "support for asahi linux"; - enableGPU = mkBoolOpt false "enable gpu driver"; firmwareDirectory = mkOpt types.path null "firmware directory"; }; @@ -21,7 +20,6 @@ in enable = cfg.enable; } // optionalAttrs cfg.enable { peripheralFirmwareDirectory = cfg.firmwareDirectory; - useExperimentalGPUDriver = cfg.enableGPU; }; }; } diff --git a/systems/aarch64-linux/lin-va-mbp-personal/default.nix b/systems/aarch64-linux/lin-va-mbp-personal/default.nix index ef1ee87..e38c781 100755 --- a/systems/aarch64-linux/lin-va-mbp-personal/default.nix +++ b/systems/aarch64-linux/lin-va-mbp-personal/default.nix @@ -1,4 +1,4 @@ -{ namespace, lib, ... }: +{ namespace, lib, pkgs, ... }: let inherit (lib.${namespace}) enabled; in @@ -30,7 +30,6 @@ in opengl = enabled; asahi = { enable = true; - enableGPU = true; firmwareDirectory = ./firmware; }; }; @@ -54,4 +53,11 @@ in }; }; }; + + # Additional System Packages + environment.systemPackages = with pkgs; [ + mosh + rclone + unzip + ]; }