From 7e686212d49293d1e4bee77e5a7f658f99deff5f Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Fri, 22 Sep 2023 10:10:04 -0400 Subject: [PATCH] s/loki/floki/g --- NOTES | 10 ++++++---- README.md | 2 +- flake.nix | 8 ++++---- hosts/{loki => floki}/default.nix | 2 +- hosts/{loki => floki}/hardware-configuration.nix | 0 hosts/{loki => floki}/ssh_host_ed25519_key.pub | 0 hosts/{loki => floki}/ssh_host_rsa_key.pub | 0 7 files changed, 12 insertions(+), 10 deletions(-) rename hosts/{loki => floki}/default.nix (97%) rename hosts/{loki => floki}/hardware-configuration.nix (100%) rename hosts/{loki => floki}/ssh_host_ed25519_key.pub (100%) rename hosts/{loki => floki}/ssh_host_rsa_key.pub (100%) diff --git a/NOTES b/NOTES index 5b45ce6..6a2b7c3 100644 --- a/NOTES +++ b/NOTES @@ -26,10 +26,10 @@ btrfs subvolume create /mnt/swap btrfs subvolume create /mnt/logs mount -o compress=zstd,subvol=root /dev/mapper/enc /mnt -mkdir /mnt/{nix,persist,swap,logs} +mkdir /mnt/{nix,persist,swap,var/logs} mount -o compress=zstd,noatime,subvol=nix /dev/mapper/enc /mnt/nix mount -o compress=zstd,subvol=persist /dev/mapper/enc /mnt/persist -mount -o compress=zstd,noatime,subvol=logs /dev/mapper/enc /mnt/logs +mount -o compress=zstd,noatime,subvol=logs /dev/mapper/enc /mnt/var/logs mount -o noatime,subvol=swap /dev/mapper/enc /mnt/swap mkdir /mnt/boot @@ -49,6 +49,8 @@ fileSystems = { "/swap".options = [ "noatime" ]; }; +user hashedPassword: mkpasswd -m sha-512 + btrfs filesystem mkswapfile --size 8g --uuid clear /swap/swapfile swapDevices = [ { device = "/swap/swapfile"; } ]; nixos-rebulid switch @@ -70,9 +72,9 @@ home-manager switch --flake .#username@hostname sudo nixos-rebuild switch --flake .#my-hostname -clear; sudo nixos-rebuild dry-activate --flake .#loki +clear; sudo nixos-rebuild dry-activate --flake .#floki ------- services.pcscd.enable = true; -https://mt-caret.github.io/blog/posts/2020-06-29-optin-state.html \ No newline at end of file +https://mt-caret.github.io/blog/posts/2020-06-29-optin-state.html diff --git a/README.md b/README.md index 1511e56..0b0db2e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Here's my NixOS/home-manager config files. Requires [Nix flakes](https://nixos.w - `common`: Shared configurations consumed by the machine-specific ones. - `global`: Configurations that are globally applied to all my machines. - `optional`: Opt-in configurations my machines can use. - - `loki`: Lenovo ThinkPad X1 Carbon Extreme Gen 5 + - `floki`: Lenovo ThinkPad X1 Carbon Extreme Gen 5 - `home`: My Home-manager configuration, acessible via `home-manager --flake` - Each directory here is a "feature" each hm configuration can toggle, thus customizing my setup for each machine (be it a server, desktop, laptop, diff --git a/flake.nix b/flake.nix index 00b0f73..e68632a 100644 --- a/flake.nix +++ b/flake.nix @@ -62,8 +62,8 @@ nixosConfigurations = { # Personal laptop - Lenovo Carbon X1 Extreme Gen 5 - x86_64 - loki = lib.nixosSystem { - modules = [ ./hosts/loki ]; + floki = lib.nixosSystem { + modules = [ ./hosts/floki ]; specialArgs = { inherit inputs outputs; }; }; @@ -94,8 +94,8 @@ homeConfigurations = { # Desktops - "gburd@loki" = lib.homeManagerConfiguration { - modules = [ ./home/gburd/loki.nix ]; + "gburd@floki" = lib.homeManagerConfiguration { + modules = [ ./home/gburd/floki.nix ]; pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; }; }; diff --git a/hosts/loki/default.nix b/hosts/floki/default.nix similarity index 97% rename from hosts/loki/default.nix rename to hosts/floki/default.nix index 6281793..d5616f2 100644 --- a/hosts/loki/default.nix +++ b/hosts/floki/default.nix @@ -17,7 +17,7 @@ ]; networking = { - hostName = "loki"; + hostName = "floki"; }; # Enable networking diff --git a/hosts/loki/hardware-configuration.nix b/hosts/floki/hardware-configuration.nix similarity index 100% rename from hosts/loki/hardware-configuration.nix rename to hosts/floki/hardware-configuration.nix diff --git a/hosts/loki/ssh_host_ed25519_key.pub b/hosts/floki/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/loki/ssh_host_ed25519_key.pub rename to hosts/floki/ssh_host_ed25519_key.pub diff --git a/hosts/loki/ssh_host_rsa_key.pub b/hosts/floki/ssh_host_rsa_key.pub similarity index 100% rename from hosts/loki/ssh_host_rsa_key.pub rename to hosts/floki/ssh_host_rsa_key.pub