From bcbb1e364fd683f8e058d264f9981f884229fb3d Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 1 May 2023 12:23:09 +0200 Subject: [PATCH] configuration/common, users/clerie: move user config to seperate directory --- configuration/common/default.nix | 9 --------- lib/flake-helper.nix | 1 + users/clerie/default.nix | 12 ++++++++++++ users/clerie/ssh.pub | 1 + 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 users/clerie/default.nix create mode 100644 users/clerie/ssh.pub diff --git a/configuration/common/default.nix b/configuration/common/default.nix index 41a1940..4245274 100644 --- a/configuration/common/default.nix +++ b/configuration/common/default.nix @@ -23,15 +23,6 @@ auto-optimise-store = true; }; - users.users.clerie = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIzEQEWeunhkzP+invKjdsZe4rbUloixa374bYEhBSA5 clerie_id" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnUBblmmVoMMBftn4EnwnzqR12m9zill51LpO124hHb10K2rqxNoq8tYSc2pMkV/3briZovffpe5SzB+m2MnXbtOBstIEXkrPZQ78vaZ/nLh7+eWg30lCmMPwjf2wIjlTXkcbxbsi7FbPW7FsolGkU/0mqGhqK1Xft/g7SnCXIoGPSSrHMXEv5dPPofCa1Z0Un+98wQTVfOSKek6TnIsfLbG01UFQVkN7afE4dqSmMiWwEm2PK9l+OiBA2/QzDpbtu9wsfTol4c192vFEWR9crB2YZ1JlMbjVWHjYmB7NFsS0A6lUOikss0Y+LUWS2/QuM/kqybSo4rasZMAIazM6D clerie" - ]; - }; - environment.systemPackages = with pkgs; [ gptfdisk htop diff --git a/lib/flake-helper.nix b/lib/flake-helper.nix index b47b36a..709ae87 100644 --- a/lib/flake-helper.nix +++ b/lib/flake-helper.nix @@ -19,6 +19,7 @@ rec { _module.args._nixfiles = self; }) ../configuration/common + ../users/clerie ({ ... }: { nixpkgs.overlays = [ (_: _: { diff --git a/users/clerie/default.nix b/users/clerie/default.nix new file mode 100644 index 0000000..8884add --- /dev/null +++ b/users/clerie/default.nix @@ -0,0 +1,12 @@ +{ ... }: + +{ + users.users.clerie = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + (builtins.readFile ./ssh.pub) + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnUBblmmVoMMBftn4EnwnzqR12m9zill51LpO124hHb10K2rqxNoq8tYSc2pMkV/3briZovffpe5SzB+m2MnXbtOBstIEXkrPZQ78vaZ/nLh7+eWg30lCmMPwjf2wIjlTXkcbxbsi7FbPW7FsolGkU/0mqGhqK1Xft/g7SnCXIoGPSSrHMXEv5dPPofCa1Z0Un+98wQTVfOSKek6TnIsfLbG01UFQVkN7afE4dqSmMiWwEm2PK9l+OiBA2/QzDpbtu9wsfTol4c192vFEWR9crB2YZ1JlMbjVWHjYmB7NFsS0A6lUOikss0Y+LUWS2/QuM/kqybSo4rasZMAIazM6D clerie" + ]; + }; +} diff --git a/users/clerie/ssh.pub b/users/clerie/ssh.pub new file mode 100644 index 0000000..3355d9a --- /dev/null +++ b/users/clerie/ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIzEQEWeunhkzP+invKjdsZe4rbUloixa374bYEhBSA5 clerie_id