From f2d2801a5f66bf6555d66584dd33e6c7609caa88 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 09:23:12 +0300 Subject: [PATCH] Fix celerrime configuration using configuration from celerrime Signed-off-by: Ivan Bushchik --- machines/celerrime/configuration.nix | 11 ++----- machines/celerrime/hardware.nix | 44 ++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 machines/celerrime/hardware.nix diff --git a/machines/celerrime/configuration.nix b/machines/celerrime/configuration.nix index 278724f..5bfbfc4 100644 --- a/machines/celerrime/configuration.nix +++ b/machines/celerrime/configuration.nix @@ -1,14 +1,9 @@ { config, pkgs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - # Include the necessary packages and configuration for Apple Silicon support. - - ]; - + imports = [ ]; + networking.hostName = "celerrime"; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; -} \ No newline at end of file +} diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix new file mode 100644 index 0000000..18a6182 --- /dev/null +++ b/machines/celerrime/hardware.nix @@ -0,0 +1,44 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "usb_storage" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + boot.kernelParams = [ "apple_dcp.show_notch=1" ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/c313a438-700c-4d9c-9413-354ebfb010eb"; + fsType = "btrfs"; + }; + + boot.initrd.luks.devices."nixos-root".device = "/dev/disk/by-uuid/871dcf57-eee1-4dde-846d-e856c92f70c8"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/6CCA-1404"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/272341f1-b083-497e-b129-aef8732b5b50"; } + ]; + hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; + hardware.asahi.addEdgeKernelConfig = true; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enu1u2u1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; +}