clean up i3 sxhkd

.github/workflows/update.yml

@@ -8,7 +8,6 @@ on:
 permissions:
   contents: write
   pull-requests: write
-  checks: write
 
 jobs:
   lockfile:
@@ -32,32 +31,8 @@ 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: gh pr merge --rebase --auto ${{ steps.update.outputs.pull-request-number }}
-        run: |
-          gh pr merge \
-            --rebase \
-            --auto \
-            ${{ steps.update.outputs.pull-request-number }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-      - name: Close Pull Request If Failed
-        if: failure()
-        run: |
-          gh pr close \
-            --comment "Auto-closing pull request" \
-            --delete-branch \
-            ${{ steps.update.outputs.pull-request-number }}
         env:
           GH_TOKEN: ${{ github.token }}

README.md

@@ -41,30 +41,6 @@ configuration may be difficult to translate to a non-Nix system.
 | ---      | ---                                         | ---                                  |
 | Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
 
-# Diagram
-
-![Diagram](https://github.com/nmasur/dotfiles/assets/7386960/ed3e7202-09c4-4a9c-9b14-0272c01647f6)
-
-- [flake.nix](./flake.nix)
-- [hosts](./hosts/)
-- [modules](./modules/)
-
----
-
-# Unique Configurations
-
-This repo contains a few more elaborate elements of configuration.
-
-- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim
-and source-controlled plugins, differing based on installed LSPs, for example.
-- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based
-dynamically on enabled services rendered with Nix.
-- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix.
-- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to
-agenix.
-- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
-including Firefox userChrome.
-
 ---
 
 # Installation

flake.lock

@@ -17,31 +17,14 @@
         "type": "github"
       }
     },
-    "age": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1672087018,
-        "narHash": "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw=",
-        "owner": "FiloSottile",
-        "repo": "age",
-        "rev": "c6dcfa1efcaa27879762a934d5bea0d1b83a894c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "FiloSottile",
-        "ref": "v1.1.1",
-        "repo": "age",
-        "type": "github"
-      }
-    },
     "baleia-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1704551058,
+        "lastModified": 1681806450,
-        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
+        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
         "owner": "m00qek",
         "repo": "baleia.nvim",
-        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
+        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
         "type": "github"
       },
       "original": {
@@ -53,44 +36,28 @@
     "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"
       }
     },
-    "bypass-paywalls-clean": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704880831,
-        "narHash": "sha256-KXYpzI/xzn9mUc7FoCewssvBUkHBv2pQ7m/4krqHFHg=",
-        "owner": "magnolia1234",
-        "repo": "bpc-uploads",
-        "rev": "fc34b6b8e2d79af62ef9cf8222daeb0eb4b785a4",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "magnolia1234",
-        "repo": "bpc-uploads",
-        "type": "gitlab"
-      }
-    },
     "cmp-nvim-lsp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702205473,
+        "lastModified": 1687494203,
-        "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=",
+        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "5af77f54de1b16c34b23cba810150689a3a90312",
+        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
         "type": "github"
       },
       "original": {
@@ -106,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704277720,
+        "lastModified": 1691275315,
-        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
+        "narHash": "sha256-9WN0IA0vNZSNxKHpy/bYvPnCw4VH/nr5iBv7c+7KUts=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
+        "rev": "829041cf10c4f6751a53c0a11ca2fd22ff0918d6",
         "type": "github"
       },
       "original": {
@@ -127,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705075138,
+        "lastModified": 1690739034,
-        "narHash": "sha256-0slYsXoR1Sd5FwTfFZLYxAsI015+J4lvgvo55u4Gw1A=",
+        "narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "f78b6498f69e04514cb84393e5daba669198c1c1",
+        "rev": "4015740375676402a2ee6adebc3c30ea625b9a94",
         "type": "github"
       },
       "original": {
@@ -140,23 +107,6 @@
         "type": "github"
       }
     },
-    "fidget-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1702031048,
-        "narHash": "sha256-wbjQuOFd/2339TIrUA97PYsV8N3PZsS+xbyMsyZmki8=",
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "rev": "300018af4abd00610a345e382ca1f4b7ba420f77",
-        "type": "github"
-      },
-      "original": {
-        "owner": "j-hui",
-        "ref": "v1.1.0",
-        "repo": "fidget.nvim",
-        "type": "github"
-      }
-    },
     "firefox-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -164,11 +114,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705193299,
+        "lastModified": 1691196340,
-        "narHash": "sha256-Hapo/l2byyBlCviP+/DNO6xS7/79oqfPb6K9DL/ddD8=",
+        "narHash": "sha256-b1haFWCbFJkiUkeTQCkNjr8hFq/8JlMPaQwNpGlcvxI=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "0d1ff8fb805bfaecfd9a05f788fcd08ca8af38e8",
+        "rev": "6081c33185dba05da784d9f2a392861af025bf1a",
         "type": "github"
       },
       "original": {
@@ -180,11 +130,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": {
@@ -194,15 +144,12 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1687709756,
+        "lastModified": 1678901627,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -213,7 +160,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -231,14 +178,14 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1689068808,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -250,11 +197,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1693226725,
+        "lastModified": 1691223193,
-        "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
+        "narHash": "sha256-Zsl4s3e4upWiU2mXKqiQcUGxslPzzebKKXfzaHiNq48=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
+        "rev": "1d40963804925754672940d07ddb250d19efec2e",
         "type": "github"
       },
       "original": {
@@ -270,11 +217,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705169127,
+        "lastModified": 1691225770,
-        "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=",
+        "narHash": "sha256-O5slH8nW8msTAqVAS5rkvdHSkjmrO+JauuSDzZCmv2M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8",
+        "rev": "0a014a729cdd54d9919ff36b714d047909d7a4c8",
         "type": "github"
       },
       "original": {
@@ -287,40 +234,37 @@
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
-        "lastModified": 1702545935,
+        "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
-        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
+        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
       }
     },
     "nextcloud-external": {
       "flake": false,
       "locked": {
-        "lastModified": 1699624334,
+        "narHash": "sha256-gY1nxqK/pHfoxW/9mE7DFtNawgdEV7a4OXpscWY14yk=",
-        "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.0/external-v5.2.0.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.0/external-v5.2.0.tar.gz"
       }
     },
     "nextcloud-news": {
       "flake": false,
       "locked": {
-        "lastModified": 1703426420,
+        "narHash": "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=",
-        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"
       }
     },
     "nil": {
@@ -332,16 +276,16 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1691372739,
+        "lastModified": 1680544266,
-        "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=",
+        "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b",
+        "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
-        "ref": "2023-08-09",
+        "ref": "2023-04-03",
         "repo": "nil",
         "type": "github"
       }
@@ -369,11 +313,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1693701915,
+        "lastModified": 1689469483,
-        "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
+        "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
+        "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
         "type": "github"
       },
       "original": {
@@ -390,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701689616,
+        "lastModified": 1690133435,
-        "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=",
+        "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "246219bc21b943c6f6812bb7744218ba0df08600",
+        "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586",
         "type": "github"
       },
       "original": {
@@ -405,11 +349,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704722960,
+        "lastModified": 1691186842,
-        "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
+        "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
+        "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42",
         "type": "github"
       },
       "original": {
@@ -419,14 +363,30 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1690470004,
+        "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9462344318b376e157c94fa60c20a25b913b2381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "null-ls-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1691810493,
+        "lastModified": 1688652536,
-        "narHash": "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=",
+        "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7",
+        "rev": "db09b6c691def0038c456551e4e2772186449f35",
         "type": "github"
       },
       "original": {
@@ -437,11 +397,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1705197850,
+        "lastModified": 1691289987,
-        "narHash": "sha256-WtgOcadsR2/4ArDfYLEezIo99JrvZ0uVpxNwH66dXmM=",
+        "narHash": "sha256-sbbDlVzxlP+bBTdhyyzJ6C0APUNU/sChuLmNU9ehkmg=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "7a24ce86be38634afc3c82caccefc2059bdf935b",
+        "rev": "cf2f5d8ad452795e5aca290c95eedc829d3da7ec",
         "type": "github"
       },
       "original": {
@@ -470,11 +430,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1705190895,
+        "lastModified": 1691292370,
-        "narHash": "sha256-BfB4q4nRBotjopq/35rI2jXrNub2uriZIPznMPGq2lc=",
+        "narHash": "sha256-YQRirmp8QerxwF9qdrSrUKJZiVrBb6ZWpUTfM8H7fl4=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "f24afa2cef551122b8bd53bb2e4a7df42343ce2e",
+        "rev": "904f95cd9db31d1800998fa428e78e418a50181d",
         "type": "github"
       },
       "original": {
@@ -486,44 +446,28 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1704630521,
+        "lastModified": 1681121236,
-        "narHash": "sha256-Xc5XqHy3Yk82BFZjeLRSoaN4U4v46FAclFcjoRHZ9no=",
+        "narHash": "sha256-iPsPDLhVKJ14iP1/2cCgcY9SCKK/DQz9Y0mQB1DqNiM=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e",
+        "rev": "cc360a9beb1b30d172438f640e2c3450358c4086",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
-        "ref": "master",
+        "ref": "v0.9.0",
         "repo": "nvim-treesitter",
         "type": "github"
       }
     },
-    "proton-ge": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1700610476,
-        "narHash": "sha256-IoClZ6hl2lsz9OGfFgnz7vEAGlSY2+1K2lDEEsJQOfU=",
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
-      }
-    },
     "root": {
       "inputs": {
         "Comment-nvim-src": "Comment-nvim-src",
-        "age": "age",
         "baleia-nvim-src": "baleia-nvim-src",
         "bufferline-nvim-src": "bufferline-nvim-src",
-        "bypass-paywalls-clean": "bypass-paywalls-clean",
         "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",
@@ -539,16 +483,15 @@
         "nvim-lspconfig-src": "nvim-lspconfig-src",
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
-        "proton-ge": "proton-ge",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
         "tree-sitter-bash": "tree-sitter-bash",
         "tree-sitter-ini": "tree-sitter-ini",
-        "tree-sitter-lua": "tree-sitter-lua",
         "tree-sitter-puppet": "tree-sitter-puppet",
         "tree-sitter-python": "tree-sitter-python",
         "tree-sitter-rasi": "tree-sitter-rasi",
+        "vscode-terraform-snippets": "vscode-terraform-snippets",
         "wallpapers": "wallpapers",
         "wsl": "wsl",
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
@@ -566,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688783586,
+        "lastModified": 1680488274,
-        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
+        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
+        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
         "type": "github"
       },
       "original": {
@@ -609,34 +552,19 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "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": {
-        "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"
       }
@@ -644,11 +572,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": {
@@ -660,16 +588,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"
       }
@@ -677,28 +605,28 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1696959291,
+        "lastModified": 1688032601,
-        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
+        "narHash": "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
+        "rev": "493646764e7ad61ce63ce3b8c59ebeb37f71b841",
         "type": "github"
       },
       "original": {
         "owner": "tree-sitter",
-        "ref": "master",
         "repo": "tree-sitter-bash",
+        "rev": "493646764e7ad61ce63ce3b8c59ebeb37f71b841",
         "type": "github"
       }
     },
     "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": {
@@ -707,23 +635,6 @@
         "type": "github"
       }
     },
-    "tree-sitter-lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1694072484,
-        "narHash": "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=",
-        "owner": "MunifTanjim",
-        "repo": "tree-sitter-lua",
-        "rev": "9668709211b2e683f27f414454a8b51bf0a6bda1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "ref": "main",
-        "repo": "tree-sitter-lua",
-        "type": "github"
-      }
-    },
     "tree-sitter-puppet": {
       "flake": false,
       "locked": {
@@ -743,17 +654,17 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1700218345,
+        "lastModified": 1690493803,
-        "narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
+        "narHash": "sha256-2btd/NRE6NuGNlx4cq535OrwtWXihiP3VMCJjPCiDOk=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
+        "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5",
         "type": "github"
       },
       "original": {
         "owner": "tree-sitter",
-        "ref": "master",
         "repo": "tree-sitter-python",
+        "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5",
         "type": "github"
       }
     },
@@ -773,6 +684,22 @@
         "type": "github"
       }
     },
+    "vscode-terraform-snippets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1614849738,
+        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
+        "owner": "run-at-scale",
+        "repo": "vscode-terraform-doc-snippets",
+        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "run-at-scale",
+        "repo": "vscode-terraform-doc-snippets",
+        "type": "github"
+      }
+    },
     "wallpapers": {
       "flake": false,
       "locked": {
@@ -793,16 +720,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1705003621,
+        "lastModified": 1690553050,
-        "narHash": "sha256-bnQKeNbNYyKfmJN2/KD+t8gDKA0uU8Ak4/sV4gvlA2E=",
+        "narHash": "sha256-pK3kF30OykL3v6P8UP6ipihlS34KoGq9SryCj3tHrFw=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "0fa9268bf9a903498cb567e6d4d01eb945f36f6e",
+        "rev": "f7a95a37306c46b42e9ce751977c44c752fd5eca",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,15 +9,12 @@
 
     # Used for MacOS system config
     darwin = {
-      url = "github:lnl7/nix-darwin/master";
+      url = "github:/lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Used for Windows Subsystem for Linux compatibility
-    wsl = {
+    wsl.url = "github:nix-community/NixOS-WSL";
-      url = "github:nix-community/NixOS-WSL";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # Used for user packages and dotfiles
     home-manager = {
@@ -61,13 +58,12 @@
 
     # Nix language server
     nil = {
-      url = "github:oxalica/nil/2023-08-09";
+      url = "github:oxalica/nil/2023-04-03";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Neovim plugins
     nvim-lspconfig-src = {
-      # https://github.com/neovim/nvim-lspconfig/tags
       url = "github:neovim/nvim-lspconfig/v0.1.6";
       flake = false;
     };
@@ -80,7 +76,6 @@
       flake = false;
     };
     baleia-nvim-src = {
-      # https://github.com/m00qek/baleia.nvim/tags
       url = "github:m00qek/baleia.nvim";
       flake = false;
     };
@@ -89,12 +84,11 @@
       flake = false;
     };
     nvim-treesitter-src = {
-      # https://github.com/nvim-treesitter/nvim-treesitter/tags
+      url = "github:nvim-treesitter/nvim-treesitter/v0.9.0";
-      url = "github:nvim-treesitter/nvim-treesitter/master";
       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 = {
@@ -102,38 +96,39 @@
       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 = {
       url = "github:kyazdani42/nvim-tree.lua";
       flake = false;
     };
-    hmts-nvim-src = {
+    vscode-terraform-snippets = {
-      url = "github:calops/hmts.nvim";
+      url = "github:run-at-scale/vscode-terraform-doc-snippets";
       flake = false;
     };
-    fidget-nvim-src = {
+    hmts-nvim-src = {
-      # https://github.com/j-hui/fidget.nvim/tags
+      url = "github:calops/hmts.nvim";
-      url = "github:j-hui/fidget.nvim/v1.1.0";
       flake = false;
     };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
-      url = "github:tree-sitter/tree-sitter-bash/master";
+      # Fix: bash highlighting doesn't work as of this commit:
+      # https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
+      url =
+        "github:tree-sitter/tree-sitter-bash/493646764e7ad61ce63ce3b8c59ebeb37f71b841";
       flake = false;
     };
     tree-sitter-python = {
-      url = "github:tree-sitter/tree-sitter-python/master";
+      # Fix: invalid node in position. Broken as of this commit (replaced with newer):
-      flake = false;
+      # https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5
-    };
+      url =
-    tree-sitter-lua = {
+        "github:tree-sitter/tree-sitter-python/5af00f64af6bbf822f208243cce5cf75396fb6f5";
-      url = "github:MunifTanjim/tree-sitter-lua/main";
       flake = false;
     };
     tree-sitter-ini = {
@@ -155,45 +150,20 @@
       flake = false;
     };
 
-    # Age encryption (pin because of failed builds)
-    age = {
-      url = "github:FiloSottile/age/v1.1.1";
-      flake = false;
-    };
-
-    # GE version of Proton for game compatibility
-    # Alternatively, could consider using https://github.com/fufexan/nix-gaming
-    proton-ge = {
-      # https://github.com/GloriousEggroll/proton-ge-custom/releases
-      url =
-        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz";
-      flake = false;
-    };
-
-    # Firefox addon from outside the extension store
-    bypass-paywalls-clean = {
-      # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
-      url = "gitlab:magnolia1234/bpc-uploads";
-      flake = false;
-    };
-
     # Nextcloud Apps
     nextcloud-news = {
-      # https://github.com/nextcloud/news/releases
       url =
-        "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
+        "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz";
       flake = false;
     };
     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.0/external-v5.2.0.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.0/cookbook-0.11.0.tar.gz";
+        "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz";
       flake = false;
     };
 
@@ -216,10 +186,8 @@
         dotfilesRepo = "https://github.com/nmasur/dotfiles";
         hostnames = {
           git = "git.${baseName}";
-          influxdb = "influxdb.${baseName}";
           metrics = "metrics.${baseName}";
           prometheus = "prom.${baseName}";
-          paperless = "paper.${baseName}";
           secrets = "vault.${baseName}";
           stream = "stream.${baseName}";
           content = "cloud.${baseName}";
@@ -240,11 +208,6 @@
         (import ./overlays/mpv-scripts.nix inputs)
         (import ./overlays/nextcloud-apps.nix inputs)
         (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/age.nix inputs)
-        (import ./overlays/proton-ge.nix inputs)
-        (import ./overlays/gh-collaborators.nix)
-        (import ./overlays/bypass-paywalls-clean.nix inputs)
-        (import ./overlays/terraform.nix)
       ];
 
       # System types to support.

hosts/README.md

@@ -12,15 +12,3 @@ These are the individual machines managed by this flake.
 | [swan](./swan/default.nix)                 | Home server         |
 | [tempest](./tempest/default.nix)           | Linux desktop       |
 
-## NixOS Workflow
-
-Each hosts file is imported into [nixosConfigurations](../flake.nix) and passed
-the arguments from the flake (inputs, globals, overlays). The `nixosSystem`
-function in that hosts file will be called by the NixOS module system during a
-nixos-rebuild.
-
-Each module in the each host's `modules` list is either a function or an
-attrset. The attrsets will simply apply values to options that have been
-declared in the config by other modules. Meanwhile, the functions will be
-passed various arguments, several of which you will see listed at the top of
-each of their files.

hosts/aws/main.tf

@@ -26,7 +26,7 @@ data "aws_iam_policy_document" "vmimport" {
     actions = [
       "s3:GetBucketLocation",
       "s3:GetObject",
-        "s3:ListBucket",
+      "s3:ListBucket",
     ]
     resources = [
       "arn:aws:s3:::${aws_s3_object.image.bucket}",

hosts/flame/default.nix

@@ -1,8 +1,6 @@
 # The Flame
 # System configuration for an Oracle free server
 
-# See [readme](../README.md) to explain how this file works.
-
 # How to install:
 # https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
 # These days, probably use nixos-anywhere instead.
@@ -60,7 +58,6 @@ inputs.nixpkgs.lib.nixosSystem {
       services.grafana.enable = true;
       services.openssh.enable = true;
       services.victoriametrics.enable = true;
-      services.influxdb2.enable = true;
       services.gitea.enable = true;
       services.vaultwarden.enable = true;
       services.minecraft-server.enable = true; # Setup Minecraft server

hosts/hydra/default.nix

@@ -1,8 +1,6 @@
 # The Hydra
 # System configuration for WSL
 
-# See [readme](../README.md) to explain how this file works.
-
 { inputs, globals, overlays, ... }:
 
 inputs.nixpkgs.lib.nixosSystem {

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

@@ -1,8 +1,6 @@
 # The Swan
 # System configuration for my home NAS server
 
-# See [readme](../README.md) to explain how this file works.
-
 { inputs, globals, overlays, ... }:
 
 inputs.nixpkgs.lib.nixosSystem {
@@ -81,8 +79,6 @@ inputs.nixpkgs.lib.nixosSystem {
       services.prometheus.enable = false;
       services.vmagent.enable = true;
       services.samba.enable = true;
-      services.paperless.enable = true;
-      services.postgresql.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {

hosts/tempest/default.nix

@@ -1,8 +1,6 @@
 # The Tempest
 # System configuration for my desktop
 
-# See [readme](../README.md) to explain how this file works.
-
 { inputs, globals, overlays, ... }:
 
 inputs.nixpkgs.lib.nixosSystem {
@@ -101,7 +99,6 @@ 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;

modules/common/applications/firefox.nix

@@ -16,7 +16,6 @@
     unfreePackages = [
       (lib.mkIf config._1password.enable "onepassword-password-manager")
       "okta-browser-plugin"
-      "wappalyzer"
     ];
 
     home-manager.users.${config.user} = {
@@ -30,21 +29,20 @@
           name = "default";
           isDefault = true;
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            (lib.mkIf config._1password.enable onepassword-password-manager)
+            ublock-origin
-            pkgs.bypass-paywalls-clean
+            vimium
-            darkreader
-            don-t-fuck-with-paste
-            facebook-container
-            markdownload
             multi-account-containers
+            facebook-container
+            (lib.mkIf config._1password.enable onepassword-password-manager)
             okta-browser-plugin
+            sponsorblock
             reddit-enhancement-suite
             return-youtube-dislikes
+            markdownload
+            darkreader
             snowflake
-            sponsorblock
+            don-t-fuck-with-paste
-            ublock-origin
+            i-dont-care-about-cookies
-            ublacklist
-            vimium
             wappalyzer
           ];
           settings = {
@@ -75,8 +73,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 = ''
@@ -118,7 +114,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/applications/kitty.nix

@@ -11,23 +11,10 @@
 
   config = lib.mkIf (config.gui.enable && config.kitty.enable) {
 
-    # Set the Rofi-Systemd terminal for viewing logs
+    terminal = "${pkgs.kitty}/bin/kitty";
-    # Using optionalAttrs because only available in NixOS
-    environment = { } // lib.attrsets.optionalAttrs
-      (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
-      };
 
     home-manager.users.${config.user} = {
 
-      # Set the i3 terminal
-      xsession.windowManager.i3.config.terminal =
-        lib.mkIf pkgs.stdenv.isLinux "kitty";
-
-      # Set the Rofi terminal for running programs
-      programs.rofi.terminal =
-        lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
-
       # Display images in the terminal
       programs.fish.shellAliases = {
         icat = "kitty +kitten icat";

modules/common/applications/obsidian.nix

@@ -15,9 +15,8 @@
       home.packages = with pkgs; [ obsidian ];
     };
 
-    # Broken on 2023-12-11
+    # Broken on 2023-04-16
-    # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
+    nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ];
-    nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
 
   };
 

modules/common/default.nix

@@ -75,18 +75,10 @@
         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.";
       };
-      influxdb = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for InfluxDB2 server.";
-      };
       secrets = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for passwords and secrets (Vaultwarden).";

modules/common/mail/aerc.nix

@@ -68,7 +68,7 @@
             "!" = ":term<space>";
             "|" = ":pipe<space>";
 
-            "/" = ":search<space>-a<space>";
+            "/" = ":search<space>";
             "\\" = ":filter <space>";
             n = ":next-result<Enter>";
             N = ":prev-result<Enter>";

modules/common/neovim/config/completion.nix

@@ -9,6 +9,7 @@
     pkgs.vimPlugins.luasnip
     pkgs.vimPlugins.cmp_luasnip
     pkgs.vimPlugins.cmp-rg
+    pkgs.vimPlugins.friendly-snippets
   ];
 
   use.cmp.setup = dsl.callWith {
@@ -23,6 +24,13 @@
       end
     '';
 
+    # Enable Luasnip snippet completion
+    snippet.expand = dsl.rawLua ''
+      function(args)
+          require("luasnip").lsp_expand(args.body)
+      end
+    '';
+
     # Basic completion keybinds
     mapping = {
       "['<C-n>']" = dsl.rawLua
@@ -62,6 +70,7 @@
     sources = [
       { name = "nvim_lua"; } # Fills in common Neovim lua functions
       { name = "nvim_lsp"; } # LSP results
+      { name = "luasnip"; } # Snippets
       { name = "path"; } # Shell completion from current PATH
       {
         name = "buffer"; # Grep for text from the current text buffer
@@ -110,6 +119,7 @@
             }
             vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
             vim_item.menu = ({
+                luasnip = "[Snippet]",
                 buffer = "[Buffer]",
                 path = "[Path]",
                 rg = "[Grep]",
@@ -129,6 +139,13 @@
   };
 
   lua = ''
+    -- Load snippets
+    -- Check status: :lua require("luasnip").log.open()
+    require("luasnip.loaders.from_vscode").lazy_load()
+    require("luasnip.loaders.from_vscode").lazy_load({ paths = { "${
+      builtins.toString pkgs.vscode-terraform-snippets
+    }" } })
+
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
         sources = {

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,110 +1,76 @@
-{ pkgs, lib, config, dsl, ... }: {
+{ pkgs, dsl, ... }: {
 
-  # Terraform optional because non-free
+  plugins = [
-  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
+    pkgs.vimPlugins.nvim-lspconfig
-  options.github = lib.mkEnableOption "Whether to enable GitHub features";
+    pkgs.vimPlugins.lsp-colors-nvim
-  options.kubernetes =
+    pkgs.vimPlugins.null-ls-nvim
-    lib.mkEnableOption "Whether to enable Kubernetes features";
+  ];
 
-  config =
+  use.lspconfig.lua_ls.setup = dsl.callWith {
+    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
+  };
 
-    let
+  use.lspconfig.nil_ls.setup = dsl.callWith {
+    cmd = [ "${pkgs.nil}/bin/nil" ];
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+  };
 
-      terraformFormat = if config.terraform then ''
+  use.lspconfig.pyright.setup = dsl.callWith {
-        require("null-ls").builtins.formatting.terraform_fmt.with({
+    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
-            command = "${pkgs.terraform}/bin/terraform",
+  };
-            extra_filetypes = { "hcl" },
-        }),
-      '' else
-        "";
 
-    in {
+  use.lspconfig.terraformls.setup =
-      plugins = [
+    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
-        pkgs.vimPlugins.nvim-lspconfig
-        pkgs.vimPlugins.null-ls-nvim
-        pkgs.vimPlugins.fidget-nvim
-      ];
 
-      setup.fidget = { };
+  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
 
-      use.lspconfig.lua_ls.setup = dsl.callWith {
+  lua = ''
-        settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+    ${builtins.readFile ./lsp.lua}
-        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 {
+    -- Prevent infinite log size (change this when debugging)
-        cmd = [ "${pkgs.nil}/bin/nil" ];
+    vim.lsp.set_log_level("off")
-        capabilities =
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-      };
 
-      use.lspconfig.pyright.setup = dsl.callWith {
+    require("null-ls").setup({
-        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+        sources = {
-      };
+            require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
+            require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+            require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+            require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
+            require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
+            require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
+            require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
+            require("null-ls").builtins.formatting.shfmt.with({
+                command = "${pkgs.shfmt}/bin/shfmt",
+                extra_args = { "-i", "4", "-ci" },
+            }),
+            require("null-ls").builtins.formatting.terraform_fmt.with({
+                command = "${pkgs.terraform}/bin/terraform",
+                extra_filetypes = { "hcl" },
+            }),
+        },
 
-      use.lspconfig.terraformls.setup = dsl.callWith {
+        on_attach = function(client, bufnr)
-        cmd = if config.terraform then [
+            if client.supports_method("textDocument/formatting") then
-          "${pkgs.terraform-ls}/bin/terraform-ls"
+                -- Auto-format on save
-          "serve"
+                vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-        ] else
+                vim.api.nvim_create_autocmd("BufWritePre", {
-          [ "echo" ];
+                    group = augroup,
-      };
+                    buffer = bufnr,
-
+                    callback = function()
-      use.lspconfig.rust_analyzer.setup = dsl.callWith {
+                        vim.lsp.buf.format({ bufnr = bufnr })
-        cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
+                    end,
-        settings = {
+                })
-          "['rust-analyzer']" = { check = { command = "clippy"; }; };
+                -- Use internal formatting for bindings like gq.
-        };
+                vim.api.nvim_create_autocmd("LspAttach", {
-      };
+                    callback = function(args)
-
+                        vim.bo[args.buf].formatexpr = nil
-      vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+                    end,
-
+                })
-      lua = ''
+            end
-        ${builtins.readFile ./lsp.lua}
+        end,
-
+    })
-        -- Prevent infinite log size (change this when debugging)
+  '';
-        vim.lsp.set_log_level("off")
-
-        require("null-ls").setup({
-            sources = {
-                require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
-                require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
-                require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
-                require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
-                require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
-                require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
-                require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
-                require("null-ls").builtins.formatting.shfmt.with({
-                    command = "${pkgs.shfmt}/bin/shfmt",
-                    extra_args = { "-i", "4", "-ci" },
-                }),
-                ${terraformFormat}
-            },
-
-            on_attach = function(client, bufnr)
-                if client.supports_method("textDocument/formatting") then
-                    -- Auto-format on save
-                    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-                    vim.api.nvim_create_autocmd("BufWritePre", {
-                        group = augroup,
-                        buffer = bufnr,
-                        callback = function()
-                            vim.lsp.buf.format({ bufnr = bufnr })
-                        end,
-                    })
-                    -- Use internal formatting for bindings like gq.
-                    vim.api.nvim_create_autocmd("LspAttach", {
-                        callback = function(args)
-                            vim.bo[args.buf].formatexpr = nil
-                        end,
-                    })
-                end
-            end,
-        })
-      '';
-
-    };
 
 }

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 = { };
 
@@ -69,6 +69,10 @@
     " Remember last position when reopening file
     au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
 
+    " LaTeX options
+    au FileType tex inoremap ;bf \textbf{}<Esc>i
+    au BufWritePost *.tex silent! execute "!pdflatex -output-directory=%:p:h % >/dev/null 2>&1" | redraw!
+
     " Flash highlight when yanking
     au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
   '';

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>")
 
@@ -64,12 +65,6 @@ key("n", "<C-Down>", ":resize -2<CR>", { silent = true })
 key("n", "<C-Left>", ":vertical resize -2<CR>", { silent = true })
 key("n", "<C-Right>", ":vertical resize +2<CR>", { silent = true })
 
--- Quickfix
-key("n", "]q", ":cnext<CR>")
-key("n", "[q", ":cprevious<CR>")
-key("n", "co", ":copen<CR>")
-key("n", "cq", ":cclose<CR>")
-
 -- Other
 key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
 key("n", "Y", "y$")                                         --- Copy to end of line

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/charm.nix

@@ -10,7 +10,6 @@
       glow # Markdown previews
       skate # Key-value store
       charm # Manage account and filesystem
-      pop # Send emails from a TUI
     ];
 
   };

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

@@ -6,7 +6,7 @@
   home-manager.users.${config.user} = {
 
     # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl ];
+    home.packages = with pkgs; [ curl exa ];
 
     programs.fish = {
       enable = true;
@@ -15,8 +15,8 @@
         # Version of bash which works much better on the terminal
         bash = "${pkgs.bashInteractive}/bin/bash";
 
-        # Use eza (exa) instead of ls for fancier output
+        # Use exa instead of ls for fancier output
-        ls = "${pkgs.eza}/bin/eza --group";
+        ls = "exa --group";
 
         # Move files to XDG trash on the commandline
         trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
@@ -123,6 +123,9 @@
         dr = "docker run --rm -it";
         db = "docker build . -t";
 
+        # Rust
+        ca = "cargo";
+
       };
       shellInit = "";
     };

modules/common/shell/fzf.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, ... }: {
 
   # FZF is a fuzzy-finder for the terminal
 
@@ -16,9 +16,10 @@
                     --search-path $HOME/dev \
                     --type directory \
                     --exact-depth 2 \
-                | ${pkgs.proximity-sort}/bin/proximity-sort . \
                 | sed 's/\\/$//' \
-                | fzf --tiebreak=index \
+                | fzf \
+                    --delimiter '/' \
+                    --with-nth 6.. \
             )
             and cd $projdir
             and commandline -f execute

modules/common/shell/git.nix

@@ -58,7 +58,6 @@ in {
           git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
         gcob = "git switch -c";
         gb = "git branch";
-        gpd = "git push origin -d";
         gbd = "git branch -d";
         gbD = "git branch -D";
         gr = "git reset";

modules/common/shell/github.nix

@@ -7,7 +7,6 @@
         enable = true;
         gitCredentialHelper.enable = true;
         settings.git_protocol = "https";
-        extensions = [ pkgs.gh-collaborators ];
       };
 
     programs.fish =
@@ -15,7 +14,7 @@
         shellAbbrs = {
           ghr = "gh repo view -w";
           gha =
-            "gh run list | head -1 | awk '{ print \\$\\(NF-2\\) }' | xargs gh run view";
+            "gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view";
           grw = "gh run watch";
           grf = "gh run view --log-failed";
           grl = "gh run view --log";

modules/common/shell/starship.nix

@@ -13,7 +13,7 @@
         "$cmd_duration"
         "$character"
       ];
-      right_format = "$nix_shell";
+      # right_format = "$nix_shell";
       character = {
         success_symbol = "[❯](bold green)";
         error_symbol = "[❯](bold red)";

modules/common/shell/utilities.nix

@@ -25,8 +25,6 @@ in {
         htop # Show system processes
         killall # Force quit
         inetutils # Includes telnet, whois
-        jless # JSON viewer
-        jo # JSON output
         jq # JSON manipulation
         lf # File viewer
         qrencode # Generate qr codes
@@ -46,11 +44,10 @@ in {
 
       home.file = {
         ".rgignore".text = ignorePatterns;
+        ".fdignore".text = ignorePatterns;
         ".digrc".text = "+noall +answer"; # Cleaner dig commands
       };
 
-      xdg.configFile."fd/ignore".text = ignorePatterns;
-
       programs.bat = {
         enable = true; # cat replacement
         config = {

modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -54,19 +54,14 @@ function obj:init()
     end)
 
     -- Launcher shortcuts
-    self.launcher:bind("ctrl", "space", function() end)
+    self.launcher:bind("ctrl", "space", function()
+    end)
     self.launcher:bind("", "return", function()
         self:switch("@kitty@")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")
     end)
-    self.launcher:bind("shift", "D", function()
-        hs.execute("launchctl remove com.paloaltonetworks.gp.pangps")
-        hs.execute("launchctl remove com.paloaltonetworks.gp.pangpa")
-        hs.alert.show("Disconnected from GlobalProtect", nil, nil, 4)
-        self.launcher:exit()
-    end)
     self.launcher:bind("", "E", function()
         self:switch("Mail.app")
     end)
@@ -85,12 +80,6 @@ function obj:init()
     self.launcher:bind("", "P", function()
         self:switch("System Preferences.app")
     end)
-    self.launcher:bind("shift", "P", function()
-        hs.execute("launchctl load /Library/LaunchAgents/com.paloaltonetworks.gp.pangps.plist")
-        hs.execute("launchctl load /Library/LaunchAgents/com.paloaltonetworks.gp.pangpa.plist")
-        hs.alert.show("Reconnecting to GlobalProtect", nil, nil, 4)
-        self.launcher:exit()
-    end)
     self.launcher:bind("", "R", function()
         hs.console.clearConsole()
         hs.reload()

modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua

@@ -55,15 +55,6 @@ local function worklayout()
         local layout = concat(left, right, laptop)
         hs.layout.apply(layout)
     end)
-
-    -- Reload Hammerspoon whenever layout changes
-    hs.screen.watcher.new(function()
-        -- Pause for 5 seconds to give time for layout to change
-        hs.timer.doAfter(5, function()
-            -- Perform the actual reload
-            hs.reload()
-        end)
-    end)
 end
 
 return worklayout

modules/darwin/homebrew.nix

@@ -38,12 +38,10 @@
         "gitify" # Git notifications in menu bar
         "keybase" # GUI on Nix not available for macOS
         "logitech-g-hub" # Mouse and keyboard management
-        "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
         "obsidian" # Obsidian packaging on Nix is not available for macOS
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
         "steam" # Not packaged for Nix
-        "epic-games" # Not packaged for Nix
       ];
     };
 

modules/darwin/user.nix

@@ -10,7 +10,11 @@
     };
 
     # Used for aerc
-    home-manager.users.${config.user}.xdg.enable = true;
+    home-manager.users.${config.user} = {
+      home.sessionVariables = {
+        XDG_CONFIG_HOME = "${config.homePath}/.config";
+      };
+    };
 
   };
 

modules/darwin/utilities.nix

@@ -2,8 +2,6 @@
 
 {
 
-  unfreePackages = [ "consul" "vault-bin" ];
-
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     home.packages = with pkgs; [
@@ -13,12 +11,11 @@
       youtube-dl # Convert web videos
       pandoc # Convert text documents
       mpd # TUI slideshows
-      mpv # Video player
       awscli2
       awslogs
       google-cloud-sdk
       ansible
-      vault-bin
+      vault
       consul
       noti # Create notifications programmatically
       ipcalc # Make IP network calculations

modules/nixos/gaming/steam.nix

@@ -22,11 +22,6 @@
 
     ];
 
-    # Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix
-    # Based on: https://github.com/NixOS/nixpkgs/issues/73323
-    environment.sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS =
-      lib.makeBinPath [ pkgs.proton-ge-custom ];
-
     # Seems like NetworkManager can help speed up Steam launch
     # https://www.reddit.com/r/archlinux/comments/qguhco/steam_startup_time_arch_1451_seconds_fedora_34/hi8opet/
     networking.networkmanager.enable = true;

modules/nixos/graphical/default.nix

@@ -5,6 +5,7 @@
     ./fonts.nix
     ./gtk.nix
     ./i3.nix
+    ./keybinds.nix
     ./picom.nix
     ./polybar.nix
     ./rofi.nix
@@ -13,14 +14,6 @@
 
   options = {
 
-    launcherCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for launching";
-    };
-    systemdSearch = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for interacting with systemd";
-    };
     altTabCommand = lib.mkOption {
       type = lib.types.str;
       description = "Command to use for choosing windows";
@@ -37,14 +30,30 @@
       type = lib.types.str;
       description = "Command to use for quick calculations";
     };
-    toggleBarCommand = lib.mkOption {
+    launcherCommand = lib.mkOption {
       type = lib.types.str;
-      description = "Command to hide and show the status bar.";
+      description = "Command to use for launching";
+    };
+    lockScreenCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use to lock the screen";
     };
     powerCommand = lib.mkOption {
       type = lib.types.str;
       description = "Command to use for power options menu";
     };
+    systemdSearch = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for interacting with systemd";
+    };
+    terminal = lib.mkOption {
+      type = lib.types.str;
+      description = "Package to use for graphical terminal";
+    };
+    toggleBarCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to hide and show the status bar.";
+    };
     wallpaper = lib.mkOption {
       type = lib.types.path;
       description = "Wallpaper background image file";

modules/nixos/graphical/i3.nix

@@ -2,11 +2,22 @@
 
 let
 
-  lockCmd =
-    "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
   lockUpdate =
     "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
 
+  workspaces = {
+    "1" = "1:I";
+    "2" = "2:II";
+    "3" = "3:III";
+    "4" = "4:IV";
+    "5" = "5:V";
+    "6" = "6:VI";
+    "7" = "7:VII";
+    "8" = "8:VIII";
+    "9" = "9:IX";
+    "10" = "10:X";
+  };
+
 in {
 
   config = lib.mkIf pkgs.stdenv.isLinux {
@@ -23,29 +34,18 @@ in {
     home-manager.users.${config.user} = {
       xsession.windowManager.i3 = {
         enable = config.services.xserver.enable;
-        config = let
+        config = let modifier = "Mod4"; # Super key
-          modifier = "Mod4"; # Super key
-          ws1 = "1:I";
-          ws2 = "2:II";
-          ws3 = "3:III";
-          ws4 = "4:IV";
-          ws5 = "5:V";
-          ws6 = "6:VI";
-          ws7 = "7:VII";
-          ws8 = "8:VIII";
-          ws9 = "9:IX";
-          ws10 = "10:X";
         in {
           modifier = modifier;
           assigns = {
-            "${ws1}" = [{ class = "Firefox"; }];
+            "${workspaces."1"}" = [{ class = "Firefox"; }];
-            "${ws2}" = [
+            "${workspaces."2"}" = [
               { class = "kitty"; }
               { class = "aerc"; }
               { class = "obsidian"; }
             ];
-            "${ws3}" = [{ class = "discord"; }];
+            "${workspaces."3"}" = [{ class = "discord"; }];
-            "${ws4}" = [ { class = "steam"; } { class = "Steam"; } ];
+            "${workspaces."4"}" = [{ class = "Steam"; }];
           };
           bars = [{ command = "echo"; }]; # Disable i3bar
           colors = let
@@ -91,131 +91,7 @@ in {
             newWindow = "urgent";
             followMouse = false;
           };
-          keybindings = {
+          keybindings = { };
-
-            # Adjust screen brightness
-            "Shift+F12" =
-              # Disable dynamic sleep
-              # https://github.com/rockowitz/ddcutil/issues/323
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-            "Shift+F11" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-            "XF86MonBrightnessUp" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-            "XF86MonBrightnessDown" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-
-            # Media player controls
-            "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
-            "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
-            "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
-            "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-
-            # Launchers
-            "${modifier}+Return" =
-              "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
-            "${modifier}+space" =
-              "exec --no-startup-id ${config.launcherCommand}";
-            "${modifier}+Shift+s" =
-              "exec --no-startup-id ${config.systemdSearch}";
-            "${modifier}+Shift+a" =
-              "exec --no-startup-id ${config.audioSwitchCommand}";
-            "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
-            "${modifier}+Shift+period" =
-              "exec --no-startup-id ${config.powerCommand}";
-            "${modifier}+Shift+m" =
-              "exec --no-startup-id ${config.brightnessCommand}";
-            "${modifier}+c" =
-              "exec --no-startup-id ${config.calculatorCommand}";
-            "${modifier}+Shift+c" = "reload";
-            "${modifier}+Shift+r" = "restart";
-            "${modifier}+Shift+q" = ''
-              exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
-            "${modifier}+Shift+x" = "exec ${lockCmd}";
-            "${modifier}+Mod1+h" =
-              "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-            "${modifier}+Mod1+r" =
-              "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-
-            # Window options
-            "${modifier}+q" = "kill";
-            "${modifier}+b" = "exec ${config.toggleBarCommand}";
-            "${modifier}+f" = "fullscreen toggle";
-            "${modifier}+h" = "focus left";
-            "${modifier}+j" = "focus down";
-            "${modifier}+k" = "focus up";
-            "${modifier}+l" = "focus right";
-            "${modifier}+Left" = "focus left";
-            "${modifier}+Down" = "focus down";
-            "${modifier}+Up" = "focus up";
-            "${modifier}+Right" = "focus right";
-            "${modifier}+Shift+h" = "move left";
-            "${modifier}+Shift+j" = "move down";
-            "${modifier}+Shift+k" = "move up";
-            "${modifier}+Shift+l" = "move right";
-            "${modifier}+Shift+Left" = "move left";
-            "${modifier}+Shift+Down" = "move down";
-            "${modifier}+Shift+Up" = "move up";
-            "${modifier}+Shift+Right" = "move right";
-
-            # Tiling
-            "${modifier}+i" = "split h";
-            "${modifier}+v" = "split v";
-            "${modifier}+s" = "layout stacking";
-            "${modifier}+t" = "layout tabbed";
-            "${modifier}+e" = "layout toggle split";
-            "${modifier}+Shift+space" = "floating toggle";
-            "${modifier}+Control+space" = "focus mode_toggle";
-            "${modifier}+a" = "focus parent";
-
-            # Workspaces
-            "${modifier}+1" = "workspace ${ws1}";
-            "${modifier}+2" = "workspace ${ws2}";
-            "${modifier}+3" = "workspace ${ws3}";
-            "${modifier}+4" = "workspace ${ws4}";
-            "${modifier}+5" = "workspace ${ws5}";
-            "${modifier}+6" = "workspace ${ws6}";
-            "${modifier}+7" = "workspace ${ws7}";
-            "${modifier}+8" = "workspace ${ws8}";
-            "${modifier}+9" = "workspace ${ws9}";
-            "${modifier}+0" = "workspace ${ws10}";
-
-            # Move windows
-            "${modifier}+Shift+1" =
-              "move container to workspace ${ws1}; workspace ${ws1}";
-            "${modifier}+Shift+2" =
-              "move container to workspace ${ws2}; workspace ${ws2}";
-            "${modifier}+Shift+3" =
-              "move container to workspace ${ws3}; workspace ${ws3}";
-            "${modifier}+Shift+4" =
-              "move container to workspace ${ws4}; workspace ${ws4}";
-            "${modifier}+Shift+5" =
-              "move container to workspace ${ws5}; workspace ${ws5}";
-            "${modifier}+Shift+6" =
-              "move container to workspace ${ws6}; workspace ${ws6}";
-            "${modifier}+Shift+7" =
-              "move container to workspace ${ws7}; workspace ${ws7}";
-            "${modifier}+Shift+8" =
-              "move container to workspace ${ws8}; workspace ${ws8}";
-            "${modifier}+Shift+9" =
-              "move container to workspace ${ws9}; workspace ${ws9}";
-            "${modifier}+Shift+0" =
-              "move container to workspace ${ws10}; workspace ${ws10}";
-
-            # Move screens
-            "${modifier}+Control+l" = "move workspace to output right";
-            "${modifier}+Control+h" = "move workspace to output left";
-
-            # Resizing
-            "${modifier}+r" = ''mode "resize"'';
-            "${modifier}+Control+Shift+h" =
-              "resize shrink width 10 px or 10 ppt";
-            "${modifier}+Control+Shift+j" =
-              "resize grow height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+k" =
-              "resize shrink height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
-          };
           modes = { };
           startup = [
             {
@@ -224,16 +100,15 @@ in {
               notification = false;
             }
             {
-              command =
+              command = "i3-msg focus right, workspace ${workspaces."2"}";
-                "i3-msg workspace ${ws2}, move workspace to output right";
               notification = false;
             }
             {
-              command =
+              command = "i3-msg focus left, workspace ${workspaces."1"}";
-                "i3-msg workspace ${ws1}, move workspace to output left";
               notification = false;
             }
           ];
+          terminal = config.terminal;
           window = {
             border = 0;
             hideEdgeBorders = "smart";
@@ -241,22 +116,74 @@ in {
           };
           workspaceAutoBackAndForth = false;
           workspaceOutputAssign = [ ];
-          # gaps = {
-          # bottom = 8;
-          # top = 8;
-          # left = 8;
-          # right = 8;
-          # horizontal = 15;
-          # vertical = 15;
-          # inner = 15;
-          # outer = 0;
-          # smartBorders = "off";
-          # smartGaps = false;
-          # };
         };
         extraConfig = "";
       };
 
+      services.sxhkd.keybindings = let
+
+        # Shortcuts
+        i3-msg = "${pkgs.i3}/bin/i3-msg";
+
+      in {
+
+        # Window navigation
+        "super + {_,shift +}{h,j,k,l}" =
+          ''${i3-msg} "{focus,move} {left,down,up,right}"'';
+        "super + {_,shift +}{Left,Down,Up,Right}" =
+          ''${i3-msg} "{focus,move} {left,down,up,right}"'';
+        "super + q" = ''${i3-msg} "kill"'';
+        "super + f" = ''${i3-msg} "fullscreen toggle"'';
+
+        # Screen management
+        "super + control + l" = ''${i3-msg} "move workspace to output right"'';
+        "super + control + h" = ''${i3-msg} "move workspace to output left"'';
+
+        # Window layouts and tiling
+        "super + {i,v}" = ''${i3-msg} "split {h,v}"'';
+        "super + {s,t,e}" =
+          ''${i3-msg} "layout {stacking,tabbed,toggle split}"'';
+        "super + shift + space" = ''${i3-msg} "floating toggle"'';
+        "super + control + space" = ''${i3-msg} "focus mode_toggle"'';
+        "super + a" = ''${i3-msg} "focus parent"'';
+
+        # Launch terminal
+        "super + Return" = ''
+          ${i3-msg} "exec --no-startup-id ${config.terminal}; workspace ${
+            workspaces."2"
+          }; layout tabbed"'';
+
+        # Restart and reload
+        "super + shift + {c,r}" = ''${i3-msg} "{reload,restart}"'';
+        "super + shift + q" = ''
+          ${pkgs.i3}/bin/i3-nagbar -t warning -m "Exit i3?" -B "Yes, exit i3" "${i3-msg} exit"'';
+
+        # Resize
+        "super + r : {h,j,k,l}" =
+          ''${i3-msg} "resize {shrink,grow} width 10px or 10 ppt"'';
+        "super + r : {j,k}" =
+          ''${i3-msg} "resize {shrink,grow} height 10px or 10 ppt"'';
+
+      } // (
+
+        # Bind navigation by number
+        let
+          bindWorkspace = num: workspace:
+            lib.attrsets.nameValuePair ("super + ${num}")
+            (''${i3-msg} "workspace ${workspace}"'');
+        in lib.mapAttrs' bindWorkspace workspaces
+
+      ) // (
+
+        # Bind move container to workspace by number
+        let
+          bindWorkspace = num: workspace:
+            lib.attrsets.nameValuePair ("super + shift +${num}") (''
+              ${i3-msg} "move container to workspace ${workspace}; workspace ${workspace}"'');
+        in lib.mapAttrs' bindWorkspace workspaces
+
+      );
+
       programs.fish.functions = {
         update-lock-screen = lib.mkIf config.services.xserver.enable {
           description = "Update lockscreen with wallpaper";
@@ -277,17 +204,20 @@ in {
 
     };
 
+    lockScreenCommand =
+      "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
+
     # Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service
     systemd.services.lock = {
       enable = config.services.xserver.enable;
-      description = "Lock the screen on resume from suspend";
+      description = "Lock the screen before suspend";
       before = [ "sleep.target" "suspend.target" ];
       serviceConfig = {
         User = config.user;
         Type = "simple";
         Environment = "DISPLAY=:0";
         TimeoutSec = "infinity";
-        ExecStart = lockCmd;
+        ExecStart = config.lockScreenCommand;
         ExecStartPost = "${pkgs.coreutils-full}/bin/sleep 1";
       };
       wantedBy = [ "sleep.target" "suspend.target" ];

modules/nixos/graphical/keybinds.nix

@@ -0,0 +1,51 @@
+{ config, pkgs, ... }: {
+
+  home-manager.users.${config.user} = {
+    services.sxhkd = {
+      enable = true;
+      keybindings = {
+
+        # Adjust screen brightness (TODO: replace with pkgs.light?)
+        "shift + {F11,F12}" = ''
+          ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 {- 30,+ 30} && sleep 1; \\
+          ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 {- 30,+ 30}
+        '';
+        "XF86MonBrightness{Down,Up}" = ''
+          ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 {- 30,+ 30} && sleep 1; \\
+          ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 {- 30,+ 30}
+        '';
+
+        # Media controls
+        "XF86Audio{Play,Stop,Next,Prev}" =
+          "${pkgs.playerctl}/bin/playerctl {play-pause,stop,next,previous}";
+
+        # Toggle bar
+        "super + b" = config.toggleBarCommand;
+
+        # Launchers
+        "super + space" = config.launcherCommand;
+        "super + shift + s" = config.systemdSearch;
+        "super + shift + a" = config.audioSwitchCommand;
+        "alt + Tab" = config.altTabCommand;
+        "super + shift + period" = config.powerCommand;
+        "super + shift + m" = config.brightnessCommand;
+        "super + c" = config.calculatorCommand;
+        "super + shift + x" = config.lockScreenCommand;
+        "super + alt + h" =
+          "${config.terminal} sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+        "super + alt + r" =
+          "${config.terminal} sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+
+      };
+    };
+
+    xsession.windowManager.i3.config.startup = [{
+
+      command = "pkill sxhkd; sxhkd";
+      always = true;
+      notification = false;
+    }];
+
+  };
+
+}

modules/nixos/graphical/picom.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
+  config = lib.mkIf config.services.xserver.enable {
     home-manager.users.${config.user} = {
 
       services.picom = {

modules/nixos/graphical/polybar.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
+  config = lib.mkIf config.services.xserver.enable {
 
     toggleBarCommand = "polybar-msg cmd toggle";
 
@@ -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/graphical/rofi.nix

@@ -8,11 +8,10 @@ in {
 
   imports = [ ./rofi/power.nix ./rofi/brightness.nix ];
 
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
+  config = lib.mkIf config.services.xserver.enable {
 
     # Set the Rofi-Systemd terminal for viewing logs
-    environment.sessionVariables.ROFI_SYSTEMD_TERM =
+    environment.sessionVariables.ROFI_SYSTEMD_TERM = config.terminal;
-      lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
 
     home-manager.users.${config.user} = {
 
@@ -24,6 +23,13 @@ in {
       programs.rofi = {
         enable = true;
         cycle = true;
+        extraConfig = {
+          show-icons = true;
+          kb-cancel = "Escape,Super+space";
+          modi = "window,run,ssh,emoji,calc,systemd";
+          sort = true;
+          # levenshtein-sort = true;
+        };
         location = "center";
         pass = { };
         plugins = [ pkgs.rofi-calc pkgs.rofi-emoji pkgs.rofi-systemd ];
@@ -59,7 +65,7 @@ in {
             border = mkLiteral "0px";
             border-radius = mkLiteral "0px";
             border-color = mkLiteral config.theme.colors.base04;
-            children = map mkLiteral [ "inputbar" "message" "listview" ];
+            children = map mkLiteral [ "inputbar" "listview" ];
             spacing = mkLiteral "10px";
             padding = mkLiteral "10px";
           };
@@ -143,15 +149,9 @@ in {
           };
 
         };
+        terminal = config.terminal;
         xoffset = 0;
         yoffset = -20;
-        extraConfig = {
-          show-icons = true;
-          kb-cancel = "Escape,Super+space";
-          modi = "window,run,ssh,emoji,calc,systemd";
-          sort = true;
-          # levenshtein-sort = true;
-        };
       };
 
       home.file.".local/share/rofi/themes" = {

modules/nixos/graphical/rofi/brightness.nix

@@ -28,18 +28,17 @@ in {
               -sep ';' \
               -selected-row 1)
 
-
       case "$chosen" in
           "$dimmer")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 25
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 25
               ;;
 
           "$medium")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 75
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 75
               ;;
 
           "$brighter")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 100
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 100
               ;;
 
           *) exit 1 ;;

modules/nixos/graphical/rofi/power.nix

@@ -31,17 +31,15 @@ in {
             -sep ';' \
             -selected-row 2)
 
-    confirm () {
-        ${builtins.readFile ./rofi-prompt.sh}
-    }
-
     case "$chosen" in
         "$power_off")
-            confirm 'Shutdown?' && doas shutdown now
+            ${
+              builtins.toString ./rofi-prompt.sh
+            } 'Shutdown?' && doas shutdown now
             ;;
 
         "$reboot")
-            confirm 'Reboot?' && doas reboot
+            ${builtins.toString ./rofi-prompt.sh} 'Reboot?' && doas reboot
             ;;
 
         "$lock")
@@ -53,7 +51,7 @@ in {
             ;;
 
         "$log_out")
-            confirm 'Logout?' && i3-msg exit
+            ${builtins.toString ./rofi-prompt.sh} 'Logout?' && i3-msg exit
             ;;
 
         *) exit 1 ;;

modules/nixos/graphical/rofi/rofi-prompt.sh

@@ -42,6 +42,6 @@ chosen=$(printf '%s;%s\n' "$yes" "$no" |
         -selected-row 1)
 
 case "$chosen" in
-    "$yes") return 0 ;;
+    "$yes") exit 0 ;;
-    *) return 1 ;;
+    *) exit 1 ;;
 esac

modules/nixos/graphical/sway.nix

@@ -0,0 +1,25 @@
+{ config, lib, ... }: {
+
+  config = lib.mkIf config.gui.enable {
+
+    programs.sway = {
+      enable = true;
+      package = null; # Use home-manager Sway instead
+    };
+
+  };
+
+  home-manager.users.${config.user} = {
+
+    wayland.windowManager.sway = {
+      enable = true;
+      config =
+        config.home-manager.users.${config.user}.xsession.windowManager.i3.config;
+    };
+
+  };
+
+  # TODO: swaybg
+  # TODO: swaylock
+
+}

modules/nixos/hardware/keyboard.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, ... }: {
 
   config = {
 
@@ -23,10 +23,6 @@
       };
     };
 
-    # For some reason, keyd doesn't restart properly when updating
-    system.activationScripts.keyd.text =
-      "${pkgs.systemd}/bin/systemctl restart keyd.service";
-
     # Enable num lock on login
     home-manager.users.${config.user}.xsession.numlock.enable = true;
 

modules/nixos/hardware/networking.nix

@@ -12,7 +12,7 @@
       domainName = "local";
       ipv6 = false; # Should work either way
       # Resolve local hostnames using Avahi DNS
-      nssmdns4 = true;
+      nssmdns = true;
       publish = {
         enable = true;
         addresses = true;

modules/nixos/services/arr.nix

@@ -2,7 +2,6 @@
 
 let
 
-  # This config specifies ports for Prometheus to scrape information
   arrConfig = {
     radarr = {
       exportarrPort = "9707";
@@ -42,8 +41,6 @@ in {
       sabnzbd = {
         enable = true;
         group = "media";
-        # The config file must be editable within the application
-        # It contains server configs and credentials
         configFile = "/data/downloads/sabnzbd/sabnzbd.ini";
       };
       sonarr = {
@@ -56,23 +53,16 @@ in {
       };
     };
 
-    # Create a media group to be shared between services
     users.groups.media = { };
-
-    # Give the human user access to the media group
     users.users.${config.user}.extraGroups = [ "media" ];
-
-    # Allows media group to read/write the sabnzbd directory
     users.users.sabnzbd.homeMode = "0770";
 
-    unfreePackages = [ "unrar" ]; # Required as a dependency for sabnzbd
+    unfreePackages = [ "unrar" ]; # Required for sabnzbd
 
     # Requires updating the base_url config value in each service
     # If you try to rewrite the URL, the service won't redirect properly
     caddy.routes = [
       {
-        # Group means that routes with the same name are mutually exclusive,
-        # so they are split between the appropriate services.
         group = "download";
         match = [{
           host = [ config.hostnames.download ];
@@ -80,7 +70,6 @@ in {
         }];
         handle = [{
           handler = "reverse_proxy";
-          # We're able to reference the url and port of the service dynamically 
           upstreams = [{ dial = arrConfig.sonarr.url; }];
         }];
       }
@@ -103,7 +92,6 @@ in {
         }];
         handle = [{
           handler = "reverse_proxy";
-          # Prowlarr doesn't offer a dynamic config, so we have to hardcode it
           upstreams = [{ dial = "localhost:9696"; }];
         }];
       }
@@ -116,7 +104,6 @@ in {
         handle = [{
           handler = "reverse_proxy";
           upstreams = [{
-            # Bazarr only dynamically sets the port, not the host
             dial = "localhost:${
                 builtins.toString config.services.bazarr.listenPort
               }";
@@ -158,12 +145,10 @@ in {
           Type = "simple";
           DynamicUser = true;
           ExecStart = let
-            # Sabnzbd doesn't accept the URI path, unlike the others
             url = if name != "sabnzbd" then
               "http://${attrs.url}/${name}"
             else
               "http://${attrs.url}";
-            # Exportarr is trained to pull from the arr services
           in ''
             ${pkgs.exportarr}/bin/exportarr ${name} \
                         --url ${url} \
@@ -212,7 +197,7 @@ in {
       prefix = "API_KEY=";
     };
 
-    # Prometheus scrape targets (expose Exportarr to Prometheus)
+    # Prometheus scrape targets
     prometheus.scrapeTargets = map (key:
       "127.0.0.1:${
         lib.attrsets.getAttrFromPath [ key "exportarrPort" ] arrConfig

modules/nixos/services/backups.nix

@@ -1,6 +1,3 @@
-# This is my setup for backing up SQlite databases and other systems to S3 or
-# S3-equivalent services (like Backblaze B2).
-
 { config, lib, ... }: {
 
   options = {

modules/nixos/services/bind.nix

@@ -1,10 +1,3 @@
-# Bind is a DNS service. This allows me to resolve public domains locally so
-# when I'm at home, I don't have to travel over the Internet to reach my
-# server.
-
-# To set this on all home machines, I point my router's DNS resolver to the
-# local IP address of the machine running this service (swan).
-
 { config, pkgs, lib, ... }:
 
 let
@@ -23,19 +16,11 @@ in {
 
   config = lib.mkIf config.services.bind.enable {
 
-    # Normally I block all requests not coming from Cloudflare, so I have to also
-    # allow my local network.
     caddy.cidrAllowlist = [ "192.168.0.0/16" ];
 
     services.bind = {
-
-      # Allow requests coming from these IPs. This way I don't somehow get
-      # spammed with DNS requests coming from the Internet.
       cacheNetworks = [ "127.0.0.0/24" "192.168.0.0/16" ];
-
-      # When making normal DNS requests, forward them to Cloudflare to resolve.
       forwarders = [ "1.1.1.1" "1.0.0.1" ];
-
       ipv4Only = true;
 
       # Use rpz zone as an override
@@ -62,7 +47,6 @@ in {
 
     };
 
-    # We must allow DNS traffic to hit our machine as well
     networking.firewall.allowedTCPPorts = [ 53 ];
     networking.firewall.allowedUDPPorts = [ 53 ];
 

modules/nixos/services/caddy.nix

@@ -1,14 +1,3 @@
-# Caddy is a reverse proxy, like Nginx or Traefik. This creates an ingress
-# point from my local network or the public (via Cloudflare). Instead of a
-# Caddyfile, I'm using the more expressive JSON config file format. This means
-# I can source routes from other areas in my config and build the JSON file
-# using the result of the expression.
-
-# Caddy helpfully provides automatic ACME cert generation and management, but
-# it requires a form of validation. We are using a custom build of Caddy
-# (compiled with an overlay) to insert a plugin for managing DNS validation
-# with Cloudflare's DNS API.
-
 { config, pkgs, lib, ... }: {
 
   options = {
@@ -53,17 +42,12 @@
       configFile = pkgs.writeText "Caddyfile" (builtins.toJSON {
         apps.http.servers.main = {
           listen = [ ":443" ];
-
-          # These routes are pulled from the rest of this repo
           routes = config.caddy.routes;
           errors.routes = config.caddy.blocks;
-
+          logs = { }; # Uncomment to collect access logs
-          logs = { }; # Uncommenting collects access logs
         };
         apps.http.servers.metrics = { }; # Enables Prometheus metrics
         apps.tls.automation.policies = config.caddy.tlsPolicies;
-
-        # Setup logging to file
         logging.logs.main = {
           encoder = { format = "console"; };
           writer = {
@@ -74,23 +58,13 @@
           };
           level = "INFO";
         };
-
       });
 
     };
 
-    # Allows Caddy to serve lower ports (443, 80)
-    systemd.services.caddy.serviceConfig.AmbientCapabilities =
-      "CAP_NET_BIND_SERVICE";
-
-    # Required for web traffic to reach this machine
     networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-    # HTTP/3 QUIC uses UDP (not sure if being used)
     networking.firewall.allowedUDPPorts = [ 443 ];
 
-    # Caddy exposes Prometheus metrics with the admin API
-    # https://caddyserver.com/docs/api
     prometheus.scrapeTargets = [ "127.0.0.1:2019" ];
 
   };

modules/nixos/services/calibre.nix

@@ -1,9 +1,3 @@
-# Calibre-web is an E-Book library and management tool.
-
-# - Exposed to the public via Caddy.
-# - Hostname defined with config.hostnames.books
-# - File directory backed up to S3 on a cron schedule.
-
 { config, pkgs, lib, ... }:
 
 let
@@ -32,7 +26,6 @@ in {
       };
     };
 
-    # Allow web traffic to Caddy
     caddy.routes = [{
       match = [{ host = [ config.hostnames.books ]; }];
       handle = [{
@@ -42,8 +35,6 @@ in {
               builtins.toString config.services.calibre-web.listen.port
             }";
         }];
-        # This is required when calibre-web is behind a reverse proxy
-        # https://github.com/janeczku/calibre-web/issues/19
         headers.request.add."X-Script-Name" = [ "/calibre-web" ];
       }];
     }];

modules/nixos/services/cloudflare-tunnel.nix

@@ -1,12 +1,3 @@
-# Cloudflare Tunnel is a service for accessing the network even behind a
-# firewall, through outbound-only requests. It works by installing an agent on
-# our machines that exposes services through Cloudflare Access (Zero Trust),
-# similar to something like Tailscale.
-
-# In this case, we're using Cloudflare Tunnel to enable SSH access over a web
-# browser even when outside of my network. This is probably not the safest
-# choice but I feel comfortable enough with it anyway.
-
 { config, lib, ... }:
 
 # First time setup:
@@ -49,28 +40,23 @@
       tunnels = {
         "${config.cloudflareTunnel.id}" = {
           credentialsFile = config.secrets.cloudflared.dest;
-          # Catch-all if no match (should never happen anyway)
           default = "http_status:404";
-          # Match from ingress of any valid server name to SSH access
           ingress = { "*.masu.rs" = "ssh://localhost:22"; };
         };
       };
     };
 
-    # Grant Cloudflare access to SSH into this server
     environment.etc = {
       "ssh/ca.pub".text = ''
         ${config.cloudflareTunnel.ca}
       '';
 
-      # Must match the username portion of the email address in Cloudflare
+      # Must match the username of the email address in Cloudflare Access
-      # Access
       "ssh/authorized_principals".text = ''
         ${config.user}
       '';
     };
 
-    # Adjust SSH config to allow access from Cloudflare's certificate
     services.openssh.extraConfig = ''
       PubkeyAuthentication yes
       TrustedUserCAKeys /etc/ssh/ca.pub

modules/nixos/services/cloudflare.nix

@@ -1,13 +1,5 @@
 # This module is necessary for hosts that are serving through Cloudflare.
 
-# Cloudflare is a CDN service that is used to serve the domain names and
-# caching for my websites and services. Since Cloudflare acts as our proxy, we
-# must allow access over the Internet from Cloudflare's IP ranges.
-
-# We also want to validate our HTTPS certificates from Caddy. We'll use Caddy's
-# DNS validation plugin to connect to Cloudflare and automatically create
-# validation DNS records for our generated certificates.
-
 { config, pkgs, lib, ... }:
 
 let
@@ -67,9 +59,10 @@ in {
         };
       }];
     }];
-    # Allow Caddy to read Cloudflare API key for DNS validation
     systemd.services.caddy.serviceConfig.EnvironmentFile =
       config.secrets.cloudflareApi.dest;
+    systemd.services.caddy.serviceConfig.AmbientCapabilities =
+      "CAP_NET_BIND_SERVICE";
 
     # API key must have access to modify Cloudflare DNS records
     secrets.cloudflareApi = {
@@ -80,7 +73,7 @@ in {
     };
 
     # Allows Nextcloud to trust Cloudflare IPs
-    services.nextcloud.extraOptions.trusted_proxies = cloudflareIpRanges;
+    services.nextcloud.config.trustedProxies = cloudflareIpRanges;
 
   };
 }

modules/nixos/services/default.nix

@@ -1,6 +1,3 @@
-# This file imports all the other files in this directory for use as modules in
-# my config.
-
 { ... }: {
 
   imports = [
@@ -16,15 +13,12 @@
     ./gnupg.nix
     ./grafana.nix
     ./honeypot.nix
-    ./influxdb2.nix
     ./jellyfin.nix
     ./keybase.nix
     ./mullvad.nix
     ./n8n.nix
     ./netdata.nix
     ./nextcloud.nix
-    ./paperless.nix
-    ./postgresql.nix
     ./prometheus.nix
     ./samba.nix
     ./secrets.nix

modules/nixos/services/gitea-runner.nix

@@ -1,9 +1,3 @@
-# Gitea Actions is a CI/CD service for the Gitea source code server, meaning it
-# allows us to run code operations (such as testing or deploys) when our git
-# repositories are updated. Any machine can act as a Gitea Action Runner, so
-# the Runners don't necessarily need to be running Gitea. All we need is an API
-# key for Gitea to connect to it and register ourselves as a Runner.
-
 { config, pkgs, lib, ... }:
 
 {

modules/nixos/services/gitea.nix

@@ -11,21 +11,11 @@ in {
         actions.ENABLED = true;
         metrics.ENABLED = true;
         repository = {
-          # Pushing to a repo that doesn't exist automatically creates one as
-          # private.
           DEFAULT_PUSH_CREATE_PRIVATE = true;
-
-          # Allow git over HTTP.
           DISABLE_HTTP_GIT = false;
-
-          # Allow requests hitting the specified hostname.
           ACCESS_CONTROL_ALLOW_ORIGIN = config.hostnames.git;
-
-          # Automatically create viable users/orgs on push.
           ENABLE_PUSH_CREATE_USER = true;
           ENABLE_PUSH_CREATE_ORG = true;
-
-          # Default when creating new repos.
           DEFAULT_BRANCH = "main";
         };
         server = {
@@ -35,15 +25,11 @@ in {
           SSH_PORT = 22;
           START_SSH_SERVER = false; # Use sshd instead
           DISABLE_SSH = false;
+          # SSH_LISTEN_HOST = "0.0.0.0";
+          # SSH_LISTEN_PORT = 122;
         };
-
-        # Don't allow public users to register accounts.
         service.DISABLE_REGISTRATION = true;
-
-        # Force using HTTPS for all session access.
         session.COOKIE_SECURE = true;
-
-        # Hide users' emails.
         ui.SHOW_USER_EMAIL = false;
       };
       extraConfig = null;
@@ -53,7 +39,6 @@ in {
     users.users.${config.user}.extraGroups = [ "gitea" ];
 
     caddy.routes = [
-      # Prevent public access to Prometheus metrics.
       {
         match = [{
           host = [ config.hostnames.git ];
@@ -64,7 +49,6 @@ in {
           status_code = "403";
         }];
       }
-      # Allow access to primary server.
       {
         match = [{ host = [ config.hostnames.git ]; }];
         handle = [{
@@ -79,7 +63,6 @@ in {
       }
     ];
 
-    # Scrape the metrics endpoint for Prometheus.
     prometheus.scrapeTargets = [
       "127.0.0.1:${
         builtins.toString config.services.gitea.settings.server.HTTP_PORT

modules/nixos/services/gnupg.nix

@@ -1,5 +1,3 @@
-# GPG is an encryption tool. This isn't really in use for me at the moment.
-
 { config, pkgs, lib, ... }: {
 
   options.gpg.enable = lib.mkEnableOption "GnuPG encryption.";

modules/nixos/services/grafana.nix

@@ -7,7 +7,6 @@ in {
 
   config = lib.mkIf config.services.grafana.enable {
 
-    # Allow Grafana to connect to email service
     secrets.mailpass-grafana = {
       source = ../../../private/mailpass-grafana.age;
       dest = "${config.secretsDirectory}/mailpass-grafana";

modules/nixos/services/honeypot.nix

@@ -1,10 +1,7 @@
-# This is a tool for blocking IPs of anyone who attempts to scan all of my
+{ config, lib, pkgs, ... }:
-# ports.
 
 # Currently has some issues that don't make this viable.
 
-{ config, lib, pkgs, ... }:
-
 # Taken from:
 # https://dataswamp.org/~solene/2022-09-29-iblock-implemented-in-nixos.html
 

modules/nixos/services/influxdb2.nix

@@ -1,61 +0,0 @@
-# InfluxDB is a timeseries database similar to Prometheus. While
-# VictoriaMetrics can also act as an InfluxDB, this version of it allows for
-# infinite retention separate from our other metrics, which can be nice for
-# recording health information, for example.
-
-{ config, lib, ... }: {
-
-  config = {
-
-    services.influxdb2 = {
-      provision = {
-        enable = true;
-        initialSetup = {
-          bucket = "default";
-          organization = "main";
-          passwordFile = config.secrets.influxdb2Password.dest;
-          retention = 0; # Keep data forever
-          tokenFile = config.secrets.influxdb2Token.dest;
-          username = "admin";
-        };
-      };
-      settings = { };
-    };
-
-    # Create credentials file for InfluxDB admin
-    secrets.influxdb2Password = lib.mkIf config.services.influxdb2.enable {
-      source = ../../../private/influxdb2-password.age;
-      dest = "${config.secretsDirectory}/influxdb2-password";
-      owner = "influxdb2";
-      group = "influxdb2";
-      permissions = "0440";
-    };
-    systemd.services.influxdb2Password-secret =
-      lib.mkIf config.services.influxdb2.enable {
-        requiredBy = [ "influxdb2.service" ];
-        before = [ "influxdb2.service" ];
-      };
-    secrets.influxdb2Token = lib.mkIf config.services.influxdb2.enable {
-      source = ../../../private/influxdb2-token.age;
-      dest = "${config.secretsDirectory}/influxdb2-token";
-      owner = "influxdb2";
-      group = "influxdb2";
-      permissions = "0440";
-    };
-    systemd.services.influxdb2Token-secret =
-      lib.mkIf config.services.influxdb2.enable {
-        requiredBy = [ "influxdb2.service" ];
-        before = [ "influxdb2.service" ];
-      };
-
-    caddy.routes = lib.mkIf config.services.influxdb2.enable [{
-      match = [{ host = [ config.hostnames.influxdb ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:8086"; }];
-      }];
-    }];
-
-  };
-
-}

modules/nixos/services/jellyfin.nix

@@ -1,6 +1,3 @@
-# Jellyfin is a self-hosted video streaming service. This means I can play my
-# server's videos from a webpage, mobile app, or TV client.
-
 { config, pkgs, lib, ... }: {
 
   config = lib.mkIf config.services.jellyfin.enable {
@@ -9,7 +6,6 @@
     users.users.jellyfin = { isSystemUser = true; };
 
     caddy.routes = [
-      # Prevent public access to Prometheus metrics.
       {
         match = [{
           host = [ config.hostnames.stream ];
@@ -20,7 +16,6 @@
           status_code = "403";
         }];
       }
-      # Allow access to normal route.
       {
         match = [{ host = [ config.hostnames.stream ]; }];
         handle = [{
@@ -52,9 +47,6 @@
     users.users.jellyfin.extraGroups =
       [ "render" "video" ]; # Access to /dev/dri
 
-    # Fix issue where Jellyfin-created directories don't allow access for media group
-    systemd.services.jellyfin.serviceConfig.UMask = lib.mkForce "0007";
-
     # Requires MetricsEnable is true in /var/lib/jellyfin/config/system.xml
     prometheus.scrapeTargets = [ "127.0.0.1:8096" ];
 

modules/nixos/services/keybase.nix

@@ -1,23 +1,23 @@
-# Keybase is an encrypted communications tool with a synchronized encrypted
-# filestore that can be mounted onto a machine's filesystem.
-
 { config, pkgs, lib, ... }: {
 
   options.keybase.enable = lib.mkEnableOption "Keybase.";
 
   config = lib.mkIf config.keybase.enable {
 
-    home-manager.users.${config.user} = lib.mkIf config.keybase.enable {
+    services.keybase.enable = true;
-
+    services.kbfs = {
-      services.keybase.enable = true;
+      enable = true;
-      services.kbfs = {
+      # enableRedirector = true;
-        enable = true;
+      mountPoint = "/run/user/1000/keybase/kbfs";
-        mountPoint = "keybase";
+    };
-      };
+    security.wrappers.keybase-redirector = {
-
+      setuid = true;
-      # https://github.com/nix-community/home-manager/issues/4722
+      owner = "root";
-      systemd.user.services.kbfs.Service.PrivateTmp = lib.mkForce false;
+      group = "root";
+      source = "${pkgs.kbfs}/bin/redirector";
+    };
 
+    home-manager.users.${config.user} = {
       home.packages = [ (lib.mkIf config.gui.enable pkgs.keybase-gui) ];
       home.file = let
         ignorePatterns = ''

modules/nixos/services/mullvad.nix

@@ -1,5 +1,3 @@
-# Mullvad is a VPN service. This isn't currently in use for me at the moment.
-
 { config, pkgs, lib, ... }: {
 
   options.mullvad.enable = lib.mkEnableOption "Mullvad VPN.";

modules/nixos/services/n8n.nix

@@ -1,6 +1,3 @@
-# n8n is an automation integration tool for connecting data from services
-# together with triggers.
-
 { config, lib, ... }: {
 
   options = {

modules/nixos/services/netdata.nix

@@ -1,6 +1,3 @@
-# Netdata is an out-of-the-box monitoring tool that exposes many different
-# metrics. Not currently in use, in favor of VictoriaMetrics and Grafana.
-
 { config, lib, ... }: {
 
   options.netdata.enable = lib.mkEnableOption "Netdata metrics.";

modules/nixos/services/nextcloud.nix

@@ -3,7 +3,7 @@
   config = lib.mkIf config.services.nextcloud.enable {
 
     services.nextcloud = {
-      package = pkgs.nextcloud28; # Required to specify
+      package = pkgs.nextcloud27; # Required to specify
       configureRedis = true;
       datadir = "/data/nextcloud";
       database.createLocally = true;
@@ -13,25 +13,18 @@
       config = {
         adminpassFile = config.secrets.nextcloud.dest;
         dbtype = "mysql";
+        extraTrustedDomains = [ config.hostnames.content ];
+        trustedProxies = [ "127.0.0.1" ];
       };
-      extraOptions = {
+      extraOptions = { default_phone_region = "US"; };
-        default_phone_region = "US";
-        # Allow access when hitting either of these hosts or IPs
-        trusted_domains = [ config.hostnames.content ];
-        trusted_proxies = [ "127.0.0.1" ];
-      };
       extraAppsEnable = true;
       extraApps = with config.services.nextcloud.package.packages.apps; {
         inherit calendar contacts;
-        # These apps are defined and pinned by overlay in flake.
         news = pkgs.nextcloudApps.news;
         external = pkgs.nextcloudApps.external;
         cookbook = pkgs.nextcloudApps.cookbook;
       };
-      phpOptions = {
+      phpOptions = { "opcache.interned_strings_buffer" = "16"; };
-        "opcache.interned_strings_buffer" = "16";
-        "output_buffering" = "0";
-      };
     };
 
     # Don't let Nginx use main ports (using Caddy instead)
@@ -54,10 +47,7 @@
             handle = [
               {
                 handler = "vars";
-                # Grab the webroot out of the written config
+                root = config.services.nextcloud.package;
-                # The webroot is a symlinked combined Nextcloud directory
-                root =
-                  config.services.nginx.virtualHosts.${config.services.nextcloud.hostName}.root;
               }
               {
                 handler = "headers";
@@ -66,6 +56,13 @@
               }
             ];
           }
+          {
+            match = [{ path = [ "/nix-apps*" "/store-apps*" ]; }];
+            handle = [{
+              handler = "vars";
+              root = config.services.nextcloud.home;
+            }];
+          }
           # Reroute carddav and caldav traffic
           {
             match =

modules/nixos/services/paperless.nix

@@ -1,50 +0,0 @@
-# Paperless-ngx is a document scanning and management solution.
-
-{ config, lib, ... }: {
-
-  config = lib.mkIf config.services.paperless.enable {
-
-    services.paperless = {
-      mediaDir = "/data/generic/paperless";
-      passwordFile = config.secrets.paperless.dest;
-      settings = {
-        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/services/postgresql.nix

@@ -1,22 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  services.postgresql = {
-    package = pkgs.postgresql_15;
-    settings = { };
-    identMap = "";
-    ensureUsers = [{
-      name = config.user;
-      ensureClauses = {
-        createdb = true;
-        createrole = true;
-        login = true;
-      };
-    }];
-  };
-
-  home-manager.users.${config.user}.home.packages =
-    lib.mkIf config.services.postgresql.enable [
-      pkgs.pgcli # Postgres client with autocomplete
-    ];
-
-}

modules/nixos/services/prometheus.nix

@@ -1,9 +1,3 @@
-# Prometheus is a timeseries database that exposes system and service metrics
-# for use in visualizing, monitoring, and alerting (with Grafana).
-
-# Instead of running traditional Prometheus, I generally run VictoriaMetrics as
-# a more efficient drop-in replacement.
-
 { config, pkgs, lib, ... }: {
 
   options.prometheus = {

modules/nixos/services/samba.nix

@@ -1,5 +1,3 @@
-# Samba is a Windows-compatible file-sharing service.
-
 { config, lib, ... }: {
 
   config = {

modules/nixos/services/sshd.nix

@@ -1,6 +1,4 @@
-# SSHD service for allowing SSH access to my machines.
+{ config, lib, ... }: {
-
-{ config, pkgs, lib, ... }: {
 
   options = {
     publicKey = lib.mkOption {
@@ -34,10 +32,7 @@
     services.sshguard.enable = true;
 
     # Add terminfo for SSH from popular terminal emulators
-    # Fix: terminfo now installs contour, which is broken on ARM
+    environment.enableAllTerminfo = true;
-    # - https://github.com/NixOS/nixpkgs/pull/253334
-    # - Will disable until fixed
-    environment.enableAllTerminfo = pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64;
   };
 
 }

modules/nixos/services/transmission.nix

@@ -1,6 +1,3 @@
-# Transmission is a bittorrent client, which can run in the background for
-# automated downloads with a web GUI.
-
 { config, pkgs, lib, ... }: {
 
   options = {

modules/nixos/services/vaultwarden.nix

@@ -1,7 +1,3 @@
-# Vaultwarden is an implementation of the Bitwarden password manager backend
-# service, which allows for self-hosting the synchronization of a Bitwarden
-# password manager client.
-
 { config, pkgs, lib, ... }:
 
 let vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory

modules/nixos/services/victoriametrics.nix

@@ -1,6 +1,3 @@
-# VictoriaMetrics is a more efficient drop-in replacement for Prometheus and
-# InfluxDB (timeseries databases built for monitoring system metrics).
-
 { config, pkgs, lib, ... }:
 
 let

modules/nixos/services/wireguard.nix

@@ -1,6 +1,3 @@
-# Wireguard is a VPN protocol that can be setup to create a mesh network
-# between machines on different LANs. This is currently not in use in my setup.
-
 { config, pkgs, lib, ... }: {
 
   options.wireguard.enable = lib.mkEnableOption "Wireguard VPN setup.";

modules/nixos/system/doas.nix

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

overlays/age.nix

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

overlays/bypass-paywalls-clean.nix

@@ -1,20 +0,0 @@
-inputs: _final: prev: {
-
-  # Based on:
-  # https://git.sr.ht/~rycee/nur-expressions/tree/master/item/pkgs/firefox-addons/default.nix#L34
-
-  bypass-paywalls-clean = let addonId = "magnolia@12.34";
-  in prev.stdenv.mkDerivation rec {
-    pname = "bypass-paywalls-clean";
-    version = "3.4.9.0";
-    src = inputs.bypass-paywalls-clean + "/bypass_paywalls_clean-latest.xpi";
-    preferLocalBuild = true;
-    allowSubstitutes = true;
-    buildCommand = ''
-      dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-      mkdir -p "$dst"
-      install -v -m644 "${src}" "$dst/${addonId}.xpi"
-    '';
-  };
-
-}

overlays/caddy.nix

@@ -22,7 +22,7 @@ let
   '';
 
 in {
-  caddy-cloudflare = prev.buildGo120Module {
+  caddy-cloudflare = prev.buildGo118Module {
     pname = "caddy-cloudflare";
     version = prev.caddy.version;
     runVend = true;
@@ -31,7 +31,7 @@ in {
 
     src = prev.caddy.src;
 
-    vendorHash = "sha256:pr2MI2Nv9y357lCEEh6aNdmD9FiCaJIkRfHaoWgdQIE=";
+    vendorSha256 = "sha256:CrHqJcJ0knX+txQ5qvzW4JrU8vfi3FO3M/xtislIC1M=";
 
     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,17 +11,15 @@ 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', '')
+     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
      g.allow_registration = config.config_public_reg

overlays/gh-collaborators.nix

@@ -1,25 +0,0 @@
-_final: prev: {
-
-  gh-collaborators = prev.buildGo120Module rec {
-    pname = "gh-collaborators";
-    version = "2.0.2";
-
-    src = prev.fetchFromGitHub {
-      owner = "katiem0";
-      repo = "gh-collaborators";
-      rev = version;
-      sha256 = "sha256-sz5LHkwZ28aA2vbMnFMzAlyGiJBDZm7jwDQYxgKBPLU=";
-    };
-
-    vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
-
-    ldflags = [
-      "-s"
-      "-w"
-      "-X github.com/katiem0/gh-collaborators/cmd.Version=${version}"
-      # "-X main.Version=${version}"
-    ];
-
-  };
-
-}

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";
     };
@@ -17,6 +17,8 @@ let
 in {
 
   nil = inputs.nil.packages.${prev.system}.nil;
+  vscode-terraform-snippets = inputs.vscode-terraform-snippets;
+
   nvim-lspconfig = withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig;
   cmp-nvim-lsp = withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp;
   null-ls-nvim = withSrc prev.vimPlugins.null-ls-nvim inputs.null-ls-nvim;
@@ -31,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;

overlays/nextcloud-apps.nix

@@ -4,17 +4,14 @@ inputs: _final: prev: {
     news = prev.fetchNextcloudApp {
       url = inputs.nextcloud-news.outPath;
       sha256 = inputs.nextcloud-news.narHash;
-      license = "agpl3Plus";
     };
     external = prev.fetchNextcloudApp {
       url = inputs.nextcloud-external.outPath;
       sha256 = inputs.nextcloud-external.narHash;
-      license = "agpl3Plus";
     };
     cookbook = prev.fetchNextcloudApp {
       url = inputs.nextcloud-cookbook.outPath;
       sha256 = inputs.nextcloud-cookbook.narHash;
-      license = "agpl3Plus";
     };
   };
 

overlays/proton-ge.nix

@@ -1,15 +0,0 @@
-# Adapted from:
-# https://github.com/Shawn8901/nix-configuration/blob/182a45a6b193143ff7ff8e78bb66f7b869ea48d4/packages/proton-ge-custom/default.nix
-# Based on: https://github.com/NixOS/nixpkgs/issues/73323
-
-inputs: _final: prev: {
-  proton-ge-custom = prev.stdenv.mkDerivation (finalAttrs: rec {
-    name = "proton-ge-custom";
-    version = "0.1"; # Made up
-    src = inputs.proton-ge;
-    installPhase = ''
-      mkdir -p $out/bin
-      cp -r ${src}/* -t $out/bin/
-    '';
-  });
-}

overlays/terraform.nix

@@ -1,12 +0,0 @@
-# Fix for Terraform and Consul on Darwin:
-# https://github.com/NixOS/nixpkgs/pull/275534/files
-_final: prev: {
-  girara = prev.girara.overrideAttrs (old: {
-    mesonFlags = [
-      "-Ddocs=disabled"
-      (prev.lib.mesonEnable "tests"
-        ((prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform)
-          && (!prev.stdenv.isDarwin)))
-    ];
-  });
-}

overlays/tree-sitter.nix

@@ -12,10 +12,6 @@ inputs: _final: prev: {
       prev.tree-sitter-grammars.tree-sitter-python.overrideAttrs
       (old: { src = inputs.tree-sitter-python; });
 
-    # Fix: invalid structure in position.
-    tree-sitter-lua = prev.tree-sitter-grammars.tree-sitter-lua.overrideAttrs
-      (old: { src = inputs.tree-sitter-lua; });
-
     # Add grammars not in nixpks
     tree-sitter-ini = prev.tree-sitter.buildGrammar {
       language = "ini";

private/influxdb2-password.age

@@ -1,14 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBhUEdQ
-ejFtQWFabkl3YTJmUmRDS2M1elBrMU5yVHhWWlFLMHdOdlNsNEFRCmREU3ZZWlZi
-R1RLQVorT2dDbFRXc2toMExpNWR1WUEvaVlzUFJ5ZUU3azQKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIDY5OGpSWlFTT2EvUzV4ajQwUG5YL3loSWhGbjV6U2J4TkFhQm5Y
-RWhvMXcKbUVpQm5wRmtLRGV2SWYzb2c3dnZYREdRSnRtdjJJcjRKTk0rbnMyZmVB
-cwotPiBzc2gtZWQyNTUxOSBuanZYNUEgd0o4WGhTQnlkVGhhWG44MmQ1UXFVWjFO
-MS9JcVpEOEIvd3ZuNmVmN2d3dwpYNXF5V05WbHRobVlIWVM2VHN1TjcyVG81cHp1
-V0pnWTduZFFWQks2ZFY0Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBkWXlRejFNdHJk
-azg0aUpzL1JMSWUvWkdXUmpLc3pVUEZTNGFwTG0rRlNrCjMyVTE5c1pjRlowVlJ4
-YmFtRzEzV1dCU0FoeUJPMjQzWHErc0h4RWhLbDgKLS0tIHhzK20vTzFPdVROVW44
-MkNhb2VWZHBqeXY0MWZuTDFUMXdNazMwTG8yZTQK1CrrD2tin/3ZhV2D1XJvkbUN
-2Nw4ASdPdRXaQJw5CMhlrW6rgSnC81j0249F7D7ZfAlo62ANOfLyL9Lv2FVGzg==
------END AGE ENCRYPTED FILE-----

private/influxdb2-token.age

@@ -1,14 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBmTnVo
-eFlINGttSEZYTlZucVVWemlMMk0reHNKcjF3SmhCQllXdmw5RzBBCnl0NWZVb1ZW
-MWRzc05pNVVWTlRyNzNRaDlYTm5TSVF3ZGNMclhyY0R3bUkKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIEppTjJPUmxlamdLY2xxRVBwcFBmTTdOM3dLU3h3YnA2TlhRWXRu
-OGJrR28KMW9JQUFDcXFLOTk4NDVHQmJucEZuOElLaG5Eb1lyK1NGTUJaMkFONit1
-dwotPiBzc2gtZWQyNTUxOSBuanZYNUEgZkF5MVNGK3FRV2JPVDFGMkY5SWxGWVVK
-YThUVFk2VGZZNXN6UWx3eFJ6MAp0d3NGWTRuLzNOb0VxdVUvZ1YwR0lWemc2NDR2
-VFI2eWRjS242SEJrQWx3Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBpY2JoaGRKY0ZR
-Y2txWFM1ODJyaW03b0xuRGlJMkVidEVZMGdiU1pTZ1hVCk0yeGF6VWU5LzF0Z1dL
-cnlDUCtLL01EWWo2Q0dYcjdtSjRtSnFjUHNWdzAKLS0tIEI4aWpNc0xqU3ZsLzcz
-TThFNXd0YjQ2MEMzc0JOQXZnTnBaTVg0V1hITzgK8GYZG8/fGXk6ELSB6rnLX0ke
-QqiztfVnV/fpgEgJ/K60Ea3aBe3ELpejzFKZfno+jesvnL5DCMGz7QRRpnThLQ==
------END AGE ENCRYPTED FILE-----

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-----