From 0cffb9cb548aee0f2f7c046ab5fcc25f7c154fb0 Mon Sep 17 00:00:00 2001
From: Sebastian Moser <sebastian@c2vi.dev>
Date: Thu, 19 Jun 2025 10:31:13 +0200
Subject: [PATCH] users upadate

---
 users/common/home.nix     |  1 -
 users/files/headless.nix  |  5 ++---
 users/files/home.nix      | 25 +++++++++++++++++++++++++
 users/me/gui-home.nix     |  6 ++++++
 users/me/headless.nix     |  2 +-
 users/me/home.nix         |  9 +++++++++
 users/server/headless.nix |  6 +++++-
 7 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 users/files/home.nix
 create mode 100644 users/me/home.nix

diff --git a/users/common/home.nix b/users/common/home.nix
index 71d7526..11e2155 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -11,7 +11,6 @@
 		../../programs/git.nix
     ../../programs/lf/default.nix
 		../../programs/bash.nix
-		../../programs/ssh.nix
 		../../programs/neovim.nix
   ];
 
diff --git a/users/files/headless.nix b/users/files/headless.nix
index fd45290..d0766a9 100644
--- a/users/files/headless.nix
+++ b/users/files/headless.nix
@@ -1,4 +1,4 @@
-{ self, config, inputs, ... }:
+{ self, config, secretsDir, ... }:
 {
 	users.users.files = {
    	isNormalUser = true;
@@ -12,7 +12,7 @@
     hostname = config.networking.hostName;
   };
 
-  home-manager.users.files = import ../common/home.nix;
+  home-manager.users.files = import ./home.nix;
 
   users.users.files.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAgNB1nsKZ5KXnmR6KWjQLfwhFKDispw24o8M7g/nbR me@bitwarden"
@@ -26,5 +26,4 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPgKLRF9iYRH3Y8hPjLX1ZY6GyavruqcQ0Q0Y8bnmpv9 me@tab"
   ];
 
-
 }
diff --git a/users/files/home.nix b/users/files/home.nix
new file mode 100644
index 0000000..c28e93e
--- /dev/null
+++ b/users/files/home.nix
@@ -0,0 +1,25 @@
+{ secretsDir, ... }: {
+
+  imports = [
+    ../common/home.nix
+  ];
+
+  programs.ssh = {
+    enable = true;
+		matchBlocks = {
+      "*" = {
+				identityFile = "/home/files/secrets/files-private";
+      };
+      ouranos = {
+        hostname = "195.201.148.94";
+        user = "root";
+      };
+      fusus = {
+        hostname = "localhost";
+        user = "server";
+        port = 49388;
+      };
+    };
+  };
+
+}
diff --git a/users/me/gui-home.nix b/users/me/gui-home.nix
index 99a1f47..57123fd 100755
--- a/users/me/gui-home.nix
+++ b/users/me/gui-home.nix
@@ -4,6 +4,7 @@
 {
 	imports = [
     ../common/home.nix
+    ../../programs/ssh.nix
 
     # my gui programs
 		../../programs/alacritty.nix
@@ -12,8 +13,11 @@
 		../../programs/rofi/default.nix
 		../../programs/zathura.nix
     ../../programs/firefox/default.nix
+    inputs.lan-mouse.homeManagerModules.default
 	];
 
+  programs.lan-mouse.systemd = true;
+
 	gtk.cursorTheme = {
 		name = "Yaru";
 	 };
@@ -40,6 +44,7 @@
 
   home.sessionVariables = {
     inherit system;
+    VIC_BINARY = "/home/me/work/victorinix/vic";
   };
 
 	services.dunst.enable = true;
@@ -51,6 +56,7 @@
 
     ".local/share/PrismLauncher/".source = config.lib.file.mkOutOfStoreSymlink "${workDir}/app-data/prism-launcher";
     ".local/share/DaVinciResolve/".source = config.lib.file.mkOutOfStoreSymlink "${workDir}/app-data/DaVinciResolve";
+    ".local/share/JetBrains/IdeaIC2024.3".source = config.lib.file.mkOutOfStoreSymlink "${workDir}/app-data/IdeaIC2024.3";
   };
 
 
diff --git a/users/me/headless.nix b/users/me/headless.nix
index 9266ea4..92aac2f 100644
--- a/users/me/headless.nix
+++ b/users/me/headless.nix
@@ -12,7 +12,7 @@
     hostname = config.networking.hostName;
   };
 
-  home-manager.users.me = import ../common/home.nix;
+  home-manager.users.me = import ./home.nix;
 
   users.users.me.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAgNB1nsKZ5KXnmR6KWjQLfwhFKDispw24o8M7g/nbR me@bitwarden"
diff --git a/users/me/home.nix b/users/me/home.nix
new file mode 100644
index 0000000..96a46a7
--- /dev/null
+++ b/users/me/home.nix
@@ -0,0 +1,9 @@
+{ secretsDir, ... }: {
+
+  imports = [
+    ../common/home.nix
+
+    ../../programs/ssh.nix
+  ];
+
+}
diff --git a/users/server/headless.nix b/users/server/headless.nix
index ca2faf4..404f38a 100644
--- a/users/server/headless.nix
+++ b/users/server/headless.nix
@@ -1,4 +1,4 @@
-{ self, config, inputs, ... }:
+{ self, config, inputs, pkgs, ... }:
 {
 	users.users.server = {
    	isNormalUser = true;
@@ -19,6 +19,9 @@
       "${inputs.vscode-server}/modules/vscode-server/home.nix"
       ../common/home.nix
     ];
+    home.packages = with pkgs; [
+      socat
+    ];
   };
 
   users.users.server.openssh.authorizedKeys.keys = [
@@ -26,6 +29,7 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII/mCDzCBE2J1jGnEhhtttIRMKkXMi1pKCAEkxu+FAim me@main"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGw5kYmBQl8oolNg2VUlptvvSrFSESfeuWpsXRovny0x me@phone"
 
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIKF/79W6y/g26xGGPHQJwLtrmaDUb24Hd5D+WD59nzE borgs@fusu"
 
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDU8OZxpeEuwVYFQC1ZYOECfU8fVg0BhNIYk5tK6aNeUe4JBJezwBWIQLsxuo1YgUX1CwbP5IAAj0JyoYUzWT5H4Qyev6rj3JWvBl+kVTnJyiipRccasXD/3IuRK2GBpMcK67sUoHtgiq1kS8myuAtGh2dVeukCp196pCZC9VI0NiEmk2M6/pCiuKmaeaeyKEpkzd2wcdvqyXu3OKtq/qZyw+N8eLk8hC8wQK5lq/Syg8aZh7OV2jqe7CnRLnybybrVy3wRNI4DdoP51YEv+Q3eMlOpOdc7SGTyDPUMnTDNbBFL8u7o7xeLs/+v3neWOz/+rNkQbAoqEvN741lCozTcAxSTT8gnTOdrf+ClMFRpFMUkl3Z6JNymw0Zx2JFibhxQJWIKJq6Wh1YuDJXenIZka0sN5ut5W0KJMmCfzeyAXHy3qruYktbmUFz8iUm1ywbURZZNCmRlzESL2lE7iuTM06SxSYw4YxQHYIC4P6leMyN3hfrr4RUPtO8wJ1lALUs= kilix@epimetheus"
   "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDrQUmZtpxDx669VjACdtLSLcIFZ5uJl4xsj49yJW6A39IglJ4S9ViPtp/kQhGZ3jJMCCFzwDLNNJBf8XfcAtio57cucUQxtRMnY57pKH284eucCanpCq8z9KgBYtrIdzYwRVQZo2tjxdAwKS5mHSOstUnqH8CzcG0kbq7k3s31MKQhzKWXx7lZEn3osQx/aIpt0eWB/SNAS4DWhx+mdGSqO2ryBqbZKaJuH90MEWyd5MKu25+h0ELbHrkkPYOwq0EnpGqvr0mps8AjEV4iExb28E+GGtS+R7yg2tw0QWM1m4PI4XF5JRAuLqt187YvgQe9DIKTuhu2BT/EN2Os7jx9r14Pq2P/IhrR0hVloSTn2/r3geUuFYNvYiL64dkZIRxBOlC3SKut/lB3cir0FPdDkxoIuRHICrsvdSC5wFfYJfhrf0ivkEk5Jgj+lS1QlC40Xw7e0ixKILo6uiriQor02bFY4ngQHTnBLKgjNsB3K23MN80vd8V6DVZdFB+XWr8= kilia@nomos"