added steam to omen

audio stuff in nixos-base
niri hotkey changes
2026-06-14 20:47:34 -05:00 · 2026-06-14 20:47:22 -05:00 · 2026-06-14 18:05:13 -05:00 · 2026-06-14 18:04:27 -05:00 · 2026-06-14 13:17:05 -05:00 · 2026-06-14 12:50:36 -05:00
43 changed files with 2353 additions and 991 deletions
@@ -0,0 +1,2 @@
+result/
+.devenv/
@@ -12,6 +12,10 @@ home-manager switch --flake .#desktop
 nix flake show --all-systems
 ```

+```shell
+nix run nixpkgs#nh home switch -- --configuration john@john-pc-ubuntu .
+```
+
 ## Layout

 - Everything under `./modules` gets auto-imported by `import-tree`
@@ -1,13 +1,106 @@
 {
  "nodes": {
+    "cachix": {
+      "inputs": {
+        "devenv": [
+          "devenv"
+        ],
+        "flake-compat": [
+          "devenv",
+          "flake-compat"
+        ],
+        "git-hooks": [
+          "devenv",
+          "git-hooks"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777487137,
+        "narHash": "sha256-TuvKVBX60mqyMT6OB5JqVEh1YIWtFMR/igLCaCdC9tw=",
+        "owner": "cachix",
+        "repo": "cachix",
+        "rev": "a66a440c321d35f7193472c317f42a55ccd1cb93",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "latest",
+        "repo": "cachix",
+        "type": "github"
+      }
+    },
+    "crate2nix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1772186516,
+        "narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=",
+        "owner": "rossng",
+        "repo": "crate2nix",
+        "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rossng",
+        "repo": "crate2nix",
+        "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
+        "type": "github"
+      }
+    },
+    "devenv": {
+      "inputs": {
+        "cachix": "cachix",
+        "crate2nix": "crate2nix",
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "ghostty": "ghostty",
+        "git-hooks": "git-hooks",
+        "nix": "nix",
+        "nixd": "nixd",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1781195293,
+        "narHash": "sha256-C9OFghpvf3RzK2rGsZjjNNrTrHgFOecEkpDhFnU4QGs=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "5f5109c83854577191634f7b86fc6e0c8fd44964",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1751685974,
-        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777699697,
+        "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
        "ref": "refs/heads/main",
-        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
-        "revCount": 92,
+        "rev": "382052b74656a369c5408822af3f2501e9b1af81",
+        "revCount": 94,
        "type": "git",
        "url": "https://git.lix.systems/lix-project/flake-compat.git"
      },
@@ -18,11 +111,11 @@
    },
    "flake-file": {
      "locked": {
-        "lastModified": 1775848911,
-        "narHash": "sha256-dqva/tlWxsXj32wYPdt06UrrR4l2QdK9JWyvPooWRi4=",
+        "lastModified": 1781217157,
+        "narHash": "sha256-N3q/SP2Ropk336e9KSgLh7kpROY6P70dprYdbPIfd5c=",
        "owner": "vic",
        "repo": "flake-file",
-        "rev": "b36cbd5fc01e9794a001ccb0c58b314efaabae08",
+        "rev": "ce63eaf7ebfe04a176653f66385a7f0a36380cee",
        "type": "github"
      },
      "original": {
@@ -34,15 +127,16 @@
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
-          "nixpkgs-lib"
+          "devenv",
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@@ -52,6 +146,26 @@
      }
    },
    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
      "inputs": {
        "nixpkgs-lib": [
          "nvf",
@@ -59,11 +173,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@@ -90,16 +204,80 @@
        "type": "github"
      }
    },
-    "home-manager": {
+    "ghostty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1779069789,
+        "narHash": "sha256-ojo+gso45/6CVSuqfSVnlWpQ4d0QeLgwok+v/g3yu0E=",
+        "owner": "ghostty-org",
+        "repo": "ghostty",
+        "rev": "4b7bf0b20e3baf9c1ba10c63f2ad1fd853faea8f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ghostty-org",
+        "repo": "ghostty",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "flake-compat": [
+          "devenv",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1776046499,
-        "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=",
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "devenv",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1781365335,
+        "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d",
+        "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
        "type": "github"
      },
      "original": {
@@ -110,11 +288,11 @@
    },
    "import-tree": {
      "locked": {
-        "lastModified": 1773693634,
-        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "lastModified": 1778781969,
+        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
        "owner": "vic",
        "repo": "import-tree",
-        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
+        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
        "type": "github"
      },
      "original": {
@@ -125,11 +303,11 @@
    },
    "mnw": {
      "locked": {
-        "lastModified": 1770419553,
-        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
+        "lastModified": 1780772958,
+        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
        "owner": "Gerg-L",
        "repo": "mnw",
-        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
+        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
        "type": "github"
      },
      "original": {
@@ -146,20 +324,86 @@
        ]
      },
      "locked": {
-        "lastModified": 1768214250,
-        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
+        "lastModified": 1779233504,
+        "narHash": "sha256-YIKEyzh0NFQlD0O92LQQNMoVCDwV8yw1Xz0Iu+4ZC5U=",
        "owner": "feel-co",
        "repo": "ndg",
-        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
+        "rev": "86f6644411a64d5413711895b7cf6e0e1be465b6",
        "type": "github"
      },
      "original": {
        "owner": "feel-co",
-        "ref": "refs/tags/v2.6.0",
+        "ref": "refs/tags/v2.8.0",
        "repo": "ndg",
        "type": "github"
      }
    },
+    "nix": {
+      "inputs": {
+        "flake-compat": [
+          "devenv",
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "devenv",
+          "flake-parts"
+        ],
+        "git-hooks-nix": [
+          "devenv",
+          "git-hooks"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ],
+        "nixpkgs-23-11": [
+          "devenv"
+        ],
+        "nixpkgs-regression": [
+          "devenv"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779748925,
+        "narHash": "sha256-meIhqGC04O5VXbKSFXSQoOKp+XCq5RMnwAk1Guo0VQo=",
+        "owner": "cachix",
+        "repo": "nix",
+        "rev": "0bc443c8ff235c3547d09327b48aaa2ab98b15f2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "devenv-2.34",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
+    "nixd": {
+      "inputs": {
+        "flake-parts": [
+          "devenv",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1778381404,
+        "narHash": "sha256-FqhdOTA8vyoIpkHhbs2cCT7h6EWM7nsLeOYJc1ifQLE=",
+        "owner": "nix-community",
+        "repo": "nixd",
+        "rev": "e3e45eb76663f522e196b7f0cf34cab201db7779",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixd",
+        "type": "github"
+      }
+    },
    "nixgl": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -184,11 +428,11 @@
    "nixos-hardware": {
      "flake": false,
      "locked": {
-        "lastModified": 1775490113,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "lastModified": 1781168557,
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
        "type": "github"
      },
      "original": {
@@ -198,41 +442,32 @@
      }
    },
    "nixpkgs": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
      "locked": {
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "lastModified": 1778507786,
+        "narHash": "sha256-HzSQCKMsMr8r55LwM1JuzIOB+8bzk0FEv6sItKvsfoY=",
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "8f24a228a782e24576b155d1e39f0d914b380691",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-src": {
+      "flake": false,
      "locked": {
-        "lastModified": 1775888245,
-        "narHash": "sha256-qTVvODr6edFBLD2lncXPF8yTQeCafZUuKVtpV3Xb3yM=",
-        "rev": "13043924aaa7375ce482ebe2494338e058282925",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre978638.13043924aaa7/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1775579569,
-        "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
+        "lastModified": 1778274207,
+        "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dfd9566f82a6e1d55c30f861879186440614696e",
+        "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
        "type": "github"
      },
      "original": {
@@ -242,10 +477,39 @@
        "type": "github"
      }
    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1780365719,
+        "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1781359544,
+        "narHash": "sha256-X8fdRtvrm8OHLZ6Lkg3ZAQm5N6we5mLkdYd92vAw4c8=",
+        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1015979.9f11f828c213/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+      }
+    },
    "nvf": {
      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts_2",
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts_3",
        "mnw": "mnw",
        "ndg": "ndg",
        "nixpkgs": [
@@ -254,11 +518,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1775892726,
-        "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
+        "lastModified": 1781440932,
+        "narHash": "sha256-aPOboQRLIpNe5XiNE6z3Bo0ra/l9Bgh1/vNy+wlw2v4=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
+        "rev": "cc5fe0bdf72aad87a140b16a65296db92a9ecffb",
        "type": "github"
      },
      "original": {
@@ -269,22 +533,41 @@
    },
    "root": {
      "inputs": {
+        "devenv": "devenv",
        "flake-file": "flake-file",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
        "home-manager": "home-manager",
        "import-tree": "import-tree",
        "nixgl": "nixgl",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_3",
        "nvf": "nvf",
        "sops-nix": "sops-nix",
        "wrapper-modules": "wrapper-modules",
        "wrappers": "wrappers"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779074409,
+        "narHash": "sha256-6aXy8Ga41iLVM8ibddFU1O5+wYWcBGNEfZzZuL91eIc=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "2a77b5b1dc952f214e8102acdef1622b68515560",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
    "sops-nix": {
      "inputs": {
        "nixpkgs": [
@@ -292,11 +575,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775971308,
-        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
+        "lastModified": 1780547341,
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
        "type": "github"
      },
      "original": {
@@ -335,16 +618,40 @@
        "type": "github"
      }
    },
-    "wrapper-modules": {
+    "treefmt-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "devenv",
+          "nixd",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1775940860,
-        "narHash": "sha256-8Jxnn2uoFhm2H579ycVxFWDtrywJ6Mc8RmqWbZwk5So=",
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "wrapper-modules": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780661205,
+        "narHash": "sha256-3F5DixT3Gk91lBI9E+TGMm0ko5HrRbDiL23di16TJGA=",
        "owner": "BirdeeHub",
        "repo": "nix-wrapper-modules",
-        "rev": "fb62851ffc5f6a4d53ebc00b93743e29b41e6224",
+        "rev": "8dd304c3582ddd339217e1cc5fb53f50acb63c2d",
        "type": "github"
      },
      "original": {
@@ -360,11 +667,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775600302,
-        "narHash": "sha256-2fgKImv78CXIcfo1RsY7EI4uMZ84x/MggA5rrusYc7c=",
+        "lastModified": 1780428045,
+        "narHash": "sha256-pMJOun/oYhXqes+B3khzRDGWuiCNiWJ25+SVW0OwzNY=",
        "owner": "lassulus",
        "repo": "wrappers",
-        "rev": "9d8397d8ef1ac35763085f3338589f558128f7db",
+        "rev": "ce9122bf06697ade7c5087940e0c280b89dd0208",
        "type": "github"
      },
      "original": {
@@ -4,10 +4,11 @@
  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);

  inputs = {
+    devenv.url = "github:cachix/devenv";
    flake-file.url = "github:vic/flake-file";
    flake-parts = {
      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
    };
    home-manager.url = "github:nix-community/home-manager";
    import-tree.url = "github:vic/import-tree";
@@ -20,7 +21,6 @@
      flake = false;
    };
    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    nixpkgs-lib.follows = "nixpkgs";
    nvf = {
      url = "github:notashelf/nvf";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -29,7 +29,10 @@
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
+    wrapper-modules = {
+      url = "github:BirdeeHub/nix-wrapper-modules";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    wrappers = {
      url = "github:lassulus/wrappers";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -4,7 +4,6 @@
      desktopManager.gnome.enable = true;
      displayManager.gdm = {
        enable = true;
-        wayland = true;
        banner = "Welcome to John's NixOS implementation";
      };
      udev.packages = [
@@ -1,11 +1,24 @@
 # https://github.com/glabrie/dotfiles/blob/main/modules/system/settings/greetd.nix
 { inputs, ... }: {
-  flake.modules.nixos.greetd = { pkgs, lib, ... }: {
+  flake.modules.nixos.greetd = { pkgs, lib, config, ... }:
+  let
+    niriPackage = if config.programs.niri.enable then config.programs.niri.package else pkgs.niri;
+    niriExe = lib.getExe niriPackage;
+    regreetExe = lib.getExe config.programs.regreet.package;
+    greeterNiriConfig = pkgs.writeText "niri-greeter.kdl" ''
+      spawn-at-startup "${regreetExe}"
+      hotkey-overlay {
+        skip-at-startup
+      }
+    '';
+  in {
+    programs.regreet.enable = true;
+
    services.greetd = {
      enable = true;
      settings = {
        default_session = {
-          command = "${lib.getExe pkgs.tuigreet} --time --remember --cmd niri-session";
+          command = "${pkgs.dbus}/bin/dbus-run-session -- ${niriExe} --config ${greeterNiriConfig}";
          user = "greeter";
        };
      };
@@ -48,7 +48,7 @@ let
      enable = lib.mkOption {
        description = "Enable automatic mTLS certificate renewal using a systemd timer.";
        type = lib.types.bool;
-        default = true;
+        default = cfg.enable;
      };
      onCalendar = lib.mkOption {
        description = "systemd OnCalendar schedule for mTLS certificate renewal checks.";
@@ -114,155 +114,28 @@ let
        printf '\033[32m✔\033[0m \033[1mmTLS Bundle:\033[0m %s\n' ${lib.escapeShellArg bundleFile}
      '';
    };
-  
-  mkMtlsCheckScript = { pkgs, bundleFile }: pkgs.writeShellApplication {
-    name = "mtls-check";
-    runtimeInputs = with pkgs; [ openssl ];
-    text = ''
-      openssl x509 -noout -in ${bundleFile} \
-        -subject -issuer \
-        -ext subjectAltName,extendedKeyUsage \
-        -enddate
-    '';
-  };
-
-  mkMtlsRenewScript = {
-    pkgs,
-    cfg,
-    systemctlArgs ? [ ],
-  }:
-  let
-    systemctlCmd = "systemctl ${lib.escapeShellArgs systemctlArgs}";
-
-    hasReloadUnits = cfg.renew.reloadUnits != [ ];
-    renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
-      if ${systemctlCmd} --quiet is-active "${unit}"; then
-        ${systemctlCmd} try-reload-or-restart "${unit}"
-      fi
-    '') cfg.renew.reloadUnits;
-
-    hasPostCommands = cfg.renew.postCommands != [ ];
-    renewPostCommands = lib.concatStringsSep "\n" cfg.renew.postCommands;
-
-    fileOwner = "${cfg.renew.user}:${cfg.renew.group}";
-  in
-    pkgs.writeShellApplication {
-      name = "mtls-renew";
-      runtimeInputs = with pkgs; [ coreutils step-cli systemd ];
-      text = ''
-      set -euo pipefail
-
-      YELLOW_BANG="\e[33m!\e[0m"
-
-      force=0
-      while [[ $# -gt 0 ]]; do
-      case $1 in
-        --force)
-        force=1
-        shift
-        ;;
-        *)
-        echo -e "$YELLOW_BANG Warning: ignoring unrecognized argument '$1'"
-        exit 1
-        ;;
-      esac
-      done
-
-      if [[ $force -eq 0 ]] && ! step certificate needs-renewal "${cfg.certFile}"; then
-        echo "Skipping renew"
-        exit 0
-      fi
-
-      echo "Renewing mTLS certificate"
-      step ca renew --force "${cfg.certFile}" "${cfg.keyFile}"
-      (umask 077; cat "${cfg.certFile}" "${cfg.keyFile}" > "${cfg.bundleFile}")
-      chown ${fileOwner} ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
-      chmod 640 ${cfg.certFile} ${cfg.keyFile} ${cfg.bundleFile}
-
-      ${lib.optionalString hasReloadUnits ''
-        echo "Reloading units: ${lib.concatStringsSep ", " cfg.renew.reloadUnits}"
-        ${renewReloadScript}
-      ''}
-
-      ${lib.optionalString hasPostCommands ''echo "Post commands:" ${renewPostCommands}''}
-      '';
-    };
-
-  mkNixosMtlsRenewService = { pkgs, cfg, ... }:
-    {
-      description = "Renew the mTLS certificate when Smallstep marks it ready";
-      wantedBy = [ ];
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-      serviceConfig = {
-        Type = "oneshot";
-        User = cfg.renew.user;
-        Group = cfg.renew.group;
-        ExecStart = lib.getExe (mkMtlsRenewScript { inherit pkgs cfg; });
-      };
-    };
-
-  mkNixosMtlsRenewTimer = {
-    onCalendar,
-    randomizedDelaySec,
-    unit ? "mtls-renew.service",
-  }: {
-    description = "Periodic Smallstep renewal for the mTLS certificate";
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      Persistent = true;
-      OnCalendar = onCalendar;
-      AccuracySec = "1us";
-      RandomizedDelaySec = randomizedDelaySec;
-      Unit = unit;
-    };
-  };
-
-  mkHomeManagerMtlsRenewService = { pkgs, cfg, ... }:
-  let
-    renewScript = mkMtlsRenewScript {
-      inherit pkgs cfg;
-      systemctlArgs = [ "--user" ];
-    };
-  in
-  {
-    Unit = {
-      Description = "Renew the mTLS certificate when Smallstep marks it ready";
-      After = [ "network-online.target" ];
-      Wants = [ "network-online.target" ];
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = lib.getExe renewScript;
-    };
-  };
-
-  mkHomeManagerMtlsRenewTimer = {
-    onCalendar,
-    randomizedDelaySec,
-    unit ? "mtls-renew.service",
-  }: {
-    Unit = {
-      Description = "Periodic Smallstep renewal for the mTLS certificate";
-    };
-    Timer = {
-      Persistent = true;
-      OnCalendar = onCalendar;
-      AccuracySec = "1us";
-      RandomizedDelaySec = randomizedDelaySec;
-      Unit = unit;
-    };
-    Install = {
-      WantedBy = [ "timers.target" ];
-    };
-  };

 in
 {
  flake.modules.nixos.mtls = { config, lib, pkgs, ... }:
    let
      cfg = config.mtls;
-      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
+      mtlsRenewWrapper = inputs.self.wrappers.mtlsRenew.apply {
+        inherit pkgs;
+        inherit (cfg) certDir keyFile certFile bundleFile;
+        inherit (cfg.renew) user group reloadUnits postCommands;
+        systemd = {
+          after = [ "network-online.target" ];
+          wants = [ "network-online.target" ];
+          serviceConfig = {
+            Type = "oneshot";
+            User = cfg.renew.user;
+            Group = cfg.renew.group;
+          };
+        } // lib.optionalAttrs cfg.renew.enable {
+          startAt = cfg.renew.onCalendar;
+        };
+      };
    in
    {
      options.mtls = (mkOpts config) // {
@@ -291,30 +164,44 @@ in
            inherit (cfg) subject provisioner san certFile keyFile bundleFile lifetime;
            inherit (cfg.renew) user group;
          })
-          (mkMtlsCheckScript { inherit pkgs; inherit (cfg) bundleFile; })
-          (mkMtlsRenewScript { inherit pkgs cfg; })
+          (inputs.self.wrappers.mtlsCheck.apply {
+            inherit pkgs;
+            inherit (cfg) bundleFile;
+          }).wrapper
+          mtlsRenewWrapper.wrapper
        ];

        systemd.tmpfiles.rules = [
          "d ${cfg.certDir} 0750 ${cfg.renew.user} ${cfg.renew.group} -"
        ];

-        systemd.services.mtls-renew = lib.mkIf cfg.renew.enable
-          (mkNixosMtlsRenewService { inherit pkgs cfg; });
+        systemd.packages = lib.mkIf cfg.renew.enable [
+          mtlsRenewWrapper.outputs.systemd-system
+        ];

-        systemd.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkNixosMtlsRenewTimer {
-          inherit (cfg.renew) onCalendar randomizedDelaySec;
-        });
+        systemd.timers.mtls-renew = lib.mkIf cfg.renew.enable {
+          wantedBy = [ "timers.target" ];
+          timerConfig = {
+            Persistent = true;
+            AccuracySec = "1us";
+            RandomizedDelaySec = cfg.renew.randomizedDelaySec;
+          };
+        };
      };
    };

  flake.modules.homeManager.mtls = { config, lib, pkgs, ... }:
    let
      cfg = config.mtls;
-      keyFile = cfg.keyFile;
-      certFile = cfg.certFile;
-      bundleFile = cfg.bundleFile;
-      sanArgs = lib.concatMapStringsSep " " (san: "--san \"${san}\"") cfg.san;
+      mtlsRenewWrapper = inputs.self.wrappers.mtlsRenew.apply {
+        inherit pkgs;
+        inherit (cfg) certDir keyFile certFile bundleFile;
+        inherit (cfg.renew) reloadUnits postCommands;
+        systemctlArgs = [ "--user" ];
+        systemd = lib.optionalAttrs cfg.renew.enable {
+          startAt = cfg.renew.onCalendar;
+        };
+      };
    in
    {
      options.mtls = (mkOpts config) // {
@@ -329,24 +216,230 @@ in
        home.packages = with pkgs; lib.optionals cfg.enable [
          # step-cli
          (mkMtlsGenerateScript {
+            inherit pkgs;
+            inherit (cfg) keyFile certFile bundleFile;
            inherit (cfg) subject provisioner san lifetime;
            inherit (cfg.renew) user group;
-            inherit pkgs certFile keyFile bundleFile;
          })
-          (mkMtlsCheckScript { inherit pkgs bundleFile; })
-          (mkMtlsRenewScript { inherit pkgs cfg; systemctlArgs = [ "--user" ]; })
+          (inputs.self.wrappers.mtlsCheck.apply {
+            inherit pkgs;
+            inherit (cfg) bundleFile;
+          }).wrapper
        ];

        systemd.user.tmpfiles.rules = lib.mkIf cfg.enable [
-          "d ${cfg.certDir} 0700 - - -"
+          "d ${cfg.certDir} 0700 - - -" # Ensure the cert directory exists and is writable by the user
        ];

-        systemd.user.services.mtls-renew = lib.mkIf cfg.renew.enable
-          (mkHomeManagerMtlsRenewService { inherit pkgs cfg; });
+        # Create the systemd service files for the user.
+        xdg.configFile = lib.mkIf cfg.renew.enable {
+          "systemd/user/mtls-renew.service".source =
+            "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.service";
+          "systemd/user/mtls-renew.timer".source =
+            "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.timer";
+          "systemd/user/mtls-renew.timer.d/override.conf".text = ''
+            [Timer]
+            Persistent=true
+            AccuracySec=1us
+            RandomizedDelaySec=${cfg.renew.randomizedDelaySec}
+          '';
+        };

-        systemd.user.timers.mtls-renew = lib.mkIf cfg.renew.enable (mkHomeManagerMtlsRenewTimer {
-          inherit (cfg.renew) onCalendar randomizedDelaySec;
-        });
+        # Ensure the timer gets started
+        home.activation.mtlsRenewTimer = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+          if [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/systemd/private" ]; then
+            if [ "${lib.boolToString (cfg.enable && cfg.renew.enable)}" = "true" ]; then
+              run ${pkgs.systemd}/bin/systemctl --user daemon-reload
+              if ${pkgs.systemd}/bin/systemctl --user cat mtls-renew.timer >/dev/null 2>&1; then
+                run ${pkgs.systemd}/bin/systemctl --user enable --now mtls-renew.timer
+              else
+                verboseEcho "mtls-renew.timer unit file is not available; skipping enable"
+              fi
+            else
+              run ${pkgs.systemd}/bin/systemctl --user disable --now mtls-renew.timer || true
+              run ${pkgs.systemd}/bin/systemctl --user daemon-reload || true
+            fi
+          fi
+        '';
      };
    };
+
+  flake.wrappers = {
+    mtlsCheck = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
+      options = {
+        bundleFile = lib.mkOption {
+          description = "String path for the mTLS key bundle";
+          type = lib.types.str;
+        };
+      };
+
+      config = {
+        binName = "mtls-check";
+        # This pattern is necessary to wrap packages like openssl that provide more than one binary
+        package = config.pkgs.symlinkJoin {
+          name = "openssl";
+          paths = [ config.pkgs.openssl.bin config.pkgs.openssl.man ];
+          meta.mainProgram = "openssl";
+        };
+        args = [
+          "x509"
+          "-noout"
+          "-in" config.bundleFile
+          "-subject"
+          "-issuer"
+          "-ext" "subjectAltName,extendedKeyUsage"
+          "-enddate"
+        ];
+      };
+    });
+
+    mtlsNeedsRenewal = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
+      options = {
+        certFile = lib.mkOption {
+          description = "String path for the public cert";
+          type = lib.types.str;
+        };
+      };
+
+      config = {
+        binName = "mtls-needs-renewal";
+        package = config.pkgs.step-cli;
+        preHook = ''
+          echo "Checking renewal status..."
+        '';
+        args = [ "certificate" "needs-renewal" "${config.certFile}" ];
+      };
+    });
+
+    mtlsRenew = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: {
+      imports = [ wlib.modules.systemd ];
+
+      options = {
+        certDir = lib.mkOption {
+          description = "String path to the directory where the certs will be stored";
+          type = lib.types.str;
+        };
+        keyFile = lib.mkOption {
+          description = "String path for the private key";
+          type = lib.types.str;
+          default = "${config.certDir}/key.pem";
+        };
+        certFile = lib.mkOption {
+          description = "String path for the public cert";
+          type = lib.types.str;
+          default = "${config.certDir}/cert.pem";
+        };
+        bundleFile = lib.mkOption {
+          description = "String path for the mTLS key bundle";
+          type = lib.types.str;
+          default = "${config.certDir}/mtls.pem";
+        };
+        user = lib.mkOption {
+          description = "User that should own the renewed certificate files.";
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+        };
+        group = lib.mkOption {
+          description = "Group that should own the renewed certificate files.";
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+        };
+        reloadUnits = lib.mkOption {
+          description = "systemd units to try-reload-or-restart after a successful renewal.";
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+        };
+        postCommands = lib.mkOption {
+          description = "Shell commands to run after a successful renewal.";
+          type = lib.types.listOf lib.types.lines;
+          default = [ ];
+        };
+        systemctlArgs = lib.mkOption {
+          description = "Additional arguments to pass to systemctl when reloading units.";
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+        };
+      };
+
+      config = {
+        binName = "mtls-renew";
+        package = let
+          systemctlCmd = "systemctl ${lib.escapeShellArgs config.systemctlArgs}";
+
+          hasReloadUnits = config.reloadUnits != [ ];
+          renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
+            if ${systemctlCmd} --quiet is-active "${unit}"; then
+              ${systemctlCmd} try-reload-or-restart "${unit}"
+            fi
+          '') config.reloadUnits;
+
+          hasPostCommands = config.postCommands != [ ];
+          renewPostCommands = lib.concatStringsSep "\n" config.postCommands;
+
+          hasOwnership = config.user != null && config.group != null;
+        in
+          config.pkgs.writeShellApplication {
+            name = "mtls-renew";
+            runtimeInputs = with config.pkgs; [ coreutils step-cli systemd ];
+            text = ''
+            set -euo pipefail
+
+            YELLOW_BANG="\e[33m!\e[0m"
+
+            force=0
+            while [[ $# -gt 0 ]]; do
+            case $1 in
+              --force)
+              force=1
+              shift
+              ;;
+              *)
+              echo -e "$YELLOW_BANG Warning: ignoring unrecognized argument '$1'"
+              exit 1
+              ;;
+            esac
+            done
+
+            if [[ $force -eq 0 ]] && ! step certificate needs-renewal "${config.certFile}"; then
+              echo "Skipping renew"
+              exit 0
+            fi
+
+            echo "Renewing mTLS certificate"
+            step ca renew --force "${config.certFile}" "${config.keyFile}"
+            (umask 077; cat "${config.certFile}" "${config.keyFile}" > "${config.bundleFile}")
+
+            ${lib.optionalString hasOwnership ''
+              chown ${config.user}:${config.group} ${config.certFile} ${config.keyFile} ${config.bundleFile}
+              chmod 640 ${config.certFile} ${config.keyFile} ${config.bundleFile}
+            ''}
+
+            ${lib.optionalString hasReloadUnits ''
+              echo "Reloading units: ${lib.concatStringsSep ", " config.reloadUnits}"
+              ${renewReloadScript}
+            ''}
+
+            ${lib.optionalString hasPostCommands ''
+              echo "Running post commands"
+              ${renewPostCommands}
+            ''}
+            '';
+          };
+        extraPackages = [
+          config.pkgs.step-cli
+        ];
+        systemd = {
+          description = "Renew the mTLS certificate when Smallstep marks it ready";
+          documentation = [
+            "https://smallstep.com/docs/step-ca/certificate-authority-server-production"
+          ];
+          startLimitIntervalSec = 0;
+          after = [ "network-online.target" ];
+          wants = [ "network-online.target" ];
+          serviceConfig.Type = lib.mkDefault "oneshot";
+          # serviceConfig.ExecCondition = "";
+        };
+      };
+    });
+  };
 }
@@ -0,0 +1,156 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.niri = { pkgs, lib, ... }:
+  let
+    niriPkg = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
+  in
+  {
+    programs.niri = {
+      enable = true;
+      package = niriPkg;
+    };
+    systemd.user.services.niri.enableDefaultPath = false;
+  };
+
+  perSystem = { pkgs, lib, self', ... }:
+    let
+      nixGLPackage = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system}.nixGLIntel;
+      noctaliaPkg = self'.packages.myNoctaliaNixGL;
+      terminalPkg = pkgs.ghostty;
+      myNiriUnwrapped = inputs.wrapper-modules.wrappers.niri.wrap {
+        inherit pkgs;
+        settings = {
+          spawn-at-startup = [
+            (lib.getExe noctaliaPkg)
+          ];
+
+          xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
+
+          input.keyboard.xkb.layout = "us,ua";
+
+          layout.gaps = 5;
+
+          binds = {
+            "Mod+Return".spawn-sh = lib.getExe terminalPkg;
+            # "Mod+Ctrl+Return".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
+            "Mod+Space".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
+            "Mod+B".spawn-sh = "${lib.getExe pkgs.brave}";
+            "Mod+E".spawn-sh = "xdg-open .";
+            "Mod+Alt+L".spawn-sh = "loginctl lock-session";
+
+            "Alt+F4".spawn-sh = "${lib.getExe' pkgs.coreutils "true"}";
+            "Mod+Shift+Q".close-window = { };
+            "Mod+S".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
+
+            "Mod+1".focus-workspace = 1;
+            "Mod+2".focus-workspace = 2;
+            "Mod+3".focus-workspace = 3;
+            "Mod+4".focus-workspace = 4;
+            "Mod+5".focus-workspace = 5;
+            "Mod+6".focus-workspace = 6;
+            "Mod+7".focus-workspace = 7;
+            "Mod+8".focus-workspace = 8;
+            "Mod+9".focus-workspace = 9;
+
+            "Mod+Tab".focus-workspace-previous = { };
+
+            # "Mod+WheelScrollDown".focus-workspace-down = { };
+            # "Mod+WheelScrollUp".focus-workspace-up = { };
+
+            # "Mod+Up".focus-window-up = { };
+            # "Mod+Down".focus-window-down = { };
+            "Mod+Up".focus-workspace-up = { };
+            "Mod+Down".focus-workspace-down = { };
+            "Mod+Left".focus-column-left = { };
+            "Mod+Right".focus-column-right = { };
+            "Mod+K".focus-window-up = { };
+            "Mod+J".focus-window-down = { };
+            "Mod+H".focus-column-left = { };
+            "Mod+L".focus-column-right = { };
+            "Mod+Home".focus-column-first = { };
+            "Mod+End".focus-column-last = { };
+
+            # "Mod+Shift+Left".focus-monitor-left = { };
+            # "Mod+Shift+Right".focus-monitor-right = { };
+            # "Mod+Shift+Up".focus-monitor-up = { };
+            # "Mod+Shift+Down".focus-monitor-down = { };
+
+            "Mod+Shift+1".move-column-to-workspace = 1;
+            "Mod+Shift+2".move-column-to-workspace = 2;
+            "Mod+Shift+3".move-column-to-workspace = 3;
+            "Mod+Shift+4".move-column-to-workspace = 4;
+            "Mod+Shift+5".move-column-to-workspace = 5;
+            "Mod+Shift+6".move-column-to-workspace = 6;
+            "Mod+Shift+7".move-column-to-workspace = 7;
+            "Mod+Shift+8".move-column-to-workspace = 8;
+            "Mod+Shift+9".move-column-to-workspace = 9;
+
+            "Mod+Ctrl+Up".move-window-up = { };
+            "Mod+Ctrl+Down".move-window-down = { };
+            "Mod+Ctrl+Left".move-column-left = { };
+            "Mod+Ctrl+Right".move-column-right = { };
+            "Mod+Ctrl+K".move-window-up = { };
+            "Mod+Ctrl+J".move-window-down = { };
+            "Mod+Ctrl+H".move-column-left = { };
+            "Mod+Ctrl+L".move-column-right = { };
+            "Mod+Ctrl+Home".move-column-to-first = { };
+            "Mod+Ctrl+End".move-column-to-last = { };
+
+            "Mod+Shift+Ctrl+Left".move-column-to-monitor-left = { };
+            "Mod+Shift+Ctrl+Right".move-column-to-monitor-right = { };
+            "Mod+Shift+Ctrl+Up".move-column-to-monitor-up = { };
+            "Mod+Shift+Ctrl+Down".move-column-to-monitor-down = { };
+
+            "Mod+Ctrl+F".expand-column-to-available-width = { };
+            "Mod+C".center-column = { };
+            "Mod+Ctrl+C".center-visible-columns = { };
+            "Mod+Minus".set-column-width = "-10%";
+            "Mod+Equal".set-column-width = "+10%";
+            "Mod+Shift+Minus".set-window-height = "-10%";
+            "Mod+Shift+Equal".set-window-height = "+10%";
+
+            "Mod+T".toggle-window-floating = { };
+            "Mod+F".fullscreen-window = { };
+            "Mod+W".toggle-column-tabbed-display = { };
+            "Mod+O".toggle-overview = { };
+
+            "Ctrl+Shift+1".screenshot = { };
+            "Ctrl+Shift+2".screenshot-screen = { };
+            "Ctrl+Shift+3".screenshot-window = { };
+
+            "Mod+Shift+Slash".show-hotkey-overlay = { };
+            "Mod+Escape".toggle-keyboard-shortcuts-inhibit = { };
+            "Mod+Shift+P".power-off-monitors = { };
+            "Ctrl+Alt+Delete".quit = { };
+
+            "Mod+WheelScrollRight".focus-column-right = { };
+            "Mod+WheelScrollLeft".focus-column-left = { };
+            "Mod+Ctrl+WheelScrollRight".move-column-right = { };
+            "Mod+Ctrl+WheelScrollLeft".move-column-left = { };
+            "Mod+Shift+WheelScrollDown".focus-column-right = { };
+            "Mod+Shift+WheelScrollUp".focus-column-left = { };
+            # "Mod+Ctrl+Shift+WheelScrollDown".move-column-right = { };
+            # "Mod+Ctrl+Shift+WheelScrollUp".move-column-left = { };
+          };
+        };
+      };
+    in {
+      packages.myNiri = myNiriUnwrapped;
+
+      packages.myNiriNixGL = pkgs.symlinkJoin {
+        name = "my-niri-nixgl";
+        paths = [ myNiriUnwrapped ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        meta.mainProgram = "niri";
+        postBuild = ''
+          for exe in "$out"/bin/*; do
+            if [[ -f "$exe" ]]; then
+              base="$(basename "$exe")"
+              mv "$exe" "$out/bin/.''${base}-real"
+              makeWrapper ${lib.getExe nixGLPackage} "$exe" \
+                --add-flags "$out/bin/.''${base}-real"
+            fi
+          done
+        '';
+      };
+    };
+}
@@ -0,0 +1,58 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.base = { config, pkgs, lib, ... }: {
+    nix.settings.experimental-features = [ "nix-command" "flakes" ];
+    nixpkgs.config = {
+      permittedInsecurePackages = [ "openssl-1.1.1w" ];
+      allowUnfree = true;
+    };
+
+    # Set your time zone.
+    time.timeZone = "US/Central";
+
+    # Select internationalisation properties.
+    i18n = {
+      defaultLocale = "en_US.UTF-8";
+      extraLocaleSettings = {
+        LC_ADDRESS = "en_US.UTF-8";
+        LC_IDENTIFICATION = "en_US.UTF-8";
+        LC_MEASUREMENT = "en_US.UTF-8";
+        LC_MONETARY = "en_US.UTF-8";
+        LC_NAME = "en_US.UTF-8";
+        LC_NUMERIC = "en_US.UTF-8";
+        LC_PAPER = "en_US.UTF-8";
+        LC_TELEPHONE = "en_US.UTF-8";
+        LC_TIME = "en_US.UTF-8";
+      };
+    };
+
+    fonts.packages = with pkgs; [
+      nerd-fonts.hack
+      nerd-fonts.sauce-code-pro
+    ];
+
+    # Need for less pain-in-the-ass for doing normal-ish stuff
+    # This is needed for VSCode remote support. Read: https://nixos.wiki/wiki/Visual_Studio_Code
+    programs.nix-ld.enable = true;
+
+    # Configure network connections interactively with nmcli or nmtui.
+    networking.networkmanager.enable = true;
+
+    services.openssh.enable = true;
+
+    security.polkit.enable = true; # polkit
+    services.gnome.gnome-keyring.enable = true; # secret service
+    security.pam.services.swaylock = {};
+
+    # Enable sound with pipewire.
+    services.pulseaudio.enable = false;
+    security.rtkit.enable = true; # PulseAudio server uses this to acquire realtime priority.
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # If you want to use JACK applications, uncomment this
+      #jack.enable = true;
+    };
+  };
+}
@@ -0,0 +1,34 @@
+{ self, inputs, ... }: {
+  perSystem = { pkgs, lib, ... }:
+    let
+      nixGLPackage = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system}.nixGLIntel;
+      myNoctaliaUnwrapped = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
+        inherit pkgs;
+        runtimePkgs = [
+          pkgs.qt6.qtwebsockets
+        ];
+        # settings =
+        #   (builtins.fromJSON
+        #     (builtins.readFile ./noctalia.json)).settings;
+      };
+    in {
+      packages.myNoctalia = myNoctaliaUnwrapped;
+
+      packages.myNoctaliaNixGL = pkgs.symlinkJoin {
+        name = "my-noctalia-nixgl";
+        paths = [ myNoctaliaUnwrapped ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        meta.mainProgram = "noctalia-shell";
+        postBuild = ''
+          for exe in "$out"/bin/*; do
+            if [[ -f "$exe" ]]; then
+              base="$(basename "$exe")"
+              mv "$exe" "$out/bin/.''${base}-real"
+              makeWrapper ${lib.getExe nixGLPackage} "$exe" \
+                --add-flags "$out/bin/.''${base}-real"
+            fi
+          done
+        '';
+      };
+    };
+}
@@ -1,41 +1,83 @@
 # This module provides all the shell options
-{ inputs, lib, ... }:
+{ self, inputs, ... }:
 {
-  flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
-    options.shell.program = lib.mkOption {
-      type = lib.types.enum [ "bash" "zsh" ];
-      default = "zsh";
-      description = "Which interactive shell configuration to enable.";
-    };
+  flake.modules.homeManager.shell-tools =
+    { config, pkgs, ... }:
+    {
+      imports = with inputs.self.modules.homeManager; [
+        # bash
+        zsh
+        files
+      ];

-    imports = with inputs.self.modules.homeManager; [
-      bash
-      zsh
-
-      # Tools
-      eza
-      files
-    ];
-
-    config = {
-      home.shell.enableShellIntegration = true;
-      programs.zsh.enable  = lib.mkForce (config.shell.program == "zsh");
      home.packages = with pkgs; [
-        nh
-        nvd
-        nix-output-monitor
-        wget
-        curl
-        busybox
-        gnugrep
-        dig
        btop
        uv
        xclip
-        jq
-        ripgrep
-        (writeShellScriptBin "ds" ''${lib.getExe pkgs.gdu} -x -I /snap /'')
+        inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
      ];
+
+      home.shell.enableShellIntegration = true;
+    };
+
+  perSystem =
+    {
+      system,
+      pkgs,
+      self',
+      ...
+    }:
+    {
+      packages.shell-tools = inputs.wrappers.lib.wrapPackage {
+        inherit pkgs;
+        # binName = "show-tools";
+        package = (
+          pkgs.symlinkJoin {
+            name = "show-tools";
+            meta.mainProgram = "show-tools";
+            paths = with pkgs; [
+              nh
+              ripgrep
+              fd
+              jq
+              wget
+              curl
+              dig
+              bat
+              self'.packages.gdu
+              self'.packages.my-eza
+              self'.packages.yazi
+              hostname
+              iproute2
+              direnv
+              (writeShellApplication {
+                name = "show-tools";
+                text = ''
+                  IFS=':' read -r -a path_dirs <<< "''${PATH:-}"
+
+                  for dir in "''${path_dirs[@]}"; do
+                    [[ "$dir" == */bin ]] || continue
+                    [[ -d "$dir" ]] || continue
+
+                    printf '%s\n' "$dir"/*
+                  done
+                '';
+              })
+            ];
+          }
+        );
+      };
+
+      packages.gdu = inputs.wrappers.lib.wrapPackage {
+        inherit pkgs;
+        package = pkgs.gdu;
+        args = [
+          "-x"
+          "--si"
+          "--collapse-path"
+          "--mouse"
+          "$@"
+        ];
+      };
    };
-  };
 }
@@ -0,0 +1,100 @@
+{ self, inputs, ... }:
+let
+  mkPrincipalArgs = principals:
+    builtins.concatLists (map (principal: [ "--principal" principal ]) principals);
+in
+{
+  perSystem = { system, self', pkgs, lib, ... }: {
+    packages.ssh-certs = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      package = (pkgs.symlinkJoin {
+        name = "ssh-certs";
+        meta.mainProgram = "sign-ssh-user-cert";
+        paths = [
+          (inputs.self.wrappers.signUserWrapper.apply {
+            inherit pkgs;
+            provisioner = "admin";
+            overwrite = true;
+            validUsers = [ "john" "root" "appdaemon" ];
+          }).wrapper
+
+          (inputs.self.wrappers.signHostWrapper.apply {
+            inherit pkgs;
+            provisioner = "admin";
+            overwrite = true;
+            # extraPrincipals = [ "home-pc" ];
+          }).wrapper
+        ];
+      });
+    };
+  };
+
+  flake.wrappers.signHostWrapper = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      provisioner = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        default = "admin";
+      };
+      extraPrincipals = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+      };
+      overwrite = lib.mkEnableOption "Overwrite existing cert file?";
+    };
+
+    config = {
+      binName = "sign-ssh-host-cert";
+      package = config.pkgs.step-cli;
+      extraPackages = with config.pkgs; [ hostname iproute2 systemd ];
+      preHook = ''
+        HOSTNAME=$(hostname -s)
+        IP_ADDRESS=$(ip -4 -o addr show scope global | while read -r _ _ _ addr _; do
+          case "$addr" in
+            192.168.1.*/*)
+              printf '%s\n' "''${addr%%/*}"
+              break
+              ;;
+          esac
+        done)
+        echo "Signing SSH host cert for $HOSTNAME at $IP_ADDRESS"
+      '';
+      args =
+        [
+          "ssh" "certificate"
+          "--host" "--sign"
+          "--principal" "$HOSTNAME"
+          "--principal" "$IP_ADDRESS"
+        ]
+        ++ lib.optionals (config.provisioner != null) [ "--provisioner" "${config.provisioner}" ]
+        ++ lib.optionals config.overwrite [ "-f" ]
+        ++ mkPrincipalArgs config.extraPrincipals;
+      postHook = ''
+        systemctl reload-or-restart sshd
+      '';
+    };
+  });
+
+  flake.wrappers.signUserWrapper = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      provisioner = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        default = "admin";
+      };
+      validUsers = lib.mkOption {
+        description = "A list of the user names that this cert will be valid for";
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+      };
+      overwrite = lib.mkEnableOption "Overwrite existing cert file?";
+    };
+
+    config = {
+      binName = "sign-ssh-user-cert";
+      package = config.pkgs.step-cli;
+      args = [ "ssh" "certificate" "--sign" ]
+        ++ lib.optionals (config.provisioner != null) [ "--provisioner" "${config.provisioner}" ]
+        ++ lib.optionals config.overwrite [ "-f" ]
+        ++ mkPrincipalArgs config.validUsers;
+    };
+  });
+}
@@ -0,0 +1,51 @@
+{ self, inputs, ... }: {
+  flake.modules.homeManager.step-client = { config, pkgs, lib, ... }: {
+    home.file.".step/config/defaults.json".text = builtins.toJSON {
+      ca-url = "https://janus.john-stream.com/";
+      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
+      root = ../hosts/janus/root_ca.crt;
+    };
+    home.packages = [
+      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.step-bootstrap
+    ];
+    # sops.secrets."step-ca-defaults" = {
+    #   sopsFile = ../hosts/janus/defaults.json;
+    #   format = "json";
+    #   key = ""; # This causes it to decode the whole file
+    #   path = "${config.home.homeDirectory}/defaults.json";
+    #   mode = "0400";
+    # };
+  };
+
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.step-bootstrap = (inputs.self.wrappers.stepBootstrap.apply {
+      inherit pkgs;
+      ca-url = "https://janus.john-stream.com";
+      fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
+      install = true;
+    }).wrapper;
+  };
+
+  flake.wrappers.stepBootstrap = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      ca-url = lib.mkOption {
+        type = lib.types.str;
+      };
+      fingerprint = lib.mkOption {
+        type = lib.types.str;
+      };
+      install = lib.mkEnableOption "Install the cert to the system trust store";
+    };
+
+    config = {
+      binName = "step-bootstrap";
+      package = config.pkgs.step-cli;
+      args = [
+        "ca" "bootstrap"
+        "--ca-url" config.ca-url
+        "--fingerprint" config.fingerprint
+      ]
+      ++ lib.optional config.install "--install";
+    };
+  });
+}
@@ -2,8 +2,6 @@
 let
  username = "john";
  hostname = "janus";
-  ca-url = "https://janus.john-stream.com/";
-  fingerprint = builtins.readFile ./fingerprint;
 in
 {
  flake.modules.nixos.janus-ca =
@@ -39,7 +37,8 @@ in
      config = {
        environment.etc = lib.mkIf cfgInEtc {
          "step-ca/defaults.json".text = builtins.toJSON {
-            inherit ca-url fingerprint;
+            ca-url = "https://janus.john-stream.com/";
+            fingerprint = builtins.readFile ./fingerprint;
            root = "/etc/${certRootEtcPath}";
          };
          "${certRootEtcPath}".source = ./root_ca.crt;
@@ -52,10 +51,10 @@ in

  flake.modules.homeManager.janus-ca = { config, ... }: {
    home.file.".step/config/defaults.json".text = builtins.toJSON {
-      inherit ca-url fingerprint;
-      root = "${config.home.homeDirectory}/.step/certs/root_ca.crt";
+      ca-url = "https://janus.john-stream.com/";
+      fingerprint = builtins.readFile ./fingerprint;
+      root = ./root_ca.crt;
    };
-    home.file.".step/certs/root_ca.crt".source = ./root_ca.crt;
  };

  flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem {
@@ -86,7 +85,6 @@ in
        home-manager.users."${username}" = {
          imports = with inputs.self.modules.homeManager; [
            mysops
-            step-ssh-user
          ];
          shell.program = "zsh";
          docker.enable = true;
@@ -94,16 +92,4 @@ in
      }
    ];
  };
-
-  perSystem = { system, pkgs, lib, ... }: {
-    packages.janus-ca = inputs.wrappers.lib.wrapPackage {
-      inherit pkgs;
-      package = pkgs.step-cli;
-      binName = "janus-cert";
-      args = [
-        "ca" "certificate"
-        "--ca-url=${ca-url}"
-      ];
-    };
-  };
 }
@@ -0,0 +1,70 @@
+{ withSystem, self, inputs, ... }:
+let
+  username = "john";
+  hostname = "omen";
+in
+{
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
+  let
+    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
+    flakeDir = "${config.xdg.configHome}/home-manager";
+  in
+  {
+    imports = with inputs.self.modules.homeManager; [
+      rebuild
+      john
+      # mtls
+      # restic
+      docker
+      desktop
+      step-client
+      # mysops
+      # myPackage
+      # myStepClient
+    ];
+    # TODO: make this more restrictive, rather than allowing all unfree packages
+    nixpkgs.config.allowUnfree = true;
+    nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
+
+    targets.genericLinux.enable = true;
+
+    home.username = "${username}";
+    home.homeDirectory = "/home/${username}";
+    home.packages = with pkgs; [
+      selfPkgs.jsl-zsh
+      selfPkgs.my-neovim
+      selfPkgs.ssh-certs
+      # selfPkgs.step-bootstrap
+      # selfPkgs.wg-platform
+      # self'.packages.myWrappedPackage
+      # (inputs.self.wrappers.test-push.apply {
+      #   inherit pkgs flakeDir;
+      #   host = testHost;
+      #   target = testTarget;
+      # }).wrapper
+    ];
+
+    homeManagerFlakeDir = flakeDir;
+    docker.enable = true;
+
+    ssh = {
+      certificates.enable = true;
+      knownHosts = [
+        "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
+      ];
+      matchSets = {
+        certs = true;
+        appdaemon = true;
+        homelab = true;
+        dev = true;
+        tailscale = true;
+      };
+    };
+  };
+
+  flake.homeConfigurations."john@omen" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = inputs'.nixpkgs.legacyPackages;
+      modules = [ inputs.self.modules.homeManager."${hostname}" ]; # Uses the module defined above
+  });
+}
@@ -5,60 +5,34 @@
      hostname = "john-p14s";
      homeDirectory = config.home-manager.users.john.home.homeDirectory;
      flakeDir = "${homeDirectory}/Documents/dendritic";
-      my-neovim = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim;
+      selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
    in
    {
      imports = [
+        self.modules.nixos.base
        self.modules.nixos.p14sHardware
+        self.modules.nixos.onepassword
      ];

-      nix.settings.experimental-features = [ "nix-command" "flakes" ];
-      nixpkgs.config = {
-        permittedInsecurePackages = [ "openssl-1.1.1w" ];
-        allowUnfree = true;
-      };
-
      rebuild.flakeDir = flakeDir;

-      networking = {
-        hostName = hostname;
-        networkmanager.enable = true;
-      };
-
-      # Enable automatic login for the user.
-      # services.displayManager.autoLogin.enable = true;
-      # services.displayManager.autoLogin.user = "john";
+      networking.hostname = hostname;

      programs.zsh.enable = true;
-      services.openssh.enable = true;
      services.tailscale.enable = true;

      # List packages installed in system profile. To search, run:
      # $ nix search wget
      environment.systemPackages = with pkgs; [
-        wget
-        cacert
-        busybox
-        dig
        samba
-        my-neovim
+        selfPkgs.my-neovim
+        selfPkgs.wg-platform
+        selfPkgs.jsl-zsh
      ];

      security.pam.services.swaylock = {};
      security.pam.services.swaylock.fprintAuth = true;

-      programs._1password.enable = true;
-      programs._1password-gui = {
-        enable = true;
-        # Certain features, including CLI integration and system authentication support,
-        # require enabling PolKit integration on some desktop environments (e.g. Plasma).
-        polkitPolicyOwners = [ "john" ];
-        # TODO this should not be a hardcoded username
-      };
-
-      # This is needed for VSCode remote support. Read: https://nixos.wiki/wiki/Visual_Studio_Code
-      programs.nix-ld.enable = true;
-
      # This value determines the NixOS release from which the default
      # settings for stateful data, like file locations and database versions
      # on your system were taken. It's perfectly fine and recommended to leave
@@ -67,44 +41,9 @@
      # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
      system.stateVersion = "24.05"; # Did you read the comment?

-      # Set your time zone.
-      time.timeZone = "America/Chicago";
-
-      # Select internationalisation properties.
-      i18n = {
-        defaultLocale = "en_US.UTF-8";
-        extraLocaleSettings = {
-          LC_ADDRESS = "en_US.UTF-8";
-          LC_IDENTIFICATION = "en_US.UTF-8";
-          LC_MEASUREMENT = "en_US.UTF-8";
-          LC_MONETARY = "en_US.UTF-8";
-          LC_NAME = "en_US.UTF-8";
-          LC_NUMERIC = "en_US.UTF-8";
-          LC_PAPER = "en_US.UTF-8";
-          LC_TELEPHONE = "en_US.UTF-8";
-          LC_TIME = "en_US.UTF-8";
-        };
-      };
-
      services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
      services.fprintd.enable = true; # Enables fingerprint sensor

-      # Enable sound with pipewire.
-      services.pulseaudio.enable = false;
-      security.rtkit.enable = true; # PulseAudio server uses this to acquire realtime priority.
-      services.pipewire = {
-        enable = true;
-        alsa.enable = true;
-        alsa.support32Bit = true;
-        pulse.enable = true;
-        # If you want to use JACK applications, uncomment this
-        #jack.enable = true;
-
-        # use the example session manager (no others are packaged yet so this is enabled by default,
-        # no need to redefine it in your config for now)
-        # media-session.enable = true;
-      };
-
      home-manager.users.root = {
        imports = with inputs.self.modules.homeManager; [
          rebuild
@@ -120,11 +59,9 @@
          my-vscode.enable = true;
          mysops.hostSecretFile = "${flakeDir}/modules/hosts/john-p14s/secrets.yaml";
          homeManagerFlakeDir = "${flakeDir}";
-          shell.program = "zsh";
          home.packages = with pkgs; [
            bash
            discord
-            my-neovim
            proton-vpn
            joplin-desktop
          ];
@@ -15,23 +15,19 @@ in
    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
    resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
    flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
-    test-push = with pkgs; writeShellApplication {
-      name = "test-push";
-      runtimeInputs = [ nh ];
-      text = ''nh os switch ${flakeDir}#${testHost} --target-host root@${testTarget} -e none'';
-    };
  in
  {
    imports = with inputs.self.modules.homeManager; [
      rebuild
      john
-      mysops
-      janus-ca
-      step-ssh-user
      mtls
      restic
      docker
      desktop
+      step-client
+      mysops
+      # myPackage
+      # myStepClient
    ];
    # TODO: make this more restrictive, rather than allowing all unfree packages
    nixpkgs.config.allowUnfree = true;
@@ -42,24 +38,22 @@ in
    home.username = "${username}";
    home.homeDirectory = "/home/${username}";
    home.packages = with pkgs; [
-      nixos-rebuild
-      test-push
-      selfPkgs.neovim-min
-      # ${selfPkgs}.my-neovim
-      # selfPkgs.richPrinter
-      selfPkgs.janus-ca
+      selfPkgs.jsl-zsh
+      # selfPkgs.my-neovim
+      selfPkgs.ssh-certs
+      # selfPkgs.step-bootstrap
+      # selfPkgs.wg-platform
+      # self'.packages.myWrappedPackage
+      (inputs.self.wrappers.test-push.apply {
+        inherit pkgs flakeDir;
+        host = testHost;
+        target = testTarget;
+      }).wrapper
    ];

-    shell.program = "zsh";
-  
    homeManagerFlakeDir = flakeDir;
    docker.enable = true;

-    step-ssh-user = {
-      enable = true;
-      principals = ["root" "${username}" "appdaemon"];
-      provisioner = "admin";
-    };
    ssh = {
      certificates.enable = true;
      knownHosts = [
@@ -70,6 +64,7 @@ in
        appdaemon = true;
        homelab = true;
        dev = true;
+        tailscale = true;
      };
    };

@@ -96,21 +91,25 @@ in
        "/home/john/john-nas"
      ];
    };
-    mtls = {
-      enable = true;
-      subject = hostname;
-      san = [
-        "${hostname}"
-        "192.168.1.85"
-        "spiffe://john-stream.com/ubuntu"
-      ];
-      lifetime = "1h";
-      renew.onCalendar = "*:1/10";
-    };
+    # mtls = {
+    #   enable = true;
+    #   subject = hostname;
+    #   san = [
+    #     "${hostname}"
+    #     "192.168.1.85"
+    #     "spiffe://john-stream.com/ubuntu"
+    #   ];
+    #   lifetime = "1h";
+    #   renew.onCalendar = "*:1/10";
+    # };
  };

-  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
+  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:
    inputs.home-manager.lib.homeManagerConfiguration {
+      # pkgs = import inputs.nixpkgs {
+      #   inherit system;
+      #   overlays = [ inputs.self.overlays.default ];
+      # };
      pkgs = inputs'.nixpkgs.legacyPackages;
      modules = [ inputs.self.modules.homeManager."${hostname}" ];
  });
@@ -0,0 +1,33 @@
+{ self, inputs, ... }: {
+  flake.wrappers.test-push = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      flakeDir = lib.mkOption {
+        type = lib.types.str;
+      };
+      host = lib.mkOption {
+        type = lib.types.str;
+      };
+      target = lib.mkOption {
+        type = lib.types.str;
+      };
+      sshUser = lib.mkOption {
+        type = lib.types.str;
+        default = "root";
+      };
+      elevationStrategy = lib.mkOption {
+        type = lib.types.str;
+        default = "none";
+      };
+    };
+
+    config = {
+      binName = "test-push";
+      package = config.pkgs.nh;
+      args = [
+        "os" "switch" "${config.flakeDir}#${config.host}"
+        "--target-host" "${config.sshUser}@${config.target}"
+        "--elevation-strategy" "${config.elevationStrategy}"
+      ]; 
+    };
+  });
+}
@@ -0,0 +1,123 @@
+{ self, inputs, ... }: {
+
+  flake.modules.nixos.omen = { pkgs, lib, ... }: {
+    # import any other modules from here
+    imports = [
+      self.modules.nixos.omenHardware
+      self.modules.nixos.base
+      self.modules.nixos.greetd
+      self.modules.nixos.niri
+      self.modules.nixos.onepassword
+      self.modules.nixos.steam
+    ];
+
+    # Use the systemd-boot EFI boot loader.
+    boot.loader.systemd-boot.enable = true;
+    boot.loader.efi.canTouchEfiVariables = true;
+
+    # Use latest kernel.
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+
+    networking.hostName = "nixos-omen"; # Define your hostname.
+
+    # Configure network proxy if necessary
+    # networking.proxy.default = "http://user:password@proxy:port/";
+    # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+    # Select internationalisation properties.
+    # i18n.defaultLocale = "en_US.UTF-8";
+    # console = {
+    #   font = "Lat2-Terminus16";
+    #   keyMap = "us";
+    #   useXkbConfig = true; # use xkb.options in tty.
+    # };
+
+    # Enable CUPS to print documents.
+    # services.printing.enable = true;
+
+    # Enable sound.
+    # services.pulseaudio.enable = true;
+    # OR
+    # services.pipewire = {
+    #   enable = true;
+    #   pulse.enable = true;
+    # };
+
+    # Enable touchpad support (enabled default in most desktopManager).
+    # services.libinput.enable = true;
+
+    # Define a user account. Don't forget to set a password with ‘passwd’.
+    # users.users.alice = {
+    #   isNormalUser = true;
+    #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    #   packages = with pkgs; [
+    #     tree
+    #   ];
+    # };
+
+    # programs.firefox.enable = true;
+
+    # List packages installed in system profile.
+    # You can use https://search.nixos.org/ to find more packages (and options).
+    environment.systemPackages = with pkgs; [
+    #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+      wget
+      git
+      micro
+      nh
+    ];
+
+    # Some programs need SUID wrappers, can be configured further or are
+    # started in user sessions.
+    # programs.mtr.enable = true;
+    # programs.gnupg.agent = {
+    #   enable = true;
+    #   enableSSHSupport = true;
+    # };
+
+    # List services that you want to enable:
+
+    # Enable the OpenSSH daemon.
+    services.openssh.enable = true;
+
+    # Open ports in the firewall.
+    # networking.firewall.allowedTCPPorts = [ ... ];
+    # networking.firewall.allowedUDPPorts = [ ... ];
+    # Or disable the firewall altogether.
+    # networking.firewall.enable = false;
+
+    # Copy the NixOS configuration file and link it from the resulting system
+    # (/run/current-system/configuration.nix). This is useful in case you
+    # accidentally delete configuration.nix.
+    # system.copySystemConfiguration = true;
+
+    # This option defines the first version of NixOS you have installed on this particular machine,
+    # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+    #
+    # Most users should NEVER change this value after the initial install, for any reason,
+    # even if you've upgraded your system to a new NixOS release.
+    #
+    # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+    # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+    # to actually do that.
+    #
+    # This value being lower than the current NixOS release does NOT mean your system is
+    # out of date, out of support, or vulnerable.
+    #
+    # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+    # and migrated your data accordingly.
+    #
+    # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+    system.stateVersion = "26.05"; # Did you read the comment?
+    # ...
+
+    home-manager.users.john.imports = with inputs.self.modules.homeManager; [
+      desktop
+      # rebuild
+      {
+        my-vscode.enable = true;
+      }
+    ];
+  };
+
+}
@@ -0,0 +1,8 @@
+{ self, inputs, ... }: {
+  flake.nixosConfigurations.omen = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      self.modules.nixos.omen
+      self.modules.nixos.john
+    ];
+  };
+}
@@ -0,0 +1,28 @@
+{ self, inputs, ... }: {
+  flake.modules.nixos.omenHardware = { config, lib, pkgs, modulesPath, ... }: {
+    imports = [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+    boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    boot.initrd.kernelModules = [ ];
+    boot.kernelModules = [ "kvm-amd" ];
+    boot.extraModulePackages = [ ];
+
+    fileSystems = {
+      "/" = {
+        device = "/dev/disk/by-uuid/35f77d1a-346c-4c52-83b2-7d25e2ac9fe1";
+        fsType = "ext4";
+      };
+      "/mnt/shared" = {
+        device = "/dev/disk/by-uuid/216e8dca-170d-4377-bf1a-69b574e1778c";
+        fsType = "ext4";
+      };
+    };
+
+    swapDevices = [ ];
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
+}
@@ -1,4 +1,4 @@
-{ self, inputs, lib, ... }:
+{ withSystem, self, inputs, lib, ... }:
 let
  username = "john";
  hostname = "soteria";
@@ -84,14 +84,10 @@ in
        sops.defaultSopsFile = ./secrets.yaml;

        programs.zsh.enable = true;
-        home-manager.users."${username}" = {
-          imports = with inputs.self.modules; [
-            homeManager."${hostname}"
-          ];
-        };
+
+        home-manager.users."${username}".imports = [ inputs.self.modules.homeManager.soteria ];

        environment.systemPackages = [
-          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.janus-ca
          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh
        ];
@@ -99,25 +95,26 @@ in
    ];
  };

-  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }: {
-    imports = with inputs.self.modules; [
-      homeManager.rebuild
-      homeManager.mysops
-    ];
+  flake.modules.homeManager.soteria = { config, pkgs, lib, ... }: {
+    imports = [
+      inputs.self.modules.homeManager.rebuild
+      inputs.self.modules.homeManager.mysops
+      ({ config, pkgs, lib, ... }: {
+        homeManagerFlakeDir = "${config.xdg.configHome}/home-manager";
+        docker.enable = true;

-    homeManagerFlakeDir = "${config.xdg.configHome}/home-manager";
-    shell.program = "zsh";
-    docker.enable = true;
-
-    # This will provide the edit-secrets script targeting this file
-    mysops.hostSecretFile = "${config.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
-  };
-
-  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
-    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
-    modules = with inputs.self.modules; [
-      homeManager."${username}"
-      homeManager."${hostname}"
+        # This will provide the edit-secrets script targeting this file
+        mysops.hostSecretFile = "${config.homeManagerFlakeDir}/modules/hosts/soteria/secrets.yaml";
+      })
    ];
  };
+
+  flake.homeConfigurations.soteria = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = inputs'.nixpkgs.legacyPackages;
+      modules = [
+        inputs.self.modules.homeManager."${username}"
+        inputs.self.modules.homeManager.soteria
+      ];
+  });
 }
@@ -40,7 +40,6 @@
    { config, pkgs, lib, ... }:
    let
      flakeDir = config.homeManagerFlakeDir;
-      hostnameCmd = "$(${lib.getExe pkgs.hostname} -s)";

      flake-parts-check = with pkgs; writeShellApplication {
        name = "flake-parts-check";
@@ -52,22 +51,6 @@
        '';
      };

-      nhms = with pkgs; writeShellApplication {
-        name = "nhms";
-        runtimeInputs = [ coreutils hostname nh ];
-        text = ''
-          HOSTNAME=$(hostname -s)
-          echo "Switching to the $HOSTNAME home-manager profile"
-          nh home switch ${flakeDir} -c "$HOSTNAME" "$@"
-        '';
-      };
-
-      nhmu = with pkgs; writeShellApplication {
-        name = "nhmu";
-        runtimeInputs = [ nhms ];
-        text = ''nhms --update'';
-      };
-
      test-build = with pkgs; writeShellApplication {
        name = "test-build";
        runtimeInputs = [ coreutils nix hostname ];
@@ -81,24 +64,6 @@
          nix eval "${flakeDir}#nixosConfigurations.$HOSTNAME.config.system.build.toplevel.drvPath"
        '';
      };
-
-      cleanup = with pkgs; writeShellApplication {
-        name = "cleanup";
-        runtimeInputs = [ coreutils home-manager nix ];
-        text = ''
-          set -e
-          DAYS=$1
-          if [ -z "$DAYS" ]; then
-            echo "usage: cleanup <days>"
-            exit 1
-          fi
-          home-manager expire-generations "-$DAYS days"
-          nix profile wipe-history --older-than "''${DAYS}d"
-          nix store gc
-          nix store optimise
-        '';
-      };
-
    in
    {
      options = {
@@ -120,13 +85,64 @@
            name = "build-tools";
            paths = [
              flake-parts-check
-              nhms
-              nhmu
              test-build
-              cleanup
+              (inputs.self.wrappers.home-switch.apply {
+                inherit pkgs flakeDir;
+              }).wrapper
+              (inputs.self.wrappers.home-switch.apply {
+                binName = lib.mkForce "nhmu";
+                inherit pkgs flakeDir;
+                extraOptions = [ "--update" ];
+              }).wrapper
+              (inputs.wrappers.lib.wrapPackage {
+                binName = "cleanup";
+                inherit pkgs;
+                package = nh;
+                args = [ "clean" "user" "--keep-since" "3days" ];
+              })
            ];
          })
        ];
      };
    };
+
+  flake.wrappers.home-switch = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      flakeDir = lib.mkOption {
+        type = lib.types.str;
+      };
+      user = lib.mkOption {
+        type = lib.types.str;
+        default = "$(whoami)";
+      };
+      hostname = lib.mkOption {
+        type = lib.types.str;
+        default = "$(hostname -s)";
+      };
+      configuration = lib.mkOption {
+        type = lib.types.str;
+        default = "${config.user}@${config.hostname}";
+      };
+      extraOptions = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+      };
+    };
+
+    config = {
+      binName = "nhms";
+      extraPackages = with config.pkgs; [ coreutils hostname nh ];
+      preHook = ''
+        CONFIG=${config.configuration}
+        echo "Switching to $CONFIG from ${config.flakeDir}"
+      '';
+      package = config.pkgs.nh;
+      args = [
+        "home" "switch"
+        "--configuration" "${config.configuration}"
+        "$@"
+        "${config.flakeDir}"
+      ] ++ config.extraOptions;
+    };
+  });
 }
@@ -14,17 +14,27 @@
        inputs.home-manager.nixosModules.home-manager
      ];

+      environment.shells = [
+        "${lib.getExe pkgs.zsh}"
+        "${lib.getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh}"
+      ];
+
+      users.groups."${username}" = {};
+
      users.users."${username}" = {
        isNormalUser = true;
+        group = username;
        home = "/home/${username}";
-        shell = lib.mkIf config.programs.zsh.enable pkgs.zsh;
-        extraGroups = [ "input" "networkmanager" ]
-        ++ lib.optional isAdmin "wheel"
-        ++ lib.optional config.virtualisation.docker.enable "docker"
-        ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group
-        ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
+        shell = pkgs.zsh;
+        extraGroups = [ "input" "networkmanager" "video" "render" ]
+          ++ lib.optional isAdmin "wheel"
+          ++ lib.optional config.virtualisation.docker.enable "docker"
+          ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group
+          ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres";
      };

+      programs.zsh.enable = true;
+
      security.sudo-rs.enable = lib.mkIf isAdmin true;

      home-manager.useGlobalPkgs = true;
@@ -33,7 +43,9 @@
        imports = [ self.modules.homeManager."${username}" ];
        home.username = "${username}";
        home.homeDirectory = "/home/${username}";
-        # home.packages = homePackages;
+        home.packages = with pkgs; [
+          # fzf zoxide starship
+        ];
      };
    };
  };
@@ -1,5 +1,5 @@
 { self, inputs, ... }: {
-  flake-file.inputs = {
+  config.flake-file.inputs = {
    wrapper-modules = {
      url = "github:BirdeeHub/nix-wrapper-modules";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -9,4 +9,13 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
+
+  options = {
+    # This is what allows wrappers to be defined in flake.wrappers.<wrapper-name> throughout different flake-parts modules
+    flake = inputs.flake-parts.lib.mkSubmoduleOptions {
+      wrappers = inputs.nixpkgs.lib.mkOption {
+        default = {};
+      };
+    };
+  };
 }
@@ -1,10 +1,9 @@
 {
  flake.modules.homeManager.bash = { pkgs, lib, config, ... }:
  {
-    programs.bash = lib.mkIf (config.shell.program == "bash") {
+    programs.bash = {
      enable = true;
      enableCompletion = true;
-      package = pkgs.bash;
    };
  };
 }
@@ -5,19 +5,27 @@
      enable = true;
      enableBashIntegration = true;
      enableZshIntegration = true;
-      git = true;
-      icons = "auto";
-      colors = "auto";
-      extraOptions = [
+      package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-eza;
+    };
+  };
+
+  perSystem = { system, pkgs, ... }: {
+    packages.my-eza = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      package = pkgs.eza;
+      args = [
        "--all"
        "--long"
        "--group-directories-first"
+        "--icons=auto"
+        "--color=auto"
        "--sort=type"
        "--dereference"
        "--octal-permissions"
        "--smart-group"
        "--no-time"
        "--git"
+        "$@"
      ];
    };
  };
@@ -14,12 +14,5 @@
        ignorecase = true;
      };
    };
-
-    home.packages = with pkgs; [
-      gdu
-      # (writeShellScriptBin "lfcd" ''
-      #   . <(${lib.getExe pkgs.lf} -print-last-dir | sed 's/^/cd /')
-      # '')
-    ];
  };
 }
@@ -9,7 +9,7 @@

  flake.modules.homeManager.ghostty = { config, pkgs, lib, ... }:
  let
-    ghosttyPackage = pkgs.symlinkJoin {
+    ghosttyX11 = pkgs.symlinkJoin {
      name = "ghostty-x11";
      paths = [ (config.lib.nixGL.wrap pkgs.ghostty) ];
      nativeBuildInputs = [ pkgs.makeWrapper ];
@@ -24,6 +24,10 @@
      TERMINAL = "ghostty";
    };

+    home.packages = with pkgs; [
+      inputs.self.packages.${system}.ghosttyGPUCheck
+    ];
+
    targets.genericLinux.nixGL = {
      packages = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system};
      defaultWrapper = "mesa";
@@ -33,7 +37,7 @@
    programs.ghostty = {
      enable = true;
      enableZshIntegration = true;
-      package = ghosttyPackage;
+      package = ghosttyX11;
      settings = {
        command = "TERM=xterm-256color ${lib.getExe pkgs.zsh}";
        font-size = 12;
@@ -72,7 +76,7 @@
    # https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
    xdg.desktopEntries."com.mitchellh.ghostty" =
    let
-      ghosttyCmd = lib.getExe ghosttyPackage;
+      ghosttyCmd = lib.getExe ghosttyX11;
    in
    {
      name = "Ghostty";
@@ -100,4 +104,16 @@
      };
    };
  };
+
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.ghosttyGPUCheck = pkgs.writeShellApplication {
+      name = "ghostty-gpu-check";
+      runtimeInputs = with pkgs; [
+        bash
+        gnugrep
+        procps # for pgrep, pidof, etc.
+      ];
+      text = builtins.readFile ../../scripts/ghostty-gpu-check.sh;
+    };
+  };
 }
@@ -6,153 +6,178 @@
    };
  };

-  perSystem = { system, pkgs, config, ... }: {
-    packages.my-neovim = ((inputs.nvf.lib.neovimConfiguration {
-      inherit pkgs;
-      modules = [
-        {
-          # https://nvf.notashelf.dev/search.html
-          config.vim = {
-            options = {
-              number = true;
-              relativenumber = true;
-              expandtab = true;
-              shiftwidth = 4;
-              tabstop = 4;
-              softtabstop = 4;
+  perSystem = { system, pkgs, config, ... }:
+    let
+      commonNeovimModule = {
+        config.vim = {
+          options = {
+            number = true;
+            relativenumber = true;
+            expandtab = true;
+            shiftwidth = 4;
+            tabstop = 4;
+            softtabstop = 4;

-              wrap = true;
-              linebreak = true;
-            };
+            wrap = true;
+            linebreak = true;
+          };

-            syntaxHighlighting = true;
+          syntaxHighlighting = true;

-            # Enable custom theming options
-            theme.enable = true;
-            theme.name = "catppuccin";
-            theme.style = "mocha";
+          theme.enable = true;
+          theme.name = "catppuccin";
+          theme.style = "mocha";

-            git.enable = true;
-            # git.neogit.enable = true;
+          git.enable = true;
+          # git.neogit.enable = true;

-            # https://github.com/akinsho/toggleterm.nvim
-            terminal.toggleterm.enable = true;
-            terminal.toggleterm.lazygit.enable = true;
-            terminal.toggleterm.lazygit.direction = "float";
-            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
-
-
-            utility.nix-develop.enable = true;
-
-            utility.oil-nvim.enable = true;
-            utility.oil-nvim.gitStatus.enable = true;
-
-            filetree.neo-tree = {
+          # https://github.com/akinsho/toggleterm.nvim
+          terminal.toggleterm = {
+            enable = true;
+            lazygit = {
              enable = true;
+              package = pkgs.lazygit;
+              direction = "float";
+              mappings.open = "<C-g>";
            };
+          };

-            # lazy = {
-            #   enable = true;
-            # };
+          languages = {
+            enableTreesitter = true;
+            enableFormat = true;

-            # globals = {
-            #   SimpylFold_docstring_preview = 1;
-            #   SimpylFold_fold_blank = 0;
-            # };
+            nix.enable = true;
+            yaml.enable = true;
+            toml.enable = true;
+          };
+        };
+      };

-            # extraPlugins = with pkgs.vimPlugins; {
-            #   SimpylFold.package = SimpylFold;
-            # };
-
-            telescope = {
-              enable = true;
-              extensions  = [
-                {
-                  name = "fzf";
-                  packages = [pkgs.vimPlugins.telescope-fzf-native-nvim];
-                  setup = {fzf = {fuzzy = true;};};
-                }
-              ];
-            };
-
-            # Enable Treesitter
-            treesitter = {
-              enable = true;
-              grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ python ];
-            };
-
-            lsp.enable = true;
-
-            languages = {
-              enableTreesitter = true;
-              enableFormat = true;
-
-              markdown = {
-                enable = true;
-                extensions = {
-                  # render-markdown-nvim.enable = true;
-                  markview-nvim.enable = true;
+      telescopeModule = {
+        config.vim = {
+          telescope = {
+            enable = true;
+            extensions = [
+              {
+                name = "fzf";
+                packages = [ pkgs.vimPlugins.telescope-fzf-native-nvim ];
+                setup = {
+                  fzf.fuzzy = true;
                };
-              };
-
-              bash.enable = true;
-              css.enable = true;
-              yaml.enable = true;
-              toml.enable = true;
-
-              nix = {
-                enable = true;
-              };
-
-              python = {
-                enable = true;
-                dap.enable = true;
-                format.type = [ "ruff" ];
-              };
-            };
-
-            keymaps = [
-              {
-                desc = "Edit key mappings";
-                key = "<leader>ekm";
-                mode = [ "n" ];
-                silent = false;
-                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
              }
-              {
-                desc = "Home Manager Switch";
-                key = "<leader>nhms";
-                mode = [ "n" ];
-                silent = false;
-                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
-              }
-              {
-                desc = "Key Maps [Telescope]";
-                key = "<leader>fkm";
-                mode = "n";
-                silent = false;
-                action = "<cmd>:Telescope keymaps<CR>";
-              }
-              {
-                desc = "Toggle Filesystem Tree [NeoTree]";
-                key = "<C-b>";
-                mode = [ "n" "v" "t" ];
-                silent = false;
-                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
-              }
-              {
-                key = "<C-`>";
-                mode = ["n" "v" "t"];
-                silent = false;
-                action = "<cmd>:ToggleTerm<CR>";
-              } 
            ];
          };
-        }
-      ];
-    }).neovim).overrideAttrs (old: {
-      pname = "my-neovim";
-      version = "custom";
-    });
-  };
+
+          keymaps = [
+            {
+              desc = "Key Maps [Telescope]";
+              key = "<leader>fkm";
+              mode = "n";
+              silent = false;
+              action = "<cmd>:Telescope keymaps<CR>";
+            }
+            {
+              desc = "Toggle Filesystem Tree [NeoTree]";
+              key = "<C-b>";
+              mode = [ "n" "v" "t" ];
+              silent = false;
+              action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+            }
+          ];
+        };
+      };
+
+      keymapsModule = {
+        config.vim = {
+          keymaps = [
+            {
+              desc = "Edit key mappings";
+              key = "<leader>ekm";
+              mode = [ "n" ];
+              silent = false;
+              action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
+            }
+            {
+              desc = "Home Manager Switch";
+              key = "<leader>nhms";
+              mode = [ "n" ];
+              silent = false;
+              action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
+            }
+            {
+              key = "<C-`>";
+              mode = [ "n" "v" "t" ];
+              silent = false;
+              action = "<cmd>:ToggleTerm<CR>";
+            }
+          ];
+        };
+      };
+    in {
+      packages.my-neovim = ((inputs.nvf.lib.neovimConfiguration {
+        inherit pkgs;
+        modules = [
+          commonNeovimModule
+          telescopeModule
+          keymapsModule
+          {
+            # https://nvf.notashelf.dev/search.html
+            config.vim = {
+              utility.nix-develop.enable = true;
+
+              utility.oil-nvim.enable = true;
+              utility.oil-nvim.gitStatus.enable = true;
+
+              filetree.neo-tree = {
+                enable = true;
+              };
+
+              # Enable Treesitter
+              treesitter = {
+                enable = true;
+                grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ python ];
+              };
+
+              lsp.enable = true;
+
+              languages = {
+                markdown = {
+                  enable = true;
+                  extensions = {
+                    # render-markdown-nvim.enable = true;
+                    markview-nvim.enable = true;
+                  };
+                };
+
+                bash.enable = true;
+                css.enable = true;
+                yaml.enable = true;
+                toml.enable = true;
+
+                python = {
+                  enable = true;
+                  dap.enable = true;
+                  format.type = [ "ruff" ];
+                };
+              };
+            };
+          }
+        ];
+      }).neovim).overrideAttrs (old: {
+        pname = "my-neovim";
+        version = "1.0.0";
+      });
+
+      packages.neovim-min = ((inputs.nvf.lib.neovimConfiguration {
+        inherit pkgs;
+        modules = [
+          commonNeovimModule
+          telescopeModule
+          keymapsModule
+        ];
+      }).neovim).overrideAttrs (old: {
+        pname = "neovim-min";
+        version = "1.0.0";
+      });
+    };
 }
@@ -1,28 +0,0 @@
-{ self, inputs, ... }: {
-  flake.modules.nixos.niri = { pkgs, lib, ... }: {
-    programs.niri = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
-    };
-  };
-
-  perSystem = { pkgs, lib, self', ... }: {
-    packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
-      inherit pkgs;
-      env.RUST_BACKTRACE = "full";
-      settings = {
-        spawn-at-startup = [
-          "${lib.getExe self'.packages.myNoctalia}"
-        ];
-        xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
-        input.keyboard.xkb.layout = "us,ua";
-        layout.gaps = 5;
-        binds = {
-          "Mod+Return".spawn-sh = lib.getExe pkgs.ghostty;
-          "Mod+Q".close-window = null;
-          "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
-        };
-      };
-    };
-  };
-}
@@ -1,8 +0,0 @@
-{ self, inputs, ... }: {
-  perSystem = { pkgs, ... }: {
-    packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
-      inherit pkgs;
-      # settings = (builtins.fromJSON (builtins.readFile ./noctalia.json)).settings;
-    };
-  };
-}
@@ -1,10 +1,20 @@
 { self, inputs, ... }: {
+  flake.modules.nixos.onepassword = { config, ... }: {
+    programs._1password.enable = true;
+    programs._1password-gui = {
+      enable = true;
+      # Certain features, including CLI integration and system authentication support,
+      # require enabling PolKit integration on some desktop environments (e.g. Plasma).
+      polkitPolicyOwners = [ "john" ];
+      # TODO this should not be a hardcoded username
+    };
+  };
+
  flake.modules.homeManager.onepassword = { config, ... }: {
    home.file.".config/1Password/ssh/agent.toml".text = ''
      # https://developer.1password.com/docs/ssh/agent/config
      [[ssh-keys]]
      vault = "Private"
    '';
-    programs.ssh.matchBlocks."*".identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
  };
 }
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 let
  inputs' = inputs;  # save a reference before it's shadowed
 in
@@ -14,84 +14,84 @@ in
    imports = [ inputs.sops-nix.nixosModules.sops ];
  };

-  # Define the homeModules that are used by flake-parts
-  # https://flake.parts/options/home-manager.html#opt-flake.modules.homeManager
-  flake.modules.homeManager.mysops = { inputs, config, pkgs, lib, ... }:
-  let
-    cfg = config.mysops;
-    sopsBin = lib.getExe pkgs.sops;
-    sopsConfigPath = ../../.sops.yaml;
-    sopsSecretsPath = ../../keys/secrets.yaml;
-
-    editScript = lib.optional (cfg.hostSecretFile != null) (pkgs.writeShellScriptBin  "edit-secrets" ''
-      ${sopsBin} --config ${sopsConfigPath} ${cfg.hostSecretFile}
-    '');
-  in
-  {
-    imports = [
-      # This import makes the sops config attribute available below
-      inputs'.sops-nix.homeManagerModules.sops
-    ];
-
-    options.mysops = {
-      ageKeyFile = lib.mkOption {
-        description = "Default location for the age key";
-        type = lib.types.str;
-        default = "${config.xdg.configHome}/sops/age/keys.txt";
-      };
-      hostSecretFile = lib.mkOption {
-        description = "Path to the secrets file for this host. Used to create the edit-secrets script";
-        type = lib.types.nullOr lib.types.str;
-        default = null;
-      };
-    };
-
-    config =
+  flake.modules.homeManager.mysops =
+    { config, pkgs, lib, ... }:
    let
-      echo = lib.getExe' pkgs.coreutils "echo";
-      dirname = lib.getExe' pkgs.coreutils "dirname";
-      mkdir = lib.getExe' pkgs.coreutils "mkdir";
-      show-age-key = (pkgs.writeShellScriptBin "show-age-key" ''
-        ${lib.getExe' pkgs.age "age-keygen"} -y ${cfg.ageKeyFile}
-      '');
+      cfg = config.mysops;
    in
    {
-      home.packages = with pkgs; [
-        eza
-        age
-        sops # This is necessary to make the sops binary available
-        ssh-to-age
-        (writeShellScriptBin "gen-age-key" ''
-          set -eu
+      imports = [
+        # This import makes the sops config attribute available below
+        inputs'.sops-nix.homeManagerModules.sops
+      ];

-          if [ ! -f "${config.ssh.identityFile}" ]; then
-            ${echo} "SSH identity file not found: ${config.ssh.identityFile}" >&2
-            exit 1
-          fi
+      options.mysops = {
+        hostSecretFile = lib.mkOption {
+          description = "Path to the secrets file for this host. Used to create the edit-secrets script";
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+        };
+      };

-          if [ -e "${cfg.ageKeyFile}" ]; then
-            ${echo} "Refusing to overwrite existing age key file: ${cfg.ageKeyFile}" >&2
-            exit 1
-          fi
+      config =
+        let
+          my-sops = (inputs.self.wrappers.mySops.apply {
+            inherit pkgs;
+            sshKey = config.ssh.identityFile;
+          }).wrapper;
+        in
+        {
+          # Option definitions for the sops home-manager module:
+          # https://github.com/Mic92/sops-nix/blob/master/modules/home-manager/sops.nix
+          sops = {
+            defaultSopsFile = ../../keys/secrets.yaml;
+            defaultSopsFormat = "yaml";
+            age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
+          };

-          ${mkdir} -p "$(${dirname} "${cfg.ageKeyFile}")"
-          ${lib.getExe pkgs.ssh-to-age} -i ${config.ssh.identityFile} -private-key > ${cfg.ageKeyFile}
-          ${echo} -n "Created ${cfg.ageKeyFile}: "
-          ${echo} $(${lib.getExe show-age-key})
-        '')
-        show-age-key
-        (writeShellScriptBin "ls-secrets" "${lib.getExe pkgs.eza} -alT --follow-symlinks ~/.config/sops-nix/secrets")
-      ] ++ editScript;
+          home.packages = with pkgs; [
+            my-sops
+            (inputs.wrappers.lib.wrapPackage {
+              binName = "ls-secrets";
+              inherit pkgs;
+              package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-eza;
+              args = [
+                "-T" "--follow-symlinks"
+                "${config.xdg.configHome}/sops-nix/secrets"
+              ];
+            })
+            
+          ]
+          ++ lib.optional (cfg.hostSecretFile != null) (inputs.wrappers.lib.wrapPackage {
+            binName = "edit-secrets";
+            inherit pkgs;
+            package = my-sops;
+            args = [ cfg.hostSecretFile ];
+          });
+        };
+    };

-      home.shellAliases.sops = "${sopsBin} --config ${sopsConfigPath}";
-
-      # Option definitions for the sops home-manager module:
-      # https://github.com/Mic92/sops-nix/blob/master/modules/home-manager/sops.nix
-      sops = {
-        defaultSopsFile = sopsSecretsPath;
-        defaultSopsFormat = "yaml";
-        age.sshKeyPaths = [ "${config.ssh.identityFile}" ];
+  flake.wrappers.mySops = inputs.wrappers.lib.wrapModule ({config, lib, wlib, ... }: {
+    options = {
+      sshKey = lib.mkOption {
+        type = lib.types.str;
+        description = "String path to the SSH key to use for creating an AGE key at runtime";
      };
    };
-  };
+
+    config = {
+      # binName = "my-sops";
+      package = config.pkgs.sops;
+      extraPackages = with config.pkgs; [ coreutils ssh-to-age ];
+      preHook = ''
+        AGE_KEY=$(umask 077; mktemp)
+        ssh-to-age -private-key -i ${config.sshKey} > "$AGE_KEY"
+      '';
+      flags."--config" = "${../../.sops.yaml}";
+      postHook = ''
+        rm "$AGE_KEY"
+        echo "Removed $AGE_KEY"
+      '';
+    };
+  });
 }
@@ -0,0 +1,54 @@
+{ self, inputs, ... }: {
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.starship = (inputs.wrappers.wrapperModules.starship.apply {
+      inherit pkgs;
+      settings = lib.recursiveUpdate (lib.importTOML (pkgs.fetchurl {
+          url = https://starship.rs/presets/toml/catppuccin-powerline.toml;
+          sha256 = "1jzbbzm3nwdlldq43aj3csp0ps23fsa6x2225z85l0s9qbj4cdy2";
+        })) {
+          palette = "catppuccin_mocha";
+          add_newline = true;
+          line_break.disabled = false;
+          git_status.diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+          cmd_duration.format = "󰔛 $duration";
+          cmd_duration.show_notifications = false;
+          hostname = {
+            disabled = false;
+            ssh_symbol = "🌐";
+            format = "[$ssh_symbol$hostname]($style)";
+            style = "bg:red fg:crust";
+          };
+          os.symbols.NixOS = " ";
+          format = lib.replaceStrings ["\n"] [""] ''
+            [](red)
+            $os
+            $username
+            $hostname
+            [](bg:peach fg:red)
+            $directory
+            [](bg:yellow fg:peach)
+            $git_branch
+            $git_status
+            [](fg:yellow bg:green)
+            $c
+            $rust
+            $golang
+            $nodejs
+            $php
+            $java
+            $kotlin
+            $haskell
+            $python
+            [](fg:green bg:sapphire)
+            $conda
+            [](fg:sapphire bg:lavender)
+            $time
+            [ ](fg:lavender)
+            $cmd_duration
+            $line_break
+            $character
+          '';
+        };
+    }).wrapper;
+  };
+}
@@ -1,37 +0,0 @@
-{ self, inputs, ... }: {
-  #
-  # Home Manager Module
-  #
-  flake.modules.homeManager.step-ssh-user = { config, pkgs, lib, ... }:
-  let
-    cfg = config.step-ssh-user;
-    firstPrincipal = lib.head cfg.principals;
-    principalArgs = lib.concatMapStringsSep " "
-      (principal: "--principal \"${principal}\"") cfg.principals;
-  in
-  {
-    options.step-ssh-user = {
-      enable = lib.mkEnableOption "opionated step client config for SSH certs";
-      provisioner = lib.mkOption {
-        type = lib.types.str;
-        default = "admin";
-      };
-      principals = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-      };
-    };
-    config = lib.mkIf cfg.enable {
-      sops.secrets."janus/admin_jwk".mode = "0400";
-      home.packages = with pkgs; [
-        (writeShellScriptBin "sign-ssh-cert" ''
-          ${lib.getExe pkgs.step-cli} ssh certificate \
-          --sign \
-          ${principalArgs} \
-          --provisioner "${cfg.provisioner}" \
-          --provisioner-password-file "${config.sops.secrets."janus/admin_jwk".path}" \
-          "${firstPrincipal}" "${config.ssh.identityFile}.pub"
-        '')
-      ];
-    };
-  };
-}
@@ -2,39 +2,13 @@
  flake.modules.nixos.wireguard = { config, pkgs, lib, ... }:
  let
    wgInterface = "platform";
-    systemctl = lib.getExe' pkgs.systemd "systemctl";
-    journalctl = lib.getExe' pkgs.systemd "journalctl";
-
-    mkConnect = interface:
-      let
-        serviceName = "wg-quick-${interface}";
-        service = "${serviceName}.service";
-      in
-      pkgs.writeShellScriptBin "wg-connect-${interface}" ''
-        ${systemctl} start ${service}
-        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
-        ${journalctl} -u ${service} --since "$start_time" --no-pager
-      '';
-    mkDisconnect = interface:
-      let
-        serviceName = "wg-quick-${interface}";
-        service = "${serviceName}.service";
-      in
-      pkgs.writeShellScriptBin "wg-disconnect-${interface}" ''
-        STOPTIME=$(${lib.getExe' pkgs.coreutils "date"} '+%Y-%m-%d %H:%M:%S')
-        ${systemctl} stop ${service}
-        start_time=$(${systemctl} show -p ActiveEnterTimestamp ${serviceName} | cut -d= -f2)
-        ${journalctl} -u ${service} --since "$STOPTIME" --no-pager
-      '';
  in
  {
    imports = [ inputs.sops-nix.nixosModules.sops ];

    environment.systemPackages = with pkgs; [
-      wireguard-tools
-      wg-netmanager
-      (mkConnect "platform")
-      (mkDisconnect "platform")
+      wireguard-tools # https://github.com/WireGuard/wireguard-tools
+      # wg-netmanager # https://github.com/gin66/wg_netmanager
    ];

    sops.secrets.wireguard_private_key = { };
@@ -56,4 +30,39 @@
      };
    };
  };
-}
+
+  perSystem = { system, pkgs, lib, ... }:
+  let
+    connect = pkgs.writeShellApplication {
+      name = "wg-platform-connect";
+      text = ''
+        sudo systemctl start wg-quick-platform.service
+        START_TIME=$(sudo systemctl show -p ActiveEnterTimestamp wg-quick-platform | cut -d= -f2)
+        journalctl -u wg-quick-platform --since "$START_TIME" --no-pager
+      '';
+    };
+
+    disconnect = pkgs.writeShellApplication {
+      name = "wg-platform-disconnect";
+      text = ''
+        STOP_TIME=$(date '+%Y-%m-%d %H:%M:%S')
+        systemctl stop wg-quick-platform.service
+        journalctl -u wg-quick-platform.service --since "$STOP_TIME" --no-pager
+      '';
+    };
+  in
+  {
+    packages.wg-platform = inputs.wrappers.lib.wrapPackage {
+      inherit pkgs;
+      runtimeInputs = with pkgs; [ coreutils systemd wireguard-tools ];
+      package = pkgs.symlinkJoin {
+        name = "wg-platform";
+        meta.mainProgram = "wg-platform-connect";
+        paths = [
+          connect
+          disconnect
+        ];
+      };
+    };
+  };
+}
@@ -0,0 +1,11 @@
+{ self, inputs, ... }: {
+  # https://github.com/Lassulus/wrappers/blob/main/modules/yazi/module.nix
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.yazi = (inputs.wrappers.wrapperModules.yazi.apply {
+      inherit pkgs;
+      settings = {
+        mgr.ratio = [ 1 4 3 ];
+      };
+    }).wrapper;
+  };
+}
@@ -0,0 +1,39 @@
+{ self, ... }:
+let
+  packageName = "zed-editor";
+  vulkanIcd = "/usr/share/vulkan/icd.d/nvidia_icd.json";
+  eglVendor = "/usr/share/glvnd/egl_vendor.d/10_nvidia.json";
+in
+{
+  perSystem = { pkgs, ... }: {
+    packages."${packageName}" = pkgs.symlinkJoin {
+      name = "zed-editor-host-gpu";
+      paths = [ pkgs.zed-editor ];
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      meta = pkgs.zed-editor.meta // {
+        mainProgram = "zeditor";
+      };
+      postBuild = ''
+        for exe in $out/bin/*; do
+          wrapProgram "$exe" \
+            --unset WAYLAND_DISPLAY \
+            --unset GDK_BACKEND \
+            --set VK_DRIVER_FILES ${vulkanIcd} \
+            --set VK_ICD_FILENAMES ${vulkanIcd} \
+            --set __EGL_VENDOR_LIBRARY_FILENAMES ${eglVendor} \
+            --set __GLX_VENDOR_LIBRARY_NAME nvidia
+        done
+      '';
+    };
+  };
+
+  flake.modules.homeManager.zed-editor = { pkgs, ... }: {
+    home.packages = [ pkgs.vulkan-tools ];
+
+    programs.zed-editor = {
+      enable = true;
+      package = self.packages.${pkgs.stdenv.hostPlatform.system}."${packageName}";
+      installRemoteServer = true;
+    };
+  };
+}
@@ -1,6 +1,25 @@
 { self, inputs, ... }:
 let
  username = "john";
+  historySize = 10000;
+  homeEndKeyBindings = ''
+    # Normalize common Home/End escape sequences across terminal emulators.
+    bindkey "^[[H" beginning-of-line
+    bindkey "^[[F" end-of-line
+    bindkey "^[[1~" beginning-of-line
+    bindkey "^[[4~" end-of-line
+    bindkey "^[[7~" beginning-of-line
+    bindkey "^[[8~" end-of-line
+    bindkey "^[OH" beginning-of-line
+    bindkey "^[OF" end-of-line
+    bindkey "^[[3~" delete-char
+
+    # Normalize common Ctrl+Arrow sequences for word-wise movement.
+    bindkey "^[[1;5D" backward-word
+    bindkey "^[[1;5C" forward-word
+    bindkey "^[[5D" backward-word
+    bindkey "^[[5C" forward-word
+  '';
 in
 {
  flake.modules = {
@@ -16,11 +35,14 @@ in
    homeManager.zsh = { pkgs, config, ... }: {
      programs.zsh = {
        enable = true;
-        package = pkgs.zsh;
+        package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh;
        enableCompletion = true;
        autosuggestion.enable = true;
        # syntaxHighlighting.enable = true;
-        initContent = "HOST=$(hostname -s)";
+        initContent = ''
+          HOST=$(hostname -s)
+          ${homeEndKeyBindings}
+        '';
        dotDir = "${config.xdg.configHome}/zsh";
        history = {
          append = true;
@@ -31,8 +53,8 @@ in
            "eza"
            "clear"
          ];
-          save = 1000;
-          size = 1000;
+          save = historySize;
+          size = historySize;
          share = true;
        };
        oh-my-zsh = {
@@ -51,138 +73,77 @@ in
    };
  };

-  perSystem = { system, pkgs, ... }: {
-    packages.jsl-zsh = inputs.wrapper-modules.wrappers.zsh.wrap {
-      inherit pkgs;
-      extraPackages = with pkgs; [
-        inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.neovim-min
-        btop
-        coreutils
-        curl
-        wget
-        yazi
-        zsh
-      ];
-    };
-
-    packages.neovim-min = ((inputs.nvf.lib.neovimConfiguration {
-      inherit pkgs;
-      modules = [
-        {
-          # https://nvf.notashelf.dev/search.html
-          config.vim = {
-            options = {
-              number = true;
-              relativenumber = true;
-              expandtab = true;
-              shiftwidth = 4;
-              tabstop = 4;
-              softtabstop = 4;
-
-              wrap = true;
-              linebreak = true;
-            };
-
-            syntaxHighlighting = true;
-
-            # Enable custom theming options
-            theme.enable = true;
-            theme.name = "catppuccin";
-            theme.style = "mocha";
-
-            git.enable = true;
-            # git.neogit.enable = true;
-            extraPlugins = with pkgs.vimPlugins; {
-              icons = {
-                package = nvim-web-devicons;
-              };
-              octo = {
-                package = octo-nvim;
-                setup = "require('octo').setup {}";
-                after = ["telescope" "icons"];
-              };
-            };
-
-            # https://github.com/akinsho/toggleterm.nvim
-            terminal.toggleterm.enable = true;
-            terminal.toggleterm.lazygit.enable = true;
-            terminal.toggleterm.lazygit.direction = "float";
-            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
-
-            utility.nix-develop.enable = true;
-
-            filetree.neo-tree.enable = true;
-
-            telescope = {
-              enable = true;
-              extensions  = [
-                {
-                  name = "fzf";
-                  packages = [pkgs.vimPlugins.telescope-fzf-native-nvim];
-                  setup = {fzf = {fuzzy = true;};};
-                }
-              ];
-            };
-
-            languages = {
-              enableTreesitter = true;
-              enableFormat = true;
-
-              markdown = {
-                enable = true;
-                extensions = {
-                  markview-nvim.enable = true;
-                };
-              };
-
-              bash.enable = true;
-              yaml.enable = true;
-              toml.enable = true;
-              nix.enable = true;
-            };
-
-            keymaps = [
-              {
-                desc = "Edit key mappings";
-                key = "<leader>ekm";
-                mode = [ "n" ];
-                silent = false;
-                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
-              }
-              {
-                desc = "Home Manager Switch";
-                key = "<leader>nhms";
-                mode = [ "n" ];
-                silent = false;
-                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
-              }
-              {
-                desc = "Key Maps [Telescope]";
-                key = "<leader>fkm";
-                mode = "n";
-                silent = false;
-                action = "<cmd>:Telescope keymaps<CR>";
-              }
-              {
-                desc = "Toggle Filesystem Tree [NeoTree]";
-                key = "<C-b>";
-                mode = [ "n" "v" "t" ];
-                silent = false;
-                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
-              }
-              {
-                key = "<C-`>";
-                mode = ["n" "v" "t"];
-                silent = false;
-                action = "<cmd>:ToggleTerm<CR>";
-              } 
-            ];
+  perSystem = { config, self', pkgs, lib, ... }: {
+    packages.jsl-zsh =
+      let
+        ignorePatterns = [
+          "ls" "eza" "history" "clear"
+        ];
+        aliasStr = lib.concatStringsSep "\n" (
+          lib.mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") {
+            ls = "eza";
+            ll = "eza -l";
+            la = "eza -a";
+            lt = "eza --tree";
+            lla = "eza -la";
+            ds = "gdu -i /snap /";
+            ld = "lazydocker";
+          });
+      in
+      (inputs.wrappers.wrapperModules.zsh.apply {
+        inherit pkgs;
+        binName = "jsl-zsh";
+        env = {
+          LANG = "en_US.UTF-8";
+          COLORTERM = "truecolor";
+          DEVENV_SHELL_TYPE = "zsh";
+        };
+        settings = {
+          completion = {
+            enable = true;
+            extraCompletions = true;
+            caseInsensitive = true;
+            fuzzySearch = true;
          };
-        }
-      ];
-    }).neovim).overrideAttrs (old: {
-      pname = "neovim-min";
-      version = "custom";
-    });
+          autoSuggestions = {
+            enable = true;
+            strategy = [ "history" "completion" ];
+          };
+          history = {
+            append = true;
+            expanded = true;
+            share = true;
+            ignoreAllDups = true;
+            ignoreSpace = true;
+          };
+          integrations = {
+            fzf.enable = true;
+            starship = {
+              enable = true;
+              package = self'.packages.starship;
+            };
+            zoxide.enable = true;
+          };
+        };
+        extraRC = ''
+          ${homeEndKeyBindings}
+
+          HISTFILE=$HOME/.config/zsh/.zsh_history
+          SAVEHIST=${toString historySize}
+          HISTORY_IGNORE=${lib.escapeShellArg "(${lib.concatStringsSep "|" ignorePatterns})"}
+
+          HOSTNAME=$(hostname -s)
+          ${aliasStr}
+
+          eval "$(devenv hook zsh)"
+        '';
+        extraPackages = with pkgs; [
+          lazygit
+          lazydocker
+          devenv
+          self'.packages.shell-tools
+          self'.packages.neovim-min
+        ];
+      }).wrapper;
  };
-}
+}
@@ -53,7 +53,7 @@ in
      };

      programs.ssh.knownHosts = lib.mkIf cfg.certificates.enable {
-        "192.168.1.*" = { 
+        "192.168.1.*" = {
          certAuthority = true;
          publicKey = sshHostCAPubKey;
        };
@@ -102,6 +102,7 @@ in
        certs = mkEnableOption "Enable Janus and Soteria SSH targets";
        homelab = mkEnableOption "Enable various Homelab targets";
        dev = mkEnableOption "Enable development targets";
+        tailscale = mkEnableOption "Enable tailscale targets";
      };
    };

@@ -125,74 +126,90 @@ in
          SetEnv TERM="xterm-256color"
        '';

-        matchBlocks = lib.mkMerge [
+        settings = lib.mkMerge [
          {
            "john-pc-ubuntu" = {
-              hostname = "192.168.1.85";
+              HostName = "192.168.1.85";
            };

            "*" = lib.mkMerge [
              {
-                user = "john";
+                User = "john";
+                IdentityAgent = "${config.home.homeDirectory}/.1password/agent.sock";

-                compression = false;
-                serverAliveInterval = 0;
-                serverAliveCountMax = 3;
+                Compression = false;
+                ServerAliveInterval = 0;
+                ServerAliveCountMax = 3;

-                identitiesOnly = true;
-                inherit identityFile;
+                IdentitiesOnly = true;
+                IdentityFile = identityFile;

-                hashKnownHosts = false;
-                userKnownHostsFile = cfg.knownHostsFile;
+                HashKnownHosts = false;
+                UserKnownHostsFile = cfg.knownHostsFile;

-                addKeysToAgent = "yes";
-                forwardAgent = false;
+                AddKeysToAgent = "yes";
+                ForwardAgent = false;
              }
-              (lib.mkIf cfg.certificates.enable { inherit certificateFile; })
+              (lib.mkIf cfg.certificates.enable { CertificateFile = certificateFile; })
            ];
          }
          (lib.mkIf cfg.matchSets.appdaemon {
            "appdaemon" = {
-              hostname = "192.168.1.242";
-              user = "appdaemon";
+              HostName = "192.168.1.242";
+              User = "appdaemon";
            };
            "ad-nix" = {
-              hostname = "192.168.1.201";
-              user = "appdaemon";
+              HostName = "192.168.1.201";
+              User = "appdaemon";
            };
          })
          (lib.mkIf cfg.matchSets.certs {
            "janus" = {
-              hostname = "janus.john-stream.com";
-              user = "root";
+              HostName = "janus.john-stream.com";
+              User = "root";
            };
            "soteria" = {
-              hostname = "soteria.john-stream.com";
-              user = "john";
+              HostName = "soteria.john-stream.com";
+              User = "john";
            };
          })
          (lib.mkIf cfg.matchSets.homelab {
            "docs" = {
-              hostname = "192.168.1.110";
-              user = "root";
+              HostName = "192.168.1.110";
+              User = "root";
+              RequestTTY = "force";
+              RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
            };
            "gitea" = {
-              hostname = "192.168.1.104";
-              user = "john";
+              HostName = "192.168.1.104";
+              User = "john";
            };
            "hermes" = {
-              hostname = "192.168.1.150";
-              user = "root";
+              HostName = "192.168.1.150";
+              User = "root";
+              # Enabling this breaks the ability of Zed to install its remote stuff
+              # RequestTTY = "force";
+              # RemoteCommand = "/root/.nix-profile/bin/jsl-zsh";
            };
            "panoptes" = {
-              hostname = "192.168.1.107";
-              user = "panoptes";
+              HostName = "192.168.1.107";
+              User = "panoptes";
            };
          })
          (lib.mkIf cfg.matchSets.dev {
            "test-nix" = {
-              hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
-              user = "john";
+              HostName = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
+              User = "john";
+              RequestTTY = "auto";
+              # RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
+            };
+          })
+          (lib.mkIf cfg.matchSets.tailscale {
+            "jdl-docker" = {
+              HostName = "jdl-docker.tailcf205.ts.net";
+              User = "john";
+              RequestTTY = "auto";
+              # RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
            };
          })
        ];
@@ -1,6 +1,10 @@
 { self, inputs, lib, ... }:
 let
  username = "john";
+  baseUserModules = self.factory.user {
+    username = username;
+    isAdmin = true;
+  };
 in
 {
  flake.meta.users."${username}" = {
@@ -8,41 +12,38 @@ in
    name = "John Lancaster";
    inherit username;
    key = "";
-    keygrip = [
-    ];
+    keygrip = [ ];
    authorizedKeys = [
      # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAUa4dcg1TWc4pW++uodyhX4eOqrX/QYIxFWtEP7HFJ john@john-pc-ubuntu"
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOkGLo4N/L3RYvaIZ1FmePlxa1HK0fMciZxKtRhN58F root@janus"
    ];
  };

-  flake.modules = lib.mkMerge [
-    (self.factory.user {
-      username = username;
-      isAdmin = true;
-    })
-    {
-      nixos."${username}" = {
-        imports = [
-          inputs.home-manager.nixosModules.home-manager
-        ];
-        users.users."${username}" = {
-          openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
-        };
+  flake.modules = {
+    nixos."${username}" = { ... }: {
+      imports = [
+        baseUserModules.nixos."${username}"
+      ];
+      users.users."${username}" = {
+        openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
      };
+    };

-      # This module will be imported by the user factory
-      homeManager."${username}" = with inputs.self.meta.users."${username}"; {
+    # This module will be imported by the user factory
+    homeManager."${username}" = { pkgs, ... }:
+      with inputs.self.meta.users."${username}"; {
        home.stateVersion = "25.11";
+        imports = [
+          inputs.self.modules.homeManager.shell-tools
+          inputs.self.modules.homeManager.ssh
+          inputs.self.modules.homeManager.git
+        ];
+        # home.packages = [
+        #   inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.shell-tools
+        # ];
        xdg.enable = true;
        programs.git.settings.user.name = name;
        programs.git.settings.user.email = email;
-        imports = with inputs.self.modules.homeManager; [
-          ssh
-          shell-tools
-          git
-        ];
      };
-    }
-  ];
+  };
 }
@@ -0,0 +1,212 @@
+#!/usr/bin/env bash
+set -u
+
+# --- pretty output helpers ---
+BOLD="\033[1m"
+DIM="\033[2m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+RED="\033[31m"
+CYAN="\033[36m"
+RESET="\033[0m"
+
+section() {
+  echo
+  echo -e "${BOLD}${CYAN}==> $1${RESET}"
+}
+
+ok()   { echo -e "${GREEN}[OK]${RESET} $1"; }
+warn() { echo -e "${YELLOW}[WARN]${RESET} $1"; }
+err()  { echo -e "${RED}[ERR]${RESET} $1"; }
+info() { echo -e "${DIM}$1${RESET}"; }
+
+has_cmd() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+found_process=0
+found_render_node=0
+found_gpu_libs=0
+software_rasterizer=0
+
+section "1) Find a running Ghostty process"
+info "What this does: tries the same two process lookups you ran (pgrep and pidof)."
+info "Good outcome: at least one PID is returned."
+
+echo -e "${DIM}\$ pgrep -x ghostty${RESET}"
+PGREP_OUT="$(pgrep -x ghostty || true)"
+if [[ -n "${PGREP_OUT}" ]]; then
+  echo "${PGREP_OUT}"
+else
+  echo "<no output>"
+fi
+
+echo -e "${DIM}\$ pidof ghostty${RESET}"
+PIDOF_OUT="$(pidof ghostty || true)"
+if [[ -n "${PIDOF_OUT}" ]]; then
+  echo "${PIDOF_OUT}"
+else
+  echo "<no output>"
+fi
+
+if [[ -n "${PGREP_OUT}" || -n "${PIDOF_OUT}" ]]; then
+  found_process=1
+  ok "Ghostty process detected."
+else
+  warn "No Ghostty process found yet by either command."
+fi
+
+section "2) Set GHOSTTY_PID"
+info "What this does: picks one Ghostty PID for all later checks."
+info "Good outcome: GHOSTTY_PID is set to a valid running Ghostty process."
+
+# Prefer step-1 outputs first (avoids re-running lookups that may block on some systems).
+GHOSTTY_PID=""
+if [[ -n "${PGREP_OUT}" ]]; then
+  GHOSTTY_PID="$(printf '%s\n' "${PGREP_OUT}" | head -n1)"
+  info "Using PID from step-1 pgrep output."
+elif [[ -n "${PIDOF_OUT}" ]]; then
+  GHOSTTY_PID="$(printf '%s\n' "${PIDOF_OUT}" | awk '{print $1}')"
+  info "Using PID from step-1 pidof output."
+else
+  echo -e "${DIM}\$ pgrep -xo ghostty${RESET}"
+  if has_cmd timeout; then
+    PGREP_RAW="$(timeout 3s pgrep -xo ghostty 2>&1)"
+    pgrep_status=$?
+    if (( pgrep_status == 124 )); then
+      warn "pgrep timed out after 3 seconds."
+    fi
+  else
+    PGREP_RAW="$(pgrep -xo ghostty 2>&1)"
+    pgrep_status=$?
+  fi
+
+  if (( pgrep_status == 0 )); then
+    GHOSTTY_PID="$(printf '%s\n' "${PGREP_RAW}" | head -n1)"
+  else
+    if [[ -n "${PGREP_RAW}" ]]; then
+      warn "[pgrep] ${PGREP_RAW}"
+    fi
+    warn "pgrep exit code: ${pgrep_status} (1 usually means no matching process)."
+
+    echo -e "${DIM}\$ pidof ghostty${RESET}"
+    PIDOF_RAW="$(pidof ghostty 2>&1)"
+    pidof_status=$?
+
+    if (( pidof_status == 0 )); then
+      GHOSTTY_PID="$(printf '%s\n' "${PIDOF_RAW}" | awk '{print $1}')"
+    else
+      if [[ -n "${PIDOF_RAW}" ]]; then
+        warn "[pidof] ${PIDOF_RAW}"
+      fi
+      warn "pidof exit code: ${pidof_status}"
+      GHOSTTY_PID=""
+    fi
+  fi
+fi
+
+if [[ -z "${GHOSTTY_PID}" ]]; then
+  err "Could not find a running Ghostty process to inspect."
+  echo "Open Ghostty, then run this script again."
+  exit 1
+fi
+
+export GHOSTTY_PID
+ok "Using GHOSTTY_PID=${GHOSTTY_PID}"
+
+section "3) Check for an open GPU render device"
+info "What this does: inspects /proc/<pid>/fd for /dev/dri entries used for rendering."
+info "Good outcome: see /dev/dri/renderD* (for example renderD128)."
+
+if has_cmd rg; then
+  echo -e "${DIM}\$ sudo ls -l /proc/\$GHOSTTY_PID/fd | rg dri${RESET}"
+  DRI_LINES="$(sudo ls -l "/proc/${GHOSTTY_PID}/fd" | rg dri || true)"
+else
+  warn "'rg' not found; using grep instead"
+  echo -e "${DIM}\$ sudo ls -l /proc/\$GHOSTTY_PID/fd | grep dri${RESET}"
+  DRI_LINES="$(sudo ls -l "/proc/${GHOSTTY_PID}/fd" | grep dri || true)"
+fi
+
+if [[ -n "${DRI_LINES}" ]]; then
+  echo "${DRI_LINES}"
+else
+  echo "<no dri-related file descriptors found>"
+fi
+
+if echo "${DRI_LINES}" | grep -q '/dev/dri/renderD'; then
+  found_render_node=1
+  ok "Found /dev/dri/renderD*: strong sign Ghostty is using GPU render infrastructure."
+elif [[ -n "${DRI_LINES}" ]]; then
+  warn "Found /dev/dri entries, but no renderD node in this output."
+else
+  warn "No /dev/dri entries seen for this process."
+fi
+
+section "4) Check mapped graphics libraries"
+info "What this does: reads process memory mappings for GL/EGL/Vulkan/Mesa libraries."
+info "Good outcome: matches like libGL, libEGL, libvulkan, mesa, libgbm, libgallium appear."
+
+echo -e "${DIM}\$ sudo grep -E 'libEGL|libGL|libvulkan|mesa' /proc/\$GHOSTTY_PID/maps | head -n 30${RESET}"
+LIB_LINES="$(sudo grep -E 'libEGL|libGL|libvulkan|mesa' "/proc/${GHOSTTY_PID}/maps" | head -n 30 || true)"
+
+if [[ -n "${LIB_LINES}" ]]; then
+  echo "${LIB_LINES}"
+  found_gpu_libs=1
+  ok "Graphics stack libraries are mapped into Ghostty."
+else
+  echo "<no matches>"
+  warn "No GL/EGL/Vulkan/Mesa mappings matched this filter."
+fi
+
+section "5) Optional probe for software rasterizer vs hardware driver hints"
+info "What this does: scans for common software rasterizer strings (llvmpipe/swrast) and driver names."
+info "Good outcome: no llvmpipe/swrast matches. Driver-name matches can vary by stack."
+
+echo -e "${DIM}\$ sudo grep -Ei 'llvmpipe|swrast|iris|radeonsi|nouveau|zink|nvidia|_dri\\.so' /proc/\$GHOSTTY_PID/maps${RESET}"
+PROBE_LINES="$(sudo grep -Ei 'llvmpipe|swrast|iris|radeonsi|nouveau|zink|nvidia|_dri\.so' "/proc/${GHOSTTY_PID}/maps" || true)"
+
+if [[ -n "${PROBE_LINES}" ]]; then
+  echo "${PROBE_LINES}"
+  if echo "${PROBE_LINES}" | grep -Eiq 'llvmpipe|swrast'; then
+    software_rasterizer=1
+    warn "Software rasterizer markers detected (llvmpipe/swrast)."
+  else
+    ok "Driver-related markers detected and no software rasterizer markers found."
+  fi
+else
+  ok "No probe matches found. This is often fine; absence of llvmpipe/swrast is usually good."
+fi
+
+section "Final interpretation"
+if (( found_process == 1 )); then
+  ok "Process check: PASS"
+else
+  warn "Process check: no process found initially (script still proceeded once PID was resolved)."
+fi
+
+if (( found_render_node == 1 )); then
+  ok "Render node check: PASS (/dev/dri/renderD* present)"
+else
+  warn "Render node check: no explicit renderD node found"
+fi
+
+if (( found_gpu_libs == 1 )); then
+  ok "Graphics library check: PASS"
+else
+  warn "Graphics library check: no matches"
+fi
+
+if (( software_rasterizer == 1 )); then
+  warn "Software rasterizer check: POSSIBLE software rendering path"
+else
+  ok "Software rasterizer check: no llvmpipe/swrast markers detected"
+fi
+
+echo
+if (( found_render_node == 1 && found_gpu_libs == 1 && software_rasterizer == 0 )); then
+  ok "Overall: strong evidence Ghostty is using GPU acceleration."
+else
+  warn "Overall: mixed signals. Consider running a live GPU activity monitor during terminal redraw stress."
+fi
+
+ok "Summary complete for PID ${GHOSTTY_PID}"
Author	SHA1	Message	Date
John Lancaster	021ca1ba83	added steam to omen	2026-06-14 20:47:34 -05:00
John Lancaster	4bd11e1047	audio stuff in nixos-base	2026-06-14 20:47:22 -05:00
John Lancaster	ff80098418	niri hotkey changes	2026-06-14 18:05:13 -05:00
John Lancaster	3265669503	security stuff in nixos-base	2026-06-14 18:04:27 -05:00
John Lancaster	7294e04ae2	onepassword module	2026-06-14 13:17:05 -05:00
John Lancaster	3e1d438453	desktop import	2026-06-14 12:50:36 -05:00
John Lancaster	2f653b95ce	added websockets	2026-06-14 12:43:31 -05:00
John Lancaster	1c1515678a	created nixos-base	2026-06-14 12:25:33 -05:00
John Lancaster	ee4839877c	null fixes	2026-06-14 11:31:33 -05:00
John Lancaster	fc2325e70b	fix	2026-06-14 11:21:01 -05:00
John Lancaster	2ae5eb9547	niri hotkeys	2026-06-14 11:15:27 -05:00
John Lancaster	ba305e29fd	WIP noctalia rendering	2026-06-14 10:58:26 -05:00
John Lancaster	deda2c9bbc	WIP greetd	2026-06-14 10:06:43 -05:00
John Lancaster	10c8c887db	WIP greetd	2026-06-14 10:02:11 -05:00
John Lancaster	7b2dffbccf	WIP niri greeter	2026-06-14 09:41:14 -05:00
John Lancaster	95f382107d	separated wrapped nixGL packages	2026-06-14 08:37:30 -05:00
John Lancaster	3cd3099987	added greetd	2026-06-14 08:33:00 -05:00
John Lancaster	775543224e	moved	2026-06-14 08:29:56 -05:00
John Lancaster	aff608c1ce	login stuff	2026-06-14 08:26:13 -05:00
John Lancaster	ecb640fa45	undo	2026-06-14 08:11:55 -05:00
John Lancaster	ceeba1c786	added spawn-at-startup command to niri	2026-06-14 08:09:18 -05:00
John Lancaster	b8153f0ebc	formatting	2026-06-14 07:52:17 -05:00
John Lancaster	e9ec34f15c	flake.lock update	2026-06-14 07:45:10 -05:00
John Lancaster	6c8ca29751	added john module	2026-06-13 10:46:29 -05:00
John Lancaster	bcd07532db	flake.lock update	2026-06-13 10:06:46 -05:00
John Lancaster	2861c460c2	ssh updates	2026-06-13 10:05:50 -05:00
John Lancaster	6e27e92f89	flake.lock update	2026-06-13 09:43:07 -05:00
John Lancaster	1002e6e0da	wrapped versions of niri and noctalia	2026-06-13 09:27:01 -05:00
John Lancaster	24eeb5967c	initial omen config	2026-06-11 08:28:49 -05:00
John Lancaster	b7f5474893	commented out my-neovim because it's in jsl-zsh	2026-06-10 08:56:50 -05:00
John Lancaster	1667e362aa	gpu stuff for zed on x11	2026-06-10 08:56:04 -05:00
John Lancaster	cd5a49c4a6	commented out mtls for john-pc	2026-06-10 08:54:08 -05:00
John Lancaster	244c60d9cd	moved yazi to shell-tools	2026-06-10 08:53:21 -05:00
John Lancaster	f2254e5dc7	added yazi	2026-06-10 08:53:21 -05:00
John Lancaster	a337ce6f2c	kde updates	2026-06-09 09:06:21 -05:00
John Lancaster	278796f47c	again	2026-06-03 19:43:50 -05:00
John Lancaster	1ab00f286e	obsolete	2026-06-03 19:43:39 -05:00
John Lancaster	771813a064	fixed double description	2026-06-03 19:43:21 -05:00
John Lancaster	722cb78737	gnome 50 update	2026-06-03 19:43:07 -05:00
John Lancaster	6bb73959c6	updated zsh with devenv	2026-06-03 08:50:02 -05:00
John Lancaster	fcff43adb1	flake.lock update	2026-06-03 08:49:24 -05:00
John Lancaster	65751a14c5	format	2026-05-09 10:55:10 -05:00
John Lancaster	05f92d1f59	again	2026-05-08 17:07:32 -05:00
John Lancaster	7c4ce8a637	lazygit restructure	2026-05-08 17:05:54 -05:00
John Lancaster	bb4fa7b82b	more neovim submodules	2026-05-06 22:13:32 -05:00
John Lancaster	dc4df3af29	flake.lock update	2026-05-06 22:13:02 -05:00
John Lancaster	6b8727b29d	started neovim-min	2026-05-06 22:05:02 -05:00
John Lancaster	d64ce644c3	added flake dir output	2026-05-06 20:32:30 -05:00
John Lancaster	4746468a94	created gitignore for result/	2026-05-06 20:32:09 -05:00
John Lancaster	12e7d290a1	ghostty-gpu-check	2026-05-06 20:25:55 -05:00
John Lancaster	24f43872ce	hermes comments	2026-05-06 19:30:05 -05:00
John Lancaster	35bd80424d	sha256 update	2026-05-02 09:47:23 -05:00
John Lancaster	3447b28af1	syntax fix	2026-05-02 09:45:48 -05:00
John Lancaster	2fea8238d1	systemd	2026-05-01 00:11:55 -05:00
John Lancaster	cf1174d36b	consolidation	2026-04-30 22:39:27 -05:00
John Lancaster	bae2b3027e	WIP mtls wrapper	2026-04-30 22:28:35 -05:00
John Lancaster	68483c0231	improvement	2026-04-30 16:36:38 -05:00
John Lancaster	f0eba76e49	mtls-check wrapping openssl kinda working	2026-04-30 16:31:26 -05:00
John Lancaster	8357372b39	mtlsCheck wrapper	2026-04-29 21:46:11 -05:00
John Lancaster	3c4aa74b0f	WIP mtls wrappers	2026-04-29 21:36:16 -05:00
John Lancaster	ed473ddfae	started zed-editor wrapper, package, and home-manager module	2026-04-29 17:46:01 -05:00
John Lancaster	133bad5aef	started mtls wrappers	2026-04-27 09:01:19 -05:00
John Lancaster	3fc08793fe	enabled tailscale ssh block	2026-04-26 19:04:01 -05:00
John Lancaster	7f4fdcf4b9	setting zsh shell	2026-04-26 19:03:44 -05:00
John Lancaster	bfc5da791a	added tailscale ssh block	2026-04-26 18:58:09 -05:00
John Lancaster	9a09399ca3	broke out starship	2026-04-22 23:40:35 -05:00
John Lancaster	cf90d3e876	various reorgs	2026-04-20 23:52:03 -05:00
John Lancaster	443020df4d	formatting	2026-04-20 22:40:08 -05:00
John Lancaster	3fc3beb4ed	test and dev wrappers	2026-04-20 22:38:31 -05:00
John Lancaster	43ae292f39	rename	2026-04-20 21:17:18 -05:00
John Lancaster	026bf541e1	sops with wrappers	2026-04-20 21:13:31 -05:00
John Lancaster	e75951318d	better ssh certs wrappers	2026-04-20 21:13:19 -05:00
John Lancaster	bd236ed977	temp	2026-04-20 16:49:31 -05:00
John Lancaster	b07bf102a4	added jsl-zsh to john-p14s config	2026-04-19 23:38:32 -05:00
John Lancaster	9bfe140367	added name to silence warning	2026-04-19 23:33:57 -05:00
John Lancaster	545a17586e	prune	2026-04-19 23:29:44 -05:00
John Lancaster	685c1bc05a	root fix	2026-04-19 23:29:44 -05:00
John Lancaster	a4f988c223	fix	2026-04-19 23:25:08 -05:00
John Lancaster	a05de7df1f	Added nerd fonts to nixos config for john-p14s	2026-04-19 23:20:06 -05:00
John Lancaster	aace1776d5	sign-ssh-user-cert	2026-04-19 18:54:09 -05:00
John Lancaster	03965917ea	reload-or-restart sshd	2026-04-19 17:49:14 -05:00
John Lancaster	dac6b70445	sign-ssh-host-cert	2026-04-19 17:31:38 -05:00
John Lancaster	932616177a	history fix	2026-04-19 15:59:28 -05:00
John Lancaster	c1bfa64cc8	step-bootstrap	2026-04-19 15:45:06 -05:00
John Lancaster	235cd297c5	silencing warning	2026-04-19 15:13:56 -05:00
John Lancaster	0c91b1d493	fixed histfile	2026-04-19 15:04:06 -05:00
John Lancaster	9825270d64	keybind for delete	2026-04-19 15:03:58 -05:00
John Lancaster	ee9573fc97	removed direnv hook	2026-04-19 14:56:45 -05:00
John Lancaster	d47394d4cc	reordered zshrc	2026-04-19 14:47:24 -05:00
John Lancaster	0abbcf0fd2	added some key bindings for compatibility	2026-04-19 14:45:36 -05:00
John Lancaster	718aa466b6	prune	2026-04-19 14:37:24 -05:00
John Lancaster	916fd41555	background	2026-04-19 14:35:02 -05:00
John Lancaster	65608646bb	ssh updates	2026-04-19 14:33:49 -05:00
John Lancaster	1278177e4d	added hostname to starship format	2026-04-19 14:26:57 -05:00
John Lancaster	f36bb22635	extraOptions for docs	2026-04-19 14:04:23 -05:00
John Lancaster	fe24eb2dde	prune binName	2026-04-19 14:03:48 -05:00
John Lancaster	e9d585f8d0	shell-tools update	2026-04-19 14:02:35 -05:00
John Lancaster	93e58c341d	added lazydocker stuff to jsl-zsh	2026-04-19 11:45:34 -05:00
John Lancaster	b8c73b446c	moved env vars	2026-04-19 10:55:51 -05:00
John Lancaster	58816b2356	variables to correct gdu output	2026-04-19 10:48:07 -05:00
John Lancaster	ca2f5ac7c8	added glibc to runtimeInputs of gdu	2026-04-19 10:32:18 -05:00
John Lancaster	904dd6e329	started wireguard wrapper	2026-04-19 09:38:06 -05:00
John Lancaster	8073125f3e	flake.lock update	2026-04-19 09:37:11 -05:00
John Lancaster	f24a269af3	newline in starship prompt	2026-04-19 09:29:46 -05:00
John Lancaster	a5a10772d1	reworked jsl-zsh	2026-04-17 00:22:45 -05:00
John Lancaster	510a026de7	user@hostname for nhms	2026-04-16 22:20:19 -05:00
John Lancaster	dd47ae94bf	wrapped version of eza	2026-04-16 19:05:04 -05:00