From c540206c42114b722049a99747c3df283241d935 Mon Sep 17 00:00:00 2001 From: emily Date: Sun, 17 Nov 2024 23:31:31 +0100 Subject: [PATCH] users: add lucy --- config/common/default.nix | 2 +- .../common/{users/default.nix => users.nix} | 2 +- config/hosts/crime/configuration.nix | 1 + config/hosts/seras/configuration.nix | 11 +--- config/{common => }/users/emily/default.nix | 0 config/users/lucy/default.nix | 50 +++++++++++++++++++ config/users/nil/default.nix | 49 ++++++++++++++++++ 7 files changed, 103 insertions(+), 12 deletions(-) rename config/common/{users/default.nix => users.nix} (62%) rename config/{common => }/users/emily/default.nix (100%) create mode 100644 config/users/lucy/default.nix create mode 100644 config/users/nil/default.nix diff --git a/config/common/default.nix b/config/common/default.nix index 0168cab..591951b 100644 --- a/config/common/default.nix +++ b/config/common/default.nix @@ -5,7 +5,7 @@ in { ./kernel.nix ./networking.nix ./openssh.nix - ./users + ./users.nix ../../modules inputs.lix-module.nixosModules.default ]; diff --git a/config/common/users/default.nix b/config/common/users.nix similarity index 62% rename from config/common/users/default.nix rename to config/common/users.nix index 34d379b..60ce336 100644 --- a/config/common/users/default.nix +++ b/config/common/users.nix @@ -1,5 +1,5 @@ { ... }: { imports = [ - ./emily + ../users/emily ]; } diff --git a/config/hosts/crime/configuration.nix b/config/hosts/crime/configuration.nix index edbaa22..5ab41bc 100644 --- a/config/hosts/crime/configuration.nix +++ b/config/hosts/crime/configuration.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ ../../common + ../../users/lucy ../../profiles/headless.nix ../../profiles/kartoffel.nix ../../profiles/lxc.nix diff --git a/config/hosts/seras/configuration.nix b/config/hosts/seras/configuration.nix index 7dd5ee9..97a1b67 100644 --- a/config/hosts/seras/configuration.nix +++ b/config/hosts/seras/configuration.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { imports = [ ../../common + ../../users/nil ../../profiles/builder.nix ../../profiles/headless.nix ../../profiles/kartoffel.nix @@ -18,16 +19,6 @@ ]; }; - users.users.nil = { - isNormalUser = true; - shell = pkgs.fish; - ignoreShellProgramCheck = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo=" - ]; - }; - services.postgresql.settings = { max_connections = 200; shared_buffers = "24GB"; diff --git a/config/common/users/emily/default.nix b/config/users/emily/default.nix similarity index 100% rename from config/common/users/emily/default.nix rename to config/users/emily/default.nix diff --git a/config/users/lucy/default.nix b/config/users/lucy/default.nix new file mode 100644 index 0000000..7789a1a --- /dev/null +++ b/config/users/lucy/default.nix @@ -0,0 +1,50 @@ +{ inputs, pkgs, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + + users.users.lucy = { + isNormalUser = true; + shell = pkgs.fish; + ignoreShellProgramCheck = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCujVaJCx/MXp/6ss9eSH+UmWQXGHWMxzYATQPBoWX1hNHlxjqbXjmbvv/cJD+PDPrEDtzlI+0uMknPItNZ6G28BcWpU18AJqrIaPBKxEtNj7RiImDG2VUKunKEEiBR33IH709ajpy2W6WBEN3GddGclxC7V2FFGWVeXzU9QBaJPL1AuVq4rOOC01XTI3vXYfaFFqlatMckq9fjXaQuwdUblcBwepFyJ626hJ53/UnIWV5BFpfqCOVxaF38L1rBN++VZatak7hD2Wa+SDeUnymWyhapNhpCD2OiiBaBy6oT88jhhucH0iA9VQfzepPxNnxe2CGJ4IE1MQdnPXKlDeSEGjeNQmiEtwq0zv9mPRLJYmgZrxZau+1ZjqQrx7DzzVdmHrLzOH9JmKJmKSD1V98ASqHbCMvDEUZ6x2CS1hS9zNf8J4Mwzdsv3P/CTDH9Yv1ipiz4qafQZ8KCbYyf1wMeHckm60QpW3tBn3cD/MEv4hqS8FMW+9rrh5+kmKgQDBM= emilia@emilia" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki" + ]; + }; + + home-manager.useGlobalPkgs = true; + home-manager.users.lucy = { + home.stateVersion = "24.11"; + + home.packages = with pkgs; [ + whois + htop + restic + fend + ]; + fonts.fontconfig.enable = true; + + programs.bat.enable = true; + programs.gpg.enable = true; + programs.ripgrep.enable = true; + + programs.eza = { + enable = true; + icons = "auto"; + git = true; + extraOptions = [ + "--color-scale=all" + "--color-scale-mode=gradient" + "--group-directories-first" + ]; + }; + programs.fish = { + enable = true; + interactiveShellInit = '' + set -U fish_greeting + ''; + }; + }; +} diff --git a/config/users/nil/default.nix b/config/users/nil/default.nix new file mode 100644 index 0000000..9aac787 --- /dev/null +++ b/config/users/nil/default.nix @@ -0,0 +1,49 @@ +{ inputs, pkgs, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + + users.users.nil = { + isNormalUser = true; + shell = pkgs.fish; + ignoreShellProgramCheck = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo=" + ]; + }; + + home-manager.useGlobalPkgs = true; + home-manager.users.nil = { + home.stateVersion = "24.11"; + + home.packages = with pkgs; [ + whois + htop + restic + fend + ]; + fonts.fontconfig.enable = true; + + programs.bat.enable = true; + programs.gpg.enable = true; + programs.ripgrep.enable = true; + + programs.eza = { + enable = true; + icons = "auto"; + git = true; + extraOptions = [ + "--color-scale=all" + "--color-scale-mode=gradient" + "--group-directories-first" + ]; + }; + programs.fish = { + enable = true; + interactiveShellInit = '' + set -U fish_greeting + ''; + }; + }; +}