From 365e05bda19d4e721f633a2a1c9440ad3017598b Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Wed, 15 Feb 2023 21:19:56 +0100 Subject: liku dead, mini alive --- liku/configuration.nix | 20 -------------------- liku/hardware-configuration.nix | 36 ------------------------------------ mini/configuration.nix | 20 ++++++++++++++++++++ mini/hardware-configuration.nix | 30 ++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 56 deletions(-) delete mode 100644 liku/configuration.nix delete mode 100644 liku/hardware-configuration.nix create mode 100644 mini/configuration.nix create mode 100644 mini/hardware-configuration.nix diff --git a/liku/configuration.nix b/liku/configuration.nix deleted file mode 100644 index 3278021..0000000 --- a/liku/configuration.nix +++ /dev/null @@ -1,20 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - imports = - [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - - # Shared config of all machines - /home/cullmann/install/nixos/common.nix - ]; - - # host name & id - networking.hostName = "liku"; - networking.hostId = "ad1d2150"; -} diff --git a/liku/hardware-configuration.nix b/liku/hardware-configuration.nix deleted file mode 100644 index b5c78cb..0000000 --- a/liku/hardware-configuration.nix +++ /dev/null @@ -1,36 +0,0 @@ -# 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 = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/D95E-E4E3"; - fsType = "vfat"; - }; - - fileSystems."/boot-fallback" = - { device = "/dev/disk/by-uuid/D95F-2A39"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - # Enables DHCP on the right ethernet interface. - networking.interfaces.enp3s0.useDHCP = true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; -} diff --git a/mini/configuration.nix b/mini/configuration.nix new file mode 100644 index 0000000..6cf1e4a --- /dev/null +++ b/mini/configuration.nix @@ -0,0 +1,20 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + + # Shared config of all machines + /home/cullmann/install/nixos/common.nix + ]; + + # host name & id + networking.hostName = "mini"; + networking.hostId = "db461356"; +} diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix new file mode 100644 index 0000000..e62774c --- /dev/null +++ b/mini/hardware-configuration.nix @@ -0,0 +1,30 @@ +# 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 = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4FD5-6BF5"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on the right ethernet interface. + networking.interfaces.eno1.useDHCP = true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + # high-resolution display + hardware.video.hidpi.enable = lib.mkDefault true; +} -- cgit v1.2.3