set checks on individual languages

drop apache-directory-studio in favor of ldapsearch
apache directory studio can't figure out how to make it work on m3
2025-07-06 22:30:13 +00:00 · 2024-02-07 23:04:08 -05:00 · 2024-02-07 22:08:22 -05:00 · 2024-02-07 21:23:01 -05:00 · 2024-02-06 23:41:28 -05:00 · 2024-02-06 22:12:14 -05:00
82 changed files with 881 additions and 521 deletions
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -31,6 +31,12 @@ jobs:
          pr-labels: |                  # Labels to be set on the PR
            dependencies
            automated
+          pr-body: |
+            Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action.
+
+            ```
+            {{ env.GIT_COMMIT_MESSAGE }}
+            ```
      - name: Check the Flake
        id: check
        run: nix flake check
--- a/README.md
+++ b/README.md
@ -41,21 +41,29 @@ 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 atypical choices for configuration.
+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 from host to host.
- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based on
-dynamic service metadata.
- [Grafana config](./modules/nixos/services/grafana.nix) based on dynamic
-service metadata.
+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.
+- Base16 [colorschemes](./colorscheme/) applied to multiple applications,
+including Firefox userChrome.

 ---

--- a/apps/loadkey.nix
+++ b/apps/loadkey.nix
@ -5,6 +5,7 @@
  program = builtins.toString (pkgs.writeShellScript "loadkey" ''
    printf "\nEnter the seed phrase for your SSH key...\n"
    printf "\nThen press ^D when complete.\n\n"
+    mkdir -p ~/.ssh/
    ${pkgs.melt}/bin/melt restore ~/.ssh/id_ed25519
    printf "\n\nContinuing activation.\n\n"
  '');
--- a/docs/installation.md
+++ b/docs/installation.md
@ -49,19 +49,24 @@ move the `windows/alacritty.yml` file to
 To get started on a bare macOS installation, first install Nix:

 ```bash
-sh -c "$(curl -L https://nixos.org/nix/install)"
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
 ```

-Then use Nix to build nix-darwin:
+Launch a new shell. Then use Nix to switch to the macOS configuration:

 ```bash
-nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
-./result/bin/darwin-installer
+sudo rm /etc/bashrc
+sudo rm /etc/nix/nix.conf
+nix \
+    --extra-experimental-features flakes \
+    --extra-experimental-features nix-command \
+    run nix-darwin -- switch \
+    --flake github:nmasur/dotfiles#lookingglass
 ```

-Then switch to the macOS configuration:
+Once installed, you can continue to update the macOS configuration:

 ```bash
-darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+darwin-rebuild switch --flake ~/dev/personal/dotfiles
 ```

--- a/flake.lock
+++ b/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": 1681806450,
-        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
+        "lastModified": 1704551058,
+        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
        "owner": "m00qek",
        "repo": "baleia.nvim",
-        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
+        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
        "type": "github"
      },
      "original": {
@ -53,16 +36,16 @@
    "bufferline-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1695205521,
-        "narHash": "sha256-MQMpXMgUpZA0E9TunzjXeOQxDWSCTogXbvi9VJnv4Kw=",
+        "lastModified": 1706180994,
+        "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=",
        "owner": "akinsho",
        "repo": "bufferline.nvim",
-        "rev": "6ecd37e0fa8b156099daedd2191130e083fb1490",
+        "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v4.4.0",
+        "ref": "v4.5.0",
        "repo": "bufferline.nvim",
        "type": "github"
      }
@ -70,11 +53,11 @@
    "bypass-paywalls-clean": {
      "flake": false,
      "locked": {
-        "lastModified": 1704296449,
-        "narHash": "sha256-UkEaTOBEfPTxcNo9Iv2xUEW6jYWMJeaGKA38KF6Yuf0=",
+        "lastModified": 1706880406,
+        "narHash": "sha256-8z2Gc3ITluXXbDij4Ltahpkxs7zdnMITvIAjotab/QU=",
        "owner": "magnolia1234",
        "repo": "bpc-uploads",
-        "rev": "dcd11128c6b7c6246fc6d199ce10d5ec796d4716",
+        "rev": "c91cfd510390ab5a138f412ad2890b2cb2a2eafd",
        "type": "gitlab"
      },
      "original": {
@ -106,11 +89,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704277720,
-        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
+        "lastModified": 1706833576,
+        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
+        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
        "type": "github"
      },
      "original": {
@ -127,11 +110,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704318910,
-        "narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
+        "lastModified": 1706491084,
+        "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "aef9a509db64a081186af2dc185654d78dc8e344",
+        "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9",
        "type": "github"
      },
      "original": {
@ -143,16 +126,16 @@
    "fidget-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1702031048,
-        "narHash": "sha256-wbjQuOFd/2339TIrUA97PYsV8N3PZsS+xbyMsyZmki8=",
+        "lastModified": 1704696337,
+        "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=",
        "owner": "j-hui",
        "repo": "fidget.nvim",
-        "rev": "300018af4abd00610a345e382ca1f4b7ba420f77",
+        "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db",
        "type": "github"
      },
      "original": {
        "owner": "j-hui",
-        "ref": "v1.1.0",
+        "ref": "v1.2.0",
        "repo": "fidget.nvim",
        "type": "github"
      }
@ -164,11 +147,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704415391,
-        "narHash": "sha256-DOK05XW4cSdE+lw+OfrzYTywIHSVazm5TJsODSDrNKY=",
+        "lastModified": 1707007453,
+        "narHash": "sha256-vs7uACn2/8GOApZJv52gAVsLfpjQWFgkHN2QJ7aVkl8=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "ca04361b1c2e6cbe5cbf7e118a28fe67ddf51f4c",
+        "rev": "d839feb516758ad28bc1cef43008d55e749c1d6a",
        "type": "github"
      },
      "original": {
@ -198,11 +181,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
        "type": "github"
      },
      "original": {
@ -216,29 +199,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
        "type": "github"
      },
      "original": {
@ -250,11 +215,11 @@
    "hmts-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1693226725,
-        "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
+        "lastModified": 1706900289,
+        "narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
        "owner": "calops",
        "repo": "hmts.nvim",
-        "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
+        "rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
        "type": "github"
      },
      "original": {
@ -270,11 +235,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704383912,
-        "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=",
+        "lastModified": 1706985585,
+        "narHash": "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7",
+        "rev": "1ca210648a6ca9b957efde5da957f3de6b1f0c45",
        "type": "github"
      },
      "original": {
@ -284,6 +249,22 @@
        "type": "github"
      }
    },
+    "kitty-scrollback-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706891759,
+        "narHash": "sha256-p7RPqLHO6D5CCTDQzUrEqTu9+jg+V7wtYfGbY4qjE9A=",
+        "owner": "mikesmithgh",
+        "repo": "kitty-scrollback.nvim",
+        "rev": "12f7687ac049d46a987c39b2b4f657fdf540fa4e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mikesmithgh",
+        "repo": "kitty-scrollback.nvim",
+        "type": "github"
+      }
+    },
    "nextcloud-cookbook": {
      "flake": false,
      "locked": {
@ -323,42 +304,32 @@
        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
      }
    },
-    "nil": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
+    "nextcloud-snappymail": {
+      "flake": false,
      "locked": {
-        "lastModified": 1691372739,
-        "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=",
-        "owner": "oxalica",
-        "repo": "nil",
-        "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b",
-        "type": "github"
+        "lastModified": 1707018069,
+        "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
      },
      "original": {
-        "owner": "oxalica",
-        "ref": "2023-08-09",
-        "repo": "nil",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
      }
    },
    "nix2vim": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1685980282,
-        "narHash": "sha256-uQyVaoqkiocA8bXKMfrgizuKmz0hUzHye5owFoUd2AQ=",
+        "lastModified": 1706886721,
+        "narHash": "sha256-iDYxsE5xYoK8Ww2TYZDmgRQNIZl+QHJfChOxWh45g0k=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "3836a348503ae27340c7f83f0bc7bcb907f3781d",
+        "rev": "29253dcf0f645a44847006d436b096369ef42fd8",
        "type": "github"
      },
      "original": {
@ -390,11 +361,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1701689616,
-        "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=",
+        "lastModified": 1706085261,
+        "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "246219bc21b943c6f6812bb7744218ba0df08600",
+        "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132",
        "type": "github"
      },
      "original": {
@ -405,11 +376,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1704194953,
-        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
+        "lastModified": 1706732774,
+        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
+        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
        "type": "github"
      },
      "original": {
@ -419,22 +390,6 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1703900474,
-        "narHash": "sha256-Zu+chYVYG2cQ4FCbhyo6rc5Lu0ktZCjRbSPE0fDgukI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9dd7699928e26c3c00d5d46811f1358524081062",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "null-ls-nvim-src": {
      "flake": false,
      "locked": {
@ -453,11 +408,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1704483764,
-        "narHash": "sha256-SuMEUsYHFbYYVZr3wWC64/tc1K/iI2/CJGdDixk6J5c=",
+        "lastModified": 1707013032,
+        "narHash": "sha256-9kEY/D0Q6sF+p6vJRefVXDK4QQdwK4Q0lSQdsYICad0=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "9c4f6b66f05fc6f6285df25e89f825b441ec9705",
+        "rev": "ab432acea15134873882610c0e936a882319bc8a",
        "type": "github"
      },
      "original": {
@ -469,16 +424,16 @@
    "nvim-lspconfig-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1675639052,
-        "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
+        "lastModified": 1701687137,
+        "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=",
        "owner": "neovim",
        "repo": "nvim-lspconfig",
-        "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
+        "rev": "cf3dd4a290084a868fac0e2e876039321d57111c",
        "type": "github"
      },
      "original": {
        "owner": "neovim",
-        "ref": "v0.1.6",
+        "ref": "v0.1.7",
        "repo": "nvim-lspconfig",
        "type": "github"
      }
@ -486,11 +441,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1704073600,
-        "narHash": "sha256-D+wCJQuRj9mvgLd0DaiYgqghDYDwfux9zlEb/vIvaqA=",
+        "lastModified": 1706571452,
+        "narHash": "sha256-b0LIqLC8cCRX1NyJx4eH5c4v5Fqqw5mMleAnQ2VRctM=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "f1b3e6a7eb92da492bd693257367d9256839ed3d",
+        "rev": "f39f7b6fcd3865ac2146de4cb4045286308f2935",
        "type": "github"
      },
      "original": {
@ -502,11 +457,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1704470326,
-        "narHash": "sha256-/kyRtwWuW68zTETOmVpJWzC1iqzl+U0q0gvRVvmnEfI=",
+        "lastModified": 1706952848,
+        "narHash": "sha256-pNjEODR+QJPDL58O4NM7SjzZEN8D3bXDHbKLNOS3fL8=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "49f1b9a7efc794be143f7ddcd60ce18e8164a7f8",
+        "rev": "4fbf150a1621d52f17b099506e1a32f107079210",
        "type": "github"
      },
      "original": {
@ -519,20 +474,51 @@
    "proton-ge": {
      "flake": false,
      "locked": {
-        "lastModified": 1699415676,
-        "narHash": "sha256-3XniKYf/KDRDYhTwffkktbmoISwOtGIABF28bsp8QHA=",
+        "lastModified": 1700610476,
+        "narHash": "sha256-IoClZ6hl2lsz9OGfFgnz7vEAGlSY2+1K2lDEEsJQOfU=",
        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-23/GE-Proton8-23.tar.gz"
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-23/GE-Proton8-23.tar.gz"
+        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
+      }
+    },
+    "ren": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704996573,
+        "narHash": "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=",
+        "owner": "robenkleene",
+        "repo": "ren-find",
+        "rev": "50c40172e354caffee48932266edd7c7a76a20fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "robenkleene",
+        "repo": "ren-find",
+        "type": "github"
+      }
+    },
+    "rep": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1705833236,
+        "narHash": "sha256-hm+v+b97z1HnY/7QHZxc0GygCq9W0mJauyjnz48ddaM=",
+        "owner": "robenkleene",
+        "repo": "rep-grep",
+        "rev": "365acc5d599934e94dc066eb85b7ddd684ba508b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "robenkleene",
+        "repo": "rep-grep",
+        "type": "github"
      }
    },
    "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",
@ -543,10 +529,11 @@
        "firefox-darwin": "firefox-darwin",
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
+        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
        "nextcloud-cookbook": "nextcloud-cookbook",
        "nextcloud-external": "nextcloud-external",
        "nextcloud-news": "nextcloud-news",
-        "nil": "nil",
+        "nextcloud-snappymail": "nextcloud-snappymail",
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
@ -556,6 +543,8 @@
        "nvim-tree-lua-src": "nvim-tree-lua-src",
        "nvim-treesitter-src": "nvim-treesitter-src",
        "proton-ge": "proton-ge",
+        "ren": "ren",
+        "rep": "rep",
        "telescope-nvim-src": "telescope-nvim-src",
        "telescope-project-nvim-src": "telescope-project-nvim-src",
        "toggleterm-nvim-src": "toggleterm-nvim-src",
@ -565,37 +554,12 @@
        "tree-sitter-puppet": "tree-sitter-puppet",
        "tree-sitter-python": "tree-sitter-python",
        "tree-sitter-rasi": "tree-sitter-rasi",
-        "vscode-terraform-snippets": "vscode-terraform-snippets",
+        "tree-sitter-vimdoc": "tree-sitter-vimdoc",
        "wallpapers": "wallpapers",
        "wsl": "wsl",
        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
      }
    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": [
-          "nil",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nil",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1688783586,
-        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -626,34 +590,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,
-        "narHash": "sha256-7SqYFnfCjotOBhuX6Wx1IOhgMKoxaoI1a4SKz1d5RVM=",
+        "lastModified": 1701167040,
+        "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=",
        "owner": "nvim-telescope",
        "repo": "telescope.nvim",
-        "rev": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a",
+        "rev": "d90956833d7c27e73c621a61f20b29fdb7122709",
        "type": "github"
      },
      "original": {
        "owner": "nvim-telescope",
-        "ref": "0.1.4",
+        "ref": "0.1.5",
        "repo": "telescope.nvim",
        "type": "github"
      }
@ -677,16 +626,16 @@
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1695636777,
-        "narHash": "sha256-o8xzoo7OuYrPnKlfrupQ24Ja9hZy1qQVnvwO0FO+4zM=",
+        "lastModified": 1701858874,
+        "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=",
        "owner": "akinsho",
        "repo": "toggleterm.nvim",
-        "rev": "faee9d60428afc7857e0927fdc18daa6c409fa64",
+        "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v2.8.0",
+        "ref": "v2.9.0",
        "repo": "toggleterm.nvim",
        "type": "github"
      }
@ -694,11 +643,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1696959291,
-        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
+        "lastModified": 1705686017,
+        "narHash": "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
+        "rev": "f7239f638d3dc16762563a9027faeee518ce1bd9",
        "type": "github"
      },
      "original": {
@ -790,19 +739,19 @@
        "type": "github"
      }
    },
-    "vscode-terraform-snippets": {
+    "tree-sitter-vimdoc": {
      "flake": false,
      "locked": {
-        "lastModified": 1614849738,
-        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
-        "owner": "run-at-scale",
-        "repo": "vscode-terraform-doc-snippets",
-        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
+        "lastModified": 1705491128,
+        "narHash": "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg=",
+        "owner": "neovim",
+        "repo": "tree-sitter-vimdoc",
+        "rev": "ed8695ad8de39c3f073da130156f00b1148e2891",
        "type": "github"
      },
      "original": {
-        "owner": "run-at-scale",
-        "repo": "vscode-terraform-doc-snippets",
+        "owner": "neovim",
+        "repo": "tree-sitter-vimdoc",
        "type": "github"
      }
    },
@ -825,15 +774,17 @@
    "wsl": {
      "inputs": {
        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1704321386,
-        "narHash": "sha256-d2ZIWHHsVviiqLDUuezuNO6w+V87EW6M+DwtNLN/Hmk=",
+        "lastModified": 1706867893,
+        "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "c81bc3f9baa0571d03d1297faddf3a08737fe49e",
+        "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b",
        "type": "github"
      },
      "original": {
@ -845,11 +796,11 @@
    "zenyd-mpv-scripts": {
      "flake": false,
      "locked": {
-        "lastModified": 1650625438,
-        "narHash": "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=",
+        "lastModified": 1706283438,
+        "narHash": "sha256-hpLZDtt5q18aZ8d9LHfT852wtBosKUTJ7Bx+cbjBLcg=",
        "owner": "zenyd",
        "repo": "mpv-scripts",
-        "rev": "19ea069abcb794d1bf8fac2f59b50d71ab992130",
+        "rev": "7100d19d18d111ce77fc9e6e8947c0d542a86397",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -14,7 +14,10 @@
    };

    # Used for Windows Subsystem for Linux compatibility
-    wsl.url = "github:nix-community/NixOS-WSL";
+    wsl = {
+      url = "github:nix-community/NixOS-WSL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

    # Used for user packages and dotfiles
    home-manager = {
@ -56,16 +59,10 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # Nix language server
-    nil = {
-      url = "github:oxalica/nil/2023-08-09";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    # Neovim plugins
    nvim-lspconfig-src = {
      # https://github.com/neovim/nvim-lspconfig/tags
-      url = "github:neovim/nvim-lspconfig/v0.1.6";
+      url = "github:neovim/nvim-lspconfig/v0.1.7";
      flake = false;
    };
    cmp-nvim-lsp-src = {
@ -82,6 +79,7 @@
      flake = false;
    };
    Comment-nvim-src = {
+      # https://github.com/numToStr/Comment.nvim/releases
      url = "github:numToStr/Comment.nvim/v0.8.0";
      flake = false;
    };
@ -91,7 +89,8 @@
      flake = false;
    };
    telescope-nvim-src = {
-      url = "github:nvim-telescope/telescope.nvim/0.1.4";
+      # https://github.com/nvim-telescope/telescope.nvim/releases
+      url = "github:nvim-telescope/telescope.nvim/0.1.5";
      flake = false;
    };
    telescope-project-nvim-src = {
@ -99,28 +98,30 @@
      flake = false;
    };
    toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim/v2.8.0";
+      # https://github.com/akinsho/toggleterm.nvim/tags
+      url = "github:akinsho/toggleterm.nvim/v2.9.0";
      flake = false;
    };
    bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim/v4.4.0";
+      # https://github.com/akinsho/bufferline.nvim/releases
+      url = "github:akinsho/bufferline.nvim/v4.5.0";
      flake = false;
    };
    nvim-tree-lua-src = {
      url = "github:kyazdani42/nvim-tree.lua";
      flake = false;
    };
-    vscode-terraform-snippets = {
-      url = "github:run-at-scale/vscode-terraform-doc-snippets";
-      flake = false;
-    };
    hmts-nvim-src = {
      url = "github:calops/hmts.nvim";
      flake = false;
    };
    fidget-nvim-src = {
      # https://github.com/j-hui/fidget.nvim/tags
-      url = "github:j-hui/fidget.nvim/v1.1.0";
+      url = "github:j-hui/fidget.nvim/v1.2.0";
+      flake = false;
+    };
+    kitty-scrollback-nvim-src = {
+      url = "github:mikesmithgh/kitty-scrollback.nvim";
      flake = false;
    };

@ -149,6 +150,10 @@
      url = "github:Fymyte/tree-sitter-rasi";
      flake = false;
    };
+    tree-sitter-vimdoc = {
+      url = "github:neovim/tree-sitter-vimdoc";
+      flake = false;
+    };

    # MPV Scripts
    zenyd-mpv-scripts = {
@ -156,9 +161,13 @@
      flake = false;
    };

-    # Age encryption (pin because of failed builds)
-    age = {
-      url = "github:FiloSottile/age/v1.1.1";
+    # Ren and rep - CLI find and replace
+    rep = {
+      url = "github:robenkleene/rep-grep";
+      flake = false;
+    };
+    ren = {
+      url = "github:robenkleene/ren-find";
      flake = false;
    };

@ -167,7 +176,7 @@
    proton-ge = {
      # https://github.com/GloriousEggroll/proton-ge-custom/releases
      url =
-        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-23/GE-Proton8-23.tar.gz";
+        "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz";
      flake = false;
    };

@ -197,6 +206,12 @@
        "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
      flake = false;
    };
+    nextcloud-snappymail = {
+      # https://github.com/the-djmaze/snappymail/releases
+      url =
+        "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz";
+      flake = false;
+    };

  };

@ -241,11 +256,10 @@
        (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)
+        (import ./overlays/ren-rep.nix inputs)
      ];

      # System types to support.
--- a/hosts/README.md
+++ b/hosts/README.md
@ -12,3 +12,15 @@ 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.
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -1,6 +1,8 @@
 # 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.
@ -50,6 +52,7 @@ inputs.nixpkgs.lib.nixosSystem {
      theme = { colors = (import ../../colorscheme/gruvbox).dark; };

      # Programs and services
+      atuin.enable = true;
      cloudflare.enable = true; # Proxy traffic with Cloudflare
      dotfiles.enable = true; # Clone dotfiles
      neovim.enable = true;
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@ -1,6 +1,8 @@
 # The Hydra
 # System configuration for WSL

+# See [readme](../README.md) to explain how this file works.
+
 { inputs, globals, overlays, ... }:

 inputs.nixpkgs.lib.nixosSystem {
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -4,7 +4,7 @@
 { inputs, globals, overlays, ... }:

 inputs.darwin.lib.darwinSystem {
-  system = "x86_64-darwin";
+  system = "aarch64-darwin";
  specialArgs = { };
  modules = [
    ../../modules/common
@ -25,6 +25,7 @@ inputs.darwin.lib.darwinSystem {
        dark = true;
      };
      mail.user = globals.user;
+      atuin.enable = true;
      charm.enable = true;
      neovim.enable = true;
      mail.enable = true;
@ -39,6 +40,7 @@ inputs.darwin.lib.darwinSystem {
      python.enable = true;
      rust.enable = true;
      lua.enable = true;
+      obsidian.enable = true;
      kubernetes.enable = true;
      _1password.enable = true;
      slack.enable = true;
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -1,6 +1,8 @@
 # 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 {
@ -66,6 +68,7 @@ inputs.nixpkgs.lib.nixosSystem {
      theme = { colors = (import ../../colorscheme/gruvbox).dark; };

      # Programs and services
+      atuin.enable = true;
      neovim.enable = true;
      cloudflare.enable = true;
      dotfiles.enable = true;
@ -80,6 +83,7 @@ inputs.nixpkgs.lib.nixosSystem {
      services.vmagent.enable = true;
      services.samba.enable = true;
      services.paperless.enable = true;
+      services.postgresql.enable = true;

      # Allows private remote access over the internet
      cloudflareTunnel = {
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -1,6 +1,8 @@
 # The Tempest
 # System configuration for my desktop

+# See [readme](../README.md) to explain how this file works.
+
 { inputs, globals, overlays, ... }:

 inputs.nixpkgs.lib.nixosSystem {
@ -83,6 +85,7 @@ inputs.nixpkgs.lib.nixosSystem {
      gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";

      # Programs and services
+      atuin.enable = true;
      charm.enable = true;
      neovim.enable = true;
      media.enable = true;
@ -105,7 +108,7 @@ inputs.nixpkgs.lib.nixosSystem {
        dwarf-fortress.enable = true;
        enable = true;
        steam.enable = true;
-        legendary.enable = false; # Electron marked as insecure
+        legendary.enable = true;
        lutris.enable = true;
        leagueoflegends.enable = true;
        ryujinx.enable = true;
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@ -9,12 +9,22 @@
    };
  };

-  config = lib.mkIf
-    (config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
-      unfreePackages = [ "1password" "_1password-gui" ];
-      home-manager.users.${config.user} = {
-        home.packages = with pkgs; [ _1password-gui ];
-      };
+  config = lib.mkIf (config.gui.enable && config._1password.enable) {
+    unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ _1password-gui _1password ];
    };

+    # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
+    # On Mac, does not apply: https://1password.community/discussion/142794/app-and-browser-integration
+    # However, the button doesn't work either:
+    # https://1password.community/discussion/140735/extending-support-for-trusted-web-browsers
+    environment.etc."1password/custom_allowed_browsers".text = ''
+      ${
+        config.home-manager.users.${config.user}.programs.firefox.package
+      }/Applications/Firefox.app/Contents/MacOS/firefox
+      firefox
+    '';
+  };
+
 }
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@ -11,8 +11,8 @@

  config = lib.mkIf (config.gui.enable && config.discord.enable) {
    unfreePackages = [ "discord" ];
+    environment.systemPackages = [ pkgs.discord ];
    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ discord ];
      xdg.configFile."discord/settings.json".text = ''
        {
          "BACKGROUND_COLOR": "#202225",
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -29,6 +29,7 @@
          id = 0;
          name = "default";
          isDefault = true;
+          # https://nur.nix-community.org/repos/rycee/
          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
            (lib.mkIf config._1password.enable onepassword-password-manager)
            pkgs.bypass-paywalls-clean
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -45,9 +45,20 @@

          # Easy fullscreen toggle (for macOS)
          "super+f" = "toggle_fullscreen";
+
+          # Kitty scrollback nvim
+          "kitty_mod+h" = "kitty_scrollback_nvim";
+          "kitty_mod+g" =
+            "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
        };
        settings = {

+          # Required for kitty-scrollback.nvim
+          allow_remote_control = "socket-only";
+          listen_on = "unix:/tmp/kitty";
+          action_alias =
+            "kitty_scrollback_nvim kitten ${pkgs.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
+
          # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
          background = config.theme.colors.base00;
          foreground = config.theme.colors.base05;
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@ -40,6 +40,7 @@
        associations.added = {
          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
          "image/*" = [ "nsxiv.desktop" ];
        };
        associations.removed = {
@ -48,6 +49,7 @@
        defaultApplications = {
          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
          "image/*" = [ "nsxiv.desktop" ];
        };
      };
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -68,7 +68,7 @@
            "!" = ":term<space>";
            "|" = ":pipe<space>";

-            "/" = ":search<space>";
+            "/" = ":search<space>-a<space>";
            "\\" = ":filter <space>";
            n = ":next-result<Enter>";
            N = ":prev-result<Enter>";
--- a/modules/common/neovim/config/completion.nix
+++ b/modules/common/neovim/config/completion.nix
@ -9,7 +9,6 @@
    pkgs.vimPlugins.luasnip
    pkgs.vimPlugins.cmp_luasnip
    pkgs.vimPlugins.cmp-rg
-    pkgs.vimPlugins.friendly-snippets
  ];

  use.cmp.setup = dsl.callWith {
@ -24,13 +23,6 @@
      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
@ -70,7 +62,6 @@
    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
@ -119,7 +110,6 @@
            }
            vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
            vim_item.menu = ({
-                luasnip = "[Snippet]",
                buffer = "[Buffer]",
                path = "[Path]",
                rg = "[Grep]",
@ -139,13 +129,6 @@
  };

  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 = {
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -1,10 +1,11 @@
 { pkgs, lib, config, dsl, ... }: {

  # Terraform optional because non-free
-  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
  options.github = lib.mkEnableOption "Whether to enable GitHub features";
  options.kubernetes =
    lib.mkEnableOption "Whether to enable Kubernetes features";
+  options.python = lib.mkEnableOption "Whether to enable Python LSP";
+  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";

  config =

@ -18,6 +19,12 @@
      '' else
        "";

+      pythonFormat = if config.python then ''
+        require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+        require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+      '' else
+        "";
+
    in {
      plugins = [
        pkgs.vimPlugins.nvim-lspconfig
@ -41,7 +48,11 @@
      };

      use.lspconfig.pyright.setup = dsl.callWith {
-        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+        cmd = if config.python then [
+          "${pkgs.pyright}/bin/pyright-langserver"
+          "--stdio"
+        ] else
+          [ "echo" ];
      };

      use.lspconfig.terraformls.setup = dsl.callWith {
@ -70,8 +81,6 @@
        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" }),
@ -80,6 +89,7 @@
                    command = "${pkgs.shfmt}/bin/shfmt",
                    extra_args = { "-i", "4", "-ci" },
                }),
+                ${pythonFormat}
                ${terraformFormat}
            },

--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@ -8,6 +8,7 @@
    pkgs.vimPlugins.glow-nvim # Markdown preview popup
    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
    pkgs.vimPlugins.which-key-nvim # Keybind helper
+    pkgs.kitty-scrollback-nvim # Scrollback pager for kitty
  ];

  # Initialize some plugins
@ -15,6 +16,7 @@
  setup.colorizer = { user_default_options = { names = false; }; };
  setup.glow = { };
  setup.which-key = { };
+  setup.kitty-scrollback = { };

  vim.o = {
    termguicolors = true; # Set to truecolor
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -1,12 +1,12 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, config, ... }: {

  plugins = [
    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
-      with pkgs.tree-sitter-grammars; [
+      with pkgs.tree-sitter-grammars;
+      [
        tree-sitter-bash
-        # tree-sitter-c
+        tree-sitter-c
        tree-sitter-fish
-        tree-sitter-hcl
        tree-sitter-ini
        tree-sitter-json
        tree-sitter-lua
@ -14,15 +14,15 @@
        tree-sitter-markdown-inline
        tree-sitter-nix
        tree-sitter-puppet
-        tree-sitter-python
        tree-sitter-rasi
        tree-sitter-toml
+        tree-sitter-vimdoc
        tree-sitter-yaml
-      ]))
+      ] ++ (if config.python.enable then [ tree-sitter-python ] else [ ])
+      ++ (if config.terraform.enable then [ tree-sitter-hcl ] else [ ])))
    pkgs.vimPlugins.vim-matchup # Better % jumping in languages
    pkgs.vimPlugins.playground # Tree-sitter experimenting
    pkgs.vimPlugins.nginx-vim
-    pkgs.vimPlugins.vim-helm
    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
    (pkgs.vimUtils.buildVimPlugin {
@ -30,7 +30,7 @@
      version = "0.1";
      src = ../plugin;
    })
-  ];
+  ] ++ (if config.kubernetes.enable then [ pkgs.vimPlugins.vim-helm ] else [ ]);

  setup."nvim-treesitter.configs" = {
    highlight = { enable = true; };
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -5,9 +5,11 @@ let
  neovim = import ./package {
    inherit pkgs;
    colors = config.theme.colors;
-    terraform = config.terraform.enable;
+    c = config.c.enable;
    github = true;
    kubernetes = config.kubernetes.enable;
+    python = config.python.enable;
+    terraform = config.terraform.enable;
  };

 in {
@ -45,8 +47,8 @@ in {
        # Requires removing some of the ANSI escape codes that are sent to the
        # scrollback using sed and baleia, as well as removing several
        # unnecessary features.
-        programs.kitty.settings.scrollback_pager = ''
-          $SHELL -c 'sed -r "s/[[:cntrl:]]\]133;[AC]..//g" | ${neovim}/bin/nvim -c "setlocal nonumber norelativenumber nolist laststatus=0" -c "lua baleia = require(\"baleia\").setup({}); baleia.once(0)" -c "map <silent> q :qa!<CR>" -c "autocmd VimEnter * normal G"' '';
+        programs.kitty.settings.scrollback_pager =
+          "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";

        # Create a desktop option for launching Neovim from a file manager
        # (Requires launching the terminal and then executing Neovim)
--- a/modules/common/programming/c.nix
+++ b/modules/common/programming/c.nix
@ -0,0 +1 @@
+{ lib, ... }: { options.c.enable = lib.mkEnableOption "C language tools."; }
--- a/modules/common/programming/kubernetes.nix
+++ b/modules/common/programming/kubernetes.nix
@ -24,113 +24,125 @@
      # Terminal Kubernetes UI
      programs.k9s = {
        enable = true;
-        # settings = { k9s = { headless = true; }; };
-        skin = {
+        settings = {
          k9s = {
-            body = {
-              fgColor = config.theme.colors.base06;
-              bgColor = config.theme.colors.base00;
-              logoColor = config.theme.colors.base02; # *blue ?
+            ui = {
+              enableMouse = true;
+              headless = true;
+              logoless = true;
+              crumbsless = false;
+              skin = "main";
            };
-            # Search bar
-            prompt = {
-              fgColor = config.theme.colors.base06;
-              bgColor = config.theme.colors.base00;
-              suggestColor = config.theme.colors.base03;
-            };
-            # Header left side
-            info = {
-              fgColor = config.theme.colors.base04;
-              sectionColor = config.theme.colors.base05;
-            };
-            dialog = {
-              fgColor = config.theme.colors.base06;
-              bgColor = config.theme.colors.base00;
-              buttonFgColor = config.theme.colors.base06;
-              buttonBgColor = config.theme.colors.base0E;
-              buttonFocusFgColor = config.theme.colors.base07;
-              buttonFocusBgColor = config.theme.colors.base02; # *cyan
-              labelFgColor = config.theme.colors.base09;
-              fieldFgColor = config.theme.colors.base06;
-            };
-            frame = {
-              border = {
-                fgColor = config.theme.colors.base01;
-                focusColor = config.theme.colors.base06;
-              };
-              menu = {
+          };
+        };
+        skins = {
+          main = {
+            k9s = {
+              body = {
                fgColor = config.theme.colors.base06;
-                keyColor = config.theme.colors.base0E; # *magenta
-                numKeyColor = config.theme.colors.base0E; # *magenta
+                bgColor = "default";
+                logoColor = config.theme.colors.base02; # *blue ?
              };
-              crumbs = {
+              # Search bar
+              prompt = {
                fgColor = config.theme.colors.base06;
-                bgColor = config.theme.colors.base01;
-                activeColor = config.theme.colors.base03;
+                bgColor = "default";
+                suggestColor = config.theme.colors.base03;
              };
-              status = {
-                newColor = config.theme.colors.base04; # *cyan
-                modifyColor = config.theme.colors.base0D; # *blue
-                addColor = config.theme.colors.base0B; # *green
-                errorColor = config.theme.colors.base08; # *red
-                highlightColor = config.theme.colors.base09; # *orange
-                killColor = config.theme.colors.base03; # *comment
-                completedColor = config.theme.colors.base03; # *comment
+              # Header left side
+              info = {
+                fgColor = config.theme.colors.base04;
+                sectionColor = config.theme.colors.base05;
              };
-              title = {
+              dialog = {
                fgColor = config.theme.colors.base06;
-                bgColor = config.theme.colors.base00;
-                highlightColor = config.theme.colors.base09; # *orange
-                counterColor = config.theme.colors.base0D; # *blue
-                filterColor = config.theme.colors.base0E; # *magenta
+                bgColor = "default";
+                buttonFgColor = config.theme.colors.base06;
+                buttonBgColor = config.theme.colors.base0E;
+                buttonFocusFgColor = config.theme.colors.base07;
+                buttonFocusBgColor = config.theme.colors.base02; # *cyan
+                labelFgColor = config.theme.colors.base09;
+                fieldFgColor = config.theme.colors.base06;
              };
-            };
-            views = {
-              charts = {
-                bgColor = config.theme.colors.base00;
-                defaultDialColors =
-                  [ config.theme.colors.base0D config.theme.colors.base08 ];
-                # - *blue
-                # - *red
-                defaultChartColors =
-                  [ config.theme.colors.base0D config.theme.colors.base08 ];
-                # - *blue
-                # - *red
-              };
-              table = {
-                # List of resources
-                fgColor = config.theme.colors.base06;
-                bgColor = config.theme.colors.base00;
-
-                # Row selection
-                cursorFgColor = config.theme.colors.base07;
-                cursorBgColor = config.theme.colors.base01;
-
-                # Header row
-                header = {
-                  fgColor = config.theme.colors.base0D;
-                  bgColor = config.theme.colors.base00;
-                  sorterColor = config.theme.colors.base0A; # *selection
+              frame = {
+                border = {
+                  fgColor = config.theme.colors.base01;
+                  focusColor = config.theme.colors.base06;
+                };
+                menu = {
+                  fgColor = config.theme.colors.base06;
+                  keyColor = config.theme.colors.base0E; # *magenta
+                  numKeyColor = config.theme.colors.base0E; # *magenta
+                };
+                crumbs = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = config.theme.colors.base01;
+                  activeColor = config.theme.colors.base03;
+                };
+                status = {
+                  newColor = config.theme.colors.base04; # *cyan
+                  modifyColor = config.theme.colors.base0D; # *blue
+                  addColor = config.theme.colors.base0B; # *green
+                  errorColor = config.theme.colors.base08; # *red
+                  highlightColor = config.theme.colors.base09; # *orange
+                  killColor = config.theme.colors.base03; # *comment
+                  completedColor = config.theme.colors.base03; # *comment
+                };
+                title = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+                  highlightColor = config.theme.colors.base09; # *orange
+                  counterColor = config.theme.colors.base0D; # *blue
+                  filterColor = config.theme.colors.base0E; # *magenta
                };
              };
-              xray = {
-                fgColor = config.theme.colors.base06;
-                bgColor = config.theme.colors.base00;
-                cursorColor = config.theme.colors.base06;
-                graphicColor = config.theme.colors.base0D;
-                showIcons = false;
-              };
-              yaml = {
-                keyColor = config.theme.colors.base0D;
-                colonColor = config.theme.colors.base04;
-                fgColor = config.theme.colors.base03;
-              };
-              logs = {
-                fgColor = config.theme.colors.base06;
-                bgColor = config.theme.colors.base00;
-                indicator = {
+              views = {
+                charts = {
+                  bgColor = "default";
+                  defaultDialColors =
+                    [ config.theme.colors.base0D config.theme.colors.base08 ];
+                  # - *blue
+                  # - *red
+                  defaultChartColors =
+                    [ config.theme.colors.base0D config.theme.colors.base08 ];
+                  # - *blue
+                  # - *red
+                };
+                table = {
+                  # List of resources
                  fgColor = config.theme.colors.base06;
-                  bgColor = config.theme.colors.base00;
+                  bgColor = "default";
+
+                  # Row selection
+                  cursorFgColor = config.theme.colors.base07;
+                  cursorBgColor = config.theme.colors.base01;
+
+                  # Header row
+                  header = {
+                    fgColor = config.theme.colors.base0D;
+                    bgColor = "default";
+                    sorterColor = config.theme.colors.base0A; # *selection
+                  };
+                };
+                xray = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+                  cursorColor = config.theme.colors.base06;
+                  graphicColor = config.theme.colors.base0D;
+                  showIcons = false;
+                };
+                yaml = {
+                  keyColor = config.theme.colors.base0D;
+                  colonColor = config.theme.colors.base04;
+                  fgColor = config.theme.colors.base03;
+                };
+                logs = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = "default";
+                  indicator = {
+                    fgColor = config.theme.colors.base06;
+                    bgColor = "default";
+                  };
                };
              };
            };
--- a/modules/common/shell/atuin.nix
+++ b/modules/common/shell/atuin.nix
@ -0,0 +1,39 @@
+{ config, lib, ... }: {
+
+  # Shell history sync
+
+  options.atuin.enable = lib.mkEnableOption "Atuin";
+
+  config = {
+
+    home-manager.users.${config.user} = lib.mkIf config.atuin.enable {
+
+      programs.atuin = {
+        enable = true;
+        flags = [ "--disable-up-arrow" "--disable-ctrl-r" ];
+        settings = {
+          auto_sync = true;
+          update_check = false;
+          sync_address = "https://api.atuin.sh";
+          search_mode = "fuzzy";
+          filter_mode = "host"; # global, host, session, directory
+          search_mode_shell_up_key_binding = "fuzzy";
+          filter_mode_shell_up_key_binding = "session";
+          style = "compact"; # or auto,full
+          show_help = true;
+          history_filter = [ ];
+          secrets_filter = true;
+          enter_accept = false;
+          keymap_mode = "vim-normal";
+        };
+      };
+
+    };
+
+    # Give root user the same setup
+    home-manager.users.root.programs.atuin =
+      config.home-manager.users.${config.user}.programs.atuin;
+
+  };
+
+}
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@ -1,5 +1,6 @@
 { ... }: {
  imports = [
+    ./atuin.nix
    ./bash
    ./charm.nix
    ./direnv.nix
--- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish
+++ b/modules/common/shell/fish/functions/fish_user_key_bindings.fish
@ -18,3 +18,5 @@ bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
+bind -M insert \ch _atuin_search --filter-mode global
+bind -M default \ch _atuin_search --filter-mode global
--- a/modules/common/shell/fzf.nix
+++ b/modules/common/shell/fzf.nix
@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, pkgs, ... }: {

  # FZF is a fuzzy-finder for the terminal

@ -16,10 +16,9 @@
                    --search-path $HOME/dev \
                    --type directory \
                    --exact-depth 2 \
+                | ${pkgs.proximity-sort}/bin/proximity-sort $PWD \
                | sed 's/\\/$//' \
-                | fzf \
-                    --delimiter '/' \
-                    --with-nth 6.. \
+                | fzf --tiebreak=index \
            )
            and cd $projdir
            and commandline -f execute
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@ -35,8 +35,20 @@ in {
          init = { defaultBranch = "master"; };
        };
        ignores = [ ".direnv/**" "result" ];
+        includes = [{
+          path = "~/.config/git/personal";
+          condition = "gitdir:~/dev/personal/";
+        }];
      };

+      # Personal git config
+      # TODO: fix with variables
+      xdg.configFile."git/personal".text = ''
+        [user]
+            name = "Noah Masur"
+            email = "7386960+nmasur@users.noreply.github.com"
+      '';
+
      programs.fish.shellAbbrs = {
        g = "git";
        gs = "git status";
--- a/modules/common/shell/github.nix
+++ b/modules/common/shell/github.nix
@ -57,6 +57,7 @@
            | fzf \
                --header-lines=1 \
                --layout=reverse \
+                --height=100% \
                --bind "ctrl-o:execute:gh repo view -w ''${organization}/{1}" \
                --bind "shift-up:preview-half-page-up" \
                --bind "shift-down:preview-half-page-down" \
--- a/modules/common/shell/nixpkgs.nix
+++ b/modules/common/shell/nixpkgs.nix
@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
  home-manager.users.${config.user} = {

    programs.fish = {
@ -60,6 +60,18 @@
      enableFishIntegration = true;
    };

+    # Create nix-index if doesn't exist
+    home.activation.createNixIndex =
+      let cacheDir = "${config.homePath}/.cache/nix-index";
+      in lib.mkIf
+      config.home-manager.users.${config.user}.programs.nix-index.enable
+      (config.home-manager.users.${config.user}.lib.dag.entryAfter
+        [ "writeBoundary" ] ''
+          if [ ! -d ${cacheDir} ]; then
+              $DRY_RUN_CMD ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
+          fi
+        '');
+
  };

  nix = {
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -31,6 +31,8 @@ in {
        lf # File viewer
        qrencode # Generate qr codes
        rsync # Copy folders
+        ren # Rename files
+        # rep # Replace text in files
        ripgrep # grep
        sd # sed
        tealdeer # Cheatsheets
--- a/modules/darwin/hammerspoon.nix
+++ b/modules/darwin/hammerspoon.nix
@ -24,9 +24,9 @@
      home.activation.reloadHammerspoon =
        config.home-manager.users.${config.user}.lib.dag.entryAfter
        [ "writeBoundary" ] ''
-          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.reload()"
+          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
          $DRY_RUN_CMD sleep 1
-          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.console.clearConsole()"
+          $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
        '';

    };
--- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
@ -9,7 +9,7 @@ obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"

 function obj:init()
-    hs.window.animationDuration = 0
+    hs.window.animationDuration = 0.1
    dofile(hs.spoons.resourcePath("worklayout.lua"))()
    -- bind hotkey
    hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "n", function()
--- a/modules/darwin/hammerspoon/init.lua
+++ b/modules/darwin/hammerspoon/init.lua
@ -1,5 +1,5 @@
+hs.ipc.cliInstall()                   -- Install Hammerspoon CLI program
 hs.loadSpoon("ControlEscape"):start() -- Load Hammerspoon bits from https://github.com/jasonrudolph/ControlEscape.spoon
 hs.loadSpoon("Launcher"):init()
 hs.loadSpoon("DismissAlerts"):init()
 hs.loadSpoon("MoveWindow"):init()
-hs.ipc.cliInstall() -- Install Hammerspoon CLI program
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@ -8,11 +8,15 @@
      if ! xcode-select --version 2>/dev/null; then
        $DRY_RUN_CMD xcode-select --install
      fi
-      if ! /usr/local/bin/brew --version 2>/dev/null; then
+      if ! /opt/homebrew/bin/brew --version 2>/dev/null; then
        $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
      fi
    '';

+    # Add homebrew paths to CLI path
+    home-manager.users.${config.user}.home.sessionPath =
+      [ "/opt/homebrew/bin/" ];
+
    homebrew = {
      enable = true;
      onActivation = {
@ -24,25 +28,19 @@
        brewfile = true; # Run brew bundle from anywhere
        lockfiles = false; # Don't save lockfile (since running from anywhere)
      };
-      taps = [
-        "homebrew/cask" # Required for casks
-        "homebrew/cask-drivers" # Used for Logitech G-Hub
-      ];
      brews = [
        "trash" # Delete files and folders to trash instead of rm
-        "openjdk" # Required by Apache Directory Studio
      ];
      casks = [
-        "1password" # 1Password packaging on Nix is broken for macOS
-        "apache-directory-studio" # Packaging on Nix is not available for macOS
-        "gitify" # Git notifications in menu bar
+        "1password" # 1Password will not launch from Nix on macOS
+        # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
        "keybase" # GUI on Nix not available for macOS
-        "logitech-g-hub" # Mouse and keyboard management
+        # "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
+        # "steam" # Not packaged for Nix
+        # "epic-games" # Not packaged for Nix
      ];
    };

--- a/modules/darwin/networking.nix
+++ b/modules/darwin/networking.nix
@ -2,7 +2,7 @@

  config = lib.mkIf pkgs.stdenv.isDarwin {
    networking = {
-      computerName = "${config.fullName}'\\''s Mac";
+      computerName = config.networking.hostName;
      # Adjust if necessary
      # hostName = "";
    };
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }: {

  config = lib.mkIf pkgs.stdenv.isDarwin {

@ -34,8 +34,8 @@
          # Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
          AppleKeyboardUIMode = 3;

-          # Automatically show and hide the menu bar
-          _HIHideMenuBar = true;
+          # Only hide menu bar in fullscreen
+          _HIHideMenuBar = false;

          # Expand save panel by default
          NSNavPanelExpandedStateForSaveMode = true;
@ -112,77 +112,95 @@
        # Disable trackpad tap to click
        trackpad.Clicking = false;

-        # universalaccess = {
-
-        #   # Zoom in with Control + Scroll Wheel
-        #   closeViewScrollWheelToggle = true;
-        #   closeViewZoomFollowsFocus = true;
-        # };
-
        # Where to save screenshots
        screencapture.location = "~/Downloads";

+        CustomUserPreferences = {
+          # Disable disk image verification
+          "com.apple.frameworks.diskimages" = {
+            skip-verify = true;
+            skip-verify-locked = true;
+            skip-verify-remote = true;
+          };
+          # Avoid creating .DS_Store files on network or USB volumes
+          "com.apple.desktopservices" = {
+            DSDontWriteNetworkStores = true;
+            DSDontWriteUSBStores = true;
+          };
+          "com.apple.dock" = {
+            magnification = true;
+            largesize = 48;
+            persistent-apps = let
+              dockText = app:
+                "<dict><key>tile-data</key><dict><key>file-data</key><dict><key>_CFURLString</key><string>${app}</string><key>_CFURLStringType</key><integer>0</integer></dict></dict></dict>";
+            in map dockText [
+              "/Applications/1Password.app"
+              "${pkgs.slack}/Applications/Slack.app"
+              "/System/Applications/Calendar.app"
+              "${pkgs.firefox-bin}/Applications/Firefox.app"
+              "/System/Applications/Messages.app"
+              "/System/Applications/Mail.app"
+              "/Applications/zoom.us.app"
+              "${pkgs.discord}/Applications/Discord.app"
+              "${pkgs.obsidian}/Applications/Obsidian.app"
+              "${pkgs.kitty}/Applications/kitty.app"
+              "/System/Applications/System Settings.app"
+            ];
+          };
+          # Require password immediately after screen saver begins
+          "com.apple.screensaver" = {
+            askForPassword = 1;
+            askForPasswordDelay = 0;
+          };
+          "com.apple.finder" = {
+            # Disable the warning before emptying the Trash
+            WarnOnEmptyTrash = false;
+
+            # Finder search in current folder by default
+            FXDefaultSearchScope = "SCcf";
+
+            # Default Finder window set to column view
+            FXPreferredViewStyle = "clmv";
+          };
+          "leits.MeetingBar" = {
+            eventTimeFormat = ''"show"'';
+            eventTitleFormat = ''"none"'';
+            eventTitleIconFormat = ''"iconCalendar"'';
+            slackBrowser =
+              ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
+            zoomBrowser =
+              ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
+            KeyboardShortcuts_joinEventShortcut =
+              ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
+            timeFormat = ''"12-hour"'';
+          };
+        };
+
+        CustomSystemPreferences = {
+
+        };
+
      };

      # Settings that don't have an option in nix-darwin
      activationScripts.postActivation.text = ''
-        echo "Disable disk image verification"
-        defaults write com.apple.frameworks.diskimages skip-verify -bool true
-        defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
-        defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
-
-        echo "Avoid creating .DS_Store files on network volumes"
-        defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
-
-        echo "Disable the warning before emptying the Trash"
-        defaults write com.apple.finder WarnOnEmptyTrash -bool false
-
-        echo "Require password immediately after sleep or screen saver begins"
-        defaults write com.apple.screensaver askForPassword -int 1
-        defaults write com.apple.screensaver askForPasswordDelay -int 0
-
        echo "Allow apps from anywhere"
        SPCTL=$(spctl --status)
        if ! [ "$SPCTL" = "assessments disabled" ]; then
            sudo spctl --master-disable
        fi
-
      '';

      # User-level settings
-      activationScripts.postUserActivation.text = ''
+      activationScripts.postUserActivation.text = let
+        persistentApps = lib.concatMapStrings (x: ''"'' + x + ''" '')
+          config.system.defaults.CustomUserPreferences."com.apple.dock".persistent-apps;
+      in ''
        echo "Show the ~/Library folder"
        chflags nohidden ~/Library

-        echo "Enable dock magnification"
-        defaults write com.apple.dock magnification -bool true
-
-        echo "Set dock magnification size"
-        defaults write com.apple.dock largesize -int 48
-
-        echo "Define dock icon function"
-        __dock_item() {
-            printf "%s%s%s%s%s" \
-                   "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
-                   "<key>_CFURLString</key><string>" \
-                   "$1" \
-                   "</string><key>_CFURLStringType</key><integer>0</integer>" \
-                   "</dict></dict></dict>"
-        }
-
        echo "Choose and order dock icons"
-        defaults write com.apple.dock persistent-apps -array \
-            "$(__dock_item /Applications/1Password.app)" \
-            "$(__dock_item ${pkgs.slack}/Applications/Slack.app)" \
-            "$(__dock_item /System/Applications/Calendar.app)" \
-            "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
-            "$(__dock_item /System/Applications/Messages.app)" \
-            "$(__dock_item /System/Applications/Mail.app)" \
-            "$(__dock_item /Applications/zoom.us.app)" \
-            "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
-            "$(__dock_item /Applications/Obsidian.app)" \
-            "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
-            "$(__dock_item /System/Applications/System\ Settings.app)"
+        defaults write com.apple.dock persistent-apps -array ${persistentApps}
      '';

    };
--- a/modules/darwin/user.nix
+++ b/modules/darwin/user.nix
@ -9,13 +9,19 @@

    };

-    # Used for aerc
    home-manager.users.${config.user} = {
-      home.sessionVariables = {
-        XDG_CONFIG_HOME = "${config.homePath}/.config";
-      };
+
+      # Default shell setting doesn't work
+      home.sessionVariables = { SHELL = "${pkgs.fish}/bin/fish"; };
+
+      # Used for aerc
+      xdg.enable = true;
+
    };

+    # Fix for: 'Error: HOME is set to "/var/root" but we expect "/var/empty"'
+    home-manager.users.root.home.homeDirectory = lib.mkForce "/var/root";
+
  };

 }
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@ -14,10 +14,10 @@
      pandoc # Convert text documents
      mpd # TUI slideshows
      mpv # Video player
+      gnupg # Encryption
      awscli2
      awslogs
      google-cloud-sdk
-      ansible
      vault-bin
      consul
      noti # Create notifications programmatically
--- a/modules/nixos/graphical/i3.nix
+++ b/modules/nixos/graphical/i3.nix
@ -95,13 +95,15 @@ in {

            # Adjust screen brightness
            "Shift+F12" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
+              # 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 --display 2 setvcp 10 - 30";
+              "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 --display 2 setvcp 10 + 30";
+              "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 --display 2 setvcp 10 - 30";
+              "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";
--- a/modules/nixos/graphical/rofi/brightness.nix
+++ b/modules/nixos/graphical/rofi/brightness.nix
@ -28,17 +28,18 @@ in {
              -sep ';' \
              -selected-row 1)

+
      case "$chosen" in
          "$dimmer")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 25
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 25; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 25
              ;;

          "$medium")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 75
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 75; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 75
              ;;

          "$brighter")
-              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 100
+              ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 100; ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 100
              ;;

          *) exit 1 ;;
--- a/modules/nixos/graphical/rofi/power.nix
+++ b/modules/nixos/graphical/rofi/power.nix
@ -31,15 +31,17 @@ in {
            -sep ';' \
            -selected-row 2)

+    confirm () {
+        ${builtins.readFile ./rofi-prompt.sh}
+    }
+
    case "$chosen" in
        "$power_off")
-            ${
-              builtins.toString ./rofi-prompt.sh
-            } 'Shutdown?' && doas shutdown now
+            confirm 'Shutdown?' && doas shutdown now
            ;;

        "$reboot")
-            ${builtins.toString ./rofi-prompt.sh} 'Reboot?' && doas reboot
+            confirm 'Reboot?' && doas reboot
            ;;

        "$lock")
@ -51,7 +53,7 @@ in {
            ;;

        "$log_out")
-            ${builtins.toString ./rofi-prompt.sh} 'Logout?' && i3-msg exit
+            confirm 'Logout?' && i3-msg exit
            ;;

        *) exit 1 ;;
--- a/modules/nixos/graphical/rofi/rofi-prompt.sh
+++ b/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") exit 0 ;;
-    *) exit 1 ;;
+    "$yes") return 0 ;;
+    *) return 1 ;;
 esac
--- a/modules/nixos/hardware/keyboard.nix
+++ b/modules/nixos/hardware/keyboard.nix
@ -4,7 +4,7 @@

    services.xserver = {

-      layout = "us";
+      xkb.layout = "us";

      # Keyboard responsiveness
      autoRepeatDelay = 250;
--- a/modules/nixos/services/arr.nix
+++ b/modules/nixos/services/arr.nix
@ -2,6 +2,7 @@

 let

+  # This config specifies ports for Prometheus to scrape information
  arrConfig = {
    radarr = {
      exportarrPort = "9707";
@ -41,6 +42,8 @@ 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 = {
@ -53,16 +56,23 @@ 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 for sabnzbd
+    unfreePackages = [ "unrar" ]; # Required as a dependency 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 ];
@ -70,6 +80,7 @@ in {
        }];
        handle = [{
          handler = "reverse_proxy";
+          # We're able to reference the url and port of the service dynamically 
          upstreams = [{ dial = arrConfig.sonarr.url; }];
        }];
      }
@ -92,6 +103,7 @@ in {
        }];
        handle = [{
          handler = "reverse_proxy";
+          # Prowlarr doesn't offer a dynamic config, so we have to hardcode it
          upstreams = [{ dial = "localhost:9696"; }];
        }];
      }
@ -104,6 +116,7 @@ in {
        handle = [{
          handler = "reverse_proxy";
          upstreams = [{
+            # Bazarr only dynamically sets the port, not the host
            dial = "localhost:${
                builtins.toString config.services.bazarr.listenPort
              }";
@ -145,10 +158,12 @@ 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} \
@ -197,7 +212,7 @@ in {
      prefix = "API_KEY=";
    };

-    # Prometheus scrape targets
+    # Prometheus scrape targets (expose Exportarr to Prometheus)
    prometheus.scrapeTargets = map (key:
      "127.0.0.1:${
        lib.attrsets.getAttrFromPath [ key "exportarrPort" ] arrConfig
--- a/modules/nixos/services/backups.nix
+++ b/modules/nixos/services/backups.nix
@ -1,3 +1,6 @@
+# This is my setup for backing up SQlite databases and other systems to S3 or
+# S3-equivalent services (like Backblaze B2).
+
 { config, lib, ... }: {

  options = {
--- a/modules/nixos/services/bind.nix
+++ b/modules/nixos/services/bind.nix
@ -1,3 +1,10 @@
+# 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
@ -16,11 +23,19 @@ 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
@ -47,6 +62,7 @@ in {

    };

+    # We must allow DNS traffic to hit our machine as well
    networking.firewall.allowedTCPPorts = [ 53 ];
    networking.firewall.allowedUDPPorts = [ 53 ];

--- a/modules/nixos/services/caddy.nix
+++ b/modules/nixos/services/caddy.nix
@ -1,3 +1,14 @@
+# 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 = {
@ -42,12 +53,17 @@
      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 = {
@ -58,13 +74,23 @@
          };
          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" ];

  };
--- a/modules/nixos/services/calibre.nix
+++ b/modules/nixos/services/calibre.nix
@ -1,3 +1,9 @@
+# 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
@ -26,6 +32,7 @@ in {
      };
    };

+    # Allow web traffic to Caddy
    caddy.routes = [{
      match = [{ host = [ config.hostnames.books ]; }];
      handle = [{
@ -35,6 +42,8 @@ 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" ];
      }];
    }];
--- a/modules/nixos/services/cloudflare-tunnel.nix
+++ b/modules/nixos/services/cloudflare-tunnel.nix
@ -1,3 +1,12 @@
+# 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:
@ -40,23 +49,28 @@
      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 of the email address in Cloudflare Access
+      # Must match the username portion of the email address in Cloudflare
+      # 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
--- a/modules/nixos/services/cloudflare.nix
+++ b/modules/nixos/services/cloudflare.nix
@ -1,5 +1,13 @@
 # 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
@ -59,10 +67,9 @@ 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 = {
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@ -1,3 +1,6 @@
+# This file imports all the other files in this directory for use as modules in
+# my config.
+
 { ... }: {

  imports = [
@ -21,6 +24,7 @@
    ./netdata.nix
    ./nextcloud.nix
    ./paperless.nix
+    ./postgresql.nix
    ./prometheus.nix
    ./samba.nix
    ./secrets.nix
--- a/modules/nixos/services/gitea-runner.nix
+++ b/modules/nixos/services/gitea-runner.nix
@ -1,3 +1,9 @@
+# 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, ... }:

 {
--- a/modules/nixos/services/gitea.nix
+++ b/modules/nixos/services/gitea.nix
@ -11,11 +11,21 @@ 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 = {
@ -25,11 +35,15 @@ 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;
@ -39,6 +53,7 @@ in {
    users.users.${config.user}.extraGroups = [ "gitea" ];

    caddy.routes = [
+      # Prevent public access to Prometheus metrics.
      {
        match = [{
          host = [ config.hostnames.git ];
@ -49,6 +64,7 @@ in {
          status_code = "403";
        }];
      }
+      # Allow access to primary server.
      {
        match = [{ host = [ config.hostnames.git ]; }];
        handle = [{
@ -63,6 +79,7 @@ in {
      }
    ];

+    # Scrape the metrics endpoint for Prometheus.
    prometheus.scrapeTargets = [
      "127.0.0.1:${
        builtins.toString config.services.gitea.settings.server.HTTP_PORT
--- a/modules/nixos/services/gnupg.nix
+++ b/modules/nixos/services/gnupg.nix
@ -1,3 +1,5 @@
+# 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.";
--- a/modules/nixos/services/grafana.nix
+++ b/modules/nixos/services/grafana.nix
@ -7,6 +7,7 @@ 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";
--- a/modules/nixos/services/honeypot.nix
+++ b/modules/nixos/services/honeypot.nix
@ -1,7 +1,10 @@
-{ config, lib, pkgs, ... }:
+# This is a tool for blocking IPs of anyone who attempts to scan all of my
+# 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

--- a/modules/nixos/services/influxdb2.nix
+++ b/modules/nixos/services/influxdb2.nix
@ -1,3 +1,8 @@
+# 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 = {
--- a/modules/nixos/services/jellyfin.nix
+++ b/modules/nixos/services/jellyfin.nix
@ -1,3 +1,6 @@
+# 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 {
@ -6,6 +9,7 @@
    users.users.jellyfin = { isSystemUser = true; };

    caddy.routes = [
+      # Prevent public access to Prometheus metrics.
      {
        match = [{
          host = [ config.hostnames.stream ];
@ -16,6 +20,7 @@
          status_code = "403";
        }];
      }
+      # Allow access to normal route.
      {
        match = [{ host = [ config.hostnames.stream ]; }];
        handle = [{
--- a/modules/nixos/services/keybase.nix
+++ b/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 {

-    services.keybase.enable = true;
-    services.kbfs = {
-      enable = true;
-      # enableRedirector = true;
-      mountPoint = "/run/user/1000/keybase/kbfs";
-    };
-    security.wrappers.keybase-redirector = {
-      setuid = true;
-      owner = "root";
-      group = "root";
-      source = "${pkgs.kbfs}/bin/redirector";
-    };
+    home-manager.users.${config.user} = lib.mkIf config.keybase.enable {
+
+      services.keybase.enable = true;
+      services.kbfs = {
+        enable = true;
+        mountPoint = "keybase";
+      };
+
+      # https://github.com/nix-community/home-manager/issues/4722
+      systemd.user.services.kbfs.Service.PrivateTmp = lib.mkForce false;

-    home-manager.users.${config.user} = {
      home.packages = [ (lib.mkIf config.gui.enable pkgs.keybase-gui) ];
      home.file = let
        ignorePatterns = ''
--- a/modules/nixos/services/mullvad.nix
+++ b/modules/nixos/services/mullvad.nix
@ -1,3 +1,5 @@
+# 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.";
--- a/modules/nixos/services/n8n.nix
+++ b/modules/nixos/services/n8n.nix
@ -1,3 +1,6 @@
+# n8n is an automation integration tool for connecting data from services
+# together with triggers.
+
 { config, lib, ... }: {

  options = {
--- a/modules/nixos/services/netdata.nix
+++ b/modules/nixos/services/netdata.nix
@ -1,3 +1,6 @@
+# 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.";
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@ -16,17 +16,23 @@
      };
      extraOptions = {
        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;
+        snappymail = pkgs.nextcloudApps.snappymail;
+      };
+      phpOptions = {
+        "opcache.interned_strings_buffer" = "16";
+        "output_buffering" = "0";
      };
-      phpOptions = { "opcache.interned_strings_buffer" = "16"; };
    };

    # Don't let Nginx use main ports (using Caddy instead)
--- a/modules/nixos/services/paperless.nix
+++ b/modules/nixos/services/paperless.nix
@ -1,3 +1,5 @@
+# Paperless-ngx is a document scanning and management solution.
+
 { config, lib, ... }: {

  config = lib.mkIf config.services.paperless.enable {
@ -5,7 +7,7 @@
    services.paperless = {
      mediaDir = "/data/generic/paperless";
      passwordFile = config.secrets.paperless.dest;
-      extraConfig = {
+      settings = {
        PAPERLESS_OCR_USER_ARGS =
          builtins.toJSON { invalidate_digital_signatures = true; };

@ -15,7 +17,10 @@
      };
    };

-    users.users.paperless.extraGroups = [ "generic" ];
+    # Allow Nextcloud and user to see files
+    users.users.nextcloud.extraGroups =
+      lib.mkIf config.services.nextcloud.enable [ "paperless" ];
+    users.users.${config.user}.extraGroups = [ "paperless" ];

    caddy.routes = [{
      match = [{
@ -43,6 +48,24 @@
      before = [ "paperless.service" ];
    };

+    # Fix permissions on a regular schedule
+    systemd.timers.paperless-permissions = {
+      timerConfig = {
+        OnCalendar = "*-*-* *:0/5"; # Every 5 minutes
+        Unit = "paperless-permissions.service";
+      };
+      wantedBy = [ "timers.target" ];
+    };
+
+    # Fix paperless shared permissions
+    systemd.services.paperless-permissions = {
+      description = "Allow group access to paperless files";
+      serviceConfig = { Type = "oneshot"; };
+      script = ''
+        find ${config.services.paperless.mediaDir} -type f -exec chmod 640 -- {} +
+      '';
+    };
+
  };

 }
--- a/modules/nixos/services/postgresql.nix
+++ b/modules/nixos/services/postgresql.nix
@ -0,0 +1,22 @@
+{ 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
+    ];
+
+}
--- a/modules/nixos/services/prometheus.nix
+++ b/modules/nixos/services/prometheus.nix
@ -1,3 +1,9 @@
+# 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 = {
--- a/modules/nixos/services/samba.nix
+++ b/modules/nixos/services/samba.nix
@ -1,3 +1,5 @@
+# Samba is a Windows-compatible file-sharing service.
+
 { config, lib, ... }: {

  config = {
--- a/modules/nixos/services/sshd.nix
+++ b/modules/nixos/services/sshd.nix
@ -1,3 +1,5 @@
+# SSHD service for allowing SSH access to my machines.
+
 { config, pkgs, lib, ... }: {

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

  options = {
--- a/modules/nixos/services/vaultwarden.nix
+++ b/modules/nixos/services/vaultwarden.nix
@ -1,3 +1,7 @@
+# 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
--- a/modules/nixos/services/victoriametrics.nix
+++ b/modules/nixos/services/victoriametrics.nix
@ -1,3 +1,6 @@
+# VictoriaMetrics is a more efficient drop-in replacement for Prometheus and
+# InfluxDB (timeseries databases built for monitoring system metrics).
+
 { config, pkgs, lib, ... }:

 let
--- a/modules/nixos/services/wireguard.nix
+++ b/modules/nixos/services/wireguard.nix
@ -1,3 +1,6 @@
+# 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.";
--- a/overlays/age.nix
+++ b/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
-  });
-}
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -16,9 +16,6 @@ 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;
@ -38,5 +35,7 @@ in {
  # Packaging plugins entirely with Nix
  baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
  hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
+  kitty-scrollback-nvim =
+    plugin "kitty-scrollback-nvim" inputs.kitty-scrollback-nvim-src;

 }
--- a/overlays/nextcloud-apps.nix
+++ b/overlays/nextcloud-apps.nix
@ -16,6 +16,11 @@ inputs: _final: prev: {
      sha256 = inputs.nextcloud-cookbook.narHash;
      license = "agpl3Plus";
    };
+    snappymail = prev.fetchNextcloudApp {
+      url = inputs.nextcloud-snappymail.outPath;
+      sha256 = inputs.nextcloud-snappymail.narHash;
+      license = "agpl3Plus";
+    };
  };

 }
--- a/overlays/ren-rep.nix
+++ b/overlays/ren-rep.nix
@ -0,0 +1,17 @@
+inputs: _final: prev: {
+
+  ren = prev.rustPlatform.buildRustPackage {
+    pname = "ren-find";
+    version = "0.0.7";
+    src = inputs.ren;
+    cargoHash = "sha256-3bI3j2xvNHp4kyLEq/DZvRJBF2rn6pE4n8oXh67edDI=";
+  };
+
+  # rep = prev.rustPlatform.buildRustPackage {
+  #   pname = "rep-grep";
+  #   version = "0.0.7";
+  #   src = inputs.rep;
+  #   cargoHash = "sha256-GEr3VvQ0VTKHUbW/GFEgwLpQWP2ZhS/4KYjDvfFLgxo=";
+  # };
+
+}
--- a/overlays/terraform.nix
+++ b/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)))
-    ];
-  });
-}
--- a/overlays/tree-sitter.nix
+++ b/overlays/tree-sitter.nix
@ -32,6 +32,11 @@ inputs: _final: prev: {
      version = "0.1.1";
      src = inputs.tree-sitter-rasi;
    };
+    tree-sitter-vimdoc = prev.tree-sitter.buildGrammar {
+      language = "vimdoc";
+      version = "2.1.0";
+      src = inputs.tree-sitter-vimdoc;
+    };
  };

 }
--- a/templates/python/flake.nix
+++ b/templates/python/flake.nix
@ -11,7 +11,7 @@
    inputs.pypi-deps-db.follows = "pypi-deps-db";
  };

-  outputs = { self, nixpkgs, mach-nix }:
+  outputs = { nixpkgs, mach-nix, ... }:
    let
      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
      forAllSystems = f:
Author	SHA1	Message	Date
Noah Masur	f85a008741	set checks on individual languages	2024-02-07 23:04:08 -05:00
Noah Masur	6c2fc0289b	drop apache-directory-studio in favor of ldapsearch apache directory studio can't figure out how to make it work on m3	2024-02-07 22:08:22 -05:00
Noah Masur	5034ada458	add time format to meetingbar and remove scroll zoom scroll wheel zoom updates don't work for whatever reason	2024-02-07 21:23:01 -05:00
Noah Masur	e635cf6225	fix: deprecated option	2024-02-06 23:41:28 -05:00
Noah Masur	b901eef822	use nsixv for png images	2024-02-06 22:12:14 -05:00
Noah Masur	e7cdfc1453	include non-zero animation in macos window movement	2024-02-06 17:43:44 -05:00
Noah Masur	7503335701	add 1password cli everywhere	2024-02-06 17:43:27 -05:00
Noah Masur	0b571e4565	partially move macos dock apps to declarative list	2024-02-04 21:09:25 -07:00
Noah Masur	f91c9bcfc2	move macos preferences from imperative to declarative	2024-02-04 13:56:16 -07:00
Noah Masur	b27b9136f9	remove ansible (no longer used)	2024-02-04 10:03:29 -07:00
Noah Masur	865dad0f4f	Revert "remove ansible (no longer used)" This reverts commit `3178a1dea9`.	2024-02-04 10:02:50 -07:00
Noah Masur	3178a1dea9	remove ansible (no longer used)	2024-02-04 10:02:39 -07:00
Noah Masur	af1b6c8b35	add rep and ren (without rep)	2024-02-04 08:33:42 -07:00
Noah Masur	89e8463b98	remove unneeded temp fix for terraform on darwin	2024-02-04 08:33:42 -07:00
github-actions[bot]	01eccb6655	flake.lock: Update Flake lock file updates: • Updated input 'bypass-paywalls-clean': 'gitlab:magnolia1234/bpc-uploads/245899e6b06e30ce36f26b37b8045b6c5b0ac8de' (2024-01-23) → 'gitlab:magnolia1234/bpc-uploads/c91cfd510390ab5a138f412ad2890b2cb2a2eafd' (2024-02-02) • Updated input 'darwin': 'github:lnl7/nix-darwin/0108864c15bb68ad57d17fb2e7d3a3e025751d79' (2024-01-28) → 'github:lnl7/nix-darwin/bdbae6ecff8fcc322bf6b9053c0b984912378af7' (2024-02-02) • Updated input 'disko': 'github:nix-community/disko/f7424625dc1f2e4eceac3009cbd1203d566feebc' (2024-01-26) → 'github:nix-community/disko/f67ba6552845ea5d7f596a24d57c33a8a9dc8de9' (2024-01-29) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/912228b33c72703badb20a309518e1e09af302c3' (2024-01-28) → 'github:bandithedoge/nixpkgs-firefox-darwin/d839feb516758ad28bc1cef43008d55e749c1d6a' (2024-02-04) • Updated input 'hmts-nvim-src': 'github:calops/hmts.nvim/14fd941d7ec2bb98314a1aacaa2573d97f1629ab' (2023-08-28) → 'github:calops/hmts.nvim/ba1239972a1f56b94252d4f85a43e777ac419662' (2024-02-02) • Updated input 'home-manager': 'github:nix-community/home-manager/b2f56952074cb46e93902ecaabfb04dd93733434' (2024-01-26) → 'github:nix-community/home-manager/1ca210648a6ca9b957efde5da957f3de6b1f0c45' (2024-02-03) • Updated input 'kitty-scrollback-nvim-src': 'github:mikesmithgh/kitty-scrollback.nvim/bb5332b8ec0763b9e611f8cabf4165ed8c3893f5' (2024-01-29) → 'github:mikesmithgh/kitty-scrollback.nvim/12f7687ac049d46a987c39b2b4f657fdf540fa4e' (2024-02-02) • Updated input 'nextcloud-snappymail': 'https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz?narHash=sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo%3D' (2024-01-28) → 'https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz?narHash=sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo%3D' (2024-02-04) • Updated input 'nix2vim': 'github:gytis-ivaskevicius/nix2vim/84584da274869fb8177e8ef2d0b9d975bbb82489' (2024-01-28) → 'github:gytis-ivaskevicius/nix2vim/29253dcf0f645a44847006d436b096369ef42fd8' (2024-02-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ae5c332cbb5827f6b1f02572496b141021de335f' (2024-01-25) → 'github:nixos/nixpkgs/b8b232ae7b8b144397fdb12d20f592e5e7c1a64d' (2024-01-31) • Updated input 'nur': 'github:nix-community/nur/ab8cf147ee2254ef91e87ff7272524975fcbba3f' (2024-01-28) → 'github:nix-community/nur/ab432acea15134873882610c0e936a882319bc8a' (2024-02-04) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/7bdb220d0fe604a77361e92cdbc7af1b8a412126' (2024-01-21) → 'github:kyazdani42/nvim-tree.lua/f39f7b6fcd3865ac2146de4cb4045286308f2935' (2024-01-29) • Updated input 'nvim-treesitter-src': 'github:nvim-treesitter/nvim-treesitter/458ce4d16c1771fc601ec10a87820acae9981f6d' (2024-01-27) → 'github:nvim-treesitter/nvim-treesitter/4fbf150a1621d52f17b099506e1a32f107079210' (2024-02-03) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/31346e340e828f79be23d9c83ec1674b152f17bc' (2024-01-24) → 'github:nix-community/NixOS-WSL/bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b' (2024-02-02)	2024-02-04 03:44:18 +00:00
Noah Masur	e7f8a75df3	fix k9s to work with new config workflow	2024-01-30 10:37:05 -07:00
Noah Masur	fa03e51d37	add meetingbar cmd opt ctrl j shortcut	2024-01-30 10:22:08 -07:00
Noah Masur	fe1a4c2c29	switch to kitty-scrollback.nvim still has problems with ergonomics	2024-01-30 09:57:38 -07:00
Noah Masur	26afa49879	bump neovim plugins and remove unnecessary overlays clean checkhealth but some possible bugs in bufferline	2024-01-27 21:46:40 -07:00
Noah Masur	94bc6662ed	fix pr body template for flake updates	2024-01-27 21:20:01 -07:00
github-actions[bot]	06c1f5c372	flake.lock: Update Flake lock file updates: • Updated input 'bypass-paywalls-clean': 'gitlab:magnolia1234/bpc-uploads/55af5ff1f6a7f8ea7fc57253029c07de8f481c62' (2024-01-18) → 'gitlab:magnolia1234/bpc-uploads/245899e6b06e30ce36f26b37b8045b6c5b0ac8de' (2024-01-23) • Updated input 'darwin': 'github:lnl7/nix-darwin/3ac7acd32db4f7111015e8d5349ff6067df01bf6' (2024-01-21) → 'github:lnl7/nix-darwin/0108864c15bb68ad57d17fb2e7d3a3e025751d79' (2024-01-28) • Updated input 'disko': 'github:nix-community/disko/0033adc6e3f1ed076f3ed1c637ef1dfe6bef6733' (2024-01-18) → 'github:nix-community/disko/f7424625dc1f2e4eceac3009cbd1203d566feebc' (2024-01-26) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/51cc53fd6e6a1625a00565f110edc09f9ea7cfd9' (2024-01-21) → 'github:bandithedoge/nixpkgs-firefox-darwin/912228b33c72703badb20a309518e1e09af302c3' (2024-01-28) • Updated input 'home-manager': 'github:nix-community/home-manager/9b378afae72cb07471e19aefc30e8e05ef2d7a61' (2024-01-20) → 'github:nix-community/home-manager/b2f56952074cb46e93902ecaabfb04dd93733434' (2024-01-26) • Updated input 'nextcloud-snappymail': 'https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz?narHash=sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo%3D' (2024-01-21) → 'https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz?narHash=sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo%3D' (2024-01-28) • Updated input 'nix2vim': 'github:gytis-ivaskevicius/nix2vim/3836a348503ae27340c7f83f0bc7bcb907f3781d' (2023-06-05) → 'github:gytis-ivaskevicius/nix2vim/84584da274869fb8177e8ef2d0b9d975bbb82489' (2024-01-28) • Updated input 'nix2vim/flake-utils': 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/521fb4cdd8a2e1a00d1adf0fea7135d1faf04234' (2024-01-16) → 'github:nix-community/nixos-generators/896f6589db5b25023b812bbb6c1f5d3a499b1132' (2024-01-24) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/bbe7d8f876fbbe7c959c90ba2ae2852220573261' (2024-01-19) → 'github:nixos/nixpkgs/ae5c332cbb5827f6b1f02572496b141021de335f' (2024-01-25) • Updated input 'nur': 'github:nix-community/nur/ff6497ef576a1d88ef7ecb7e40e3a7cd9a410b2b' (2024-01-21) → 'github:nix-community/nur/ab8cf147ee2254ef91e87ff7272524975fcbba3f' (2024-01-28) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/74525ac04760bf0d9fec2bf51474d2b05f36048e' (2024-01-20) → 'github:kyazdani42/nvim-tree.lua/7bdb220d0fe604a77361e92cdbc7af1b8a412126' (2024-01-21) • Updated input 'nvim-treesitter-src': 'github:nvim-treesitter/nvim-treesitter/5cc562748729b6dc9563ea5a3d676ff102ab38b1' (2024-01-20) → 'github:nvim-treesitter/nvim-treesitter/458ce4d16c1771fc601ec10a87820acae9981f6d' (2024-01-27) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/bb3eeeb96ce059ae29309138874ccf58e796f4b1' (2024-01-15) → 'github:nix-community/NixOS-WSL/31346e340e828f79be23d9c83ec1674b152f17bc' (2024-01-24) • Updated input 'wsl/flake-utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'zenyd-mpv-scripts': 'github:zenyd/mpv-scripts/3ad7502fe2d6575b395db5568afdf830872c85d0' (2024-01-19) → 'github:zenyd/mpv-scripts/7100d19d18d111ce77fc9e6e8947c0d542a86397' (2024-01-26)	2024-01-28 04:16:16 +00:00
Noah Masur	4dd94ee59d	switch nixpath back to strings because of nixos only works as list of attrsets in darwin	2024-01-27 21:06:23 -07:00
Noah Masur	69dd348c92	fix: repos function fzf window too small	2024-01-25 14:57:29 -05:00
Noah Masur	d823b2a49e	fix: homebrew programs not in path	2024-01-25 14:57:18 -05:00
Noah Masur	756177826c	add code for macos meetingbar settings	2024-01-25 08:35:19 -05:00
Noah Masur	c60632a37f	tweaks for new mac	2024-01-25 07:55:31 -05:00
Noah Masur	324956c091	fixes for onboarding aarch64-darwin	2024-01-24 21:52:33 -05:00
Noah Masur	68c5816d4d	fixes for testing on brand new darwin system	2024-01-24 14:41:24 -05:00
Noah Masur	643b722eb4	get system ready for m3 macbook	2024-01-24 11:02:06 -05:00
Noah Masur	db0b2b147c	comment for firefox-addon repository	2024-01-23 07:44:18 -05:00
Noah Masur	b382bc9fbb	add gpg for darwin machine just for specific usecases where it's been annoying to pull every time	2024-01-22 16:34:37 -05:00
Noah Masur	454accd742	fix proximity sort by using full path	2024-01-22 13:03:46 -05:00
Noah Masur	088de57cab	add atuin to darwin	2024-01-21 14:28:13 -05:00
Noah Masur	5a992d6d5a	setup atuin synced shell history for user and root	2024-01-21 09:42:46 -05:00
github-actions[bot]	f44cf65c43	flake.lock: Update Flake lock file updates: • Updated input 'bypass-paywalls-clean': 'gitlab:magnolia1234/bpc-uploads/fc34b6b8e2d79af62ef9cf8222daeb0eb4b785a4' (2024-01-10) → 'gitlab:magnolia1234/bpc-uploads/55af5ff1f6a7f8ea7fc57253029c07de8f481c62' (2024-01-18) • Updated input 'darwin': 'github:lnl7/nix-darwin/0dd382b70c351f528561f71a0a7df82c9d2be9a4' (2024-01-03) → 'github:lnl7/nix-darwin/3ac7acd32db4f7111015e8d5349ff6067df01bf6' (2024-01-21) • Updated input 'disko': 'github:nix-community/disko/f78b6498f69e04514cb84393e5daba669198c1c1' (2024-01-12) → 'github:nix-community/disko/0033adc6e3f1ed076f3ed1c637ef1dfe6bef6733' (2024-01-18) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/0d1ff8fb805bfaecfd9a05f788fcd08ca8af38e8' (2024-01-14) → 'github:bandithedoge/nixpkgs-firefox-darwin/51cc53fd6e6a1625a00565f110edc09f9ea7cfd9' (2024-01-21) • Updated input 'home-manager': 'github:nix-community/home-manager/f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8' (2024-01-13) → 'github:nix-community/home-manager/9b378afae72cb07471e19aefc30e8e05ef2d7a61' (2024-01-20) • Updated input 'nextcloud-snappymail': 'https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz?narHash=sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo%3D' (2024-01-21) → 'https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz?narHash=sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo%3D' (2024-01-21) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/246219bc21b943c6f6812bb7744218ba0df08600' (2023-12-04) → 'github:nix-community/nixos-generators/521fb4cdd8a2e1a00d1adf0fea7135d1faf04234' (2024-01-16) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/317484b1ead87b9c1b8ac5261a8d2dd748a0492d' (2024-01-08) → 'github:nixos/nixpkgs/bbe7d8f876fbbe7c959c90ba2ae2852220573261' (2024-01-19) • Updated input 'nur': 'github:nix-community/nur/7a24ce86be38634afc3c82caccefc2059bdf935b' (2024-01-14) → 'github:nix-community/nur/ff6497ef576a1d88ef7ecb7e40e3a7cd9a410b2b' (2024-01-21) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/f24afa2cef551122b8bd53bb2e4a7df42343ce2e' (2024-01-14) → 'github:kyazdani42/nvim-tree.lua/74525ac04760bf0d9fec2bf51474d2b05f36048e' (2024-01-20) • Updated input 'nvim-treesitter-src': 'github:nvim-treesitter/nvim-treesitter/8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e' (2024-01-07) → 'github:nvim-treesitter/nvim-treesitter/5cc562748729b6dc9563ea5a3d676ff102ab38b1' (2024-01-20) • Updated input 'tree-sitter-bash': 'github:tree-sitter/tree-sitter-bash/7331995b19b8f8aba2d5e26deb51d2195c18bc94' (2023-10-10) → 'github:tree-sitter/tree-sitter-bash/f7239f638d3dc16762563a9027faeee518ce1bd9' (2024-01-19) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/0fa9268bf9a903498cb567e6d4d01eb945f36f6e' (2024-01-11) → 'github:nix-community/NixOS-WSL/bb3eeeb96ce059ae29309138874ccf58e796f4b1' (2024-01-15) • Updated input 'zenyd-mpv-scripts': 'github:zenyd/mpv-scripts/19ea069abcb794d1bf8fac2f59b50d71ab992130' (2022-04-22) → 'github:zenyd/mpv-scripts/3ad7502fe2d6575b395db5568afdf830872c85d0' (2024-01-19)	2024-01-21 03:49:33 +00:00
Noah Masur	46f3a459b6	enable paperless permissions cleanup for nextcloud and other systems	2024-01-21 03:19:19 +00:00
Noah Masur	161c1f46b0	update paperless group permissions	2024-01-21 02:13:13 +00:00
Noah Masur	fc2484227a	add snappymail to nextcloud	2024-01-21 02:13:13 +00:00
Noah Masur	e7bbf68dde	add logitune for macos even though it doesn't seem to install	2024-01-19 15:11:15 -05:00
Noah Masur	10f7b97b64	add pgcli for better interactivity and set pg version	2024-01-19 03:43:10 +00:00
Noah Masur	c8a8b7a897	add postgres to swan	2024-01-17 00:58:05 +00:00
Noah Masur	6560d2f9a2	update documentation for nixos hosts	2024-01-16 16:30:41 -05:00
Noah Masur	3be397429a	fix: module renamed extraConfig to settings	2024-01-15 17:49:31 +00:00
Noah Masur	8b17fd035b	improve aerc search to use all fields by default	2024-01-15 10:28:08 -05:00
Noah Masur	8da8fe7efb	tweak readme	2024-01-14 23:05:06 -05:00
Noah Masur	59111f5da6	remove snippets from neovim i never used them anyway	2024-01-14 22:33:50 -05:00
Noah Masur	95e8d5c268	switch to proximity fzf project switcher also sadly must remove the shortcut names because sorting requires full paths	2024-01-14 22:33:29 -05:00
github-actions[bot]	56d2c95c64	flake.lock: Update Flake lock file updates: • Updated input 'bypass-paywalls-clean': 'gitlab:magnolia1234/bpc-uploads/dcd11128c6b7c6246fc6d199ce10d5ec796d4716' (2024-01-03) → 'gitlab:magnolia1234/bpc-uploads/fc34b6b8e2d79af62ef9cf8222daeb0eb4b785a4' (2024-01-10) • Updated input 'disko': 'github:nix-community/disko/aef9a509db64a081186af2dc185654d78dc8e344' (2024-01-03) → 'github:nix-community/disko/f78b6498f69e04514cb84393e5daba669198c1c1' (2024-01-12) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/89d4e4ae6eb41838020dbe0a13cc72506402e0e3' (2024-01-07) → 'github:bandithedoge/nixpkgs-firefox-darwin/0d1ff8fb805bfaecfd9a05f788fcd08ca8af38e8' (2024-01-14) • Updated input 'home-manager': 'github:nix-community/home-manager/51e44a13acea71b36245e8bd8c7db53e0a3e61ee' (2024-01-05) → 'github:nix-community/home-manager/f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8' (2024-01-13) • Updated input 'nil/flake-utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/bd645e8668ec6612439a9ee7e71f7eac4099d4f6' (2024-01-02) → 'github:nixos/nixpkgs/317484b1ead87b9c1b8ac5261a8d2dd748a0492d' (2024-01-08) • Updated input 'nur': 'github:nix-community/nur/3a216c262c910b70e23ee01a4479dcc40c58599b' (2024-01-07) → 'github:nix-community/nur/7a24ce86be38634afc3c82caccefc2059bdf935b' (2024-01-14) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/78a5836092617205a999aefc75be1d842c299cbc' (2024-01-06) → 'github:kyazdani42/nvim-tree.lua/f24afa2cef551122b8bd53bb2e4a7df42343ce2e' (2024-01-14) • Updated input 'nvim-treesitter-src': 'github:nvim-treesitter/nvim-treesitter/5032f9952ad2a3a7f7792ac438c4f9e2bd53e0b9' (2024-01-06) → 'github:nvim-treesitter/nvim-treesitter/8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e' (2024-01-07) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/d2fd320bab0aa486383bbf5f13d5d8120700f911' (2024-01-05) → 'github:nix-community/NixOS-WSL/0fa9268bf9a903498cb567e6d4d01eb945f36f6e' (2024-01-11)	2024-01-14 03:44:12 +00:00
Noah Masur	602d411bad	fix: python flake template	2024-01-13 22:07:27 -05:00
Noah Masur	4cd9572993	fix: nextcloud status check says no output buffering	2024-01-13 13:35:50 +00:00
Noah Masur	84d7fc9892	fix: aerc on darwin switch to using xdg so config is saved in home dir instead of ~/Library/Preferences/aerc/	2024-01-12 12:34:04 -05:00
Noah Masur	dab40e081a	add more services documentation	2024-01-09 23:11:11 -05:00
Noah Masur	984a47d3b1	add links for readme diagram	2024-01-07 19:07:16 -05:00
Noah Masur	48cd96858a	add diagram to readme	2024-01-07 19:05:13 -05:00
Noah Masur	2cce4c572f	reenable legendary and heroic games	2024-01-07 18:48:40 -05:00
Noah Masur	2f783f2ba3	fix: confirm prompt should return not exit	2024-01-07 17:46:11 -05:00
Noah Masur	1ee22e3a9a	reduce duplicate flake inputs	2024-01-07 08:51:21 -05:00
github-actions[bot]	450b211e7e	flake.lock: Update Flake lock file updates: • Updated input 'baleia-nvim-src': 'github:m00qek/baleia.nvim/00bb4af31c8c3865b735d40ebefa6c3f07b2dd16' (2023-04-18) → 'github:m00qek/baleia.nvim/6d9cbdaca3a428bc7296f838fdfce3ad01ee7495' (2024-01-06) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/ca04361b1c2e6cbe5cbf7e118a28fe67ddf51f4c' (2024-01-05) → 'github:bandithedoge/nixpkgs-firefox-darwin/89d4e4ae6eb41838020dbe0a13cc72506402e0e3' (2024-01-07) • Updated input 'home-manager': 'github:nix-community/home-manager/26b8adb300e50efceb51fff6859a1a6ba1ade4f7' (2024-01-04) → 'github:nix-community/home-manager/51e44a13acea71b36245e8bd8c7db53e0a3e61ee' (2024-01-05) • Updated input 'nur': 'github:nix-community/nur/9c4f6b66f05fc6f6285df25e89f825b441ec9705' (2024-01-05) → 'github:nix-community/nur/3a216c262c910b70e23ee01a4479dcc40c58599b' (2024-01-07) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/f1b3e6a7eb92da492bd693257367d9256839ed3d' (2024-01-01) → 'github:kyazdani42/nvim-tree.lua/78a5836092617205a999aefc75be1d842c299cbc' (2024-01-06) • Updated input 'nvim-treesitter-src': 'github:nvim-treesitter/nvim-treesitter/49f1b9a7efc794be143f7ddcd60ce18e8164a7f8' (2024-01-05) → 'github:nvim-treesitter/nvim-treesitter/5032f9952ad2a3a7f7792ac438c4f9e2bd53e0b9' (2024-01-06) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/c81bc3f9baa0571d03d1297faddf3a08737fe49e' (2024-01-03) → 'github:nix-community/NixOS-WSL/d2fd320bab0aa486383bbf5f13d5d8120700f911' (2024-01-05)	2024-01-07 03:50:00 +00:00
Noah Masur	19f3147f25	inline rofi power prompt hope to fix issue where confirmation doesn't run when linked to another file	2024-01-06 20:51:18 -05:00
Noah Masur	5d6d6fc68e	fix: second monitor brightness not working https://github.com/rockowitz/ddcutil/issues/323	2024-01-06 20:21:43 -05:00
Noah Masur	ec55658fd1	update to latest proton-ge	2024-01-05 23:36:58 -05:00
Noah Masur	d25b189952	switch keybase to home-manager fixing issues with keybase running in the background and keybase gui	2024-01-05 23:31:53 -05:00
				`@ -0,0 +1 @@`
				`{ lib, ... }: { options.c.enable = lib.mkEnableOption "C language tools."; }`