From 98ef3451dc41b404223e3e593c3bbe03f2477616 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:15:49 -0700 Subject: add ssh key for zenbook --- modules/users/defin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/users/defin.nix b/modules/users/defin.nix index b437692..2f9ac62 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -22,6 +22,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXrt3+N4+ahtXZCUn11evQsVGsGgAohGwafC29/a4fk defin@Radahn" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICkGcmYIYCe6GHsZZvnXqsedF0wn+AhGSr+RPJtUO/kl defin@khad" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaMYXO9ghATyUPzyE7aD/XVVmK9UAexueoGEYAqPT4L defin@kebab" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxVpBnkWiukuHNt81K2gRNVjOdz9lFiaw0fhZ4CcB3R defin@zenbook" ]; }; }; -- cgit v1.2.3 From 152fcf721aa4227489a66b5c501f7c363d4168f2 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:25:07 -0700 Subject: this key should be unlocked for root access --- modules/users/defin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/defin.nix b/modules/users/defin.nix index 2f9ac62..c156d7e 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -22,7 +22,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXrt3+N4+ahtXZCUn11evQsVGsGgAohGwafC29/a4fk defin@Radahn" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICkGcmYIYCe6GHsZZvnXqsedF0wn+AhGSr+RPJtUO/kl defin@khad" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaMYXO9ghATyUPzyE7aD/XVVmK9UAexueoGEYAqPT4L defin@kebab" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxVpBnkWiukuHNt81K2gRNVjOdz9lFiaw0fhZ4CcB3R defin@zenbook" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHslJRD5+7rytlVDzeZh6B/4XW8QWQ5dsWWDBbOXKTrJ defin@zenbook" ]; }; }; -- cgit v1.2.3 From f7593d6fc923692a8ba500f3fbe05d64fe9ffa58 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:34:00 -0700 Subject: making a reduced permissions user for automation --- modules/users/defin.nix | 1 - modules/users/git.nix | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 modules/users/git.nix diff --git a/modules/users/defin.nix b/modules/users/defin.nix index c156d7e..b437692 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -22,7 +22,6 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXrt3+N4+ahtXZCUn11evQsVGsGgAohGwafC29/a4fk defin@Radahn" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICkGcmYIYCe6GHsZZvnXqsedF0wn+AhGSr+RPJtUO/kl defin@khad" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaMYXO9ghATyUPzyE7aD/XVVmK9UAexueoGEYAqPT4L defin@kebab" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHslJRD5+7rytlVDzeZh6B/4XW8QWQ5dsWWDBbOXKTrJ defin@zenbook" ]; }; }; diff --git a/modules/users/git.nix b/modules/users/git.nix new file mode 100644 index 0000000..494f4b5 --- /dev/null +++ b/modules/users/git.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: { + users = { + mutableUsers = false; + users.git = { + isNormaluser = false; + description = "user for git and building automation"; + extraGroups = [ "builders" ]; + + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHslJRD5+7rytlVDzeZh6B/4XW8QWQ5dsWWDBbOXKTrJ defin@zenbook" + ]; + }; + }; + + services.openssh = { settings.PasswordAuthenitcation = false; }; +} -- cgit v1.2.3 From 879e2a1c83aaa45b422d23e806bd87bdcba6ec29 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:36:45 -0700 Subject: add git user to doretta --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 666a981..923f894 100644 --- a/flake.nix +++ b/flake.nix @@ -253,7 +253,9 @@ ./modules/nixos/environment.nix ./modules/nixos/tailscale.nix ./modules/nixos/system-packages.nix + ./modules/users/defin.nix + ./modules/users/git.nix ./modules/users/root.nix home-manager.nixosModules.home-manager { -- cgit v1.2.3 From e6d1a8f53ad698f1fc42b15ff12ad62b2a1e0870 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:37:38 -0700 Subject: typo --- modules/users/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/git.nix b/modules/users/git.nix index 494f4b5..f01dc97 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -2,7 +2,7 @@ users = { mutableUsers = false; users.git = { - isNormaluser = false; + isNormalUser = false; description = "user for git and building automation"; extraGroups = [ "builders" ]; -- cgit v1.2.3 From 0e5d625ecc2439e9cb030d81ac0d85e881008ed4 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:39:34 -0700 Subject: must be specified as system or normal user --- modules/users/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/users/git.nix b/modules/users/git.nix index f01dc97..4ded449 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -3,6 +3,7 @@ mutableUsers = false; users.git = { isNormalUser = false; + isSystemUser = true; description = "user for git and building automation"; extraGroups = [ "builders" ]; -- cgit v1.2.3 From 448640bd67fa0611e4ab5ba4ee9cfa72b9f7c2c3 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:41:06 -0700 Subject: user group must be set --- modules/users/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/users/git.nix b/modules/users/git.nix index 4ded449..b001cf1 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -5,6 +5,7 @@ isNormalUser = false; isSystemUser = true; description = "user for git and building automation"; + group = "git"; extraGroups = [ "builders" ]; openssh.authorizedKeys.keys = [ -- cgit v1.2.3 From f4f1141b94a56017c04a3b0b5bef276083cd501e Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:43:47 -0700 Subject: group must also exist --- modules/users/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/git.nix b/modules/users/git.nix index b001cf1..85dd168 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -1,11 +1,11 @@ { pkgs, ... }: { users = { + groups.git = { "git" }; mutableUsers = false; users.git = { isNormalUser = false; isSystemUser = true; description = "user for git and building automation"; - group = "git"; extraGroups = [ "builders" ]; openssh.authorizedKeys.keys = [ -- cgit v1.2.3 From 0cbe7c2309172b9dbe7f45143b1825d2bbf8fe02 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:45:19 -0700 Subject: group must be created empty? --- modules/users/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/users/git.nix b/modules/users/git.nix index 85dd168..f528e6f 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -1,11 +1,12 @@ { pkgs, ... }: { users = { - groups.git = { "git" }; + groups.git = { }; mutableUsers = false; users.git = { isNormalUser = false; isSystemUser = true; description = "user for git and building automation"; + group = "git"; extraGroups = [ "builders" ]; openssh.authorizedKeys.keys = [ -- cgit v1.2.3 From bfa7d5d58ff0bd9258a86d019025d2bb921a7ac4 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:46:57 -0700 Subject: missing config input --- modules/users/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/git.nix b/modules/users/git.nix index f528e6f..b238e84 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: { users = { groups.git = { }; mutableUsers = false; -- cgit v1.2.3 From 36521ff8d95a1107663fdfb3e148a6a8446babc2 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:47:48 -0700 Subject: not sure why this line breaks config --- modules/users/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/git.nix b/modules/users/git.nix index b238e84..f5680e9 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -15,5 +15,5 @@ }; }; - services.openssh = { settings.PasswordAuthenitcation = false; }; + # services.openssh = { settings.PasswordAuthenitcation = false; }; } -- cgit v1.2.3 From 4e45cad8f421c0ae64271bc477f6d3acaa0a4910 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 14 Feb 2024 08:59:48 -0700 Subject: more keys --- modules/users/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/users/git.nix b/modules/users/git.nix index f5680e9..7ad561f 100644 --- a/modules/users/git.nix +++ b/modules/users/git.nix @@ -11,6 +11,7 @@ openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHslJRD5+7rytlVDzeZh6B/4XW8QWQ5dsWWDBbOXKTrJ defin@zenbook" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxVpBnkWiukuHNt81K2gRNVjOdz9lFiaw0fhZ4CcB3R gitlab" ]; }; }; -- cgit v1.2.3