From b9155c99b9a581c1379982c0710daa3975eb38b8 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 25 Apr 2024 19:57:24 -0500 Subject: [PATCH] woops fix those drive labels --- hosts/gpdPocket3/hardware-configuration.nix | 10 +++------- readme.md | 7 +++++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hosts/gpdPocket3/hardware-configuration.nix b/hosts/gpdPocket3/hardware-configuration.nix index d37ed08..081d553 100644 --- a/hosts/gpdPocket3/hardware-configuration.nix +++ b/hosts/gpdPocket3/hardware-configuration.nix @@ -14,20 +14,16 @@ boot.extraModulePackages = [ ]; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3A6C-BF60"; + { device = "/dev/disk/by-label/NIXBOOT"; fsType = "vfat"; - # umask=0077 ensures that only the owner (root) can read, write, or execute files on the EFI partition, while all other users are denied all permissions - options = [ "umask=0077" ]; }; fileSystems."/" = - { device = "/dev/disk/by-uuid/e740e27d-13bf-468c-a5c6-fa06fe4ac3cd"; + { device = "/dev/disk/by-label/NIXROOT"; fsType = "ext4"; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/91682eed-a01c-482d-8000-bd1222d4952a"; } - ]; + swapDevices = [ ]; # 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 diff --git a/readme.md b/readme.md index 97de26f..6a1c95a 100644 --- a/readme.md +++ b/readme.md @@ -12,10 +12,13 @@ export USERNAME=desired_username_for_admin_on_this_machine (josh) - log into USERNAME with `password1`, use `passwd` to change the password -- Copy public keys into secrets.nix file - - `cat /etc/ssh/ssh_host_ed25519_key.pub ~/.ssh/id_ed25519.pub` +- `cat /etc/ssh/ssh_host_ed25519_key.pub ~/.ssh/id_ed25519.pub` + - On an already onboarded computer copy these and add them to secrets/secrets.nix file + - Rekey secrets: `nix run github:yaxitech/ragenix -- --rules ~/.config/nixos-config/secrets/secrets.nix -r` - git clone nixos-config `git clone https://github.com/RingOfStorms/dotfiles.git ~/.config/nixos-config` - `sudo nixos-rebuild switch --flake ~/.config/nixos-config` +- Update remote, ssh should work now: `cd ~/.config/nixos-config && git remote remove origin && git remote add origin "git@github.com:RingOfStorms/dotfiles.git" && git pull origin master` + - TODO ONBOARD NEW MACHINE CONFIGS, secrets, etc - use hostname to make new folders in the repo, copy hardware config, and create config from template. Update flake.nix with top level info needed for this system with ARCH detected. - Copy public keys into secrets.nix file