From 4f2bb588ac32056f8eb6d470cd6f07f8936fae31 Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Wed, 27 Aug 2025 18:05:21 +0530 Subject: chore(common): drop hostname from age key path --- flake.nix | 3 ++- os/common/configuration.nix | 2 +- os/common/modules/home-manager.nix | 3 ++- os/kay/modules/sftp.nix | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index d666d59..c1a8191 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,8 @@ pkgs = nixpkgs.legacyPackages.${system}; modules = [ ./home/common/home.nix - ] ++ lib.optional (builtins.pathExists ./home/${host}) ./home/${host}/home.nix; + ] + ++ lib.optional (builtins.pathExists ./home/${host}) ./home/${host}/home.nix; }; in { diff --git a/os/common/configuration.nix b/os/common/configuration.nix index 5c06075..7b6b956 100644 --- a/os/common/configuration.nix +++ b/os/common/configuration.nix @@ -46,7 +46,7 @@ in sops = { defaultSopsFile = ../${host}/secrets.yaml; - age.keyFile = "/var/secrets/${host}.sops"; + age.keyFile = "/var/lib/sops-nix/key.txt"; }; boot = { diff --git a/os/common/modules/home-manager.nix b/os/common/modules/home-manager.nix index d93df49..8212747 100644 --- a/os/common/modules/home-manager.nix +++ b/os/common/modules/home-manager.nix @@ -12,7 +12,8 @@ in { imports = [ ../../../home/common/home.nix - ] ++ lib.optional (builtins.pathExists ../../../home/${host}) ../../../home/${host}/home.nix; + ] + ++ lib.optional (builtins.pathExists ../../../home/${host}) ../../../home/${host}/home.nix; }; }; } diff --git a/os/kay/modules/sftp.nix b/os/kay/modules/sftp.nix index b740fd6..f75abc4 100644 --- a/os/kay/modules/sftp.nix +++ b/os/kay/modules/sftp.nix @@ -20,7 +20,8 @@ in # samsung files only support PEM, hence RSA key # https://r1.community.samsung.com/t5/galaxy-s/unable-to-remotely-connect-to-sftp-server-through-my-files/m-p/16347552/highlight/true#M105871 "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCqe7CcXJw+dhXKUVeuj1iGOcV7KhyiJ55PxhGDXfQdu1YS5gi/pBnOk39pL22+QBFZX0trU/JNHpCMZWyFp/Fz9GBxp2LJERHwkANu0lk0PJ7QZdg79YN5lKpWTo2GpA3gHHC555Rm5V5BknwbZwVXWvGhSR93g/2b6AjcSZn4ZUwFF8soSb2EYsRa7blVbBv2njV2SGI9FezfHBF+N3CNOP7kxk63Pilk9NEUQuvYF1tmF7z/zIXbyLNaLT1MJE8KCbayM7E/WZuonSBqFf3fsmQge0La/LveRehQHb503uHNHzlFHXdMMZQrzOAHHyFQUHhYECvhLNDhGJb1KrjZcEiKmqCMmvHCG4JssRdJB5mq6J0g05ZmMrKt0srIT6lginkHy89AKkqt83xHHvXhZEw40zoGcq2rZD1dPN3toNZL/uGaIK0u1eMxFbuVKK3OjMg2UwzaHX1DDZyJdRes5huG/uXTgN7xamUu/TIBOK+WgibJeNf93i3GbsYezTs= sftp@paq" - ] ++ pubKeys; + ] + ++ pubKeys; }; users."nazer" = { -- cgit v1.2.3