From 454a5651e612c8f34993ef44ec206ec33e359315 Mon Sep 17 00:00:00 2001
From: victor <victor@xirion.net>
Date: Mon, 3 Oct 2022 21:25:57 +0200
Subject: [PATCH] added laura

---
 nixos/common/users/default.nix             | 28 ++++------------------
 nixos/common/users/laura.nix               | 12 ++++++++++
 nixos/common/users/victor.nix              | 22 +++++++++++++++++
 nixos/hosts/thalassa/null/home/default.nix |  1 +
 4 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 nixos/common/users/laura.nix
 create mode 100644 nixos/common/users/victor.nix

diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix
index 99083b9..e782347 100644
--- a/nixos/common/users/default.nix
+++ b/nixos/common/users/default.nix
@@ -1,6 +1,10 @@
 { config, pkgs, lib, inputs, ... }:
-
 {
+  imports = [
+    ./laura.nix
+    ./victor.nix
+  ];
+
   # Setup ZSH to use grml config
   programs.zsh = {
     enable = true;
@@ -28,27 +32,6 @@
   # Disable sudo prompt for `wheel` users.
   security.sudo.wheelNeedsPassword = lib.mkDefault false;
 
-  # The block that specifies my user account.
-  users.extraUsers.victor = {
-    # This account is intended for a non-system user.
-    isNormalUser = true;
-
-    # My default shell
-    shell = pkgs.zsh;
-
-    # My SSH keys.
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKME+A5zu36tMIsY+PBoboizgAzt6xReUNrKRBkxvl3i victor@null"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC8llUcEBHsLqotFZc++LNP2fjItuuzeUsu5ObXecYNj victor@eevee"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 victor@bastion"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB victor@bastion"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIM3TqXaApX2JZsgfZd7PKVFMecDgqTHKibpSzgdXNpYAAAAABHNzaDo= solov2-le"
-    ];
-
-    # Make me admin
-    extraGroups = [ "systemd-journal" "wheel" "networkmanager" ];
-  };
-
   # Configure the root account
   users.extraUsers.root = {
     # Allow my SSH keys for logging in as root.
@@ -68,5 +51,4 @@
     rsync
     zoxide
   ];
-
 }
diff --git a/nixos/common/users/laura.nix b/nixos/common/users/laura.nix
new file mode 100644
index 0000000..a0d0ea7
--- /dev/null
+++ b/nixos/common/users/laura.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  users.extraUsers.laura = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBIlFUUXbwOkhNUjoA6zueTdRuaylgpgFqSe/xWGK9zb laura@zmeura"
+    ];
+
+    extraGroups = [ ];
+  };
+}
\ No newline at end of file
diff --git a/nixos/common/users/victor.nix b/nixos/common/users/victor.nix
new file mode 100644
index 0000000..d88f106
--- /dev/null
+++ b/nixos/common/users/victor.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }: {
+    # The block that specifies my user account.
+  users.extraUsers.victor = {
+    # This account is intended for a non-system user.
+    isNormalUser = true;
+
+    # My default shell
+    shell = pkgs.zsh;
+
+    # My SSH keys.
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKME+A5zu36tMIsY+PBoboizgAzt6xReUNrKRBkxvl3i victor@null"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC8llUcEBHsLqotFZc++LNP2fjItuuzeUsu5ObXecYNj victor@eevee"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBhJAp7NWlHgwDYd2z6VNROy5RkeZHRINFLsFvwT4b3 victor@bastion"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMbdjysLnmwJD5Fs/SjBPstdIQNUxy8zFHP0GlhHMJB victor@bastion"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIM3TqXaApX2JZsgfZd7PKVFMecDgqTHKibpSzgdXNpYAAAAABHNzaDo= solov2-le"
+    ];
+
+    # Make me admin
+    extraGroups = [ "systemd-journal" "wheel" "networkmanager" ];
+  };
+}
\ No newline at end of file
diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix
index 04de3b2..82f0935 100644
--- a/nixos/hosts/thalassa/null/home/default.nix
+++ b/nixos/hosts/thalassa/null/home/default.nix
@@ -21,6 +21,7 @@ in {
     brightnessctl
     btop
     calibre
+    cinny-desktop
     element-desktop-wayland
     fluxcd
     fusee-launcher