clean up jqr

based on: https://gist.github.com/reegnz/b9e40993d410b75c2d866441add2cb55

flake.lock

@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728385805,
+        "lastModified": 1731642829,
-        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
+        "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
+        "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728687662,
+        "lastModified": 1731549112,
-        "narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
+        "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bdbdb725d632863bdedb80baabf21327614dd237",
+        "rev": "5fd852c4155a689098095406500d0ae3d04654a8",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728694479,
+        "lastModified": 1731718692,
-        "narHash": "sha256-NFFW6RrOTBuIk29LKtAO3MU5Y0ll7zAp9Skd9HvCGfs=",
+        "narHash": "sha256-7CIkVwWznCUy3nQvcSHV1uZ6cvIWqIvckCT4ldzee6k=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "8a3143c1ce147481db4463e71bc3b7002e6ebc56",
+        "rev": "16b0320abb172e6636b4e8dce059023197c7f186",
         "type": "github"
       },
       "original": {
@@ -195,6 +195,24 @@
       "inputs": {
         "systems": "systems"
       },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
         "lastModified": 1710146030,
         "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -208,9 +226,9 @@
         "type": "indirect"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -226,9 +244,9 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_4": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1726560853,
@@ -263,11 +281,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1727357627,
+        "lastModified": 1729786258,
-        "narHash": "sha256-8FJlLw5LApQs7S8xEh2UE9wdYCAweZTbvgozCGPfQJc=",
+        "narHash": "sha256-V5dwIJdxBulFVKk1iSlf4H5NRz1UH7uYQeMvwtgkpIs=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa",
+        "rev": "c7ff4c3ad96cd05664b18fb5bbbe2abbd7682dd2",
         "type": "github"
       },
       "original": {
@@ -283,11 +301,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728685293,
+        "lastModified": 1731604581,
-        "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
+        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
+        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
         "type": "github"
       },
       "original": {
@@ -297,21 +315,43 @@
         "type": "github"
       }
     },
+    "jujutsu": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1731797343,
+        "narHash": "sha256-y33gAd6RJo4O1/AS5yP9quxNkWJTAvOwap1hA9RIo2w=",
+        "owner": "martinvonz",
+        "repo": "jj",
+        "rev": "e8bbd89ec16b9c5f339bb31954eb57769a6e797f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "martinvonz",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
     "mac-app-util": {
       "inputs": {
         "cl-nix-lite": "cl-nix-lite",
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1727470707,
+        "lastModified": 1731385712,
-        "narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
+        "narHash": "sha256-hcPGb+Voh1N+SD3XuwgcwDMA6W/lGkXLCnd3mttoLoA=",
         "owner": "hraban",
         "repo": "mac-app-util",
-        "rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
+        "rev": "9ef4d1c14dab18a95691602bf541cd091fdcc2e3",
         "type": "github"
       },
       "original": {
@@ -323,68 +363,68 @@
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "lastModified": 1719431638,
+        "lastModified": 1726214817,
-        "narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
+        "narHash": "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=",
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
       }
     },
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1710338675,
+        "lastModified": 1729501349,
-        "narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
+        "narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "lastModified": 1718102703,
+        "lastModified": 1729667621,
-        "narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
+        "narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
       }
     },
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1728704544,
+        "lastModified": 1731728847,
-        "narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
+        "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
         "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
       }
     },
     "nix2vim": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1727867024,
+        "lastModified": 1729103549,
-        "narHash": "sha256-yimXLupF3hG57imRMpqWho/Wstcj7P8Yh8t0SBiX+dQ=",
+        "narHash": "sha256-9caCn1wB0bD39bwwjnTsHoDveCUKs06nBe212fs5TKU=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "da26caae6c7776eedbc6514a0f57f1ccd6a759ed",
+        "rev": "b3900e6d79233573f318006505d9ad3fb7170b92",
         "type": "github"
       },
       "original": {
@@ -395,11 +435,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1728176478,
+        "lastModified": 1731200463,
-        "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
+        "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
+        "rev": "e04234d263750db01c78a412690363dc2226e68a",
         "type": "github"
       },
       "original": {
@@ -416,11 +456,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728522165,
+        "lastModified": 1731546190,
-        "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
+        "narHash": "sha256-kJix8nLyFIJ3EC7VtoXK/85C4ZN2dC5oWoS8+ErehqI=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
+        "rev": "06ffce1a8d95e95c06a4bcfa117dd960b14a7101",
         "type": "github"
       },
       "original": {
@@ -431,11 +471,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728492678,
+        "lastModified": 1731319897,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
         "type": "github"
       },
       "original": {
@@ -463,11 +503,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1728627514,
+        "lastModified": 1731652201,
-        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
+        "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
+        "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
         "type": "github"
       },
       "original": {
@@ -479,11 +519,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1728704557,
+        "lastModified": 1731726629,
-        "narHash": "sha256-HnYBB+oE+03rNDzTTVazBcysPOu5udRpTOGpP7/A5Ow=",
+        "narHash": "sha256-eDq+jrosOOzb1OeaYKkDx0g1zgLMnIhmXBnG76953ZE=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "1d143f52b0a046924ee7fe74bce0bd2e10e07c3d",
+        "rev": "be2664b26e2c661b5053239f9f4d8a9b458e5dca",
         "type": "github"
       },
       "original": {
@@ -495,11 +535,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1728582620,
+        "lastModified": 1730367889,
-        "narHash": "sha256-wfui4kE3oxveCJPjJfkJSbE69zVTeAsasDdfJkElmn8=",
+        "narHash": "sha256-vLsyRc8nbJJBjWebNFy5yrS6w2TmibEeMNpyzFenoTg=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "f707b3ae50417067fa63fdfe179b0bff6b380da1",
+        "rev": "36da8dd0ddc4f88e0beae234c20e75397326f143",
         "type": "github"
       },
       "original": {
@@ -528,11 +568,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1728614821,
+        "lastModified": 1731275826,
-        "narHash": "sha256-WYtu+jtsQSFqruTxdzkHE9UQJBE2TGoNoFar36AAoqo=",
+        "narHash": "sha256-YIClwxyw4fNos5OIBZOjM0dlCw+yOhDDnq5jONSu7rs=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe",
+        "rev": "28eac2801b201f301449e976d7a9e8cfde053ba3",
         "type": "github"
       },
       "original": {
@@ -558,6 +598,22 @@
         "type": "github"
       }
     },
+    "osc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731356260,
+        "narHash": "sha256-SvuHH/HfvQfK1Ob+aTjyvKnd1N2jaszpeTQ5SVHz9Mw=",
+        "owner": "theimpostor",
+        "repo": "osc",
+        "rev": "8a313c60d67353669509e9461d22b403df72b5e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theimpostor",
+        "repo": "osc",
+        "type": "github"
+      }
+    },
     "ren": {
       "flake": false,
       "locked": {
@@ -603,6 +659,7 @@
         "gh-collaborators": "gh-collaborators",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
+        "jujutsu": "jujutsu",
         "mac-app-util": "mac-app-util",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
@@ -618,6 +675,7 @@
         "nvim-lspconfig-src": "nvim-lspconfig-src",
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
+        "osc": "osc",
         "ren": "ren",
         "rep": "rep",
         "snipe-nvim-src": "snipe-nvim-src",
@@ -637,14 +695,35 @@
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "jujutsu",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729304879,
+        "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "snipe-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1724418876,
+        "lastModified": 1731254481,
-        "narHash": "sha256-G4g/OzyXhDhX84HkxlhFSy6E+EAGxH+HL1Bw5s5FWHE=",
+        "narHash": "sha256-VZ7h/+7Obc+Q9ukftVezkLrMRAByN9RMWLMQw4oN6g8=",
         "owner": "leath-dub",
         "repo": "snipe.nvim",
-        "rev": "f1abd4aaaef6398b45dcddc9f1a40dd982f732b0",
+        "rev": "e6787c30998b549e75b77b2432bcb7e7c595c30c",
         "type": "github"
       },
       "original": {
@@ -698,6 +777,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
@@ -734,11 +828,11 @@
     "tiny-inline-diagnostic-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1726582328,
+        "lastModified": 1731028203,
-        "narHash": "sha256-NBcUVUSnk2TlbSr/vFTbp3Rh35ms8lAcfDqpmE1KTq4=",
+        "narHash": "sha256-A4v8pZuzuH/MSWYF7Hg7ZQo2HNLqlE7dZMhylPEpTdM=",
         "owner": "rachartier",
         "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7",
+        "rev": "86050f39a62de48734f1a2876d70d179b75deb7c",
         "type": "github"
       },
       "original": {
@@ -767,11 +861,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1725407033,
+        "lastModified": 1731338420,
-        "narHash": "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog=",
+        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "c8713e50f0bd77d080832fc61ad128bc8f2934e9",
+        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
         "type": "github"
       },
       "original": {
@@ -800,11 +894,11 @@
     "tree-sitter-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1725894603,
+        "lastModified": 1729494737,
-        "narHash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
+        "narHash": "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow=",
         "owner": "MunifTanjim",
         "repo": "tree-sitter-lua",
-        "rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
+        "rev": "34e60e7f45fc313463c68090d88d742a55d1bd7a",
         "type": "github"
       },
       "original": {
@@ -833,11 +927,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1725324041,
+        "lastModified": 1731308116,
-        "narHash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
+        "narHash": "sha256-/jYGi2yksifMGPitlS8oM/g3YrR7RJ57imBhEyow/jc=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
+        "rev": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91",
         "type": "github"
       },
       "original": {
@@ -866,11 +960,11 @@
     "tree-sitter-vimdoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1717834376,
+        "lastModified": 1729686839,
-        "narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
+        "narHash": "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=",
         "owner": "neovim",
         "repo": "tree-sitter-vimdoc",
-        "rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
+        "rev": "d2e4b5c172a109966c2ce0378f73df6cede39400",
         "type": "github"
       },
       "original": {
@@ -898,17 +992,17 @@
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1728588346,
+        "lastModified": 1731682434,
-        "narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
+        "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
+        "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -175,6 +175,13 @@
       flake = false;
     };
 
+    # Git alternative
+    # Fixes: https://github.com/martinvonz/jj/issues/4784
+    jujutsu = {
+      url = "github:martinvonz/jj";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Ren and rep - CLI find and replace
     rep = {
       url = "github:robenkleene/rep-grep";
@@ -190,26 +197,32 @@
       flake = false;
     };
 
+    # Clipboard over SSH
+    osc = {
+      url = "github:theimpostor/osc";
+      flake = false;
+    };
+
     # Nextcloud Apps
     nextcloud-news = {
       # https://github.com/nextcloud/news/releases
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
       flake = false;
     };
     nextcloud-external = {
       # https://github.com/nextcloud-releases/external/releases
-      url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
       flake = false;
     };
     nextcloud-cookbook = {
       # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
       flake = false;
     };
     nextcloud-snappymail = {
       # https://github.com/the-djmaze/snappymail/releases
       # https://snappymail.eu/repository/nextcloud
-      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
+      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
       # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
       flake = false;
     };
@@ -260,6 +273,7 @@
       overlays = [
         inputs.nur.overlay
         inputs.nix2vim.overlay
+        inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784
         (import ./overlays/neovim-plugins.nix inputs)
         (import ./overlays/disko.nix inputs)
         (import ./overlays/tree-sitter.nix inputs)
@@ -267,6 +281,7 @@
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
         (import ./overlays/gh-collaborators.nix inputs)
+        (import ./overlays/osc.nix inputs)
         (import ./overlays/ren-rep.nix inputs)
       ];
 

hosts/flame/default.nix

@@ -82,6 +82,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
       services.minecraft-server.enable = true; # Setup Minecraft server
       services.n8n.enable = true;
       services.ntfy-sh.enable = true;
+      services.postgresql.enable = true;
       services.uptime-kuma.enable = true;
       system.autoUpgrade.enable = true;
 

modules/common/applications/1password.nix

@@ -23,7 +23,7 @@
     ];
     home-manager.users.${config.user} = {
       home.packages = [
-        pkgs._1password
+        pkgs._1password-cli
       ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
     };
 

modules/common/default.nix

@@ -77,6 +77,10 @@
       default = [ ];
     };
     hostnames = {
+      audiobooks = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for audiobook server (Audiobookshelf).";
+      };
       files = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for files server (Filebrowser).";

modules/common/neovim/config/lsp.nix

@@ -11,11 +11,6 @@
   options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
   options.github = lib.mkEnableOption "Whether to enable GitHub features";
   options.kubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
-  options.nixosConfiguration = lib.mkOption {
-    type = lib.types.str;
-    description = "Configuration to use for nixd options checking";
-    default = "default";
-  };
 
   config = {
     plugins = [
@@ -48,21 +43,6 @@
     use.lspconfig.nixd.setup = dsl.callWith {
       cmd = [ "${pkgs.nixd}/bin/nixd" ];
       capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-      # settings = {
-      #   nixd = {
-      #     options = {
-      #       nixos = {
-      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.${config.nixosConfiguration}.options";
-      #       };
-      #       home-manager = {
-      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).homeConfigurations.${config.nixosConfiguration}.options";
-      #       };
-      #       darwin = {
-      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.${config.nixosConfiguration}.options";
-      #       };
-      #     };
-      #   };
-      # };
     };
 
     use.lspconfig.pyright.setup = dsl.callWith {

modules/common/neovim/config/toggleterm.lua

@@ -21,7 +21,7 @@ function TERM_TOGGLE()
     basicterminal:toggle()
 end
 
-local nixpkgs = terminal:new({ cmd = "nix repl '<nixpkgs>'" })
+local nixpkgs = terminal:new({ cmd = "nix repl --expr 'import <nixpkgs>{}'" })
 function NIXPKGS_TOGGLE()
     nixpkgs:toggle()
 end

modules/common/neovim/default.nix

@@ -13,7 +13,6 @@ let
     terraform = config.terraform.enable;
     github = true;
     kubernetes = config.kubernetes.enable;
-    nixosConfiguration = config.networking.hostName; # Used for Nixd
   };
 in
 {

modules/common/neovim/package/default.nix

@@ -32,7 +32,6 @@
   terraform ? false,
   github ? false,
   kubernetes ? false,
-  nixosConfiguration ? "default",
   ...
 }:
 
@@ -45,7 +44,6 @@ pkgs.neovimBuilder {
     terraform
     github
     kubernetes
-    nixosConfiguration
     ;
   imports = [
     ../config/align.nix

modules/common/shell/bash/scripts/jqr.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Adapted from: https://gist.github.com/reegnz/b9e40993d410b75c2d866441add2cb55
+
+if [[ -z $1 ]] || [[ $1 == "-" ]]; then
+    input=$(mktemp)
+    trap 'rm -f $input' EXIT
+    cat /dev/stdin >"$input"
+else
+    input=$1
+fi
+
+echo '' |
+    fzf --phony \
+        --height 100% \
+        --preview-window='up:80%' \
+        --query '.' \
+        --print-query \
+        --header $'CTRL-O: jq output\nCTRL-Y: copy output\nALT-Y: copy query' \
+        --preview "jq --color-output -r {q} $input" \
+        --bind "ctrl-o:execute(jq -r {q} $input)+clear-query+accept" \
+        --bind "alt-y:execute(echo {q} | pbcopy)" \
+        --bind "ctrl-y:execute(jq -r {q} $input | pbcopy)"

modules/common/shell/fzf.nix

@@ -41,5 +41,16 @@
         FZF_CTRL_T_COMMAND = fzfCommand;
         FZF_DEFAULT_OPTS = "-m --height 50% --border";
       };
+
+    home.packages = [
+      (pkgs.writeShellApplication {
+        name = "jqr";
+        runtimeInputs = [
+          pkgs.jq
+          pkgs.fzf
+        ];
+        text = builtins.readFile ./bash/scripts/jqr.sh;
+      })
+    ];
   };
 }

modules/common/shell/nixpkgs.nix

@@ -13,7 +13,7 @@
         ns = "nix-shell -p";
         nsf = "nix-shell --run fish -p";
         nsr = "nix-shell-run";
-        nps = "nix repl '<nixpkgs>'";
+        nps = "nix repl --expr 'import <nixpkgs>{}'";
         nixo = "man configuration.nix";
         nixh = "man home-configuration.nix";
         nr = "rebuild-nixos";

modules/common/shell/utilities.nix

@@ -31,6 +31,7 @@ in
         jo # JSON output
         jq # JSON manipulation
         lf # File viewer
+        osc # Clipboard over SSH
         qrencode # Generate qr codes
         rsync # Copy folders
         ren # Rename files

modules/common/shell/work.nix

@@ -13,7 +13,11 @@
       let
         ldap_scheme = "ldaps";
         magic_prefix = "take";
-        ldap_port = 636;
+        ldap_port = 3269;
+        jq_parse = pkgs.writeShellScriptBin "ljq" ''
+          jq --slurp \
+            --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
+        '';
         ldap_script = pkgs.writeShellScriptBin "ldap" ''
           if ! [ "$LDAP_HOST" ]; then
               echo "No LDAP_HOST specified!"
@@ -22,13 +26,13 @@
           SEARCH_FILTER="$@"
           ldapsearch -LLL \
               -B -o ldif-wrap=no \
+              -E pr=5000/prompt \
               -H "${ldap_scheme}://''${LDAP_HOST}:${builtins.toString ldap_port}" \
               -D "${pkgs.lib.toUpper magic_prefix}2\\${pkgs.lib.toLower config.user}" \
-              -w "$(${pkgs._1password}/bin/op item get T2 --fields label=password)" \
+              -w "$(${pkgs._1password-cli}/bin/op item get T2 --fields label=password --reveal)" \
               -b "dc=''${LDAP_HOST//./,dc=}" \
               -s "sub" -x "(cn=''${SEARCH_FILTER})" \
-              | jq --slurp \
+              | ${jq_parse}/bin/ljq
-                  --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
         '';
         ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
           if ! [ "$LDAP_HOST" ]; then
@@ -49,6 +53,7 @@
         ldap_script
         ldapm_script
         ldapg_script
+        jq_parse
       ];
   };
 }

modules/darwin/hammerspoon.nix

@@ -36,7 +36,7 @@
     homebrew.casks = [ "hammerspoon" ];
 
     system.activationScripts.postUserActivation.text = ''
-      defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
+      defaults write org.hammerspoon.Hammerspoon MJConfigFile "${config.homePath}/.config/hammerspoon/init.lua"
       sudo killall Dock
     '';
   };

modules/nixos/gaming/steam.nix

@@ -15,6 +15,7 @@
       "steam-original"
       "steamcmd"
       "steam-run"
+      "steam-unwrapped"
     ];
 
     programs.steam = {
@@ -27,7 +28,7 @@
     environment.systemPackages = with pkgs; [
 
       # Enable terminal interaction
-      steamPackages.steamcmd
+      steamcmd
       steam-tui
 
       # Overlay with performance monitoring

modules/nixos/services/audiobookshelf.nix

@@ -1,13 +1,6 @@
 { config, lib, ... }:
 {
 
-  options = {
-    hostnames.audiobooks = lib.mkOption {
-      type = lib.types.str;
-      description = "Hostname for audiobook server (Audiobookshelf).";
-    };
-  };
-
   config = lib.mkIf config.services.audiobookshelf.enable {
 
     services.audiobookshelf = {

modules/nixos/services/nextcloud.nix

@@ -9,7 +9,7 @@
   config = lib.mkIf config.services.nextcloud.enable {
 
     services.nextcloud = {
-      package = pkgs.nextcloud29; # Required to specify
+      package = pkgs.nextcloud30; # Required to specify
       configureRedis = true;
       datadir = "/data/nextcloud";
       database.createLocally = true;

overlays/osc.nix

@@ -0,0 +1,15 @@
+inputs: _final: prev: {
+
+  osc = prev.buildGoModule {
+    pname = "osc";
+    version = "v0.4.4";
+    src = inputs.osc;
+
+    vendorHash = "sha256-VEzVd1LViMtqhQaltvGuupEemV/2ewMuVYjGbKOi0iw=";
+
+    ldflags = [
+      "-s"
+      "-w"
+    ];
+  };
+}