From 02b2fd3a7b8c0368c9f0ca2bc00feef8051b64b0 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Fri, 9 Jun 2023 19:25:10 +0200 Subject: [PATCH] add mini config after reinstall --- mini/configuration.nix | 7 +++--- mini/hardware-configuration.nix | 42 +++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/mini/configuration.nix b/mini/configuration.nix index 6cf1e4a..70165b1 100644 --- a/mini/configuration.nix +++ b/mini/configuration.nix @@ -1,6 +1,6 @@ # 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’). +# and in the NixOS manual (accessible by running `nixos-help`). { config, pkgs, ... }: @@ -11,10 +11,9 @@ ./hardware-configuration.nix # Shared config of all machines - /home/cullmann/install/nixos/common.nix + /data/nixos/common.nix ]; - # host name & id + # host name networking.hostName = "mini"; - networking.hostId = "db461356"; } diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix index fd5c88e..dc163a7 100644 --- a/mini/hardware-configuration.nix +++ b/mini/hardware-configuration.nix @@ -13,14 +13,52 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = + { device = "none"; + fsType = "tmpfs"; + }; + fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4FD5-6BF5"; + { device = "/dev/disk/by-uuid/90AD-64A8"; fsType = "vfat"; }; + boot.initrd.luks.devices."crypt-disk1".device = "/dev/disk/by-uuid/2244e83d-eb7a-4e42-8632-9ba4586f240c"; + boot.initrd.luks.devices."crypt-disk1".allowDiscards = true; + boot.initrd.luks.devices."crypt-disk1".bypassWorkqueues = true; + + fileSystems."/nix" = + { device = "/dev/mapper/crypt-disk1"; + fsType = "btrfs"; + options = [ "subvol=nix" "noatime" "compress=zstd" ]; + }; + + fileSystems."/data" = + { device = "/dev/mapper/crypt-disk1"; + fsType = "btrfs"; + options = [ "subvol=data" "noatime" "compress=zstd" ]; + }; + + fileSystems."/home" = + { device = "/data/home"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/root" = + { device = "/data/root"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/etc/nixos" = + { device = "/data/nixos/mini"; + fsType = "none"; + options = [ "bind" ]; + }; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }