From fff1c89a0045316e764c0f3edc3b4ebf23cc65ff Mon Sep 17 00:00:00 2001
From: Nickolaj Jepsen <nickolaj@fireproof.website>
Date: Wed, 26 Feb 2025 15:26:31 +0100
Subject: [PATCH] chore: update ssh config

---
 hosts/work/ssh.nix                   | 19 +++++++++++++++++++
 modules/base/ssh.nix                 |  8 ++++++--
 modules/desktop/hyprland/default.nix |  1 +
 modules/hardware/keyboard.nix        |  0
 result                               |  2 +-
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 hosts/work/ssh.nix
 create mode 100644 modules/hardware/keyboard.nix

diff --git a/hosts/work/ssh.nix b/hosts/work/ssh.nix
new file mode 100644
index 0000000..e419164
--- /dev/null
+++ b/hosts/work/ssh.nix
@@ -0,0 +1,19 @@
+{lib, ...}: {
+  fireproof.home-manager.programs.ssh.matchBlocks = {
+    "dev.ao" = {
+      hostname = "192.168.2.28";
+      proxyJump = lib.mkForce null;
+    };
+    "flex.ao" = {
+      hostname = "192.168.2.5";
+      proxyJump = lib.mkForce null;
+    };
+    "bastion.ao" = {
+      hostname = "192.168.2.6";
+      proxyJump = lib.mkForce null;
+    };
+    "server" = {
+      proxyJump = "bastion.ao";
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/base/ssh.nix b/modules/base/ssh.nix
index c886a4d..aca5a74 100644
--- a/modules/base/ssh.nix
+++ b/modules/base/ssh.nix
@@ -29,13 +29,17 @@ in {
         "*" = {
           identityFile = "${config.age.secrets.ssh-key.path}";
         };
+        server = {
+          hostname = "x.nickolaj.com";
+          user = "server";
+        };
         # Work hostnames definded in ./networking.nix
         "*.ao" = {
           user = "nij";
           identityFile = "${config.age.secrets.ssh-key-ao.path}";
         };
-        "dev.ao".proxyJump = "bastion.ao";
-        "scw.ao".proxyJump = "bastion.ao";
+        "dev.ao".proxyJump = lib.mkDefault "bastion.ao";
+        "scw.ao".proxyJump = lib.mkDefault "dev.ao";
         "clickhouse.ao".user = "ubuntu";
         "flex.ao" = {
           hostname = "192.168.2.5";
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
index 5d417e0..301f3d8 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -301,6 +301,7 @@ in {
             # Firefox
             "float,class:^(firefox)$,title:^(Picture-in-Picture)$"
             "float,class:^(firefox)$,title:^(Library)$"
+            "float,class:^(firefox)$,title:^(Bitwarden Password Manager)$"
 
             # JetBrains
             "center,class:^(jetbrains-.*)$,title:^$,floating:1"
diff --git a/modules/hardware/keyboard.nix b/modules/hardware/keyboard.nix
new file mode 100644
index 0000000..e69de29
diff --git a/result b/result
index 50a9706..fa16634 120000
--- a/result
+++ b/result
@@ -1 +1 @@
-/nix/store/mabdcimq3jgzzpb8azqw94f4bny91v5a-nixos-system-work-24.11.20250221.11415c7
\ No newline at end of file
+/nix/store/srlm3dpxlzlpj9i4n9knqg5dfd2vglpq-nixos-system-work-24.11.20250221.11415c7
\ No newline at end of file