move most asahi specific stuff into flake

This commit is contained in:
mir 2024-02-28 14:28:08 -09:00
parent 70f98eadea
commit 09253e1451
3 changed files with 16 additions and 13 deletions

View File

@ -2,10 +2,8 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
# let
# home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
# in
{ {
# imports = # imports =
# [ # Include the results of the hardware scan. # [ # Include the results of the hardware scan.

View File

@ -12,8 +12,13 @@
galvatron = nixpkgs.lib.nixosSystem { galvatron = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
./galvatron/configuration.nix ./galvatron/configuration.nix {
hardware.asahi.peripheralFirmwareDirectory = ./galvatron/firmware;
boot.loader.efi.canTouchEfiVariables = false;
networking.hostName = "galvatron";
};
./galvatron/hardware-configuration.nix ./galvatron/hardware-configuration.nix
./galvatron/apple-silicon-support
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View File

@ -5,20 +5,20 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = # imports =
[ # Include the results of the hardware scan. # [ # Include the results of the hardware scan.
./hardware-configuration.nix # # ./hardware-configuration.nix
./apple-silicon-support # # ./apple-silicon-support
]; # ];
# asahi shit # asahi shit
hardware.asahi.peripheralFirmwareDirectory = ./firmware; # hardware.asahi.peripheralFirmwareDirectory = ./firmware;
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = false; # boot.loader.efi.canTouchEfiVariables = false;
networking.hostName = "galvatron"; # Define your hostname. # networking.hostName = "galvatron"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.