diff --git a/.gitattributes b/.gitattributes index 44891c0..f0bd4f3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -common/users/user.nix filter=git-crypt diff=git-crypt +secrets.nix filter=git-crypt diff=git-crypt diff --git a/common/users/default.nix b/common/users/default.nix index 5e81cf6..7b375c3 100644 --- a/common/users/default.nix +++ b/common/users/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ pkgs, secrets, ... }: let - user = import ./user.nix; + user = (import ../../secrets.nix).users; in { users.mutableUsers = false; diff --git a/common/users/user.nix b/common/users/user.nix deleted file mode 100644 index ee5752d..0000000 Binary files a/common/users/user.nix and /dev/null differ diff --git a/home/default.nix b/home/default.nix index 5c29bd5..7a7b18c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,6 +1,6 @@ { hyprland, impermanence, nixvim, pkgs, ... }: let - user = import ../users/user.nix; + user = (import ../secrets.nix).users; in { programs.fuse.userAllowOther = true; diff --git a/home/programs/git.nix b/home/programs/git.nix index 30d9a12..22f6c4f 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -1,6 +1,6 @@ { ... }: let - user = import ../../users/user.nix; + user = (import ../../secrets.nix).users; in { programs.git = { diff --git a/hosts/skipper/services/default.nix b/hosts/skipper/services/default.nix index 55e3c93..7734cf6 100644 --- a/hosts/skipper/services/default.nix +++ b/hosts/skipper/services/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ pkgs, secrets, ... }: let - user = import ../../../users/user.nix; + user = (import ../../../secrets.nix).users; in { imports = [ diff --git a/secrets.nix b/secrets.nix new file mode 100644 index 0000000..ee2ec69 Binary files /dev/null and b/secrets.nix differ