From 044b240b66061f7438588196cba249f79c9d2a3d Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 21 Mar 2025 17:30:50 -0400 Subject: [PATCH] Move snapshot dir, add corn to Kitty --- hosts/kitty/users/corn/default.nix | 15 +++++++++++++++ hosts/kitty/users/default.nix | 5 ++++- hosts/tower/disko/default.nix | 4 ++-- .../home/programs/terminal/ranger/default.nix | 3 ++- .../disks/impermanence/main/default.nix | 1 - .../system/devices/disks/snapper/default.nix | 2 +- .../disks/snapper/{main => home}/default.nix | 4 ++-- modules/system/secrets/default.nix | Bin 2004 -> 2005 bytes modules/system/users/main/default.nix | 2 +- 9 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 hosts/kitty/users/corn/default.nix rename modules/system/devices/disks/snapper/{main => home}/default.nix (55%) diff --git a/hosts/kitty/users/corn/default.nix b/hosts/kitty/users/corn/default.nix new file mode 100644 index 00000000..20ca5f2e --- /dev/null +++ b/hosts/kitty/users/corn/default.nix @@ -0,0 +1,15 @@ +{ ... }: +{ + users.users."corn" = { + isNormalUser = true; + createHome = true; + openssh.authorizedKeys.keys = [ + "AAAAC3NzaC1lZDI1NTE5AAAAIKaZsnlyUJDNx2oK4iHsUDb+Ok4vg1jNYEAnoHsjjM2c Chinook" + "AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant" + ]; + uid = 1001; + shell = pkgs.zsh; + }; + + environment.persistence."/persist".directories = [ "/home/corn" ]; +} diff --git a/hosts/kitty/users/default.nix b/hosts/kitty/users/default.nix index 57e7f20b..303e215a 100644 --- a/hosts/kitty/users/default.nix +++ b/hosts/kitty/users/default.nix @@ -1,4 +1,7 @@ { ... }: { - imports = [ ./main ]; + imports = [ + ./main + ./corn + ]; } diff --git a/hosts/tower/disko/default.nix b/hosts/tower/disko/default.nix index e3aa3035..8b56d84a 100644 --- a/hosts/tower/disko/default.nix +++ b/hosts/tower/disko/default.nix @@ -68,8 +68,8 @@ mountOptions = [ "compress=zstd" "noatime" "ssd" ]; }; "/persist/.snapshots" = { }; - "/persist/home/${config.sysusers.main}" = { }; - "/persist/home/${config.sysusers.main}/.snapshots" = { }; + "/persist/home" = { }; + "/persist/home/.snapshots" = { }; }; }; }; diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index d761c1ba..c86fd380 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -105,10 +105,11 @@ c:/home/${config.home.username}/.config l:/home/${config.home.username}/.local d:/mnt + p:/persist n:/etc/nixos # Remote files - H:/home/${config.home.username}/Midas + H:/home/${config.home.username}/Midas/storage K:/home/${config.home.username}/Midas/storage/Files V:/home/${config.home.username}/Midas/storage/Media M:/home/${config.home.username}/Midas/storage/Music diff --git a/modules/system/devices/disks/impermanence/main/default.nix b/modules/system/devices/disks/impermanence/main/default.nix index cca8d2c8..f75b6cc8 100644 --- a/modules/system/devices/disks/impermanence/main/default.nix +++ b/modules/system/devices/disks/impermanence/main/default.nix @@ -11,7 +11,6 @@ "Games" "VMs" - ".snapshots" ".mozilla" ".thunderbird" diff --git a/modules/system/devices/disks/snapper/default.nix b/modules/system/devices/disks/snapper/default.nix index 112c3787..dda37e31 100644 --- a/modules/system/devices/disks/snapper/default.nix +++ b/modules/system/devices/disks/snapper/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./main + ./home ./root ]; diff --git a/modules/system/devices/disks/snapper/main/default.nix b/modules/system/devices/disks/snapper/home/default.nix similarity index 55% rename from modules/system/devices/disks/snapper/main/default.nix rename to modules/system/devices/disks/snapper/home/default.nix index cac62e46..6d85aea1 100644 --- a/modules/system/devices/disks/snapper/main/default.nix +++ b/modules/system/devices/disks/snapper/home/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - services.snapper.configs.${config.sysusers.main} = lib.mkIf config.environment.persistence."/persist".enable { - SUBVOLUME = "/persist/home/${config.sysusers.main}"; + services.snapper.configs.home = lib.mkIf config.environment.persistence."/persist".enable { + SUBVOLUME = "/persist/home"; TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; TIMELINE_LIMIT_DAILY = 1; diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix index 1a44f1446e45ad21a0acc41f403065568ac19539..08d97784dbffa8a2859c872de6367454dfe93c9c 100644 GIT binary patch literal 2005 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 diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix index e9e29832..6d36fbaa 100644 --- a/modules/system/users/main/default.nix +++ b/modules/system/users/main/default.nix @@ -10,7 +10,7 @@ users.users."${config.sysusers.main}" = { isNormalUser = true; createHome = true; - hashedPassword = config.secrets.mainAccPass; + hashedPassword = config.secrets.accPass.main; openssh.authorizedKeys.keyFiles = [ ../../../../hosts/tower/id_ed25519.pub ../../../../hosts/kitty/id_ed25519.pub