try building mole for eblume

relates to #68
2026-11-13 14:45:02 +00:00 · 2024-06-26 16:24:35 -04:00
392 changed files with 7472 additions and 9749 deletions
@@ -3,7 +3,7 @@ name: Update Flake
 on:
  workflow_dispatch: # allows manual triggering
  schedule:
-    - cron: '33 3 * * 6' # runs weekly on Saturday at 03:33
+    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33

 permissions:
  contents: write
@@ -19,14 +19,12 @@ jobs:
        uses: actions/checkout@v3
      - name: Install Nix
        uses: DeterminateSystems/nix-installer-action@v11
-        with:
-          nix-package-url: https://releases.nixos.org/nix/nix-2.18.4/nix-2.18.4-x86_64-linux.tar.xz
      - name: Check Nixpkgs Inputs
        uses: DeterminateSystems/flake-checker-action@v7
      - name: Add Nix Cache
        uses: DeterminateSystems/magic-nix-cache-action@v6
      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v23
+        uses: DeterminateSystems/update-flake-lock@v21
        id: update
        with:
          pr-title: "Update flake.lock" # Title of PR to be created
@@ -25,6 +25,9 @@ rec {
  # Re-encrypt secrets for all machines
  reencrypt-secrets = import ./reencrypt-secrets.nix { inherit pkgs; };

+  # Connect machine metrics to Netdata Cloud
+  netdata = import ./netdata-cloud.nix { inherit pkgs; };
+
  # Run neovim as an app
  neovim = import ./neovim.nix { inherit pkgs; };
  nvim = neovim;
@@ -5,5 +5,37 @@

  type = "app";

-  program = pkgs.lib.getExe pkgs.format-root;
+  program = builtins.toString (
+    pkgs.writeShellScript "format-root" ''
+      set -e
+
+      DISK=$1
+
+      if [ -z "''${DISK}" ]; then
+          ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
+              --foreground "#fb4934" \
+              "Missing required parameter." \
+              "Usage: format-root -- <disk>" \
+              "Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
+          echo "(exiting)"
+          exit 1
+      fi
+
+      ${pkgs.disko-packaged}/bin/disko \
+          --mode create \
+          --dry-run \
+          --flake "path:$(pwd)#root" \
+          --arg disk \""/dev/''${DISK}"\"
+
+      ${pkgs.gum}/bin/gum confirm \
+          "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
+          --default=false
+
+      ${pkgs.disko-packaged}/bin/disko \
+          --mode create \
+          --flake "path:$(pwd)#root" \
+          --arg disk "/dev/''${DISK}"
+
+    ''
+  );
 }
@@ -17,6 +17,7 @@
          '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
          '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
          '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
+          '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
      echo ""
      echo ""
    ''
@@ -1,9 +1,15 @@
 { pkgs, ... }:
 {

-  # TODO: just replace with packages instead of apps
-
  type = "app";

-  program = "${pkgs.loadkey}/bin/loadkey";
+  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"
+    ''
+  );
 }
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+
+  type = "app";
+
+  program = builtins.toString (
+    pkgs.writeShellScript "netdata-cloud" ''
+      if [ "$EUID" -ne 0 ]; then
+        echo "Please run as root"
+        exit 1
+      fi
+      mkdir --parents --mode 0750 /var/lib/netdata/cloud.d
+      printf "\nEnter the claim token for netdata cloud...\n\n"
+      read -p "Token: " token
+      echo "''${token}" > /var/lib/netdata/cloud.d/token
+      chown -R netdata:netdata /var/lib/netdata
+      ${pkgs.netdata}/bin/netdata-claim.sh -id=$(uuidgen)
+      printf "\n\nNow restart netdata service.\n\n"
+    ''
+  );
+}
@@ -0,0 +1,98 @@
+{ pool, disks, ... }:
+{
+  disk = lib.genAttrs disks (disk: {
+    "${disk}" = {
+      type = "disk";
+      device = "/dev/${disk}";
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [
+          {
+            type = "partition";
+            name = "zfs";
+            start = "128MiB";
+            end = "100%";
+            content = {
+              type = "zfs";
+              pool = pool;
+            };
+          }
+        ];
+      };
+    };
+  });
+  zpool = {
+    "${pool}" = {
+      type = "zpool";
+      mode = "raidz1";
+      rootFsOptions = {
+        compression = "on"; # lz4 by default
+        "com.sun:auto-snapshot" = "false";
+        ashift = "12";
+      };
+      # mountpoint = "/";
+
+      datasets = {
+        root = {
+          zfs_type = "filesystem";
+          mountpoint = null;
+          options."com.sun:auto-snapshot" = "false";
+        };
+        # "media/movies" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/movies";
+        #   options.recordsize = "1M";
+        # };
+        # "media/tv" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/tv";
+        #   options.recordsize = "1M";
+        # };
+        # "media/books" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/books";
+        # };
+        # archive = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/archive";
+        #   options.compression = "zstd";
+        #   options."com.sun:auto-snapshot" = "true";
+        # };
+        # zfs_unmounted_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "none";
+        # };
+        # zfs_legacy_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "legacy";
+        #   mountpoint = "/zfs_legacy_fs";
+        # };
+        # zfs_testvolume = {
+        #   zfs_type = "volume";
+        #   size = "10M";
+        #   content = {
+        #     type = "filesystem";
+        #     format = "ext4";
+        #     mountpoint = "/ext4onzfs";
+        #   };
+        # };
+        # encrypted = {
+        #   zfs_type = "filesystem";
+        #   size = "20M";
+        #   options = {
+        #     mountpoint = "none";
+        #     encryption = "aes-256-gcm";
+        #     keyformat = "passphrase";
+        #     keylocation = "file:///tmp/secret.key";
+        #   };
+        # };
+        # "encrypted/test" = {
+        #   zfs_type = "filesystem";
+        #   size = "2M";
+        #   mountpoint = "/zfs_crypted";
+        # };
+      };
+    };
+  };
+}
@@ -3,11 +3,11 @@
    "baleia-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1721805312,
-        "narHash": "sha256-qA1x5kplP2I8bURO0I4R0gt/zeznu9hQQ+XHptLGuwc=",
+        "lastModified": 1717182435,
+        "narHash": "sha256-duI3myrJSvmtjF9n7NVrVOsuSo1O3JEypA5ghBHsULc=",
        "owner": "m00qek",
        "repo": "baleia.nvim",
-        "rev": "1b25eac3ac03659c3d3af75c7455e179e5f197f7",
+        "rev": "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1",
        "type": "github"
      },
      "original": {
@@ -51,11 +51,11 @@
    },
    "cl-nix-lite": {
      "locked": {
-        "lastModified": 1728174978,
-        "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=",
+        "lastModified": 1717972076,
+        "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
        "owner": "hraban",
        "repo": "cl-nix-lite",
-        "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87",
+        "rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
        "type": "github"
      },
      "original": {
@@ -67,11 +67,11 @@
    "cmp-nvim-lsp-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1733823748,
-        "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=",
+        "lastModified": 1715931395,
+        "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=",
        "owner": "hrsh7th",
        "repo": "cmp-nvim-lsp",
-        "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
+        "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d",
        "type": "github"
      },
      "original": {
@@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737162735,
-        "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=",
+        "lastModified": 1718662658,
+        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08",
+        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
        "type": "github"
      },
      "original": {
@@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737038063,
-        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
+        "lastModified": 1718846788,
+        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
+        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
        "type": "github"
      },
      "original": {
@@ -138,14 +138,34 @@
        "type": "github"
      }
    },
+    "firefox-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1718930737,
+        "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=",
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "rev": "087919070dffc9798a8cb753e97babe287f06c25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1730663653,
-        "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=",
+        "lastModified": 1697816753,
+        "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
        "owner": "hraban",
        "repo": "flake-compat",
-        "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e",
+        "rev": "6025bade1336a36014639bc3f67eacc853dab78f",
        "type": "github"
      },
      "original": {
@@ -158,11 +178,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -171,40 +191,16 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
-        "systems": [
-          "mac-app-util",
-          "systems"
-        ]
+        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -230,14 +226,32 @@
        "type": "github"
      }
    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "hmts-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1729786258,
-        "narHash": "sha256-V5dwIJdxBulFVKk1iSlf4H5NRz1UH7uYQeMvwtgkpIs=",
+        "lastModified": 1715076655,
+        "narHash": "sha256-vDTqJQzLyg0nmlC+CrLnPkYti1rPxmvRW8eQq/9Zg+M=",
        "owner": "calops",
        "repo": "hmts.nvim",
-        "rev": "c7ff4c3ad96cd05664b18fb5bbbe2abbd7682dd2",
+        "rev": "19a91816c123173a4551a6a04f2882338f20db1d",
        "type": "github"
      },
      "original": {
@@ -253,11 +267,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737120639,
-        "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
+        "lastModified": 1718983978,
+        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
+        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
        "type": "github"
      },
      "original": {
@@ -274,15 +288,14 @@
        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "systems": "systems"
+        ]
      },
      "locked": {
-        "lastModified": 1732920695,
-        "narHash": "sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE=",
+        "lastModified": 1718893255,
+        "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=",
        "owner": "hraban",
        "repo": "mac-app-util",
-        "rev": "548672d0cb661ce11d08ee8bde92b87d2a75c872",
+        "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc",
        "type": "github"
      },
      "original": {
@@ -294,53 +307,52 @@
    "nextcloud-cookbook": {
      "flake": false,
      "locked": {
-        "lastModified": 1726214817,
-        "narHash": "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=",
+        "lastModified": 1702545935,
+        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
      }
    },
    "nextcloud-external": {
      "flake": false,
      "locked": {
-        "lastModified": 1729501349,
-        "narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=",
+        "lastModified": 1699624334,
+        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
      }
    },
    "nextcloud-news": {
      "flake": false,
      "locked": {
-        "lastModified": 1729667621,
-        "narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=",
+        "lastModified": 1703426420,
+        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
      }
    },
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1737171597,
-        "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
+        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
+        "type": "file",
+        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
+        "type": "file",
+        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
      }
    },
    "nix2vim": {
@@ -351,11 +363,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732820845,
-        "narHash": "sha256-YPXk41l4PzKb5rtcxkYhymwjHJG95fxl4iXIzXnftr8=",
+        "lastModified": 1718621825,
+        "narHash": "sha256-bSfjwRgKKpLyjEDPRAF1hlJKc7QDoqopalHwNCB/eAA=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "e2c511ea553418dd432005875c649b09d56b7e58",
+        "rev": "1db11dbf8a4d124e02244fa5c4ff219b672a8e5b",
        "type": "github"
      },
      "original": {
@@ -366,11 +378,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
+        "lastModified": 1712450863,
+        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
+        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
        "type": "github"
      },
      "original": {
@@ -387,11 +399,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737057290,
-        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+        "lastModified": 1718025593,
+        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
        "type": "github"
      },
      "original": {
@@ -402,11 +414,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1737062831,
-        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "lastModified": 1718895438,
+        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
        "type": "github"
      },
      "original": {
@@ -416,36 +428,29 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable": {
+    "nixpkgs-caddy": {
      "locked": {
-        "lastModified": 1735563628,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
-        "owner": "nixos",
+        "lastModified": 1699107987,
+        "narHash": "sha256-nWXETr4Oqy/vOfzgWyMY04qzEN2iREFJc5ycQ3XNu0A=",
+        "owner": "jpds",
        "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "rev": "a33b02fa9d664f31dadc8a874eb1a5dbaa9f4ecf",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
+        "owner": "jpds",
+        "ref": "caddy-external-plugins",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
      "locked": {
-        "lastModified": 1737170882,
-        "narHash": "sha256-Km700i1Eg72bFsU2X2ZgH4qEgx6SrdZFJURJGTSQH2M=",
+        "lastModified": 1719001822,
+        "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "62cdd681201843553ec740a85ccf2f0a6fca75c6",
+        "rev": "e7edcaeae9db01224266febe88eb7d3411055636",
        "type": "github"
      },
      "original": {
@@ -457,11 +462,11 @@
    "nvim-lint-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1736154173,
-        "narHash": "sha256-OChCLXHAqa129NiGfmwddq0Hj5F9AtC3TmFbnNCZqfo=",
+        "lastModified": 1717789608,
+        "narHash": "sha256-LNYFxAM9lQNNOIOc+IgKgbSRp2U09B/9HivSCwMyUpQ=",
        "owner": "mfussenegger",
        "repo": "nvim-lint",
-        "rev": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44",
+        "rev": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce",
        "type": "github"
      },
      "original": {
@@ -490,11 +495,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1737156486,
-        "narHash": "sha256-b8YOOIYML9aKy4Y7S+iLKIaTfCqrxK1wB/ZaeFRCUmo=",
+        "lastModified": 1717900986,
+        "narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "fca0b67c0b5a31727fb33addc4d9c100736a2894",
+        "rev": "2086e564c4d23fea714e8a6d63b881e551af2f41",
        "type": "github"
      },
      "original": {
@@ -506,20 +511,52 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1705679158,
-        "narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
+        "lastModified": 1718957498,
+        "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
+        "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23",
        "type": "github"
      },
      "original": {
        "owner": "nvim-treesitter",
-        "ref": "v0.9.2",
+        "ref": "master",
        "repo": "nvim-treesitter",
        "type": "github"
      }
    },
+    "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": 1707216692,
+        "narHash": "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=",
+        "owner": "robenkleene",
+        "repo": "rep-grep",
+        "rev": "10510d47e392cb9d30a861c69f702fd194b3fa88",
+        "type": "github"
+      },
+      "original": {
+        "owner": "robenkleene",
+        "repo": "rep-grep",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "baleia-nvim-src": "baleia-nvim-src",
@@ -529,6 +566,7 @@
        "darwin": "darwin",
        "disko": "disko",
        "fidget-nvim-src": "fidget-nvim-src",
+        "firefox-darwin": "firefox-darwin",
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
        "mac-app-util": "mac-app-util",
@@ -539,16 +577,16 @@
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-caddy": "nixpkgs-caddy",
        "nur": "nur",
        "nvim-lint-src": "nvim-lint-src",
        "nvim-lspconfig-src": "nvim-lspconfig-src",
        "nvim-tree-lua-src": "nvim-tree-lua-src",
        "nvim-treesitter-src": "nvim-treesitter-src",
-        "snipe-nvim-src": "snipe-nvim-src",
+        "ren": "ren",
+        "rep": "rep",
        "telescope-nvim-src": "telescope-nvim-src",
        "telescope-project-nvim-src": "telescope-project-nvim-src",
-        "tiny-inline-diagnostic-nvim-src": "tiny-inline-diagnostic-nvim-src",
        "toggleterm-nvim-src": "toggleterm-nvim-src",
        "tree-sitter-bash": "tree-sitter-bash",
        "tree-sitter-ini": "tree-sitter-ini",
@@ -562,34 +600,18 @@
        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
      }
    },
-    "snipe-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736108869,
-        "narHash": "sha256-sJ71eiE0XmMJkhNCkbY82R4eHzBOOKFrPa+nxLc1f8s=",
-        "owner": "leath-dub",
-        "repo": "snipe.nvim",
-        "rev": "0d0a482ac713370196e4fc0025d5aaac5030104d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "leath-dub",
-        "repo": "snipe.nvim",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
-        "lastModified": 1689347925,
-        "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
-        "repo": "default-darwin",
-        "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default-darwin",
+        "repo": "default",
        "type": "github"
      }
    },
@@ -608,6 +630,21 @@
        "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": {
@@ -628,11 +665,11 @@
    "telescope-project-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1733083023,
-        "narHash": "sha256-qEORRWYKBpK7fn7se8g+5uuVBJNu0T4JHSc0C2QzNDY=",
+        "lastModified": 1701464478,
+        "narHash": "sha256-touMCltcnqkrQYV1NtNeWLQeFVGt+WM3aIWIdKilA7w=",
        "owner": "nvim-telescope",
        "repo": "telescope-project.nvim",
-        "rev": "1d7920e799fc5001dffc7bd10909a86e0358eaf4",
+        "rev": "1aaf16580a614601a7f7077d9639aeb457dc5559",
        "type": "github"
      },
      "original": {
@@ -641,35 +678,19 @@
        "type": "github"
      }
    },
-    "tiny-inline-diagnostic-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736959343,
-        "narHash": "sha256-11+Z54shcy5oRevfTOu3dt5DtXhnYaH9zvktH6Lvxjs=",
-        "owner": "rachartier",
-        "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rachartier",
-        "repo": "tiny-inline-diagnostic.nvim",
-        "type": "github"
-      }
-    },
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1721232722,
-        "narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
+        "lastModified": 1713792255,
+        "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=",
        "owner": "akinsho",
        "repo": "toggleterm.nvim",
-        "rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
+        "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v2.12.0",
+        "ref": "v2.11.0",
        "repo": "toggleterm.nvim",
        "type": "github"
      }
@@ -677,11 +698,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1731338420,
-        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
+        "lastModified": 1715005250,
+        "narHash": "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
+        "rev": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed",
        "type": "github"
      },
      "original": {
@@ -694,11 +715,11 @@
    "tree-sitter-ini": {
      "flake": false,
      "locked": {
-        "lastModified": 1725233451,
-        "narHash": "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU=",
+        "lastModified": 1716889525,
+        "narHash": "sha256-IyHrIxcmuzs60zUiJv4E3nSkhSkgbcaLDUdeDx5mlHk=",
        "owner": "justinmk",
        "repo": "tree-sitter-ini",
-        "rev": "962568c9efa71d25720ab42c5d36e222626ef3a6",
+        "rev": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c",
        "type": "github"
      },
      "original": {
@@ -710,11 +731,11 @@
    "tree-sitter-lua": {
      "flake": false,
      "locked": {
-        "lastModified": 1729494737,
-        "narHash": "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow=",
+        "lastModified": 1710150044,
+        "narHash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=",
        "owner": "MunifTanjim",
        "repo": "tree-sitter-lua",
-        "rev": "34e60e7f45fc313463c68090d88d742a55d1bd7a",
+        "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
        "type": "github"
      },
      "original": {
@@ -727,11 +748,11 @@
    "tree-sitter-puppet": {
      "flake": false,
      "locked": {
-        "lastModified": 1734835631,
-        "narHash": "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=",
+        "lastModified": 1713617121,
+        "narHash": "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI=",
        "owner": "amaanq",
        "repo": "tree-sitter-puppet",
-        "rev": "15f192929b7d317f5914de2b4accd37b349182a6",
+        "rev": "584522f32495d648b18a53ccb52d988e60de127d",
        "type": "github"
      },
      "original": {
@@ -743,11 +764,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1736288149,
-        "narHash": "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU=",
+        "lastModified": 1714528221,
+        "narHash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "409b5d671eb0ea4972eeacaaca24bbec1acf79b1",
+        "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7",
        "type": "github"
      },
      "original": {
@@ -776,11 +797,11 @@
    "tree-sitter-vimdoc": {
      "flake": false,
      "locked": {
-        "lastModified": 1729686839,
-        "narHash": "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=",
+        "lastModified": 1717834376,
+        "narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
        "owner": "neovim",
        "repo": "tree-sitter-vimdoc",
-        "rev": "d2e4b5c172a109966c2ce0378f73df6cede39400",
+        "rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
        "type": "github"
      },
      "original": {
@@ -789,27 +810,6 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "wallpapers": {
      "flake": false,
      "locked": {
@@ -829,16 +829,17 @@
    "wsl": {
      "inputs": {
        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1736095716,
-        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
+        "lastModified": 1718710563,
+        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
+        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
        "type": "github"
      },
      "original": {
@@ -1,5 +1,5 @@
 {
-  description = "An opinionated flake containing the NixOS, nix-darwin, and home-manager configurations for multiple systems.";
+  description = "My system";

  # Other flakes that we want to pull from
  inputs = {
@@ -7,8 +7,8 @@
    # Used for system packages
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

-    # Used for specific stable packages
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+    # Used for caddy plugins
+    nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";

    # Used for MacOS system config
    darwin = {
@@ -29,17 +29,14 @@
    };

    # Community packages; used for Firefox extensions
-    nur = {
-      url = "github:nix-community/nur";
+    nur.url = "github:nix-community/nur";
+
+    # Use official Firefox binary for macOS
+    firefox-darwin = {
+      url = "github:bandithedoge/nixpkgs-firefox-darwin";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # # Use official Firefox binary for macOS
-    # firefox-darwin = {
-    #   url = "github:bandithedoge/nixpkgs-firefox-darwin";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
-
    # Better App install management in macOS
    mac-app-util = {
      url = "github:hraban/mac-app-util";
@@ -91,7 +88,7 @@
    };
    nvim-treesitter-src = {
      # https://github.com/nvim-treesitter/nvim-treesitter/tags
-      url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
+      url = "github:nvim-treesitter/nvim-treesitter/master";
      flake = false;
    };
    telescope-nvim-src = {
@@ -105,7 +102,7 @@
    };
    toggleterm-nvim-src = {
      # https://github.com/akinsho/toggleterm.nvim/tags
-      url = "github:akinsho/toggleterm.nvim/v2.12.0";
+      url = "github:akinsho/toggleterm.nvim/v2.11.0";
      flake = false;
    };
    bufferline-nvim-src = {
@@ -130,14 +127,6 @@
      url = "github:mfussenegger/nvim-lint";
      flake = false;
    };
-    tiny-inline-diagnostic-nvim-src = {
-      url = "github:rachartier/tiny-inline-diagnostic.nvim";
-      flake = false;
-    };
-    snipe-nvim-src = {
-      url = "github:leath-dub/snipe.nvim";
-      flake = false;
-    };

    # Tree-Sitter Grammars
    tree-sitter-bash = {
@@ -175,34 +164,36 @@
      flake = false;
    };

-    # # Git alternative
-    # # Fixes: https://github.com/martinvonz/jj/issues/4784
-    # jujutsu = {
-    #   url = "github:martinvonz/jj";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    # Ren and rep - CLI find and replace
+    rep = {
+      url = "github:robenkleene/rep-grep";
+      flake = false;
+    };
+    ren = {
+      url = "github:robenkleene/ren-find";
+      flake = false;
+    };

    # Nextcloud Apps
    nextcloud-news = {
      # https://github.com/nextcloud/news/releases
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
      flake = false;
    };
    nextcloud-external = {
      # https://github.com/nextcloud-releases/external/releases
-      url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
      flake = false;
    };
    nextcloud-cookbook = {
      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
+      url = "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
      # https://snappymail.eu/repository/nextcloud
-      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
-      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
+      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
      flake = false;
    };
  };
@@ -227,38 +218,36 @@
          mail.smtpHost = "smtp.purelymail.com";
          dotfilesRepo = "https://github.com/nmasur/dotfiles";
          hostnames = {
-            audiobooks = "read.${baseName}";
-            budget = "money.${baseName}";
-            files = "files.${baseName}";
            git = "git.${baseName}";
            influxdb = "influxdb.${baseName}";
            irc = "irc.${baseName}";
            metrics = "metrics.${baseName}";
            minecraft = "minecraft.${baseName}";
-            n8n = "n8n.${baseName}";
-            notifications = "ntfy.${baseName}";
+            n8n = "n8n2.${baseName}";
            prometheus = "prom.${baseName}";
            paperless = "paper.${baseName}";
-            photos = "photos.${baseName}";
            secrets = "vault.${baseName}";
            stream = "stream.${baseName}";
            content = "cloud.${baseName}";
            books = "books.${baseName}";
            download = "download.${baseName}";
-            status = "status.${baseName}";
            transmission = "transmission.${baseName}";
          };
        };

      # Common overlays to always use
      overlays = [
-        inputs.nur.overlays.default
+        inputs.nur.overlay
        inputs.nix2vim.overlay
-        # inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784
        (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/calibre-web.nix)
+        (import ./overlays/disko.nix inputs)
        (import ./overlays/tree-sitter.nix inputs)
        (import ./overlays/mpv-scripts.nix inputs)
        (import ./overlays/nextcloud-apps.nix inputs)
+        (import ./overlays/betterlockscreen.nix)
+        (import ./overlays/gh-collaborators.nix)
+        (import ./overlays/ren-rep.nix inputs)
      ];

      # System types to support.
@@ -271,97 +260,28 @@

      # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
-      # { system -> pkgs }
-      pkgsBySystem = forAllSystems (system: import nixpkgs { inherit system overlays; });
-      # stablePkgsBySystem = forAllSystems (system: import nixpkgs { inherit system overlays; });
-
-      buildHome =
-        { pkgs, modules }:
-        inputs.home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = modules ++ [
-            ./platforms/home-manager
-          ];
-        };
-
-      buildNixos =
-        { pkgs, modules }:
-        nixpkgs.lib.nixosSystem {
-          inherit pkgs;
-          modules = modules ++ [
-            inputs.home-manager.nixosModules.home-manager
-            inputs.disko.nixosModules.disko
-            inputs.wsl.nixosModules.wsl
-            ./platforms/nixos
-          ];
-        };
-
-      buildDarwin =
-        { pkgs, modules }:
-        inputs.darwin.lib.darwinSystem {
-          inherit pkgs;
-          modules = modules ++ [
-            inputs.home-manager.darwinModules.home-manager
-            inputs.mac-app-util.darwinModules.default
-            ./platforms/nix-darwin
-          ];
-        };
-
    in
    rec {

-      # The plan
-      # Import all the host configurations as modules
-      # Setup the modules as nixosModules, homeModules, darwinModules
-      # Create nixosConfigurations using the different pkgs for each system
-      # What to do with home config?
-
-      nixosModules = import ./hosts/x86_64-linux nixpkgs // import ./hosts/aarch64-linux nixpkgs;
-
      # Contains my full system builds, including home-manager
      # nixos-rebuild switch --flake .#tempest
-      nixosConfigurations =
-        (builtins.mapAttrs (
-          name: module:
-          buildNixos {
-            pkgs = pkgsBySystem.x86_64-linux;
-            modules = [ module ];
-          }
-        ) nixosModules)
-        // (builtins.mapAttrs (
-          name: module:
-          buildNixos {
-            pkgs = pkgsBySystem.aarch64-linux;
-            modules = [ module ];
-          }
-        ) nixosModules);
-      # builtins.mapAttrs buildNixos {
-      #   pkgs = pkgsBySystem.x86_64-linux;
-      #   modules = import ./hosts/x86_64-linux;
-      # }
-      # // builtins.mapAttrs buildNixos {
-      #   pkgs = pkgsBySystem.aarch64-linux;
-      #   modules = import ./hosts/aarch64-linux;
-      # };
+      nixosConfigurations = {
+        arrow = import ./hosts/arrow { inherit inputs globals overlays; };
+        tempest = import ./hosts/tempest { inherit inputs globals overlays; };
+        hydra = import ./hosts/hydra { inherit inputs globals overlays; };
+        flame = import ./hosts/flame { inherit inputs globals overlays; };
+        swan = import ./hosts/swan { inherit inputs globals overlays; };
+      };

      # Contains my full Mac system builds, including home-manager
      # darwin-rebuild switch --flake .#lookingglass
-      darwinConfigurations = builtins.mapAttrs buildDarwin {
-        pkgs = pkgsBySystem.aarch64-darwin;
-        modules = import ./hosts/darwin;
+      darwinConfigurations = {
+        lookingglass = import ./hosts/lookingglass { inherit inputs globals overlays; };
      };

      # For quickly applying home-manager settings with:
      # home-manager switch --flake .#tempest
-      homeConfigurations = rec {
-        default = personal;
-        work = buildHome {
-          pkgs = pkgsBySystem.aarch64-darwin;
-          modules = { };
-        };
-        personal = buildHome {
-        };
+      homeConfigurations = {
        tempest = nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
        lookingglass = darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
      };
@@ -398,11 +318,17 @@
          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
            system = "x86_64-linux";
            format = "iso";
+            specialArgs = {
+              pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+            };
            modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
          };
          x86_64-linux.arrow-aws = inputs.nixos-generators.nixosGenerate rec {
            system = "x86_64-linux";
            format = "amazon";
+            specialArgs = {
+              pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+            };
            modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
              (
                { ... }:
@@ -1,16 +0,0 @@
-# Return a list of all nix-darwin hosts
-
-{ lib, ... }:
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]
@@ -1,20 +0,0 @@
-# Return a list of all NixOS hosts
-
-{ nixpkgs, ... }:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]
@@ -1,6 +0,0 @@
-# Return a list of all hosts
-
-{
-  darwin-hosts = import ./aarch64-darwin;
-  linux-hosts = import ./x86_64-linux // import ./aarch64-linux;
-}
@@ -1,54 +1,134 @@
 # 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.

-rec {
-  # Hardware
-  networking.hostName = "flame";
+{
+  inputs,
+  globals,
+  overlays,
+  ...
+}:

-  nmasur.settings = {
-    username = "noah";
-    fullName = "Noah Masur";
+inputs.nixpkgs.lib.nixosSystem rec {
+  system = "aarch64-linux";
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
  };
+  modules = [
+    globals
+    inputs.home-manager.nixosModules.home-manager
+    ../../modules/common
+    ../../modules/nixos
+    {
+      nixpkgs.overlays = overlays;

-  nmasur.profiles = {
-    base.enable = true;
-    server.enable = true;
-    communications.enable = true;
-  };
+      # Hardware
+      server = true;
+      networking.hostName = "flame";

-  home-manager.users."noah" = {
-    nmasur.settings = nmasur.settings;
-    nmasur.profiles = {
-      common.enable = true;
-      linux-base.enable = true;
-    };
-  };
+      # Not sure what's necessary but too afraid to remove anything
+      imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
+      boot.initrd.availableKernelModules = [
+        "xhci_pci"
+        "virtio_pci"
+        "usbhid"
+      ];

-  # File systems must be declared in order to boot
+      # File systems must be declared in order to boot

-  # This is the root filesystem containing NixOS
-  # I forgot to set a clean label for it
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
-    fsType = "ext4";
-  };
+      # This is the root filesystem containing NixOS
+      # I forgot to set a clean label for it
+      fileSystems."/" = {
+        device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
+        fsType = "ext4";
+      };

-  # This is the boot filesystem for systemd-boot
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D5CA-237A";
-    fsType = "vfat";
-  };
+      # This is the boot filesystem for systemd-boot
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-uuid/D5CA-237A";
+        fsType = "vfat";
+      };

-  # Allows private remote access over the internet
-  nmasur.presets.services.cloudflared = {
-    tunnel = {
-      id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
-      credentialsFile = ../../private/cloudflared-flame.age;
-      ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
-    };
-  };
+      # Theming
+
+      # Server doesn't require GUI
+      gui.enable = false;
+
+      # Still require colors for programs like Neovim, K9S
+      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;
+      giteaRunner.enable = true;
+      services.caddy.enable = true;
+      services.grafana.enable = true;
+      services.thelounge.enable = true;
+      services.openssh.enable = true;
+      services.victoriametrics.enable = true;
+      services.influxdb2.enable = true;
+      services.gitea.enable = true;
+      services.vaultwarden.enable = true;
+      services.minecraft-server.enable = true; # Setup Minecraft server
+      system.autoUpgrade.enable = true;
+
+      # Allows private remote access over the internet
+      cloudflareTunnel = {
+        enable = true;
+        id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
+        credentialsFile = ../../private/cloudflared-flame.age;
+        ca = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
+      };
+
+      # Nextcloud backup config
+      backup.s3 = {
+        endpoint = "s3.us-west-002.backblazeb2.com";
+        bucket = "noahmasur-backup";
+        accessKeyId = "0026b0e73b2e2c80000000005";
+      };
+
+      # Disable passwords, only use SSH key
+      publicKeys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s personal"
+      ];
+
+      # # Wireguard config for Transmission
+      # wireguard.enable = true;
+      # networking.wireguard.interfaces.wg0 = {
+      #
+      #   # The local IPs for this machine within the Wireguard network
+      #   # Any inbound traffic bound for these IPs should be kept on localhost
+      #   ips = [ "10.66.13.200/32" "fc00:bbbb:bbbb:bb01::3:dc7/128" ];
+      #
+      #   peers = [{
+      #
+      #     # Identity of Wireguard target peer (VPN)
+      #     publicKey = "bOOP5lIjqCdDx5t+mP/kEcSbHS4cZqE0rMlBI178lyY=";
+      #
+      #     # The public internet address of the target peer
+      #     endpoint = "86.106.143.132:51820";
+      #
+      #     # Which outgoing IP ranges should be sent through Wireguard
+      #     allowedIPs = [ "0.0.0.0/0" "::0/0" ];
+      #
+      #     # Send heartbeat signal within the network
+      #     persistentKeepalive = 25;
+      #
+      #   }];
+      #
+      # };
+
+      # # VPN port forwarding
+      # services.transmission.settings.peer-port = 57599;
+    }
+  ];
 }
@@ -26,8 +26,7 @@ inputs.darwin.lib.darwinSystem {
    inputs.mac-app-util.darwinModules.default
    {
      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
-      networking.hostName = "NYCM-NMASUR2";
-      networking.computerName = "NYCM-NMASUR2";
+      networking.hostName = "lookingglass";
      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
      gui.enable = true;
      theme = {
@@ -35,6 +34,7 @@ inputs.darwin.lib.darwinSystem {
        dark = true;
      };
      mail.user = globals.user;
+      mole.enable = true;
      atuin.enable = true;
      charm.enable = true;
      neovim.enable = true;
@@ -54,7 +54,6 @@ inputs.darwin.lib.darwinSystem {
      _1password.enable = true;
      slack.enable = true;
      wezterm.enable = true;
-      yt-dlp.enable = true;
    }
  ];
 }
@@ -8,8 +8,11 @@
  ...
 }:

-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
  system = "x86_64-linux";
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
  modules = [
    globals
    inputs.home-manager.nixosModules.home-manager
@@ -63,14 +66,6 @@ inputs.nixpkgs.lib.nixosSystem {
        devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
      };

-      zramSwap.enable = true;
-      swapDevices = [
-        {
-          device = "/swapfile";
-          size = 4 * 1024; # 4 GB
-        }
-      ];
-
      boot.zfs = {
        # Automatically load the ZFS pool on boot
        extraPools = [ "tank" ];
@@ -101,11 +96,8 @@ inputs.nixpkgs.lib.nixosSystem {
      cloudflare.enable = true;
      dotfiles.enable = true;
      arrs.enable = true;
-      filebrowser.enable = true;
-      services.audiobookshelf.enable = true;
      services.bind.enable = true;
      services.caddy.enable = true;
-      services.immich.enable = true;
      services.jellyfin.enable = true;
      services.nextcloud.enable = true;
      services.calibre-web.enable = true;
@@ -130,7 +122,6 @@ inputs.nixpkgs.lib.nixosSystem {
        endpoint = "s3.us-west-002.backblazeb2.com";
        bucket = "noahmasur-backup";
        accessKeyId = "0026b0e73b2e2c80000000005";
-        resticBucket = "noahmasur-restic";
      };

      # Disable passwords, only use SSH key
@@ -8,12 +8,8 @@
  ...
 }:

-inputs.nixpkgs.lib.nixosSystem rec {
+inputs.nixpkgs.lib.nixosSystem {
  system = "x86_64-linux";
-  specialArgs = {
-    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
-    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
-  };
  modules = [
    globals
    inputs.home-manager.nixosModules.home-manager
@@ -41,12 +37,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
      boot.kernelModules = [ "kvm-amd" ];
      services.xserver.videoDrivers = [ "amdgpu" ];

-      # I don't think I need this?
-      # boot.kernelParams = [
-      #   "video=DP-0:2560x1440@165"
-      #   "video=DP-1:1920x1080@60"
-      # ];
-
      # Required binary blobs to boot on this machine
      hardware.enableRedistributableFirmware = true;

@@ -128,7 +118,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
        dwarf-fortress.enable = true;
        enable = true;
        steam.enable = true;
-        moonlight.enable = true;
        legendary.enable = true;
        lutris.enable = true;
        ryujinx.enable = true;
@@ -1,20 +0,0 @@
-# Return a list of all NixOS hosts
-
-{ nixpkgs, ... }:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  # AWS settings require this
+  permitRootLogin = "prohibit-password";
+
+  # Make sure disk size is large enough
+  # https://github.com/nix-community/nixos-generators/issues/150
+  amazonImage.sizeMB = 16 * 1024;
+}
@@ -0,0 +1,42 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    _1password = {
+      enable = lib.mkEnableOption {
+        description = "Enable 1Password.";
+        default = false;
+      };
+    };
+  };
+
+  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
+    '';
+  };
+}
@@ -0,0 +1,107 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    alacritty = {
+      enable = lib.mkEnableOption {
+        description = "Enable Alacritty.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.alacritty.enable) {
+    home-manager.users.${config.user} = {
+      xsession.windowManager.i3.config.terminal = "alacritty";
+      programs.rofi.terminal = "${pkgs.alacritty}/bin/alacritty";
+      programs.alacritty = {
+        enable = true;
+        settings = {
+          window = {
+            dimensions = {
+              columns = 85;
+              lines = 30;
+            };
+            padding = {
+              x = 20;
+              y = 20;
+            };
+            opacity = 1.0;
+          };
+          scrolling.history = 10000;
+          font = {
+            size = 14.0;
+          };
+          key_bindings = [
+            # Used for word completion in fish_user_key_bindings
+            {
+              key = "Return";
+              mods = "Shift";
+              chars = "\\x1F";
+            }
+            # Used for searching nixpkgs in fish_user_key_bindings
+            {
+              key = "N";
+              mods = "Control|Shift";
+              chars = "\\x11F";
+            }
+            {
+              key = "H";
+              mods = "Control|Shift";
+              mode = "~Vi";
+              action = "ToggleViMode";
+            }
+            {
+              key = "Return";
+              mode = "Vi";
+              action = "ToggleViMode";
+            }
+            # Used to enable $ keybind in Vi mode
+            {
+              key = 5; # Scancode for key4
+              mods = "Shift";
+              mode = "Vi|~Search";
+              action = "Last";
+            }
+          ];
+          colors = {
+            primary = {
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
+            };
+            cursor = {
+              text = "#1d2021";
+              cursor = config.theme.colors.base05;
+            };
+            normal = {
+              black = "#1d2021";
+              red = config.theme.colors.base08;
+              green = config.theme.colors.base0B;
+              yellow = config.theme.colors.base0A;
+              blue = config.theme.colors.base0D;
+              magenta = config.theme.colors.base0E;
+              cyan = config.theme.colors.base0C;
+              white = config.theme.colors.base05;
+            };
+            bright = {
+              black = config.theme.colors.base03;
+              red = config.theme.colors.base09;
+              green = config.theme.colors.base01;
+              yellow = config.theme.colors.base02;
+              blue = config.theme.colors.base04;
+              magenta = config.theme.colors.base06;
+              cyan = config.theme.colors.base0F;
+              white = config.theme.colors.base07;
+            };
+          };
+          draw_bold_text_with_bright_colors = false;
+        };
+      };
+    };
+  };
+}
@@ -0,0 +1,18 @@
+{ ... }:
+{
+
+  imports = [
+    ./1password.nix
+    ./alacritty.nix
+    ./discord.nix
+    ./firefox.nix
+    ./kitty.nix
+    ./media.nix
+    ./mole.nix
+    ./obsidian.nix
+    ./qbittorrent.nix
+    ./slack.nix
+    ./wezterm.nix
+    ./yt-dlp.nix
+  ];
+}
@@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    discord = {
+      enable = lib.mkEnableOption {
+        description = "Enable Discord.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.discord.enable) {
+    unfreePackages = [ "discord" ];
+    environment.systemPackages = [ pkgs.discord ];
+    home-manager.users.${config.user} = {
+      xdg.configFile."discord/settings.json".text = ''
+        {
+          "BACKGROUND_COLOR": "#202225",
+          "IS_MAXIMIZED": false,
+          "IS_MINIMIZED": false,
+          "OPEN_ON_STARTUP": false,
+          "MINIMIZE_TO_TRAY": false,
+          "SKIP_HOST_UPDATE": true
+        }
+      '';
+    };
+  };
+}
@@ -0,0 +1,192 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+
+  options = {
+    firefox = {
+      enable = lib.mkEnableOption {
+        description = "Enable Firefox.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.firefox.enable) {
+
+    unfreePackages = [
+      (lib.mkIf config._1password.enable "onepassword-password-manager")
+      "okta-browser-plugin"
+    ];
+
+    home-manager.users.${config.user} = {
+
+      programs.firefox = {
+        enable = true;
+        package = if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
+        profiles.default = {
+          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)
+            darkreader
+            don-t-fuck-with-paste
+            facebook-container
+            markdownload
+            multi-account-containers
+            okta-browser-plugin
+            reddit-enhancement-suite
+            return-youtube-dislikes
+            sponsorblock
+            ublock-origin
+            ublacklist
+            vimium
+          ];
+          settings = {
+            "app.update.auto" = false;
+            "browser.aboutConfig.showWarning" = false;
+            "browser.warnOnQuit" = false;
+            "browser.quitShortcut.disabled" = if pkgs.stdenv.isLinux then true else false;
+            "browser.theme.dark-private-windows" = true;
+            "browser.toolbars.bookmarks.visibility" = false;
+            "browser.startup.page" = 3; # Restore previous session
+            "browser.newtabpage.enabled" = false; # Make new tabs blank
+            "trailhead.firstrun.didSeeAboutWelcome" = true; # Disable welcome splash
+            "dom.forms.autocomplete.formautofill" = false; # Disable autofill
+            "extensions.formautofill.creditCards.enabled" = false; # Disable credit cards
+            "dom.payments.defaults.saveAddress" = false; # Disable address save
+            "general.autoScroll" = true; # Drag middle-mouse to scroll
+            "services.sync.prefs.sync.general.autoScroll" = false; # Prevent disabling autoscroll
+            "extensions.pocket.enabled" = false;
+            "toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Allow userChrome.css
+            "layout.css.color-mix.enabled" = true;
+            "ui.systemUsesDarkTheme" = if config.theme.dark == true then 1 else 0;
+            "media.ffmpeg.vaapi.enabled" = true; # Enable hardware video acceleration
+            "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
+            "devtools.command-button-screenshot.enabled" = true; # Scrolling screenshot of entire page
+            "svg.context-properties.content.enabled" = true; # Sidebery styling
+          };
+          userChrome = ''
+            :root {
+              --focus-outline-color: ${config.theme.colors.base04} !important;
+              --toolbar-color: ${config.theme.colors.base07} !important;
+              --tab-min-height: 30px !important;
+            }
+            /* Background of tab bar */
+            .toolbar-items {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            /* Extra tab bar sides on macOS */
+            .titlebar-spacer {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            .titlebar-buttonbox-container {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            #tabbrowser-tabs {
+              border-inline-start: 0 !important;
+            }
+            /* Private Browsing indicator on macOS */
+            #private-browsing-indicator-with-label {
+              background-color: ${config.theme.colors.base00} !important;
+              margin-inline: 0 !important;
+              padding-inline: 7px;
+            }
+            /* Tabs themselves */
+            .tabbrowser-tab .tab-stack {
+              border-radius: 5px 5px 0 0;
+              overflow: hidden;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
+            }
+            .tab-content {
+              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent);
+              border-radius: 5px 5px 0 0;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
+            }
+            .tab-content[selected] {
+              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
+              background-color: ${config.theme.colors.base01} !important;
+              color: ${config.theme.colors.base07} !important;
+            }
+            /* Below tab bar */
+            #nav-bar {
+              background: ${config.theme.colors.base01} !important;
+            }
+            /* URL bar in nav bar */
+            #urlbar[focused=true] {
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+              caret-color: ${config.theme.colors.base05} !important;
+            }
+            #urlbar:not([focused=true]) {
+              color: ${config.theme.colors.base04} !important;
+              background: ${config.theme.colors.base02} !important;
+            }
+            #urlbar ::-moz-selection {
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+            }
+            #urlbar-input-container {
+              border: 1px solid ${config.theme.colors.base01} !important;
+            }
+            #urlbar-background {
+              background: ${config.theme.colors.base01} !important;
+            }
+            /* Text in URL bar */
+            #urlbar-input, #urlbar-scheme, .searchbar-textbox {
+              color: ${config.theme.colors.base07} !important;
+            }
+          '';
+          userContent = ''
+            @-moz-document url-prefix(about:blank) {
+              * {
+                background-color:${config.theme.colors.base01} !important;
+              }
+            }
+          '';
+
+          extraConfig = "";
+        };
+      };
+
+      xdg.mimeApps = {
+        associations.added = {
+          "text/html" = [ "firefox.desktop" ];
+        };
+        defaultApplications = {
+          "text/html" = [ "firefox.desktop" ];
+        };
+        associations.removed = {
+          "text/html" = [ "wine-extension-htm.desktop" ];
+        };
+
+      };
+
+      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
+        "${
+          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+        }+Shift+b" = "exec ${
+          # Don't name the script `firefox` or it will affect grep
+          builtins.toString (
+            pkgs.writeShellScript "focus-ff.sh" ''
+              count=$(ps aux | grep -c firefox)
+              if [ "$count" -eq 1 ]; then
+                  i3-msg "exec --no-startup-id firefox"
+                  sleep 0.5
+              fi
+              i3-msg "[class=firefox] focus"
+            ''
+          )
+        }";
+      };
+    };
+  };
+}
@@ -0,0 +1,115 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    kitty = {
+      enable = lib.mkEnableOption {
+        description = "Enable Kitty.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.kitty.enable) {
+
+    # Set the Rofi-Systemd terminal for viewing logs
+    # Using optionalAttrs because only available in NixOS
+    environment =
+      { }
+      // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
+      };
+
+    home-manager.users.${config.user} = {
+
+      # Set the i3 terminal
+      xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";
+
+      # Set the Rofi terminal for running programs
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
+
+      # Display images in the terminal
+      programs.fish.shellAliases = {
+        icat = "kitty +kitten icat";
+        ssh = "kitty +kitten ssh";
+      };
+
+      programs.kitty = {
+        enable = true;
+        environment = { };
+        extraConfig = "";
+        font.size = 14;
+        keybindings = {
+          # Use shift+enter to complete text suggestions in fish
+          "shift+enter" = "send_text all \\x1F";
+
+          # Easy fullscreen toggle (for macOS)
+          "super+f" = "toggle_fullscreen";
+        };
+        settings = {
+
+          # 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;
+          selection_background = config.theme.colors.base05;
+          selection_foreground = config.theme.colors.base00;
+          url_color = config.theme.colors.base04;
+          cursor = config.theme.colors.base05;
+          active_border_color = config.theme.colors.base03;
+          inactive_border_color = config.theme.colors.base01;
+          active_tab_background = config.theme.colors.base00;
+          active_tab_foreground = config.theme.colors.base05;
+          inactive_tab_background = config.theme.colors.base01;
+          inactive_tab_foreground = config.theme.colors.base04;
+          tab_bar_background = config.theme.colors.base01;
+
+          # normal
+          color0 = config.theme.colors.base00;
+          color1 = config.theme.colors.base08;
+          color2 = config.theme.colors.base0B;
+          color3 = config.theme.colors.base0A;
+          color4 = config.theme.colors.base0D;
+          color5 = config.theme.colors.base0E;
+          color6 = config.theme.colors.base0C;
+          color7 = config.theme.colors.base05;
+
+          # bright
+          color8 = config.theme.colors.base03;
+          color9 = config.theme.colors.base08;
+          color10 = config.theme.colors.base0B;
+          color11 = config.theme.colors.base0A;
+          color12 = config.theme.colors.base0D;
+          color13 = config.theme.colors.base0E;
+          color14 = config.theme.colors.base0C;
+          color15 = config.theme.colors.base07;
+
+          # extended base16 colors
+          color16 = config.theme.colors.base09;
+          color17 = config.theme.colors.base0F;
+          color18 = config.theme.colors.base01;
+          color19 = config.theme.colors.base02;
+          color20 = config.theme.colors.base04;
+          color21 = config.theme.colors.base06;
+
+          # Scrollback
+          scrollback_lines = 10000;
+          scrollback_pager_history_size = 300; # MB
+
+          # Window
+          window_padding_width = 6;
+
+          tab_bar_edge = "top";
+          tab_bar_style = "slant";
+
+          # Disable audio
+          enable_audio_bell = false;
+        };
+      };
+    };
+  };
+}
@@ -0,0 +1,67 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    media = {
+      enable = lib.mkEnableOption {
+        description = "Enable media programs.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.media.enable) {
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [
+        nsxiv # Image viewer
+        mupdf # PDF viewer
+        zathura # PDF viewer
+      ];
+
+      # Video player
+      programs.mpv = {
+        enable = true;
+        bindings = { };
+        config = {
+          image-display-duration = 2; # For cycling through images
+          hwdec = "auto-safe"; # Attempt to use GPU decoding for video
+        };
+        scripts = [
+
+          # Automatically load playlist entries before and after current file
+          pkgs.mpvScripts.autoload
+
+          # Delete current file after quitting
+          pkgs.mpvScripts.mpv-delete-file
+        ];
+      };
+
+      # Set default programs for opening PDFs and other media
+      xdg.mimeApps = {
+        associations.added = {
+          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+        associations.removed = {
+          "application/pdf" = [
+            "mupdf.desktop"
+            "wine-extension-pdf.desktop"
+          ];
+        };
+        defaultApplications = {
+          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+      };
+    };
+  };
+}
@@ -0,0 +1,110 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+
+  # Build kdl-py
+  kdl-py = pkgs.python311.pkgs.buildPythonPackage rec {
+    pname = "kdl-py";
+    version = "1.2.0";
+    pyproject = true;
+    src = pkgs.fetchPypi {
+      inherit pname version;
+      hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM=";
+    };
+    build-system = [ pkgs.python311.pkgs.setuptools ];
+    # has no tests
+    doCheck = false;
+  };
+
+  mole = pkgs.python311.pkgs.buildPythonPackage rec {
+    pname = "mole";
+    version = "0.7.1";
+    pyproject = true;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "eblume";
+      repo = pname;
+      rev = "30bb052a97050b1fa89c287855d834f7952b195a";
+      sha256 = "sha256-DUWsfyICCfFQ2ZQBYSQVoA3eLdKC8djUylKgGdHIyJo=";
+    };
+
+    patches = [
+      (builtins.toString (
+        pkgs.writeText "pyproject.toml.patch" ''
+          diff --git a/pyproject.toml b/pyproject.toml
+          index 12ce0f5..787e978 100644
+          --- a/pyproject.toml
+          +++ b/pyproject.toml
+          @@ -12,11 +12,11 @@ packages = [
+           [tool.poetry.dependencies]
+           python = "^3.11"
+           # Now back to the regular dependencies
+          -typer = {extras = ["all"], version = "^0.9"}
+          +typer = {extras = ["all"], version = "^0.12"}
+           todoist-api-python = "^2.1.3"
+           openai = "^1.2.4"
+           rich = "^13.4.2"
+          -watchdog = "^3.0.0"
+          +watchdog = "^4.0.0"
+           pydub = "^0.25.1"
+           requests = "^2.31.0"
+           pyyaml = "^6.0.1"
+        ''
+      ))
+    ];
+
+    # Used during build time
+    nativeBuildInputs = [ pkgs.python311Packages.poetry-core ];
+
+    # Used during run time
+    buildInputs = [
+      pkgs._1password
+      pkgs.nb-cli
+    ];
+
+    # Both build and run time
+    propagatedBuildInputs = [
+      pkgs.python311Packages.typer
+      pkgs.python311Packages.todoist-api-python
+      pkgs.python311Packages.openai
+      pkgs.python311Packages.rich
+      pkgs.python311Packages.watchdog
+      pkgs.python311Packages.pydub
+      pkgs.python311Packages.requests
+      pkgs.python311Packages.pyyaml
+      pkgs.python311Packages.pydantic
+      pkgs.python311Packages.pendulum
+      kdl-py
+      pkgs.ffmpeg
+    ];
+
+    build-system = [ pkgs.python311.pkgs.setuptools ];
+
+    # has no tests
+    doCheck = false;
+
+  };
+
+in
+{
+
+  options = {
+    mole = {
+      enable = lib.mkEnableOption {
+        description = "Enable Mole.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf config.mole.enable {
+    home-manager.users.${config.user} = {
+      home.packages = [ mole ];
+    };
+  };
+}
@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    obsidian = {
+      enable = lib.mkEnableOption {
+        description = "Enable Obsidian.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
+    unfreePackages = [ "obsidian" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ obsidian ];
+    };
+
+    # Broken on 2023-12-11
+    # https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
+    nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
+  };
+}
@@ -0,0 +1,25 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    qbittorrent = {
+      enable = lib.mkEnableOption {
+        description = "Enable qBittorrent.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.qbittorrent.enable) {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [ qbittorrent ];
+    };
+  };
+}
@@ -0,0 +1,24 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    slack = {
+      enable = lib.mkEnableOption {
+        description = "Enable Slack.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.slack.enable) {
+    unfreePackages = [ "slack" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ slack ];
+    };
+  };
+}
@@ -0,0 +1,235 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    wezterm = {
+      enable = lib.mkEnableOption {
+        description = "Enable WezTerm terminal.";
+        default = false;
+      };
+    };
+  };
+
+  config =
+    let
+      font = config.home-manager.users.${config.user}.programs.kitty.font.name;
+    in
+    lib.mkIf (config.gui.enable && config.wezterm.enable) {
+
+      # Set the Rofi-Systemd terminal for viewing logs
+      # Using optionalAttrs because only available in NixOS
+      environment =
+        { }
+        // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+          sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.wezterm}/bin/wezterm";
+        };
+
+      home-manager.users.${config.user} = {
+
+        # Set the i3 terminal
+        xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "wezterm";
+
+        # Set the Rofi terminal for running programs
+        programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.wezterm}/bin/wezterm";
+
+        # Display images in the terminal
+        programs.fish.shellAliases = {
+          icat = lib.mkForce "wezterm imgcat";
+        };
+
+        programs.wezterm = {
+          enable = true;
+          colorSchemes = {
+            myTheme = {
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
+              cursor_bg = config.theme.colors.base05;
+              cursor_fg = config.theme.colors.base00;
+              cursor_border = config.theme.colors.base05;
+              selection_bg = config.theme.colors.base05;
+              selection_fg = config.theme.colors.base00;
+              scrollbar_thumb = config.theme.colors.base03;
+              ansi = [
+                config.theme.colors.base01 # black
+                config.theme.colors.base0F # maroon
+                config.theme.colors.base0B # green
+                config.theme.colors.base0A # olive
+                config.theme.colors.base0D # navy
+                config.theme.colors.base0E # purple
+                config.theme.colors.base0C # teal
+                config.theme.colors.base06 # silver
+              ];
+              brights = [
+                config.theme.colors.base03 # grey
+                config.theme.colors.base08 # red
+                config.theme.colors.base0B # lime
+                config.theme.colors.base0A # yellow
+                config.theme.colors.base0D # blue
+                config.theme.colors.base0E # fuchsia
+                config.theme.colors.base0C # aqua
+                config.theme.colors.base07 # white
+              ];
+              compose_cursor = config.theme.colors.base09; # orange
+              copy_mode_active_highlight_bg = {
+                Color = config.theme.colors.base03;
+              };
+              copy_mode_active_highlight_fg = {
+                Color = config.theme.colors.base07;
+              };
+              copy_mode_inactive_highlight_bg = {
+                Color = config.theme.colors.base02;
+              };
+              copy_mode_inactive_highlight_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_label_bg = {
+                Color = config.theme.colors.base02;
+              };
+              quick_select_label_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_match_bg = {
+                Color = config.theme.colors.base03;
+              };
+              quick_select_match_fg = {
+                Color = config.theme.colors.base07;
+              };
+            };
+          };
+          extraConfig = ''
+            return {
+                color_scheme = "myTheme",
+
+                -- Scrollback
+                scrollback_lines = 10000,
+
+                -- Window
+                window_padding = {
+                  left = 10,
+                  right = 10,
+                  top = 10,
+                  bottom = 10,
+                },
+
+                font = wezterm.font('${font}', { weight = 'Bold'}),
+                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
+
+                -- Tab Bar
+                hide_tab_bar_if_only_one_tab = true,
+                window_frame = {
+                  font = wezterm.font('${font}', { weight = 'Bold'}),
+                  font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
+                },
+
+                colors = {
+                  tab_bar = {
+                    active_tab = {
+                      bg_color = '${config.theme.colors.base00}',
+                      fg_color = '${config.theme.colors.base04}',
+                    },
+                  },
+                },
+
+                -- Disable audio
+                audible_bell = "Disabled",
+
+                initial_rows = 80,
+                initial_cols = 200,
+
+                keys = {
+                  -- sends completion string for fish autosuggestions
+                  {
+                    key = 'Enter',
+                    mods = 'SHIFT',
+                    action = wezterm.action.SendString '\x1F'
+                  },
+                  -- ctrl-shift-h was "hide"
+                  {
+                    key = 'H',
+                    mods = 'SHIFT|CTRL',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- alt-enter was "fullscreen"
+                  {
+                    key = 'Enter',
+                    mods = 'ALT',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- make super-f "fullscreen"
+                  {
+                    key = 'f',
+                    mods = 'SUPER',
+                    action = wezterm.action.ToggleFullScreen
+                  },
+                  -- super-t open new tab in new dir
+                  {
+                    key = 't',
+                    mods = 'SUPER',
+                    action = wezterm.action.SpawnCommandInNewTab {
+                      cwd = wezterm.home_dir,
+                    },
+                  },
+                  -- shift-super-t open new tab in same dir
+                  {
+                    key = 't',
+                    mods = 'SUPER|SHIFT',
+                    action = wezterm.action.SpawnTab 'CurrentPaneDomain'
+                  },
+                  -- project switcher
+                  {
+                     key = 'P',
+                     mods = 'SUPER',
+                     action = wezterm.action_callback(function(window, pane)
+                       local choices = {}
+
+                       wezterm.log_info "working?"
+
+                       function scandir(directory)
+                           local i, t, popen = 0, {}, io.popen
+                           local pfile = popen('${pkgs.fd}/bin/fd --search-path "'..directory..'" --type directory --exact-depth 2 | ${pkgs.proximity-sort}/bin/proximity-sort "'..os.getenv("HOME").."/dev/work"..'"')
+                           for filename in pfile:lines() do
+                               i = i + 1
+                               t[i] = filename
+                           end
+                           pfile:close()
+                           return t
+                       end
+
+                       for _, v in pairs(scandir(os.getenv("HOME").."/dev")) do
+                         table.insert(choices, { label = v })
+                       end
+
+                       window:perform_action(
+                         wezterm.action.InputSelector {
+                           action = wezterm.action_callback(function(window, pane, id, label)
+                             if not id and not label then
+                               wezterm.log_info "cancelled"
+                             else
+                               window:perform_action(
+                                 wezterm.action.SpawnCommandInNewTab {
+                                   cwd = label,
+                                 },
+                                 pane
+                               )
+                             end
+                           end),
+                           fuzzy = true,
+                           title = "Select Project",
+                           choices = choices,
+                         },
+                         pane
+                       )
+                     end),
+                  },
+                },
+            }
+          '';
+        };
+      };
+    };
+}
@@ -0,0 +1,38 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    yt-dlp = {
+      enable = lib.mkEnableOption {
+        description = "Enable YouTube downloader.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.yt-dlp.enable) {
+    home-manager.users.${config.user} = {
+      programs.yt-dlp = {
+        enable = true;
+        extraConfig = "";
+        settings = {
+          no-continue = true; # Always re-download each fragment
+          no-overwrites = true; # Don't overwrite existing files
+          download-archive = "archive.log"; # Log of archives
+          embed-metadata = true;
+          embed-thumbnail = true;
+          embed-subs = true;
+          sub-langs = "en.*";
+          concurrent-fragments = 4; # Parallel download chunks
+        };
+      };
+
+      programs.fish.shellAbbrs.yt = "yt-dlp";
+    };
+  };
+}
@@ -16,135 +16,124 @@
  ];

  options = {
-    # user = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Primary user of the system";
-    # };
-    # fullName = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Human readable name of the user";
-    # };
-    # userDirs = {
-    #   # Required to prevent infinite recursion when referenced by himalaya
-    #   download = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "XDG directory for downloads";
-    #     default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
-    #   };
-    # };
-    # identityFile = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Path to existing private key file.";
-    #   default = "/etc/ssh/ssh_host_ed25519_key";
-    # };
-    # homePath = lib.mkOption {
-    #   type = lib.types.path;
-    #   description = "Path of user's home directory.";
-    #   default = builtins.toPath (
-    #     if pkgs.stdenv.isDarwin then "/Users/${config.user}" else "/home/${config.user}"
-    #   );
-    # };
-    # dotfilesPath = lib.mkOption {
-    #   type = lib.types.path;
-    #   description = "Path of dotfiles repository.";
-    #   default = config.homePath + "/dev/personal/dotfiles";
-    # };
-    # dotfilesRepo = lib.mkOption {
-    #   type = lib.types.str;
-    #   description = "Link to dotfiles repository HTTPS URL.";
-    # };
-    # unfreePackages = lib.mkOption {
-    #   type = lib.types.listOf lib.types.str;
-    #   description = "List of unfree packages to allow.";
-    #   default = [ ];
-    # };
-    # insecurePackages = lib.mkOption {
-    #   type = lib.types.listOf lib.types.str;
-    #   description = "List of insecure packages to allow.";
-    #   default = [ ];
-    # };
-    # hostnames = {
-    #   audiobooks = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for audiobook server (Audiobookshelf).";
-    #   };
-    #   budget = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for budgeting server (ActualBudget).";
-    #   };
-    #   files = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for files server (Filebrowser).";
-    #   };
-    #   git = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for git server (Gitea).";
-    #   };
-    #   metrics = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for metrics server.";
-    #   };
-    #   minecraft = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for Minecraft server.";
-    #   };
-    #   paperless = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for document server (paperless-ngx).";
-    #   };
-    #   photos = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for photo management (Immich).";
-    #   };
-    #   prometheus = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for Prometheus server.";
-    #   };
-    #   influxdb = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for InfluxDB2 server.";
-    #   };
-    #   secrets = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for passwords and secrets (Vaultwarden).";
-    #   };
-    #   stream = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for video/media library (Jellyfin).";
-    #   };
-    #   content = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for personal content system (Nextcloud).";
-    #   };
-    #   books = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for books library (Calibre-Web).";
-    #   };
-    #   download = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for download services.";
-    #   };
-    #   irc = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for IRC services.";
-    #   };
-    #   n8n = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for n8n automation.";
-    #   };
-    #   notifications = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for push notification services (ntfy).";
-    #   };
-    #   status = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for status page (Uptime-Kuma).";
-    #   };
-    #   transmission = lib.mkOption {
-    #     type = lib.types.str;
-    #     description = "Hostname for peer2peer downloads (Transmission).";
-    #   };
-    # };
+    user = lib.mkOption {
+      type = lib.types.str;
+      description = "Primary user of the system";
+    };
+    fullName = lib.mkOption {
+      type = lib.types.str;
+      description = "Human readable name of the user";
+    };
+    userDirs = {
+      # Required to prevent infinite recursion when referenced by himalaya
+      download = lib.mkOption {
+        type = lib.types.str;
+        description = "XDG directory for downloads";
+        default = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else "$HOME/downloads";
+      };
+    };
+    identityFile = lib.mkOption {
+      type = lib.types.str;
+      description = "Path to existing private key file.";
+      default = "/etc/ssh/ssh_host_ed25519_key";
+    };
+    gui = {
+      enable = lib.mkEnableOption {
+        description = "Enable graphics.";
+        default = false;
+      };
+    };
+    theme = {
+      colors = lib.mkOption {
+        type = lib.types.attrs;
+        description = "Base16 color scheme.";
+        default = (import ../colorscheme/gruvbox).dark;
+      };
+      dark = lib.mkOption {
+        type = lib.types.bool;
+        description = "Enable dark mode.";
+        default = true;
+      };
+    };
+    homePath = lib.mkOption {
+      type = lib.types.path;
+      description = "Path of user's home directory.";
+      default = builtins.toPath (
+        if pkgs.stdenv.isDarwin then "/Users/${config.user}" else "/home/${config.user}"
+      );
+    };
+    dotfilesPath = lib.mkOption {
+      type = lib.types.path;
+      description = "Path of dotfiles repository.";
+      default = config.homePath + "/dev/personal/dotfiles";
+    };
+    dotfilesRepo = lib.mkOption {
+      type = lib.types.str;
+      description = "Link to dotfiles repository HTTPS URL.";
+    };
+    unfreePackages = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "List of unfree packages to allow.";
+      default = [ ];
+    };
+    hostnames = {
+      git = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for git server (Gitea).";
+      };
+      metrics = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for metrics server.";
+      };
+      minecraft = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Minecraft server.";
+      };
+      paperless = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for document server (paperless-ngx).";
+      };
+      prometheus = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Prometheus server.";
+      };
+      influxdb = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for InfluxDB2 server.";
+      };
+      secrets = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for passwords and secrets (Vaultwarden).";
+      };
+      stream = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for video/media library (Jellyfin).";
+      };
+      content = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for personal content system (Nextcloud).";
+      };
+      books = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for books library (Calibre-Web).";
+      };
+      download = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for download services.";
+      };
+      irc = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for IRC services.";
+      };
+      n8n = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for n8n automation.";
+      };
+      transmission = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for peer2peer downloads (Transmission).";
+      };
+    };
  };

  config =
@@ -153,13 +142,25 @@
    in
    {

+      # Basic common system packages for all devices
+      environment.systemPackages = with pkgs; [
+        git
+        vim
+        wget
+        curl
+      ];
+
+      # Use the system-level nixpkgs instead of Home Manager's
+      home-manager.useGlobalPkgs = true;
+
+      # Install packages to /etc/profiles instead of ~/.nix-profile, useful when
+      # using multiple profiles for one user
+      home-manager.useUserPackages = true;
+
      # Allow specified unfree packages (identified elsewhere)
      # Retrieves package object based on string name
      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;

-      # Allow specified insecure packages (identified elsewhere)
-      nixpkgs.config.permittedInsecurePackages = config.insecurePackages;
-
      # Pin a state version to prevent warnings
      home-manager.users.${config.user}.home.stateVersion = stateVersion;
      home-manager.users.root.home.stateVersion = stateVersion;
@@ -0,0 +1,220 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
+
+  config = lib.mkIf config.mail.aerc.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        w3m # Render HTML
+        dante # Socksify for rendering HTML
+      ];
+
+      programs.aerc = {
+        enable = true;
+        extraBinds = {
+          # Binds are of the form <key sequence> = <command to run>
+          # To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
+          # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
+          global = {
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab <Enter>";
+            "<C-t>" = ":term<Enter>";
+            "?" = ":help keys<Enter>";
+          };
+
+          messages = {
+            q = ":quit<Enter>";
+
+            j = ":next <Enter>";
+            "<Down>" = ":next<Enter>";
+            "<C-d>" = ":next 50%<Enter>";
+            "<C-f>" = ":next 100%<Enter>";
+            "<PgDn>" = ":next 100%<Enter>";
+
+            k = ":prev <Enter>";
+            "<Up>" = ":prev<Enter>";
+            "<C-u>" = ":prev 50%<Enter>";
+            "<C-b>" = ":prev 100%<Enter>";
+            "<PgUp>" = ":prev 100%<Enter>";
+            g = ":select 0 <Enter>";
+            G = ":select -1<Enter>";
+
+            J = ":next-folder <Enter>";
+            K = ":prev-folder<Enter>";
+            H = ":collapse-folder<Enter>";
+            L = ":expand-folder<Enter>";
+
+            v = ":mark -t<Enter>";
+            V = ":mark -v<Enter>";
+
+            T = ":toggle-threads<Enter>";
+
+            "<Enter>" = ":view<Enter>";
+            d = ":prompt 'Really delete this message?' 'delete-message'<Enter>";
+            D = ":move Trash<Enter>";
+            A = ":archive flat<Enter>";
+
+            C = ":compose<Enter>";
+
+            rr = ":reply -a<Enter>";
+            rq = ":reply -aq<Enter>";
+            Rr = ":reply<Enter>";
+            Rq = ":reply -q<Enter>";
+
+            c = ":cf<space>";
+            "$" = ":term<space>";
+            "!" = ":term<space>";
+            "|" = ":pipe<space>";
+
+            "/" = ":search<space>-a<space>";
+            "\\" = ":filter <space>";
+            n = ":next-result<Enter>";
+            N = ":prev-result<Enter>";
+            "<Esc>" = ":clear<Enter>";
+          };
+
+          "messages:folder=Drafts" = {
+            "<Enter>" = ":recall<Enter>";
+          };
+
+          view = {
+            "/" = ":toggle-key-passthrough <Enter> /";
+            q = ":close<Enter>";
+            O = ":open<Enter>";
+            S = ":save<space>";
+            "|" = ":pipe<space>";
+            D = ":move Trash<Enter>";
+            A = ":archive flat<Enter>";
+
+            "<C-l>" = ":open-link <space>";
+
+            f = ":forward <Enter>";
+            rr = ":reply -a<Enter>";
+            rq = ":reply -aq<Enter>";
+            Rr = ":reply<Enter>";
+            Rq = ":reply -q<Enter>";
+
+            H = ":toggle-headers<Enter>";
+            "<C-k>" = ":prev-part<Enter>";
+            "<C-j>" = ":next-part<Enter>";
+            J = ":next <Enter>";
+            K = ":prev<Enter>";
+          };
+
+          "view::passthrough" = {
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<Esc>" = ":toggle-key-passthrough<Enter>";
+          };
+
+          compose = {
+            # Keybindings used when the embedded terminal is not selected in the compose
+            # view
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-k>" = ":prev-field<Enter>";
+            "<C-j>" = ":next-field<Enter>";
+            "<A-p>" = ":switch-account -p<Enter>";
+            "<A-n>" = ":switch-account -n<Enter>";
+            "<tab>" = ":next-field<Enter>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+          "compose::editor" = {
+            # Keybindings used when the embedded terminal is selected in the compose view
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-k>" = ":prev-field<Enter>";
+            "<C-j>" = ":next-field<Enter>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+          "compose::review" = {
+            # Keybindings used when reviewing a message to be sent
+            y = ":send <Enter>";
+            n = ":abort<Enter>";
+            p = ":postpone<Enter>";
+            q = ":choose -o d discard abort -o p postpone postpone<Enter>";
+            e = ":edit<Enter>";
+            a = ":attach<space>";
+            d = ":detach<space>";
+          };
+
+          terminal = {
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+        };
+        extraConfig = {
+          general = {
+            unsafe-accounts-conf = true;
+            # log-file = "~/.cache/aerc.log";
+            # log-level = "debug";
+          };
+          viewer = {
+            pager = "${pkgs.less}/bin/less -R";
+          };
+          filters = {
+            "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
+            "text/html" = "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
+            # "text/*" =
+            #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
+            "message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
+            "application/pdf" = "${pkgs.zathura}/bin/zathura -";
+            "audio/*" = "${pkgs.mpv}/bin/mpv -";
+            "image/*" = "${pkgs.feh}/bin/feh -";
+          };
+        };
+      };
+      accounts.email.accounts.home.aerc = {
+        enable = true;
+        extraAccounts = {
+          check-mail = "5m";
+          check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
+          check-mail-timeout = "15s";
+        };
+      };
+
+      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
+        name = "aerc";
+        exec = "kitty aerc %u";
+      };
+      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
+        "${
+          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+        }+Shift+e" = "exec ${
+          # Don't name the script `aerc` or it will affect grep
+          builtins.toString (
+            pkgs.writeShellScript "focus-mail.sh" ''
+              count=$(ps aux | grep -c aerc)
+              if [ "$count" -eq 1 ]; then
+                  i3-msg "exec --no-startup-id kitty --class aerc aerc"
+                  sleep 0.25
+              fi
+              i3-msg "[class=aerc] focus"
+            ''
+          )
+        }";
+      };
+
+      programs.fish.shellAbbrs = {
+        ae = "aerc";
+      };
+    };
+  };
+}
@@ -0,0 +1,139 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  imports = [
+    ./himalaya.nix
+    ./aerc.nix
+    ./system.nix
+  ];
+
+  options = {
+    mail.enable = lib.mkEnableOption "Mail service.";
+    mail.user = lib.mkOption {
+      type = lib.types.str;
+      description = "User name for the email address.";
+      default = config.user;
+    };
+    mail.server = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server name for the email address.";
+    };
+    mail.imapHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for IMAP (reading mail).";
+    };
+    mail.smtpHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for SMTP (sending mail).";
+    };
+  };
+
+  config = lib.mkIf config.mail.enable {
+
+    home-manager.users.${config.user} = {
+      programs.mbsync = {
+        enable = true;
+      };
+
+      # Automatically check for mail and keep files synced locally
+      services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
+        enable = true;
+        frequency = "*:0/5";
+        postExec = "${pkgs.notmuch}/bin/notmuch new";
+      };
+
+      # Used to watch for new mail and trigger sync
+      services.imapnotify.enable = pkgs.stdenv.isLinux;
+
+      # Allows sending email from CLI/sendmail
+      programs.msmtp.enable = true;
+
+      # Better local mail search
+      programs.notmuch = {
+        enable = true;
+        new.ignore = [
+          ".mbsyncstate.lock"
+          ".mbsyncstate.journal"
+          ".mbsyncstate.new"
+        ];
+      };
+
+      accounts.email = {
+
+        # Where email files are stored
+        maildirBasePath = "${config.homePath}/mail";
+
+        accounts = {
+          home =
+            let
+              address = "${config.mail.user}@${config.mail.server}";
+            in
+            {
+              userName = address;
+              realName = config.fullName;
+              primary = true;
+              inherit address;
+              aliases = map (user: "${user}@${config.mail.server}") [
+                "me"
+                "hey"
+                "admin"
+              ];
+
+              # Options for contact completion
+              alot = { };
+
+              imap = {
+                host = config.mail.imapHost;
+                port = 993;
+                tls.enable = true;
+              };
+
+              # Watch for mail and run notifications or sync
+              imapnotify = {
+                enable = true;
+                boxes = [ "Inbox" ];
+                onNotify = "${pkgs.isync}/bin/mbsync -a";
+                onNotifyPost =
+                  lib.mkIf config.home-manager.users.${config.user}.services.dunst.enable
+                    "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
+              };
+
+              # Name of the directory in maildir for this account
+              maildir = {
+                path = "main";
+              };
+
+              # Bi-directional syncing options for local files
+              mbsync = {
+                enable = true;
+                create = "both";
+                expunge = "both";
+                remove = "both";
+                patterns = [ "*" ];
+                extraConfig.channel = {
+                  CopyArrivalDate = "yes"; # Sync time of original message
+                };
+              };
+
+              # Enable indexing
+              notmuch.enable = true;
+
+              # Used to login and send and receive emails
+              passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
+
+              smtp = {
+                host = config.mail.smtpHost;
+                port = 465;
+                tls.enable = true;
+              };
+            };
+        };
+      };
+    };
+  };
+}
@@ -0,0 +1,26 @@
+{ config, lib, ... }:
+{
+
+  options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
+
+  config = lib.mkIf config.mail.himalaya.enable {
+
+    home-manager.users.${config.user} = {
+
+      programs.himalaya = {
+        enable = true;
+      };
+      accounts.email.accounts.home.himalaya = {
+        enable = true;
+        settings = {
+          downloads-dir = config.userDirs.download;
+          smtp-insecure = true;
+        };
+      };
+
+      programs.fish.shellAbbrs = {
+        hi = "himalaya";
+      };
+    };
+  };
+}
@@ -0,0 +1,35 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  config = lib.mkIf (config.mail.enable || config.server) {
+
+    home-manager.users.${config.user} = {
+
+      programs.msmtp.enable = true;
+
+      # The system user for sending automatic notifications
+      accounts.email.accounts.system =
+        let
+          address = "system@${config.mail.server}";
+        in
+        {
+          userName = address;
+          realName = "NixOS System";
+          primary = !config.mail.enable; # Only primary if mail not enabled
+          inherit address;
+          passwordCommand = "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${pkgs.writeText "mailpass-system.age" (builtins.readFile ../../../private/mailpass-system.age)}";
+          msmtp.enable = true;
+          smtp = {
+            host = config.mail.smtpHost;
+            port = 465;
+            tls.enable = true;
+          };
+        };
+    };
+  };
+}
@@ -6,7 +6,6 @@
  plugins = [
    pkgs.vimPlugins.bufferline-nvim
    pkgs.vimPlugins.vim-bbye # Better closing of buffers
-    pkgs.vimPlugins.snipe-nvim # Jump between open buffers
  ];
  setup.bufferline = {
    options = {
@@ -16,7 +15,6 @@
      offsets = [ { filetype = "NvimTree"; } ];
    };
  };
-  setup.snipe = { };
  lua = ''
    -- Move buffers
    vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
@@ -24,7 +22,5 @@

    -- Kill buffer
    vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
-
-    -- Jump to buffer
-    vim.keymap.set("n", "gb", require("snipe").open_buffer_menu, { silent = true }) '';
+  '';
 }
@@ -13,7 +13,7 @@
    description = "Attrset of base16 colorscheme key value pairs.";
  };

-  config = lib.mkIf config.colors {
+  config = {
    plugins = [ pkgs.vimPlugins.base16-nvim ];
    setup.base16-colorscheme = config.colors;

@@ -2,7 +2,6 @@
 {

  plugins = [
-    pkgs.vimPlugins.nvim-cmp
    pkgs.vimPlugins.cmp-nvim-lsp
    pkgs.vimPlugins.cmp-buffer
    pkgs.vimPlugins.cmp-path
@@ -27,21 +26,15 @@

    # Basic completion keybinds
    mapping = {
-      "['<C-n>']" =
-        dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-      "['<C-p>']" =
-        dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
-      "['<Down>']" =
-        dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
-      "['<Up>']" =
-        dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
+      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
+      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
+      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
+      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
      "['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
      "['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
      "['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
-      "['<C-y>']" =
-        dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
-      "['<C-r>']" =
-        dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
+      "['<C-y>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
+      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
      "['<Esc>']" = dsl.rawLua ''
        function(_)
            cmp.mapping({
@@ -135,7 +128,7 @@
    };
  };

-  lua' = ''
+  lua = ''
    -- Use buffer source for `/`
    require('cmp').setup.cmdline("/", {
        mapping = {
@@ -19,11 +19,9 @@
      pkgs.vimPlugins.fidget-nvim
      pkgs.vimPlugins.nvim-lint
      pkgs.vimPlugins.vim-table-mode
-      pkgs.vimPlugins.tiny-inline-diagnostic-nvim
    ];

    setup.fidget = { };
-    setup.tiny-inline-diagnostic = { };

    use.lspconfig.lua_ls.setup = dsl.callWith {
      settings = {
@@ -73,9 +71,6 @@
          files = {
            excludeDirs = [ ".direnv" ];
          };
-          cargo = {
-            features = "all";
-          };
        };
      };
    };
@@ -138,9 +133,6 @@

      -- Prevent infinite log size (change this when debugging)
      vim.lsp.set_log_level("off")
-
-      -- Hide buffer diagnostics (use tiny-inline-diagnostic.nvim instead)
-      vim.diagnostic.config({ virtual_text = false })
    '';
  };
 }
@@ -10,8 +10,7 @@
    pkgs.vimPlugins.vim-eunuch # File manipulation commands
    pkgs.vimPlugins.vim-fugitive # Git commands
    pkgs.vimPlugins.vim-repeat # Better repeat using .
-    pkgs.vimPlugins.vim-abolish # Keep capitalization in substitute (Subvert)
-    pkgs.vimPlugins.markview-nvim # Markdown preview
+    pkgs.vimPlugins.glow-nvim # Markdown preview popup
    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
    pkgs.vimPlugins.which-key-nvim # Keybind helper
  ];
@@ -22,7 +21,7 @@
      names = false;
    };
  };
-  setup.markview = { };
+  setup.glow = { };
  setup.which-key = { };

  vim.o = {
@@ -58,8 +57,8 @@

  # Better backup, swap and undo storage
  vim.o.backup = true; # Easier to recover and more secure
-  vim.opt.undofile = true; # Keeps undos after quit
-  vim.opt.swapfile = false; # Instead of swaps, create backups
+  vim.bo.swapfile = false; # Instead of swaps, create backups
+  vim.bo.undofile = true; # Keeps undos after quit
  vim.o.backupdir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/backup//")'';
  vim.o.undodir = dsl.rawLua ''vim.fn.expand("~/.local/state/nvim/undo//")'';

@@ -21,7 +21,7 @@ function TERM_TOGGLE()
    basicterminal:toggle()
 end

-local nixpkgs = terminal:new({ cmd = "nix repl --expr 'import <nixpkgs>{}'" })
+local nixpkgs = terminal:new({ cmd = "nix repl '<nixpkgs>'" })
 function NIXPKGS_TOGGLE()
    nixpkgs:toggle()
 end
@@ -14,6 +14,11 @@
    open_mapping = dsl.rawLua "[[<c-\\>]]";
    hide_numbers = true;
    direction = "float";
+    float_opts = {
+      width = dsl.rawLua "vim.o.columns - 4";
+      height = dsl.rawLua "vim.o.lines - 4";
+      row = 0;
+    };
  };

  lua = ''
@@ -0,0 +1,67 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+
+  neovim = import ./package {
+    inherit pkgs;
+    colors = config.theme.colors;
+    terraform = config.terraform.enable;
+    github = true;
+    kubernetes = config.kubernetes.enable;
+  };
+in
+{
+
+  options.neovim.enable = lib.mkEnableOption "Neovim.";
+
+  config = lib.mkIf config.neovim.enable {
+    home-manager.users.${config.user} =
+
+      {
+
+        home.packages = [ neovim ];
+
+        # Use Neovim as the editor for git commit messages
+        programs.git.extraConfig.core.editor = "nvim";
+        programs.jujutsu.settings.ui.editor = "nvim";
+
+        # Set Neovim as the default app for text editing and manual pages
+        home.sessionVariables = {
+          EDITOR = "nvim";
+          MANPAGER = "nvim +Man!";
+        };
+
+        # Create quick aliases for launching Neovim
+        programs.fish = {
+          shellAliases = {
+            vim = "nvim";
+          };
+          shellAbbrs = {
+            v = lib.mkForce "nvim";
+            vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
+            vll = "nvim -c 'Telescope oldfiles'";
+          };
+        };
+
+        # Create a desktop option for launching Neovim from a file manager
+        # (Requires launching the terminal and then executing Neovim)
+        xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
+          name = "Neovim wrapper";
+          exec = "kitty nvim %F";
+          mimeType = [
+            "text/plain"
+            "text/markdown"
+          ];
+        };
+        xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
+          "text/plain" = [ "nvim.desktop" ];
+          "text/markdown" = [ "nvim.desktop" ];
+        };
+      };
+  };
+}
@@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
 key("n", "cq", ":cclose<CR>")

 -- Other
-key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
-key("n", "Y", "y$") --- Copy to end of line
+key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
+key("n", "Y", "y$")                                         --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
-key("v", "D", "y'>gp") --- Duplicate selected
-key("x", "<Leader>p", '"_dP') --- Paste but keep register
+key("v", "D", "y'>gp")                                      --- Duplicate selected
+key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
@@ -28,7 +28,7 @@

 {
  pkgs,
-  colors ? null,
+  colors,
  terraform ? false,
  github ? false,
  kubernetes ? false,
@@ -46,17 +46,17 @@ pkgs.neovimBuilder {
    kubernetes
    ;
  imports = [
-    ./config/align.nix
-    ./config/bufferline.nix
-    ./config/colors.nix
-    ./config/completion.nix
-    ./config/gitsigns.nix
-    ./config/lsp.nix
-    ./config/misc.nix
-    ./config/statusline.nix
-    ./config/syntax.nix
-    ./config/telescope.nix
-    ./config/toggleterm.nix
-    ./config/tree.nix
+    ../config/align.nix
+    ../config/bufferline.nix
+    ../config/colors.nix
+    ../config/completion.nix
+    ../config/gitsigns.nix
+    ../config/lsp.nix
+    ../config/misc.nix
+    ../config/statusline.nix
+    ../config/syntax.nix
+    ../config/telescope.nix
+    ../config/toggleterm.nix
+    ../config/tree.nix
  ];
 }
@@ -0,0 +1,12 @@
+{ ... }:
+{
+
+  imports = [
+    ./haskell.nix
+    ./kubernetes.nix
+    ./lua.nix
+    ./python.nix
+    ./rust.nix
+    ./terraform.nix
+  ];
+}
@@ -1,13 +1,9 @@
 { config, lib, ... }:
-let
-  cfg = config.nmasur.presets.programs.haskell;
-in
 {

-  options.nmasur.presets.programs.haskell.enable =
-    lib.mkEnableOption "Haskell programming language config.";
+  options.haskell.enable = lib.mkEnableOption "Haskell programming language.";

-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.haskell.enable {

    # Binary Cache for Haskell.nix
    nix.settings.trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
@@ -0,0 +1,164 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
+
+  config = lib.mkIf config.kubernetes.enable {
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        kubectl # Basic Kubernetes queries
+        kubernetes-helm # Helm CLI
+        fluxcd # Bootstrap clusters with Flux
+        kustomize # Kustomize CLI (for Flux)
+      ];
+
+      programs.fish.shellAbbrs = {
+        k = "kubectl";
+        pods = "kubectl get pods -A";
+        nodes = "kubectl get nodes";
+        deploys = "kubectl get deployments -A";
+        dash = "kube-dashboard";
+        ks = "k9s";
+      };
+
+      # Terminal Kubernetes UI
+      programs.k9s = {
+        enable = true;
+        settings = {
+          k9s = {
+            ui = {
+              enableMouse = true;
+              headless = true;
+              logoless = true;
+              crumbsless = false;
+              skin = "main";
+            };
+          };
+        };
+        skins = {
+          main = {
+            k9s = {
+              body = {
+                fgColor = config.theme.colors.base06;
+                bgColor = "default";
+                logoColor = config.theme.colors.base02; # *blue ?
+              };
+              # Search bar
+              prompt = {
+                fgColor = config.theme.colors.base06;
+                bgColor = "default";
+                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 = "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;
+              };
+              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
+                };
+              };
+              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 = "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";
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.lua.enable = lib.mkEnableOption "Lua programming language.";
+
+  config = lib.mkIf config.lua.enable {
+    home-manager.users.${config.user}.home.packages = with pkgs; [
+      stylua # Lua formatter
+      sumneko-lua-language-server # Lua LSP
+    ];
+  };
+}
@@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.python.enable = lib.mkEnableOption "Python programming language.";
+
+  config = lib.mkIf config.python.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        # python310 # Standard Python interpreter
+        pyright # Python language server
+        black # Python formatter
+        python310Packages.flake8 # Python linter
+      ];
+
+      programs.fish.shellAbbrs = {
+        py = "python3";
+      };
+    };
+  };
+}
@@ -0,0 +1,27 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.rust.enable = lib.mkEnableOption "Rust programming language.";
+
+  config = lib.mkIf config.rust.enable {
+
+    home-manager.users.${config.user} = {
+
+      programs.fish.shellAbbrs = {
+        ca = "cargo";
+      };
+
+      home.packages = with pkgs; [
+        cargo
+        rustc
+        clippy
+        gcc
+      ];
+    };
+  };
+}
@@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options.terraform.enable = lib.mkEnableOption "Terraform tools.";
+
+  config = lib.mkIf config.terraform.enable {
+    unfreePackages = [ "terraform" ];
+
+    home-manager.users.${config.user} = {
+      programs.fish.shellAbbrs = {
+        # Terraform
+        te = "terraform";
+      };
+      home.packages = with pkgs; [
+        terraform # Terraform executable
+        terraform-ls # Language server
+        tflint # Linter
+      ];
+    };
+  };
+}
@@ -0,0 +1,8 @@
+{ ... }:
+{
+
+  imports = [
+    ./dotfiles.nix
+    ./notes.nix
+  ];
+}
@@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  # Allows me to make sure I can work on my dotfiles locally
+
+  options.dotfiles.enable = lib.mkEnableOption "Clone dotfiles.";
+
+  config = lib.mkIf config.dotfiles.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.activation = {
+
+        # Always clone dotfiles repository if it doesn't exist
+        cloneDotfiles = config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
+          if [ ! -d "${config.dotfilesPath}" ]; then
+              $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
+              $DRY_RUN_CMD ${pkgs.git}/bin/git \
+                  clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+          fi
+        '';
+      };
+
+      # Set a variable for dotfiles repo, not necessary but convenient
+      home.sessionVariables.DOTS = config.dotfilesPath;
+    };
+  };
+}
@@ -0,0 +1,36 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  # This is just a placeholder as I expect to interact with my notes in a
+  # certain location
+
+  home-manager.users.${config.user} = {
+
+    home.sessionVariables = {
+      NOTES_PATH = "${config.homePath}/dev/personal/notes/content";
+    };
+
+    # Sync notes for Nextcloud automatically
+    systemd.user.timers.refresh-notes = lib.mkIf config.services.nextcloud.enable {
+      Timer = {
+        OnCalendar = "*-*-* *:0/10:50"; # Every 10 minutes
+        Unit = "refresh-notes.service";
+      };
+    };
+    systemd.user.services.refresh-notes = {
+      Unit.Description = "Get latest notes.";
+      Service = {
+        Type = "oneshot";
+        ExecStartPre = "${pkgs.git}/bin/git -C /data/git/notes reset --hard master";
+        ExecStart = "${pkgs.git}/bin/git -C /data/git/notes pull";
+        WorkingDirectory = config.homePath;
+        Environment = "PATH=${pkgs.openssh}/bin";
+      };
+    };
+  };
+}
@@ -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;
+  };
+}
@@ -0,0 +1,24 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  config = {
+    home-manager.users.${config.user} = {
+
+      programs.bash = {
+        enable = true;
+        shellAliases = config.home-manager.users.${config.user}.programs.fish.shellAliases;
+        initExtra = "";
+        profileExtra = "";
+      };
+
+      programs.starship.enableBashIntegration = false;
+      programs.zoxide.enableBashIntegration = true;
+      programs.fzf.enableBashIntegration = true;
+    };
+  };
+}
@@ -6,15 +6,14 @@ BUCKET_NAME_PART_1="t2"
 BUCKET_NAME_PART_2="global"
 BUCKET_NAME_PART_3="terraformstate"

-PROJECT_ROOT=$(git rev-parse --show-toplevel)
-WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/terraform.yml"
+WORKFLOW_FILE=".github/workflows/terraform.yml"

-if [ ! -f "$WORKFLOW_FILE" ]; then
-    WORKFLOW_FILE="${PROJECT_ROOT}/.github/workflows/apply.yml"
+if [ ! -f $WORKFLOW_FILE ]; then
+    WORKFLOW_FILE=".github/workflows/apply.yml"
 fi

 AWS_ACCOUNT_NUMBER=$(
-    awk '/aws_account_number: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
+    awk '/aws_account_number: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
        echo "$(
            read -r s
            s=${s//\'/}
@@ -24,7 +23,7 @@ AWS_ACCOUNT_NUMBER=$(

 if [ -z "${AWS_ACCOUNT_NUMBER}" ]; then
    AWS_ACCOUNT_NUMBER=$(
-        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
+        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
            echo "$(
                read -r s
                s=${s//\'/}
@@ -0,0 +1,22 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  # Convenience utilities from charm.sh
+
+  options.charm.enable = lib.mkEnableOption "Charm utilities.";
+
+  config.home-manager.users.${config.user} = lib.mkIf config.charm.enable {
+
+    home.packages = with pkgs; [
+      glow # Markdown previews
+      skate # Key-value store
+      charm # Manage account and filesystem
+      pop # Send emails from a TUI
+    ];
+  };
+}
@@ -0,0 +1,18 @@
+{ ... }:
+{
+  imports = [
+    ./atuin.nix
+    ./bash
+    ./charm.nix
+    ./direnv.nix
+    ./fish
+    ./fzf.nix
+    ./git.nix
+    ./github.nix
+    ./jujutsu.nix
+    ./nixpkgs.nix
+    ./starship.nix
+    ./utilities.nix
+    ./work.nix
+  ];
+}
@@ -0,0 +1,36 @@
+{ config, ... }:
+{
+
+  # Enables quickly entering Nix shells when changing directories
+  home-manager.users.${config.user}.programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+    config = {
+      whitelist = {
+        prefix = [ config.dotfilesPath ];
+      };
+    };
+  };
+
+  # programs.direnv.direnvrcExtra = ''
+  #   layout_postgres() {
+  #       export PGDATA="$(direnv_layout_dir)/postgres"
+  #       export PGHOST="$PGDATA"
+  #
+  #       if [[ ! -d "PGDATA" ]]; then
+  #           initdb
+  #           cat >> "$PGDATA/postgres.conf" <<- EOF
+  #                   listen_addresses = '''
+  #                   unix_socket_directories = '$PGHOST'
+  #           EOF
+  #           echo "CREATE DATABASE $USER;" | postgres --single -E postgres
+  #       fi
+  #   }
+  # '';
+
+  # Prevent garbage collection
+  nix.extraOptions = ''
+    keep-outputs = true
+    keep-derivations = true
+  '';
+}
@@ -1,44 +1,54 @@
 {
  config,
+  pkgs,
  lib,
  ...
 }:
-
-let
-  cfg = config.nmasur.presets.programs.fish;
-in
-
 {

-  options.nmasur.presets.programs.fish = {
-    enable = lib.mkEnableOption "Fish shell";
-    fish_user_key_bindings = lib.mkOption {
-      type = lib.types.lines;
-      description = "Text of fish_user_key_bindings function";
-      default = "";
-    };
-  };
+  users.users.${config.user}.shell = pkgs.fish;
+  programs.fish.enable = true; # Needed for LightDM to remember username

-  config = lib.mkIf cfg.enable {
+  home-manager.users.${config.user} = {

-    cfg.fish_user_key_bindings = # fish
-      ''
-        # Shift-Enter (defined by terminal)
-        bind -M insert \x1F accept-autosuggestion
-        bind -M default \x1F accept-autosuggestion
-      '';
+    # Packages used in abbreviations and aliases
+    home.packages = with pkgs; [ curl ];

    programs.fish = {
      enable = true;
+      shellAliases = {
+
+        # Version of bash which works much better on the terminal
+        bash = "${pkgs.bashInteractive}/bin/bash";
+
+        # Use eza (exa) instead of ls for fancier output
+        ls = "${pkgs.eza}/bin/eza --group";
+
+        # Move files to XDG trash on the commandline
+        trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
+      };
      functions = {
+        commandline-git-commits = {
+          description = "Insert commit into commandline";
+          body = builtins.readFile ./functions/commandline-git-commits.fish;
+        };
        copy = {
          description = "Copy file contents into clipboard";
          body = "cat $argv | pbcopy"; # Need to fix for non-macOS
        };
+        edit = {
+          description = "Open a file in Vim";
+          body = builtins.readFile ./functions/edit.fish;
+        };
        envs = {
          description = "Evaluate a bash-like environment variables file";
          body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
        };
+        fcd = {
+          description = "Jump to directory";
+          argumentNames = "directory";
+          body = builtins.readFile ./functions/fcd.fish;
+        };
        fish_user_key_bindings = {
          body = builtins.readFile ./functions/fish_user_key_bindings.fish;
        };
@@ -49,9 +59,22 @@ in
          description = "Tidy up JSON using jq";
          body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
        };
-        _which = {
-          description = "Identify the path to a program in the shell";
-          body = "command --search (string sub --start=2 $argv)";
+        note = {
+          description = "Edit or create a note";
+          argumentNames = "filename";
+          body = builtins.readFile ./functions/note.fish;
+        };
+        recent = {
+          description = "Open a recent file in Vim";
+          body = builtins.readFile ./functions/recent.fish;
+        };
+        search-and-edit = {
+          description = "Search and open the relevant file in Vim";
+          body = builtins.readFile ./functions/search-and-edit.fish;
+        };
+        syncnotes = {
+          description = "Full git commit on notes";
+          body = builtins.readFile ./functions/syncnotes.fish;
        };
      };
      interactiveShellInit = ''
@@ -78,19 +101,12 @@ in
        "-" = "cd -";
        mkd = "mkdir -pv";

-        # Convert a program into its full path
-        "=" = {
-          position = "anywhere";
-          regex = "=\\w+";
-          function = "_which";
-        };
-
        # System
        s = "sudo";
        sc = "systemctl";
        scs = "systemctl status";
-        sca = "systemctl cat";
        m = "make";
+        t = "trash";

        # Vim (overwritten by Neovim)
        v = "vim";
@@ -99,6 +115,10 @@ in
        # Notes
        sn = "syncnotes";

+        # Fun CLI Tools
+        weather = "curl wttr.in/$WEATHER_CITY";
+        moon = "curl wttr.in/Moon";
+
        # Cheat Sheets
        ssl = "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr";
        fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -";
@@ -115,5 +135,8 @@ in

    home.sessionVariables.fish_greeting = "";

+    programs.starship.enableFishIntegration = true;
+    programs.zoxide.enableFishIntegration = true;
+    programs.fzf.enableFishIntegration = true;
  };
 }
@@ -1,4 +1,4 @@
 set vimfile (fzf)
 and set vimfile (echo $vimfile | tr -d '\r')
-and commandline -r "vim \"$vimfile\""
+and commandline -r "vim $vimfile"
 and commandline -f execute
@@ -0,0 +1,22 @@
+bind -M insert \co edit
+bind -M default \co edit
+bind -M insert \cs search-and-edit
+bind -M default \cs search-and-edit
+bind -M insert \ca 'cd ~; and edit; and commandline -a "; cd -"; commandline -f execute'
+bind -M default \ca 'cd ~; and edit; and commandline -a "; cd -"; commandline -f execute'
+bind -M insert \ce recent
+bind -M default \ce recent
+bind -M default \cg commandline-git-commits
+bind -M insert \cg 'commandline -i (git rev-parse --show-toplevel 2>/dev/null || echo ".")'
+bind -M insert \cf fcd
+bind -M default \cf fcd
+bind -M insert \cp projects
+bind -M default \cp projects
+bind -M insert \x1F accept-autosuggestion
+bind -M default \x1F accept-autosuggestion
+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'
@@ -0,0 +1,122 @@
+#!/usr/local/bin/fish
+
+function fish_vi_cursor -d 'Set cursor shape for different vi modes'
+    # If we're not interactive, there is effectively no bind mode.
+    if not status is-interactive
+        return
+    end
+
+    # This is hard to test in expect, since the exact sequences depend on the environment.
+    # Instead disable it.
+    if set -q FISH_UNIT_TESTS_RUNNING
+        return
+    end
+
+    # If this variable is set, skip all checks
+    if not set -q fish_vi_force_cursor
+
+        # Emacs Makes All Cursors Suck
+        if set -q INSIDE_EMACS
+            return
+        end
+
+        # vte-based terms set $TERM = xterm*, but only gained support in 2015.
+        # From https://bugzilla.gnome.org/show_bug.cgi?id=720821, it appears it was version 0.40.0
+        if set -q VTE_VERSION
+            and test "$VTE_VERSION" -lt 4000 2>/dev/null
+            return
+        end
+
+        # Similarly, genuine XTerm can do it since v280.
+        if set -q XTERM_VERSION
+            and not test (string replace -r "XTerm\((\d+)\)" '$1' -- "$XTERM_VERSION") -ge 280 2>/dev/null
+            return
+        end
+
+        # We need one of these terms.
+        # It would be lovely if we could rely on terminfo, but:
+        # - The "Ss" entry isn't a thing in macOS' old and crusty terminfo
+        # - It is set for xterm, and everyone and their dog claims to be xterm
+        #
+        # So we just don't care about $TERM, unless it is one of the few terminals that actually have their own entry.
+        #
+        # Note: Previous versions also checked $TMUX, and made sure that then $TERM was screen* or tmux*.
+        # We don't care, since we *cannot* handle term-in-a-terms 100% correctly.
+        if not set -q KONSOLE_PROFILE_NAME
+            and not test -n "$KONSOLE_VERSION" -a "$KONSOLE_VERSION" -ge 200400 # konsole, but new.
+            and not set -q ITERM_PROFILE
+            and not set -q VTE_VERSION # which version is already checked above
+            and not set -q WT_PROFILE_ID
+            and not set -q XTERM_VERSION
+            and not string match -rq '^st(-.*)$' -- $TERM
+            and not string match -q 'xterm-kitty*' -- $TERM
+            and not string match -q 'rxvt*' -- $TERM
+            and not string match -q 'alacritty*' -- $TERM
+            return
+        end
+
+        # HACK: Explicitly disable on ITERM because of #3696, which is weirdness with multi-line prompts.
+        # --force-iterm is now deprecated; set $fish_vi_force_cursor instead
+        if contains -- $argv[1] --force-iterm
+            set -e argv[1]
+        else if set -q ITERM_PROFILE
+            return
+        end
+    end
+
+    set -l terminal $argv[1]
+    set -q terminal[1]
+    or set terminal auto
+
+    set -l function
+    switch "$terminal"
+        case auto
+            # Nowadays, konsole does not set $KONSOLE_PROFILE_NAME anymore,
+            # and it uses the xterm sequences.
+            if set -q KONSOLE_PROFILE_NAME
+                set function __fish_cursor_konsole
+            else if set -q ITERM_PROFILE
+                set function __fish_cursor_1337
+            else
+                set function __fish_cursor_xterm
+            end
+        case konsole
+            set function __fish_cursor_konsole
+        case xterm
+            set function __fish_cursor_xterm
+    end
+
+    set -l tmux_prefix
+    set -l tmux_postfix
+    if set -q TMUX
+        set tmux_prefix echo -ne "'\ePtmux;\e'"
+        set tmux_postfix echo -ne "'\e\\\\'"
+    end
+
+    set -q fish_cursor_unknown
+    or set -g fish_cursor_unknown block blink
+
+    echo "
+          function fish_vi_cursor_handle --on-variable fish_bind_mode --on-event fish_postexec --on-event fish_focus_in
+              set -l varname fish_cursor_\$fish_bind_mode
+              if not set -q \$varname
+                set varname fish_cursor_unknown
+              end
+              $tmux_prefix
+              $function \$\$varname
+              $tmux_postfix
+          end
+         " | source
+
+    echo "
+          function fish_vi_cursor_handle_preexec --on-event fish_preexec
+              set -l varname fish_cursor_default
+              if not set -q \$varname
+                set varname fish_cursor_unknown
+              end
+              $tmux_prefix
+              $function \$\$varname
+              $tmux_postfix
+          end
+         " | source
+end