diff --git a/README.md b/README.md index e2945a0..d65686a 100644 --- a/README.md +++ b/README.md @@ -50,5 +50,20 @@ $ nixos-rebuild switch --flake . --target-host 192.168.1.195 --fast --use-remote VM install ``` +$ parted /dev/sda -- mklabel gpt +$ parted /dev/sda -- mkpart root ext4 512MB -8GB +$ parted /dev/sda -- mkpart swap linux-swap -8GB 100% +$ parted /dev/sda -- mkpart ESP fat32 1MB 512MB +$ parted /dev/sda -- set 3 esp on + +$ mkfs.ext4 -L nixos /dev/sda1 +$ mkswap -L swap /dev/sda2 +$ mkfs.fat -F 32 -n boot /dev/sda3 + +$ mount /dev/disk/by-label/nixos /mnt +$ mkdir -p /mnt/boot +$ mount -o umask=077 /dev/disk/by-label/boot /mnt/boot +$ swapon /dev/sda2 + $ nixos-install --flake github:esselius/cfg#vm ``` diff --git a/home-configurations/peteresselius.nix b/home-configurations/peteresselius.nix index ae82d20..2b6e6e3 100644 --- a/home-configurations/peteresselius.nix +++ b/home-configurations/peteresselius.nix @@ -1,4 +1,4 @@ -{ ezModules, config, lib, ... }: +{ pkgs, ezModules, config, lib, ... }: let inherit (lib) mkMerge mkIf; @@ -36,4 +36,10 @@ in ''; }) ]; + + home = { + stateVersion = "24.05"; + homeDirectory = if pkgs.stdenv.isDarwin then "/Users/peteresselius" else "/home/peteresselius"; + username = "peteresselius"; + }; } diff --git a/home-modules/default.nix b/home-modules/default.nix index 49c3dbb..8dce722 100644 --- a/home-modules/default.nix +++ b/home-modules/default.nix @@ -8,12 +8,6 @@ ezModules.nix ]; - home = { - stateVersion = "24.05"; - homeDirectory = if pkgs.stdenv.isDarwin then "/Users/peteresselius" else "/home/peteresselius"; - username = "peteresselius"; - }; - inherit (osConfig) context; inherit (osConfig) formfactor; } diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index 51128d3..aa7ef5f 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -7,7 +7,4 @@ ezModules.nix ../overlays.nix ]; - - security.sudo.wheelNeedsPassword = false; - users.mutableUsers = false; } diff --git a/nixos-modules/user-peteresselius.nix b/nixos-modules/user-peteresselius.nix index 2bcebce..b6478e8 100644 --- a/nixos-modules/user-peteresselius.nix +++ b/nixos-modules/user-peteresselius.nix @@ -14,4 +14,7 @@ }; programs.fish.enable = true; + + security.sudo.wheelNeedsPassword = false; + users.mutableUsers = false; }