From 54caab4d8cc67f2b979fb09fafb94ee9f12cb08d Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Sat, 18 May 2024 14:46:08 +0100
Subject: [PATCH] changed ssh keys

---
 flake.lock                                         | 8 ++++----
 hosts/common/users/keys/gitea.pub                  | 1 -
 hosts/common/users/keys/sam@nixdev-ssh-ed25519.pub | 1 +
 hosts/sparky/default.nix                           | 2 --
 scripts/bootstrap.sh                               | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 hosts/common/users/keys/gitea.pub
 create mode 100644 hosts/common/users/keys/sam@nixdev-ssh-ed25519.pub

diff --git a/flake.lock b/flake.lock
index e054d74..5a244f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1716024725,
-        "narHash": "sha256-rAdVGcOuQPcFJ2FmufePv2oTvS7FKNLdenwmo2O11IY=",
+        "lastModified": 1716039101,
+        "narHash": "sha256-jaliFlqz3HKW+tsW3Onqtbw3w6mLTYJJZZQrrPmxZ8Q=",
         "ref": "refs/heads/master",
-        "rev": "a9a7e1913a46fa4ab5deea15e0d469579d9d9dac",
-        "revCount": 11,
+        "rev": "7cef1d6f77d212a887e6660f85b28f8b20181d9b",
+        "revCount": 13,
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },
diff --git a/hosts/common/users/keys/gitea.pub b/hosts/common/users/keys/gitea.pub
deleted file mode 100644
index f5a1a2a..0000000
--- a/hosts/common/users/keys/gitea.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILywv6g5k5cOVplxgbbStrGf3qYVukgCcd80TJSBM8e8 sam@nixos
diff --git a/hosts/common/users/keys/sam@nixdev-ssh-ed25519.pub b/hosts/common/users/keys/sam@nixdev-ssh-ed25519.pub
new file mode 100644
index 0000000..2e5bfd1
--- /dev/null
+++ b/hosts/common/users/keys/sam@nixdev-ssh-ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYioCEiSLTNr3QqWEvcs8iIS4XmQUDfRg4psHyowzwp sam@nixdev
diff --git a/hosts/sparky/default.nix b/hosts/sparky/default.nix
index 5d378c0..f10dc71 100644
--- a/hosts/sparky/default.nix
+++ b/hosts/sparky/default.nix
@@ -76,12 +76,10 @@
 
 	services.xserver = {
 		enable = true;
-		#libinput.enable = true;
 		displayManager.lightdm.enable = true;
 		desktopManager = {
 			cinnamon.enable = true;
 		};
-		#displayManager.defaultSession = "cinnamon";
 	};
 
   security.pam = {
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 18ad867..7e36708 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -36,7 +36,7 @@ ssh-copy-id -i "$(readlink -n "$HOME/.ssh/deploy_key-ssh-ed25519.pub" )" "root@$
 overwrite=""
 [ -f "$KEY_DIR/$KEY_NAME" ] && read -p "Key exists, would you like to overwrite it? (yes|no) " overwrite
 
-[  -z "$overwrite" ] || [ "$overwrite" == "yes" ] && ssh-keygen -t ed25519 -f "$KEY_DIR/$KEY_NAME" -C "$hostname@$ip" -N ""
+[  -z "$overwrite" ] || [ "$overwrite" == "yes" ] && ssh-keygen -t ed25519 -f "$KEY_DIR/$KEY_NAME" -C "$username@$hostname" -N ""
 
 echo "Copying ssh key to target host:"
 scp -i "$KEY_DIR/$KEY_NAME"* "root@$ip:/etc/ssh/"