set keyd overload tap timeout

helps prevent escape key from being sent if not tapped

.github/workflows/update.yml

@@ -8,7 +8,6 @@ on:
 permissions:
   contents: write
   pull-requests: write
-  checks: write
 
 jobs:
   lockfile:
@@ -32,17 +31,7 @@ jobs:
             dependencies
             automated
       - name: Check the Flake
-        id: check
         run: nix flake check
-      - name: Update Check Status
-        uses: LouisBrunner/checks-action@v1.6.1
-        if: always()
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          name: Update Flake
-          conclusion: ${{ job.status }}
-          output: |
-            {"summary":"${{ steps.check.outputs.stdout }}"}
       - name: Enable Pull Request Automerge
         if: success()
         run: |

flake.lock

@@ -53,16 +53,16 @@
     "bufferline-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1695205521,
+        "lastModified": 1687763763,
-        "narHash": "sha256-MQMpXMgUpZA0E9TunzjXeOQxDWSCTogXbvi9VJnv4Kw=",
+        "narHash": "sha256-wbOeylzjjScQXkrDbBU2HtrOZrp2YUK+wQ2aOkgxmRQ=",
         "owner": "akinsho",
         "repo": "bufferline.nvim",
-        "rev": "6ecd37e0fa8b156099daedd2191130e083fb1490",
+        "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v4.4.0",
+        "ref": "v4.2.0",
         "repo": "bufferline.nvim",
         "type": "github"
       }
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
+        "lastModified": 1696043447,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701905325,
+        "lastModified": 1695864092,
-        "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
+        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
+        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
         "type": "github"
       },
       "original": {
@@ -124,22 +124,6 @@
         "type": "github"
       }
     },
-    "fidget-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1702155792,
-        "narHash": "sha256-bqbMKptpK3SGjKMO1fPongkUAkEXTL8eWPot4LGolJY=",
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "rev": "7dc62b9ce32ac0f21cfb510f243644ce28a39299",
-        "type": "github"
-      },
-      "original": {
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "type": "github"
-      }
-    },
     "firefox-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -147,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702082536,
+        "lastModified": 1696034364,
-        "narHash": "sha256-bAfjDDrcvH/GQwqkIaSl2SqC5ce5GUMSZdAmp4/K0H0=",
+        "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "800c0105a5f408d8d0c616ea8af36906f8c49f3e",
+        "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df",
         "type": "github"
       },
       "original": {
@@ -163,11 +147,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1673956053,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -253,11 +237,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702159252,
+        "lastModified": 1696063111,
-        "narHash": "sha256-4mYOL1EhOmt92OtYsHXRViWrSHvR5obLfCllMmQsUzY=",
+        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e6b7303bd149723c57ca23f5a9428482d6b07306",
+        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
         "type": "github"
       },
       "original": {
@@ -270,7 +254,6 @@
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "lastModified": 1679666795,
         "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
         "type": "tarball",
         "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
@@ -283,20 +266,18 @@
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1699624334,
+        "narHash": "sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ=",
-        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "lastModified": 1695883388,
         "narHash": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=",
         "type": "tarball",
         "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"
@@ -373,11 +354,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701689616,
+        "lastModified": 1696058303,
-        "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=",
+        "narHash": "sha256-eNqKWpF5zG0SrgbbtljFOrRgFgRzCc4++TMFADBMLnc=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "246219bc21b943c6f6812bb7744218ba0df08600",
+        "rev": "150f38bd1e09e20987feacb1b0d5991357532fb5",
         "type": "github"
       },
       "original": {
@@ -388,11 +369,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701718080,
+        "lastModified": 1695830400,
-        "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
+        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
+        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
         "type": "github"
       },
       "original": {
@@ -402,18 +383,34 @@
         "type": "github"
       }
     },
+    "nixpkgs-keyd": {
+      "locked": {
+        "lastModified": 1690363189,
+        "narHash": "sha256-Zs0VkngOtQz7nIEO7Wi8AwGB4TBSex2KZAw784aOm2M=",
+        "owner": "JohnAZoidberg",
+        "repo": "nixpkgs",
+        "rev": "6591d332f93422e388ef6337f6b362b4ff8d0724",
+        "type": "github"
+      },
+      "original": {
+        "owner": "JohnAZoidberg",
+        "ref": "keyd-2.4.3",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1701539137,
+        "lastModified": 1695825837,
-        "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
+        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -436,11 +433,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1702176421,
+        "lastModified": 1696080597,
-        "narHash": "sha256-t1QgMEDkaUQXRtnNOiBwcmiavQCX9nBpXr+k83Dql/4=",
+        "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "be7ffe627e0a74da807928cc3e7ce9f594a16c9e",
+        "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6",
         "type": "github"
       },
       "original": {
@@ -469,11 +466,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702163602,
+        "lastModified": 1695716495,
-        "narHash": "sha256-7I57phLX+gpes4uAHnPz0uPU7lvNeoUCTmfLicwpsNo=",
+        "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "0a7c24b675ab75dab8c36f2a326d274ad66b7166",
+        "rev": "934469b9b6df369e198fb3016969e56393b0dc07",
         "type": "github"
       },
       "original": {
@@ -485,11 +482,11 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702135096,
+        "lastModified": 1696061053,
-        "narHash": "sha256-oH7N7xRbz9xrrqpyuRxoMB3DLKrPkrw8y0BjkrgG2p4=",
+        "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "7958ff9ec7a2baea2842323d0e7ac67a509da4d2",
+        "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32",
         "type": "github"
       },
       "original": {
@@ -502,14 +499,13 @@
     "proton-ge": {
       "flake": false,
       "locked": {
-        "lastModified": 1699415676,
+        "narHash": "sha256-75A0VCVdYkiMQ1duE9r2+DLBJzV02vUozoVLeo/TIWQ=",
-        "narHash": "sha256-3XniKYf/KDRDYhTwffkktbmoISwOtGIABF28bsp8QHA=",
         "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-23/GE-Proton8-23.tar.gz"
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-23/GE-Proton8-23.tar.gz"
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
       }
     },
     "root": {
@@ -521,7 +517,6 @@
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
         "darwin": "darwin",
         "disko": "disko",
-        "fidget-nvim-src": "fidget-nvim-src",
         "firefox-darwin": "firefox-darwin",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
@@ -532,6 +527,7 @@
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-keyd": "nixpkgs-keyd",
         "null-ls-nvim-src": "null-ls-nvim-src",
         "nur": "nur",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
@@ -626,16 +622,16 @@
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1697004956,
+        "lastModified": 1686302912,
-        "narHash": "sha256-7SqYFnfCjotOBhuX6Wx1IOhgMKoxaoI1a4SKz1d5RVM=",
+        "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a",
+        "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
-        "ref": "0.1.4",
+        "ref": "0.1.2",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -643,11 +639,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1701464478,
+        "lastModified": 1682606566,
-        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
+        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
+        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
         "type": "github"
       },
       "original": {
@@ -659,16 +655,16 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1695636777,
+        "lastModified": 1685434104,
-        "narHash": "sha256-o8xzoo7OuYrPnKlfrupQ24Ja9hZy1qQVnvwO0FO+4zM=",
+        "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "faee9d60428afc7857e0927fdc18daa6c409fa64",
+        "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.8.0",
+        "ref": "v2.7.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
@@ -676,11 +672,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1696959291,
+        "lastModified": 1695263734,
-        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
+        "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
+        "rev": "fd4e40dab883d6456da4d847de8321aee9c80805",
         "type": "github"
       },
       "original": {
@@ -693,11 +689,11 @@
     "tree-sitter-ini": {
       "flake": false,
       "locked": {
-        "lastModified": 1699877527,
+        "lastModified": 1690815608,
-        "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=",
+        "narHash": "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M=",
         "owner": "justinmk",
         "repo": "tree-sitter-ini",
-        "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5",
+        "rev": "7f11a02fb8891482068e0fe419965d7bade81a68",
         "type": "github"
       },
       "original": {
@@ -742,11 +738,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1700218345,
+        "lastModified": 1695282953,
-        "narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
+        "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
+        "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c",
         "type": "github"
       },
       "original": {
@@ -811,11 +807,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1701722881,
+        "lastModified": 1696053802,
-        "narHash": "sha256-Wim+dqT6W6nTdifu/jmToIzD7eCQaCEhDqDp5kexyfM=",
+        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "5ee4fa3515de7b5609e6d161b800d91328a7a143",
+        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
         "type": "github"
       },
       "original": {

flake.nix

@@ -7,9 +7,13 @@
     # Used for system packages
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    # Update to keyd 2.4.3 not yet in nixpkgs-unstable
+    # https://github.com/NixOS/nixpkgs/pull/245327
+    nixpkgs-keyd.url = "github:JohnAZoidberg/nixpkgs/keyd-2.4.3";
+
     # Used for MacOS system config
     darwin = {
-      url = "github:lnl7/nix-darwin/master";
+      url = "github:/lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -90,7 +94,7 @@
       flake = false;
     };
     telescope-nvim-src = {
-      url = "github:nvim-telescope/telescope.nvim/0.1.4";
+      url = "github:nvim-telescope/telescope.nvim/0.1.2";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -98,11 +102,11 @@
       flake = false;
     };
     toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim/v2.8.0";
+      url = "github:akinsho/toggleterm.nvim/v2.7.0";
       flake = false;
     };
     bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim/v4.4.0";
+      url = "github:akinsho/bufferline.nvim/v4.2.0";
       flake = false;
     };
     nvim-tree-lua-src = {
@@ -117,10 +121,6 @@
       url = "github:calops/hmts.nvim";
       flake = false;
     };
-    fidget-nvim-src = {
-      url = "github:j-hui/fidget.nvim";
-      flake = false;
-    };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
@@ -165,7 +165,7 @@
     proton-ge = {
       # https://github.com/GloriousEggroll/proton-ge-custom/releases
       url =
-        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-23/GE-Proton8-23.tar.gz";
+        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz";
       flake = false;
     };
 
@@ -179,7 +179,7 @@
     nextcloud-external = {
       # https://github.com/nextcloud-releases/external/releases
       url =
-        "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
+        "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz";
       flake = false;
     };
     nextcloud-cookbook = {
@@ -210,7 +210,6 @@
           git = "git.${baseName}";
           metrics = "metrics.${baseName}";
           prometheus = "prom.${baseName}";
-          paperless = "paper.${baseName}";
           secrets = "vault.${baseName}";
           stream = "stream.${baseName}";
           content = "cloud.${baseName}";
@@ -233,6 +232,7 @@
         (import ./overlays/betterlockscreen.nix)
         (import ./overlays/age.nix inputs)
         (import ./overlays/proton-ge.nix inputs)
+        (import ./overlays/keyd.nix inputs)
       ];
 
       # System types to support.

hosts/lookingglass/default.nix

@@ -37,7 +37,6 @@ inputs.darwin.lib.darwinSystem {
       nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
-      rust.enable = true;
       lua.enable = true;
       kubernetes.enable = true;
       _1password.enable = true;

hosts/swan/default.nix

@@ -79,7 +79,6 @@ inputs.nixpkgs.lib.nixosSystem {
       services.prometheus.enable = false;
       services.vmagent.enable = true;
       services.samba.enable = true;
-      services.paperless.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {

hosts/tempest/default.nix

@@ -99,13 +99,12 @@ inputs.nixpkgs.lib.nixosSystem {
       keybase.enable = true;
       mullvad.enable = false;
       nixlang.enable = true;
-      rust.enable = true;
       yt-dlp.enable = true;
       gaming = {
         dwarf-fortress.enable = true;
         enable = true;
         steam.enable = true;
-        legendary.enable = false; # Electron marked as insecure
+        legendary.enable = true;
         lutris.enable = true;
         leagueoflegends.enable = true;
         ryujinx.enable = true;

modules/common/applications/firefox.nix

@@ -43,6 +43,7 @@
             darkreader
             snowflake
             don-t-fuck-with-paste
+            i-dont-care-about-cookies
             wappalyzer
           ];
           settings = {
@@ -73,8 +74,6 @@
             "media.ffmpeg.vaapi.enabled" =
               true; # Enable hardware video acceleration
             "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "devtools.command-button-screenshot.enabled" =
-              true; # Scrolling screenshot of entire page
             "svg.context-properties.content.enabled" = true; # Sidebery styling
           };
           userChrome = ''
@@ -116,7 +115,7 @@
               background-color: ${config.theme.colors.base00};
               color: ${config.theme.colors.base06} !important;
             }
-            .tab-content[selected] {
+            .tab-content[selected=true] {
               border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
               background-color: ${config.theme.colors.base01} !important;
               color: ${config.theme.colors.base07} !important;

modules/common/default.nix

@@ -75,10 +75,6 @@
         type = lib.types.str;
         description = "Hostname for metrics server.";
       };
-      paperless = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for document server (paperless-ngx).";
-      };
       prometheus = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for Prometheus server.";

modules/common/neovim/config/github.lua

@@ -1,14 +0,0 @@
--- Keymap to open file in GitHub web
-vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
-
--- Pop a terminal to watch the current run
-local gitwatch =
-    require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
-
--- Set a toggle for this terminal
-function GITWATCH_TOGGLE()
-    gitwatch:toggle()
-end
-
--- Keymap to toggle the run
-vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)

modules/common/neovim/config/kubernetes.lua

@@ -1,6 +0,0 @@
-local k9s = require("toggleterm.terminal").Terminal:new({ cmd = "k9s" })
-function K9S_TOGGLE()
-    k9s:toggle()
-end
-
-vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)

modules/common/neovim/config/lsp.nix

@@ -1,63 +1,28 @@
-{ pkgs, lib, config, dsl, ... }: {
+{ pkgs, dsl, ... }: {
 
-  # Terraform optional because non-free
-  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";
-
-  config =
-
-    let
-
-      terraformFormat = if config.terraform then ''
-        require("null-ls").builtins.formatting.terraform_fmt.with({
-            command = "${pkgs.terraform}/bin/terraform",
-            extra_filetypes = { "hcl" },
-        }),
-      '' else
-        "";
-
-    in {
   plugins = [
     pkgs.vimPlugins.nvim-lspconfig
+    pkgs.vimPlugins.lsp-colors-nvim
     pkgs.vimPlugins.null-ls-nvim
-        pkgs.vimPlugins.fidget-nvim
   ];
 
-      setup.fidget = { };
-
   use.lspconfig.lua_ls.setup = dsl.callWith {
     settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-        capabilities =
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
     cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
   };
 
   use.lspconfig.nil_ls.setup = dsl.callWith {
     cmd = [ "${pkgs.nil}/bin/nil" ];
-        capabilities =
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
   };
 
   use.lspconfig.pyright.setup = dsl.callWith {
     cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
   };
 
-      use.lspconfig.terraformls.setup = dsl.callWith {
+  use.lspconfig.terraformls.setup =
-        cmd = if config.terraform then [
+    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
-          "${pkgs.terraform-ls}/bin/terraform-ls"
-          "serve"
-        ] else
-          [ "echo" ];
-      };
-
-      use.lspconfig.rust_analyzer.setup = dsl.callWith {
-        cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
-        settings = {
-          "['rust-analyzer']" = { check = { command = "clippy"; }; };
-        };
-      };
 
   vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
 
@@ -80,7 +45,10 @@
                 command = "${pkgs.shfmt}/bin/shfmt",
                 extra_args = { "-i", "4", "-ci" },
             }),
-                ${terraformFormat}
+            require("null-ls").builtins.formatting.terraform_fmt.with({
+                command = "${pkgs.terraform}/bin/terraform",
+                extra_filetypes = { "hcl" },
+            }),
         },
 
         on_attach = function(client, bufnr)
@@ -105,6 +73,4 @@
     })
   '';
 
-    };
-
 }

modules/common/neovim/config/misc.nix

@@ -12,7 +12,7 @@
 
   # Initialize some plugins
   setup.Comment = { };
-  setup.colorizer = { user_default_options = { names = false; }; };
+  setup.colorizer = { };
   setup.glow = { };
   setup.which-key = { };
 

modules/common/neovim/config/syntax.nix

@@ -4,7 +4,6 @@
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
       with pkgs.tree-sitter-grammars; [
         tree-sitter-bash
-        # tree-sitter-c
         tree-sitter-fish
         tree-sitter-hcl
         tree-sitter-ini
@@ -25,7 +24,7 @@
     pkgs.vimPlugins.vim-helm
     pkgs.baleia-nvim # Clean ANSI from kitty scrollback
     # pkgs.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPlugin {
+    (pkgs.vimUtils.buildVimPluginFrom2Nix {
       pname = "nmasur";
       version = "0.1";
       src = ../plugin;

modules/common/neovim/config/toggleterm.lua

@@ -26,5 +26,17 @@ function NIXPKGS_TOGGLE()
     nixpkgs:toggle()
 end
 
+local gitwatch = terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+function GITWATCH_TOGGLE()
+    gitwatch:toggle()
+end
+
+local k9s = terminal:new({ cmd = "k9s" })
+function K9S_TOGGLE()
+    k9s:toggle()
+end
+
 vim.keymap.set("n", "<Leader>t", TERM_TOGGLE)
 vim.keymap.set("n", "<Leader>P", NIXPKGS_TOGGLE)
+vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
+vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)

modules/common/neovim/config/toggleterm.nix

@@ -1,4 +1,4 @@
-{ pkgs, dsl, config, ... }: {
+{ pkgs, dsl, ... }: {
 
   # Toggleterm provides a floating terminal inside the editor for quick access
 
@@ -10,10 +10,6 @@
     direction = "float";
   };
 
-  lua = ''
+  lua = builtins.readFile ./toggleterm.lua;
-    ${builtins.readFile ./toggleterm.lua}
-    ${if config.github then (builtins.readFile ./github.lua) else ""}
-    ${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
-  '';
 
 }

modules/common/neovim/config/tree.nix

@@ -63,6 +63,7 @@
     '';
     view = { # Set look and feel
       width = 30;
+      hide_root_folder = false;
       side = "left";
       number = false;
       relativenumber = false;

modules/common/neovim/default.nix

@@ -5,9 +5,6 @@ let
   neovim = import ./package {
     inherit pkgs;
     colors = config.theme.colors;
-    terraform = config.terraform.enable;
-    github = true;
-    kubernetes = config.kubernetes.enable;
   };
 
 in {

modules/common/neovim/lua/keybinds.lua

@@ -39,6 +39,7 @@ key("n", "<Leader>fs", ":write<CR>")
 key("n", "<Leader>fd", ":lcd %:p:h<CR>", { silent = true })
 key("n", "<Leader>fu", ":lcd ..<CR>", { silent = true })
 key("n", "<Leader><Tab>", ":b#<CR>", { silent = true })
+key("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
 key("n", "<Leader>tt", [[<Cmd>exe 'edit $NOTES_PATH/journal/'.strftime("%Y-%m-%d_%a").'.md'<CR>]])
 key("n", "<Leader>jj", ":!journal<CR>:e<CR>")
 

modules/common/neovim/package/default.nix

@@ -26,13 +26,13 @@
 #   ] ++ extraConfig;
 # }
 
-{ pkgs, colors, terraform ? false, github ? false, kubernetes ? false, ... }:
+{ pkgs, colors, ... }:
 
 # Comes from nix2vim overlay:
 # https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
-  inherit colors terraform github kubernetes;
+  inherit colors;
   imports = [
     ../config/align.nix
     ../config/bufferline.nix

modules/common/programming/default.nix

@@ -6,7 +6,6 @@
     ./lua.nix
     ./nix.nix
     ./python.nix
-    ./rust.nix
     ./terraform.nix
   ];
 

modules/common/programming/rust.nix

@@ -1,17 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  options.rust.enable = lib.mkEnableOption "Rust programming language.";
-
-  config = lib.mkIf config.rust.enable {
-
-    home-manager.users.${config.user} = {
-
-      programs.fish.shellAbbrs = { ca = "cargo"; };
-
-      home.packages = with pkgs; [ cargo rustc clippy gcc ];
-
-    };
-
-  };
-
-}

modules/common/programming/terraform.nix

@@ -3,7 +3,6 @@
   options.terraform.enable = lib.mkEnableOption "Terraform tools.";
 
   config = lib.mkIf config.terraform.enable {
-    unfreePackages = [ "terraform" ];
 
     home-manager.users.${config.user} = {
       programs.fish.shellAbbrs = {

modules/common/shell/direnv.nix

@@ -7,22 +7,6 @@
     config = { whitelist = { prefix = [ config.dotfilesPath ]; }; };
   };
 
-  # programs.direnv.direnvrcExtra = ''
-  #   layout_postgres() {
-  #       export PGDATA="$(direnv_layout_dir)/postgres"
-  #       export PGHOST="$PGDATA"
-  #
-  #       if [[ ! -d "PGDATA" ]]; then
-  #           initdb
-  #           cat >> "$PGDATA/postgres.conf" <<- EOF
-  #                   listen_addresses = '''
-  #                   unix_socket_directories = '$PGHOST'
-  #           EOF
-  #           echo "CREATE DATABASE $USER;" | postgres --single -E postgres
-  #       fi
-  #   }
-  # '';
-
   # Prevent garbage collection
   nix.extraOptions = ''
     keep-outputs = true

modules/common/shell/fish/default.nix

@@ -123,6 +123,9 @@
         dr = "docker run --rm -it";
         db = "docker build . -t";
 
+        # Rust
+        ca = "cargo";
+
       };
       shellInit = "";
     };

modules/nixos/graphical/polybar.nix

@@ -36,7 +36,7 @@
             module-margin = 1;
             modules-left = "i3";
             modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date keyboard power";
+            modules-right = "mailcount network pulseaudio date power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -200,17 +200,10 @@
             label-foreground = config.theme.colors.base0A;
             # format-background = colors.background;
           };
-          "module/keyboard" = {
-            type = "custom/text";
-            content = "󰌌";
-            click-left = "doas systemctl restart keyd";
-            content-foreground = config.theme.colors.base04;
-          };
           "module/power" = {
             type = "custom/text";
             content = "  ";
             click-left = config.powerCommand;
-            click-right = "polybar-msg cmd restart";
             content-foreground = config.theme.colors.base04;
           };
           "settings" = {

modules/nixos/hardware/keyboard.nix

@@ -18,7 +18,14 @@
       keyboards = {
         default = {
           ids = [ "*" ];
-          settings = { main = { capslock = "overload(control, esc)"; }; };
+          settings = {
+            main = { capslock = "overload(control, esc)"; };
+
+            # Fix: ctrl-click sends escape afterwards
+            # Suppresses escape if held for more than 500ms
+            # https://github.com/rvaiya/keyd/issues/424
+            global = { overload_tap_timeout = 500; };
+          };
         };
       };
     };

modules/nixos/services/default.nix

@@ -19,7 +19,6 @@
     ./n8n.nix
     ./netdata.nix
     ./nextcloud.nix
-    ./paperless.nix
     ./prometheus.nix
     ./samba.nix
     ./secrets.nix

modules/nixos/services/paperless.nix

@@ -1,48 +0,0 @@
-{ config, lib, ... }: {
-
-  config = lib.mkIf config.services.paperless.enable {
-
-    services.paperless = {
-      mediaDir = "/data/generic/paperless";
-      passwordFile = config.secrets.paperless.dest;
-      extraConfig = {
-        PAPERLESS_OCR_USER_ARGS =
-          builtins.toJSON { invalidate_digital_signatures = true; };
-
-        # Enable if changing the path name in Caddy
-        # PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";
-        # PAPERLESS_STATIC_URL = "/paperless/static/";
-      };
-    };
-
-    users.users.paperless.extraGroups = [ "generic" ];
-
-    caddy.routes = [{
-      match = [{
-        host = [ config.hostnames.paperless ];
-        # path = [ "/paperless*" ]; # Change path name in Caddy
-      }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial =
-            "localhost:${builtins.toString config.services.paperless.port}";
-        }];
-      }];
-    }];
-
-    secrets.paperless = {
-      source = ../../../private/prometheus.age;
-      dest = "${config.secretsDirectory}/paperless";
-      owner = "paperless";
-      group = "paperless";
-      permissions = "0440";
-    };
-    systemd.services.paperless-secret = {
-      requiredBy = [ "paperless.service" ];
-      before = [ "paperless.service" ];
-    };
-
-  };
-
-}

modules/nixos/system/doas.nix

@@ -26,14 +26,9 @@
       };
     };
 
-    home-manager.users.${config.user}.programs = {
-
     # Alias sudo to doas for convenience
-      fish.shellAliases = { sudo = "doas"; };
+    home-manager.users.${config.user}.programs.fish.shellAliases = {
-
+      sudo = "doas";
-      # Disable overriding our sudo alias with a TERMINFO alias
-      kitty.settings.shell_integration = "no-sudo";
-
     };
 
   };

overlays/age.nix

@@ -1,9 +1,5 @@
 # Pin age because it is failing to build
-# https://github.com/NixOS/nixpkgs/pull/265753
 
 inputs: _final: prev: {
-  age = prev.age.overrideAttrs (old: {
+  age = prev.age.overrideAttrs (old: { src = inputs.age; });
-    src = inputs.age;
-    doCheck = false; # https://github.com/FiloSottile/age/issues/517
-  });
 }

overlays/caddy.nix

@@ -31,7 +31,7 @@ in {
 
     src = prev.caddy.src;
 
-    vendorSha256 = "sha256:0KfMzTt4lNzVfoCfDHhC2ue3OWICkFCHuhREiM2JPMY=";
+    vendorSha256 = "sha256:mwIsWJYKuEZpOU38qZOG1LEh4QpK4EO0/8l4UGsroU8=";
 
     overrideModAttrs = (_: {
       preBuild = ''

overlays/calibre-web-cloudflare.patch

@@ -1,8 +1,8 @@
 diff --git a/cps/__init__.py b/cps/__init__.py
-index f4f8dbf2..7377acdf 100644
+index 269e4aca..e2b828a9 100644
 --- a/cps/__init__.py
 +++ b/cps/__init__.py
-@@ -151,7 +151,6 @@ def create_app():
+@@ -150,7 +150,6 @@ def create_app():
  
      lm.login_view = 'web.login'
      lm.anonymous_user = ub.Anonymous
@@ -11,16 +11,14 @@ index f4f8dbf2..7377acdf 100644
      db.CalibreDB.update_config(config)
      db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
 diff --git a/cps/admin.py b/cps/admin.py
-index 045a9523..825a28af 100644
+index 20c58aac..99d2ad19 100644
 --- a/cps/admin.py
 +++ b/cps/admin.py
-@@ -102,10 +102,6 @@ def admin_required(f):
+@@ -101,8 +101,6 @@ def admin_required(f):
  
  @admi.before_app_request
  def before_request():
--    if not ub.check_user_session(current_user.id,
+-    if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
--                                 flask_session.get('_id')) and 'opds' not in request.path \
--      and config.config_session == 1:
 -        logout_user()
      g.constants = constants
      g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')

overlays/keyd.nix

@@ -0,0 +1,6 @@
+# Use latest PR of keyd to update to 2.4.3
+# https://github.com/NixOS/nixpkgs/pull/245327
+
+inputs: _final: prev: {
+  inherit (inputs.nixpkgs-keyd.legacyPackages.${prev.system}) keyd;
+}

overlays/neovim-plugins.nix

@@ -9,7 +9,7 @@ let
 
   # Package plugin - for plugins not found in nixpkgs at all
   plugin = pname: src:
-    prev.vimUtils.buildVimPlugin {
+    prev.vimUtils.buildVimPluginFrom2Nix {
       inherit pname src;
       version = "master";
     };
@@ -33,7 +33,6 @@ in {
   bufferline-nvim =
     withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim;
   nvim-tree-lua = withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua;
-  fidget-nvim = withSrc prev.vimPlugins.fidget-nvim inputs.fidget-nvim;
 
   # Packaging plugins entirely with Nix
   baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;

private/paperless.age

@@ -1,15 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBWY3N0
-VkY0Y2tLQnNhZWdRVzFxU0plWThveUthK2NjZWNhZDd5ZGtXVVZ3CjVPc3YxbnBM
-MmozZFlORVppQmJrQ2ovWEFVVm81ZlBpRCtQQmRiNnBCaVUKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIEtvRFJEQXJLNjlyRldpM2pMdXNxWVZmVFl2NVJjRUtuQzNtbmJq
-UTBDR2cKQ1J4cHVkWHJZU1M4dnFIekx2ejlua0NjUUtET0EwN24rY2NPcGQ5eEp1
-TQotPiBzc2gtZWQyNTUxOSBuanZYNUEgVnBQOHV5VUk0N2lyU2NkdXovQmJYVGhL
-dnUwTG9oZkZKOUxFWTNiZkhBbwo2WjgyNHBhaGtFREJGVDk5TzJhZjRzKytaLzZR
-TDQxeU9pY24zQnJBYmN3Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBQQ3I2YnNNZVlX
-TEhNbWhRSjJRbk9DYnJIRUFieDBMRUtBRVhxZ1RQcVNNClNzU0VPMnh5bUFGVTZm
-ekJLSzFjT3dHVVdoQ3A5ZStCUk83Qk5rcWZmN3MKLS0tIFdvRG1mYzdUenhndkY2
-amo0ZGpjQkdabUdNRUJwV29CRXByVk8ySEZzTzAKsDY+DVJqZb/jCn6Xa/OqNheR
-uNlV5vVKUaZu5F+MTZqZaRYdn66TJVXgz5GydbgwQGs3l0K67ikPiTOoln0FapnB
-TQ==
------END AGE ENCRYPTED FILE-----

templates/poetry/flake.nix

@@ -5,7 +5,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
   inputs.poetry2nix.url = "github:nix-community/poetry2nix";
 
-  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
+  outputs = { nixpkgs, flake-utils, poetry2nix }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {

templates/python/flake.nix

@@ -11,7 +11,7 @@
     inputs.pypi-deps-db.follows = "pypi-deps-db";
   };
 
-  outputs = { self, nixpkgs, mach-nix }:
+  outputs = { nixpkgs, mach-nix }:
     let
       supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
       forAllSystems = f:

templates/rust/flake.nix

@@ -1,29 +0,0 @@
-{
-  description = "Basic Rust project";
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  outputs = { self, nixpkgs }:
-    let
-      forAllSystems = nixpkgs.lib.genAttrs [
-        "x86_64-linux"
-        "x86_64-darwin"
-        "aarch64-linux"
-        "aarch64-darwin"
-      ];
-    in {
-      devShells = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system; };
-        in {
-          default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              gcc
-              rustc
-              cargo
-              cargo-watch
-              rustfmt
-              pkg-config
-              openssl
-            ];
-          };
-        });
-    };
-}