users/jordan: add niri config

Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/f7f357f15f83612078eb0919ca08b71cac01c25e?narHash=sha256-y0bopy/Hob48/q71u4yJo2S0g90JFUJqq3rfh2DgKkk%3D' (2025-12-23)
  → 'github:hyprwm/Hyprland/33df518f97b930316742736ecb07dc322da4c5d3?narHash=sha256-m9VZ9cxYUl9Q9%2BROSKmYpVeyIAvz1faqNqBKZ4WamWI%3D' (2025-12-26)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/76701a179d3a98b07653e2b0409847499b2a07d3?narHash=sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv%2Bn5GX6Qto%3D' (2025-12-23)
  → 'github:NixOS/nixpkgs/f560ccec6b1116b22e6ed15f4c510997d99d5852?narHash=sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ%3D' (2025-12-26)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/a6531044f6d0bef691ea18d4d4ce44d0daa6e816?narHash=sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC%2B2IVK0NoVEzDoOh4DA4%3D' (2025-12-21)
  → 'github:NixOS/nixpkgs/3e2499d5539c16d0d173ba53552a4ff8547f4539?narHash=sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU%3D' (2025-12-25)
• Updated input 'nixvim':
    'github:nix-community/nixvim/35688970083857d26bf6c57934541eb906f96249?narHash=sha256-aajoMAR81hZX4PZho2Hvx8Y95M1MtgQHF/8CwyJquZ4%3D' (2025-12-23)
  → 'github:nix-community/nixvim/2d3184cd3dd31f6eb57eb4ddfe2387ebd141f1e5?narHash=sha256-JG0KvKmVyAQZ4PxKVDy7FGGUirt1lLhWwGwy9ExLCoI%3D' (2025-12-26)

flake.lock

@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764714051,
+        "lastModified": 1765900596,
-        "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=",
+        "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "a43bedcceced5c21ad36578ed823e6099af78214",
+        "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765495779,
+        "lastModified": 1765835352,
-        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
@@ -517,11 +517,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765979862,
+        "lastModified": 1766553861,
-        "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=",
+        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9",
+        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1766160862,
+        "lastModified": 1766761711,
-        "narHash": "sha256-rEOiUTknr+/t9p6C9o2UH2sK98h3HqeiYj7UydqiZn4=",
+        "narHash": "sha256-m9VZ9cxYUl9Q9+ROSKmYpVeyIAvz1faqNqBKZ4WamWI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "315806f59816aacdbf7c66aaeaa0e49d3a33a66d",
+        "rev": "33df518f97b930316742736ecb07dc322da4c5d3",
         "type": "github"
       },
       "original": {
@@ -652,11 +652,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764812575,
+        "lastModified": 1765643131,
-        "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=",
+        "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "fd321368a40c782cfa299991e5584ca338e36ebe",
+        "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
         "type": "github"
       },
       "original": {
@@ -682,11 +682,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766161483,
+        "lastModified": 1766258034,
-        "narHash": "sha256-0yg382Du05r+mW2paV8Q4NgSDgMK0BwapTcGDgfe9lw=",
+        "narHash": "sha256-0EoL8X+sYexDBusF9XyY2WoGKRqnARA+vfh/3uAi/j0=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "9b2b156197433cad28bb72b8d4ef7242ecddf086",
+        "rev": "3e29d68d5a830c542643a52d4be726661eaa85e7",
         "type": "github"
       },
       "original": {
@@ -707,11 +707,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759610243,
+        "lastModified": 1765214753,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -813,11 +813,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764962281,
+        "lastModified": 1766160771,
-        "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",
+        "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",
+        "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
         "type": "github"
       },
       "original": {
@@ -867,11 +867,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764872015,
+        "lastModified": 1766253200,
-        "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=",
+        "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "7997451dcaab7b9d9d442f18985d514ec5891608",
+        "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
         "type": "github"
       },
       "original": {
@@ -939,6 +939,64 @@
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1766765523,
+        "narHash": "sha256-DCk3GKdKZNjpvNuDy9ZVfVwCy3tlm96/UZnYkJO7N44=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "a3e638c75d07de759421e6f34bd69c3f9a0a3567",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1766751930,
+        "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-topology": {
       "inputs": {
         "devshell": "devshell_3",
@@ -966,11 +1024,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764440730,
+        "lastModified": 1766568855,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
         "type": "github"
       },
       "original": {
@@ -989,11 +1047,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764185122,
+        "lastModified": 1766537863,
-        "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=",
+        "narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba",
+        "rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
         "type": "gitlab"
       },
       "original": {
@@ -1005,11 +1063,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764950072,
+        "lastModified": 1766070988,
-        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f61125a668a320878494449750330ca58b78c557",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
         "type": "github"
       },
       "original": {
@@ -1034,13 +1092,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1766070988,
+        "lastModified": 1766736597,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1766651565,
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
         "type": "github"
       },
       "original": {
@@ -1051,11 +1125,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1765838191,
+        "lastModified": 1766736597,
-        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
         "type": "github"
       },
       "original": {
@@ -1074,11 +1148,11 @@
         "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1766002164,
+        "lastModified": 1766725080,
-        "narHash": "sha256-QtDp8UDjBH0Dr7DgVUQHDU8lgQOHagx3JCRJcMWk5Ms=",
+        "narHash": "sha256-JG0KvKmVyAQZ4PxKVDy7FGGUirt1lLhWwGwy9ExLCoI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "685d0be1fce70865c71108ef4105749dbd0957f3",
+        "rev": "2d3184cd3dd31f6eb57eb4ddfe2387ebd141f1e5",
         "type": "github"
       },
       "original": {
@@ -1121,11 +1195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765016596,
+        "lastModified": 1765911976,
-        "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -1171,6 +1245,7 @@
         "hyprland-plugins": "hyprland-plugins",
         "impermanence": "impermanence",
         "kvlibadwaita": "kvlibadwaita",
+        "niri": "niri",
         "nix-topology": "nix-topology",
         "nixos-hardware": "nixos-hardware",
         "nixos-mailserver": "nixos-mailserver",
@@ -1404,6 +1479,39 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1766429945,
+        "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -62,6 +62,11 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
       inputs.nixpkgs.follows = "nixpkgs";

hosts/common.nix

@@ -24,6 +24,7 @@
     config.allowUnfree = true;
     overlays = [
       inputs.agenix.overlays.default
+      inputs.niri.overlays.niri
       (final: prev: {
         unstable = import inputs.nixpkgs-unstable {
           config = {

hosts/odyssey/aws.env

@@ -0,0 +1 @@
+AWS_REGION=us-east-1

hosts/odyssey/default.nix

@@ -65,6 +65,24 @@
 
   services.pcscd.enable = true;
 
+  security.acme = {
+    acceptTerms = true;
+    defaults = {
+      email = "hostmaster@vimium.com";
+      dnsProvider = "route53";
+      dnsResolver = "9.9.9.9";
+      credentialFiles = {
+        AWS_SHARED_CREDENTIALS_FILE = "/home/jordan/projects/vimium/infra/credentials";
+      };
+      environmentFile = ./aws.env;
+    };
+    certs = {
+      "vimium.com" = {
+        extraDomainNames = [ "*.vimium.com" ];
+      };
+    };
+  };
+
   modules = {
     hardware.presonus-studio.enable = true;
     services = {

hosts/vps1/nginx.nix

@@ -17,7 +17,7 @@ let
     add_header Expect-CT max-age=30 always;
     add_header Referrer-Policy strict-origin-when-cross-origin always;
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
-    add_header Vimium-Responding-Instance $hostname;
+    add_header Vimium-Responding-Instance edge-lhr-a0 always;
     add_header X-XSS-Protection "1; mode=block" always;
     add_header X-Content-Type-Options nosniff always;
   '';

users/jordan/common/gpg.nix

@@ -9,7 +9,6 @@
 
   services.gpg-agent = {
     enable = true;
-    enableSshSupport = true;
   };
 
   home.persistence."/persist".directories = [

users/jordan/common/optional/graphical/firefox.nix

@@ -176,7 +176,7 @@
         "browser.ml.enable" = false;
         "browser.ml.chat.enable" = false;
         "browser.ml.chat.menu" = false;
-        "browser.ml.linkpreview.enable" = false;
+        "browser.ml.linkPreview.enable" = false;
         "browser.tabs.groups.smart.enabled" = false;
 
         ## DOM / JavaScript

users/jordan/common/optional/graphical/niri.nix

@@ -0,0 +1,261 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    getExe
+    ;
+in
+{
+  imports = [
+    inputs.niri.homeModules.niri
+  ];
+
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    config.niri = {
+      default = [
+        "gnome"
+        "gtk"
+      ];
+      "org.freedesktop.impl.portal.Access" = "gtk";
+      "org.freedesktop.impl.portal.Notification" = "gtk";
+      "org.freedesktop.impl.portal.Secret" = "gnome-keyring";
+      "org.freedesktop.impl.portal.FileChooser" = "gtk";
+      "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
+      "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
+    };
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-gnome
+    ];
+  };
+
+  programs.niri = {
+    enable = true;
+    package = pkgs.niri-unstable;
+
+    settings = {
+      xwayland-satellite.path = getExe pkgs.xwayland-satellite-stable;
+      input = {
+        keyboard = {
+          xkb = {
+            layout = "us";
+            variant = "intl";
+          };
+
+          repeat-delay = 235;
+          repeat-rate = 60;
+        };
+
+        touchpad = {
+          tap = true;
+          dwt = true;
+          dwtp = true;
+          natural-scroll = true;
+          accel-profile = "flat";
+        };
+
+        mouse = {
+          accel-speed = 0.2;
+          accel-profile = "flat";
+        };
+
+        power-key-handling.enable = false;
+        workspace-auto-back-and-forth = true;
+      };
+
+      gestures.hot-corners.enable = false;
+      debug.honor-xdg-activation-with-invalid-serial = true;
+      binds = with config.lib.niri.actions; {
+        "Mod+T".action = spawn "kitty";
+        "Mod+b".action = spawn "firefox";
+        "Super+Alt+L".action = spawn "systemctl suspend";
+        XF86AudioRaiseVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+";
+          allow-when-locked = true;
+        };
+        XF86AudioLowerVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-";
+          allow-when-locked = true;
+        };
+        XF86AudioMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
+          allow-when-locked = true;
+        };
+        XF86AudioMicMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
+          allow-when-locked = true;
+        };
+        "Mod+Q".action = close-window;
+
+        "Mod+n".action = focus-column-left;
+        "Mod+left".action = focus-column-left;
+        "Mod+Shift+n".action = move-column-left;
+        "Mod+Shift+left".action = move-column-left;
+
+        "Mod+r".action = focus-window-or-workspace-down;
+        "Mod+down".action = focus-window-or-workspace-down;
+        "Mod+Shift+r".action = move-window-down;
+        "Mod+Shift+down".action = move-window-down;
+
+        "Mod+l".action = focus-window-or-workspace-up;
+        "Mod+up".action = focus-window-or-workspace-up;
+        "Mod+Shift+l".action = move-window-up;
+        "Mod+Shift+up".action = move-window-up;
+
+        "Mod+s".action = focus-column-right;
+        "Mod+right".action = focus-column-right;
+        "Mod+Shift+s".action = move-column-right;
+        "Mod+Shift+right".action = move-column-right;
+
+        "Mod+h".action = focus-column-first;
+        "Mod+Shift+h".action = consume-or-expel-window-left;
+        "Mod+m".action = focus-column-last;
+        "Mod+Shift+m".action = consume-or-expel-window-right;
+
+        "Mod+Ctrl+n".action = focus-monitor-left;
+        "Mod+Shift+Ctrl+n".action = move-column-to-monitor-left;
+        "Mod+Ctrl+r".action = focus-monitor-down;
+        "Mod+Shift+Ctrl+r".action = move-column-to-monitor-down;
+        "Mod+Ctrl+l".action = focus-monitor-up;
+        "Mod+Shift+Ctrl+l".action = move-column-to-monitor-up;
+        "Mod+Ctrl+s".action = focus-monitor-right;
+        "Mod+Shift+Ctrl+s".action = move-column-to-monitor-right;
+
+        "Mod+Period".action = focus-workspace-down;
+        "Mod+Shift+Period".action = move-column-to-workspace-down;
+        "Mod+Ctrl+Period".action = move-workspace-down;
+        "Mod+comma".action = focus-workspace-up;
+        "Mod+Shift+comma".action = move-column-to-workspace-up;
+        "Mod+Ctrl+comma".action = move-workspace-up;
+
+        "Mod+WheelScrollDown" = {
+          action = focus-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollUp" = {
+          action = focus-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollDown" = {
+          action = move-column-to-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollUp" = {
+          action = move-column-to-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollRight".action = focus-column-right;
+        "Mod+WheelScrollLeft".action = focus-column-left;
+        "Mod+Ctrl+WheelScrollRight".action = move-column-right;
+        "Mod+Ctrl+WheelScrollLeft".action = move-column-left;
+        "Mod+Shift+WheelScrollDown".action = focus-column-right;
+        "Mod+Shift+WheelScrollUp".action = focus-column-left;
+        "Mod+Ctrl+Shift+WheelScrollDown".action = move-column-right;
+        "Mod+Ctrl+Shift+WheelScrollUp".action = move-column-left;
+
+        "Mod+V".action = maximize-column;
+        "Mod+Ctrl+V".action = expand-column-to-available-width;
+        "Mod+return".action = fullscreen-window;
+        "Mod+Minus".action = set-column-width "-10%";
+        "Mod+Shift+0".action = set-column-width "+10%";
+
+        "Mod+F".action = toggle-window-floating;
+        "Mod+Ctrl+F".action = switch-focus-between-floating-and-tiling;
+
+        "Mod+y".action = toggle-column-tabbed-display;
+
+        #"Print".action = screenshot;
+        #"Ctrl+Print".action = screenshot-screen {};
+        #"Alt+Print".action = screenshot-window;
+
+        "Mod+Escape" = {
+          action = toggle-keyboard-shortcuts-inhibit;
+          allow-inhibiting = false;
+        };
+
+        # The quit action will show a confirmation dialog to avoid accidental exits.
+        "Mod+Ctrl+Escape".action = quit;
+        # Powers off the monitors. To turn them back on, do any input like
+        # moving the mouse or pressing any other key.
+        "Mod+Shift+P".action = power-off-monitors;
+      };
+
+      spawn-at-startup = [
+        { command = [ "firefox" ]; }
+      ];
+
+      prefer-no-csd = true;
+      hotkey-overlay = {
+        skip-at-startup = true;
+      };
+      layout = {
+        gaps = 1;
+        center-focused-column = "never";
+        empty-workspace-above-first = true;
+        preset-column-widths = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        default-column-width = {
+          proportion = 0.5;
+        };
+        preset-window-heights = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        focus-ring = {
+          enable = true;
+          width = 2;
+          active.color = "#7fc8ff";
+          inactive.color = "#505050";
+        };
+        border = {
+          enable = false;
+          width = 2;
+          active.color = "#ffc87f";
+          inactive.color = "#505050";
+        };
+        shadow = {
+          # on
+          softness = 30;
+          spread = 5;
+          offset = {
+            x = 0;
+            y = 5;
+          };
+          draw-behind-window = true;
+          color = "#00000070";
+          # inactive-color "#00000054"
+        };
+        tab-indicator = {
+          # off
+          hide-when-single-tab = true;
+          place-within-column = true;
+          gap = 5;
+          width = 4;
+          length = {
+            total-proportion = 1.0;
+          };
+          position = "right";
+          gaps-between-tabs = 2;
+          corner-radius = 8;
+          active.color = "red";
+          inactive.color = "gray";
+        };
+        insert-hint = {
+          # off
+          display.color = "#ffc87f80";
+        };
+      };
+    };
+  };
+}

users/jordan/common/ssh.nix

@@ -3,11 +3,8 @@
 }:
 
 {
-  services.ssh-agent.enable = true;
-
   programs.ssh = {
     enable = true;
-    matchBlocks."*".addKeysToAgent = "yes";
   };
 
   home.persistence."/state".files = [

users/jordan/helios.nix

@@ -7,7 +7,7 @@
   imports = [
     ./common/optional/graphical/firefox.nix
     ./common/optional/graphical/fonts.nix
-    ./common/optional/graphical/hyprland
+    ./common/optional/graphical/niri.nix
     ./common/optional/graphical/mimeapps.nix
   ];