diff --git a/modules/base-server.nix b/modules/base-server.nix
index 16dd45d..5e7fc1c 100644
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -4,6 +4,7 @@
imports =
[
./base.nix
+ ./users/chris.nix
];
# My servers always use /dev/sda as boot disk...
diff --git a/modules/base.nix b/modules/base.nix
index 4033813..89e070e 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -4,7 +4,7 @@
imports =
[
./packages/vim.nix
- ./users.nix
+ ./users/Rory.nix
/etc/nixos/hardware-configuration.nix
];
@@ -41,7 +41,6 @@
neofetch
lnav
zsh
- feh
git
lsd
#sshfs
@@ -51,5 +50,4 @@
system.stateVersion = "22.11"; # DO NOT EDIT!
-}
-
+}
\ No newline at end of file
diff --git a/modules/users.nix b/modules/users.nix
deleted file mode 100644
index 15e76a0..0000000
--- a/modules/users.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
- users.users.Rory = {
- isNormalUser = true;
- extraGroups = [ "wheel" ];
- packages = with pkgs; [
- ];
- initialPassword = "password";
- };
-}
-
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
new file mode 100644
index 0000000..b5c0dae
--- /dev/null
+++ b/modules/users/Rory.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+
+ users.users.Rory = {
+ isNormalUser = true;
+ extraGroups = [ "wheel" ];
+ packages = with pkgs; [
+ ];
+ #initialPassword = "password";
+ openssh.authorizedKeys.keys = [
+ #"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpmQMHBFOpLfb0Y138VUK1p4FxEPSOz5FRpDK8/eOFwBmEKDjLnT4d/e/Rz2VknCTSKXLMZ4KBMYM014NW3SZR90cDAFwlkdSX638fQlEO3usfALNLWsLbzqzkufw6PKWqrybZvlpwjcacYlRItvit/GH7FLqfiT/G6BdyBErn/lmmcBxF0So0aeba2G/xf7BPPQqqaTqQgE9ml87fdFVw4zVcix823K92SQIx7PkSInpgJwqjLR8cVkL2lkvMdq6IjAEsHAiUYNbAQTUl6xhYa6+Cl8CdvCyINzCpWS3Md2rSH84dZEq0ymZ40orF9JZbHHPgSGFbrg5PUOuJ57iaCPK20z474q2APUJ7aQXiifToZKqcWHFHCj7hqWja1rEt3rQbqRPgttSg5aP3lQ3GXbR/XhdcSYln1QpPTCBxklrfN1P6hF6lWBtGhtGzOvZ5Lt1uofdsK71k5eMwYHTcBnVaMtxbYzR9ihFN6LCNvvnrj+2NvHOiYSCr+y3G4kk= thearcanebrony@DESKTOP-RMRJ2VG"
+ #"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICT+53Hy3wbIlNVIomK2RroaimMWrTlUkndjHt1dFuyh root@pfSense-arcane-home.localdomain"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILF2IuNu//0DP/wKMuDvBgVT3YBS2uULsipbdrhJCTM7 thearcanebrony@tab-linux-desktop"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN/kNkY/E5b6rvCQLMaSbpLQ/xoyywIwVVu9uo2j/B6p Rory@RoryNix"
+ ];
+ };
+}
+
diff --git a/modules/users/chris.nix b/modules/users/chris.nix
new file mode 100644
index 0000000..86acee5
--- /dev/null
+++ b/modules/users/chris.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+{
+
+ users.users.chris = {
+ isNormalUser = true;
+ extraGroups = [ "wheel" ];
+ packages = with pkgs; [
+ nano
+ nodejs-slim
+ ];
+ #initialPassword = "password";
+ openssh.authorizedKeys.keys = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd9U0+wKjBG3Q9Qg249xJY+ybYeRV9/VMPjuwKvFBEI"
+ ];
+ };
+}
+
|