diff --git a/configuration.nix b/configuration.nix index 55c5f8c..3f0b669 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,10 +2,8 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: -# let -# home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"; -# in +{ config, lib, pkgs, ... }: + { # imports = # [ # Include the results of the hardware scan. diff --git a/flake.nix b/flake.nix index 4b0e2d1..9c7d529 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,13 @@ galvatron = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; 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/apple-silicon-support home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/galvatron/configuration.nix b/galvatron/configuration.nix index 0a470c9..908d3ff 100644 --- a/galvatron/configuration.nix +++ b/galvatron/configuration.nix @@ -5,20 +5,20 @@ { config, lib, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./apple-silicon-support - ]; +# imports = +# [ # Include the results of the hardware scan. +# # ./hardware-configuration.nix +# # ./apple-silicon-support +# ]; # asahi shit - hardware.asahi.peripheralFirmwareDirectory = ./firmware; + # hardware.asahi.peripheralFirmwareDirectory = ./firmware; # Use the systemd-boot EFI boot loader. 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. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.