diff --git a/README.md b/README.md index bc17632..d4f8ede 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,12 @@ ## Deploying +Setup disks, mount root to `/mnt` and `/boot` to `/mnt/boot` and run something like it + ```shell -nixos-install --flake https://github.com/ivabus/nixos#host +git clone https://github.com/ivabus/nixos /mnt/etc/nixos +nixos-generate-config --show-hardware-config --root /mnt > /mnt/etc/nixos/machines/host/hardware.nix +nixos-install --flake path:.#host ``` ## Rebuilding diff --git a/machines/celerrime/configuration.nix b/machines/celerrime/configuration.nix index db9e313..5f25df0 100644 --- a/machines/celerrime/configuration.nix +++ b/machines/celerrime/configuration.nix @@ -6,4 +6,11 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; + boot.kernelParams = [ "apple_dcp.show_notch=1" ]; + + hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; + hardware.asahi.addEdgeKernelConfig = true; + hardware.asahi.useExperimentalGPUDriver = true; + + system.stateVersion = "23.05"; } diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix index 19b7538..6e63761 100644 --- a/machines/celerrime/hardware.nix +++ b/machines/celerrime/hardware.nix @@ -9,7 +9,6 @@ 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"; @@ -26,10 +25,6 @@ swapDevices = [ { device = "/dev/disk/by-uuid/272341f1-b083-497e-b129-aef8732b5b50"; } ]; - hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; - hardware.asahi.addEdgeKernelConfig = true; - hardware.asahi.useExperimentalGPUDriver = true; - networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; diff --git a/machines/stella/configuration.nix b/machines/stella/configuration.nix index b61d086..3bb15f5 100644 --- a/machines/stella/configuration.nix +++ b/machines/stella/configuration.nix @@ -10,6 +10,11 @@ services.xserver.videoDrivers=["amdgpu"]; boot.initrd.kernelModules=["amdgpu"]; + powerManagement = { + enable = true; + cpuFreqGovernor = "performance"; + }; + system.stateVersion = "23.05"; } diff --git a/machines/stella/hardware.nix b/machines/stella/hardware.nix index f740056..5875c23 100644 --- a/machines/stella/hardware.nix +++ b/machines/stella/hardware.nix @@ -11,7 +11,6 @@ boot.kernelModules = [ "kvm-amd" "nct6775" ]; boot.extraModulePackages = [ ]; - environment.etc = { "sysconfig/lm_sensors".text = '' HWMON_MODULES="lm75" @@ -34,10 +33,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - services.tlp.settings = { - START_CHARGE_THRESH_BAT0 = 40; - STOP_CHARGE_THRESH_BAT0 = 80; - }; - powerManagement.enable = true; - powerManagement.cpuFreqGovernor = "performance"; } diff --git a/machines/vetus/configuration.nix b/machines/vetus/configuration.nix index 800cf08..135a2b5 100644 --- a/machines/vetus/configuration.nix +++ b/machines/vetus/configuration.nix @@ -7,7 +7,6 @@ boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "vetus"; - time.timeZone = "Europe/Moscow"; system.stateVersion = "23.05"; } diff --git a/machines/vetus/hardware.nix b/machines/vetus/hardware.nix index fdebbdd..f6b39ba 100644 --- a/machines/vetus/hardware.nix +++ b/machines/vetus/hardware.nix @@ -28,4 +28,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} \ No newline at end of file +}