mail and username config

more adjustments
more tweaks to overlays
2025-07-12 10:20:14 +00:00 · 2025-02-16 10:48:31 -05:00 · 2025-02-15 20:26:14 -05:00 · 2025-02-15 13:59:17 -05:00 · 2025-02-14 15:36:54 -05:00 · 2025-02-08 20:14:54 -05:00
385 changed files with 9018 additions and 7402 deletions
--- a/apps/default.nix
+++ b/apps/default.nix
@ -25,9 +25,6 @@ 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;
--- a/apps/format-root.nix
+++ b/apps/format-root.nix
@ -5,37 +5,5 @@

  type = "app";

-  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}"
-
-    ''
-  );
+  program = pkgs.lib.getExe pkgs.format-root;
 }
--- a/apps/help.nix
+++ b/apps/help.nix
@ -17,7 +17,6 @@
          '  • {{ 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 ""
    ''
--- a/apps/loadkey.nix
+++ b/apps/loadkey.nix
@ -1,15 +1,9 @@
 { pkgs, ... }:
 {

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

-  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"
-    ''
-  );
+  program = "${pkgs.loadkey}/bin/loadkey";
 }
--- a/apps/netdata-cloud.nix
+++ b/apps/netdata-cloud.nix
@ -1,21 +0,0 @@
-{ 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"
-    ''
-  );
-}
--- a/disks/zfs.nix
+++ b/disks/zfs.nix
@ -1,98 +0,0 @@
-{ 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";
-        # };
-      };
-    };
-  };
-}
--- a/flake.lock
+++ b/flake.lock
@ -51,11 +51,11 @@
    },
    "cl-nix-lite": {
      "locked": {
-        "lastModified": 1717972076,
-        "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
+        "lastModified": 1728174978,
+        "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=",
        "owner": "hraban",
        "repo": "cl-nix-lite",
-        "rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
+        "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87",
        "type": "github"
      },
      "original": {
@ -67,11 +67,11 @@
    "cmp-nvim-lsp-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1715931395,
-        "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=",
+        "lastModified": 1733823748,
+        "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=",
        "owner": "hrsh7th",
        "repo": "cmp-nvim-lsp",
-        "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d",
+        "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
        "type": "github"
      },
      "original": {
@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731032247,
-        "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=",
+        "lastModified": 1737162735,
+        "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632",
+        "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08",
        "type": "github"
      },
      "original": {
@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731060864,
-        "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
+        "lastModified": 1737038063,
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
        "type": "github"
      },
      "original": {
@ -138,34 +138,14 @@
        "type": "github"
      }
    },
-    "firefox-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731113649,
-        "narHash": "sha256-U6FMghMpHTk2Pb5VsjNk8tBgCiiyB+bebmfOuNtMisA=",
-        "owner": "bandithedoge",
-        "repo": "nixpkgs-firefox-darwin",
-        "rev": "22a53e2cae4d37fb24e9326c6f72a54cb4f269d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "bandithedoge",
-        "repo": "nixpkgs-firefox-darwin",
-        "type": "github"
-      }
-    },
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1697816753,
-        "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
+        "lastModified": 1730663653,
+        "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=",
        "owner": "hraban",
        "repo": "flake-compat",
-        "rev": "6025bade1336a36014639bc3f67eacc853dab78f",
+        "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e",
        "type": "github"
      },
      "original": {
@ -178,11 +158,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@ -191,16 +171,40 @@
        "type": "github"
      }
    },
-    "flake-utils": {
+    "flake-parts": {
      "inputs": {
-        "systems": "systems"
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "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"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -226,40 +230,6 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "gh-collaborators": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717117275,
-        "narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
-        "owner": "katiem0",
-        "repo": "gh-collaborators",
-        "rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "katiem0",
-        "repo": "gh-collaborators",
-        "type": "github"
-      }
-    },
    "hmts-nvim-src": {
      "flake": false,
      "locked": {
@ -283,11 +253,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730837930,
-        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+        "lastModified": 1737120639,
+        "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+        "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
        "type": "github"
      },
      "original": {
@ -304,14 +274,15 @@
        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1727470707,
-        "narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
+        "lastModified": 1732920695,
+        "narHash": "sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE=",
        "owner": "hraban",
        "repo": "mac-app-util",
-        "rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
+        "rev": "548672d0cb661ce11d08ee8bde92b87d2a75c872",
        "type": "github"
      },
      "original": {
@ -362,7 +333,7 @@
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1731123727,
+        "lastModified": 1737171597,
        "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
        "type": "tarball",
        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
@ -380,11 +351,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729103549,
-        "narHash": "sha256-9caCn1wB0bD39bwwjnTsHoDveCUKs06nBe212fs5TKU=",
+        "lastModified": 1732820845,
+        "narHash": "sha256-YPXk41l4PzKb5rtcxkYhymwjHJG95fxl4iXIzXnftr8=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "b3900e6d79233573f318006505d9ad3fb7170b92",
+        "rev": "e2c511ea553418dd432005875c649b09d56b7e58",
        "type": "github"
      },
      "original": {
@ -395,11 +366,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1729386149,
-        "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
+        "lastModified": 1736643958,
+        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
+        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
        "type": "github"
      },
      "original": {
@ -416,11 +387,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729472750,
-        "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
+        "lastModified": 1737057290,
+        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
+        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
        "type": "github"
      },
      "original": {
@ -431,11 +402,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
        "type": "github"
      },
      "original": {
@ -445,29 +416,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-caddy": {
-      "locked": {
-        "lastModified": 1699107987,
-        "narHash": "sha256-nWXETr4Oqy/vOfzgWyMY04qzEN2iREFJc5ycQ3XNu0A=",
-        "owner": "jpds",
-        "repo": "nixpkgs",
-        "rev": "a33b02fa9d664f31dadc8a874eb1a5dbaa9f4ecf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jpds",
-        "ref": "caddy-external-plugins",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1730883749,
-        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
        "type": "github"
      },
      "original": {
@ -477,29 +432,20 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
      "locked": {
-        "lastModified": 1731119600,
-        "narHash": "sha256-Asx9nXJBdRN4AvuA8+etlQWY8PrqrXXvPb1uNFveV8k=",
+        "lastModified": 1737170882,
+        "narHash": "sha256-Km700i1Eg72bFsU2X2ZgH4qEgx6SrdZFJURJGTSQH2M=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "b29499982ee565c8dab5ca5c7be8d2ebfc267d87",
+        "rev": "62cdd681201843553ec740a85ccf2f0a6fca75c6",
        "type": "github"
      },
      "original": {
@ -511,11 +457,11 @@
    "nvim-lint-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1730367889,
-        "narHash": "sha256-vLsyRc8nbJJBjWebNFy5yrS6w2TmibEeMNpyzFenoTg=",
+        "lastModified": 1736154173,
+        "narHash": "sha256-OChCLXHAqa129NiGfmwddq0Hj5F9AtC3TmFbnNCZqfo=",
        "owner": "mfussenegger",
        "repo": "nvim-lint",
-        "rev": "36da8dd0ddc4f88e0beae234c20e75397326f143",
+        "rev": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44",
        "type": "github"
      },
      "original": {
@ -544,11 +490,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1731122044,
-        "narHash": "sha256-pf4S8iMtgCJU8jOMxqr0oItO0htBGafGglKnEU1neus=",
+        "lastModified": 1737156486,
+        "narHash": "sha256-b8YOOIYML9aKy4Y7S+iLKIaTfCqrxK1wB/ZaeFRCUmo=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "3fc8de198c15ec4e5395f57b70579b3959976960",
+        "rev": "fca0b67c0b5a31727fb33addc4d9c100736a2894",
        "type": "github"
      },
      "original": {
@ -574,38 +520,6 @@
        "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",
@ -615,8 +529,6 @@
        "darwin": "darwin",
        "disko": "disko",
        "fidget-nvim-src": "fidget-nvim-src",
-        "firefox-darwin": "firefox-darwin",
-        "gh-collaborators": "gh-collaborators",
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
        "mac-app-util": "mac-app-util",
@ -627,15 +539,12 @@
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
-        "nixpkgs-caddy": "nixpkgs-caddy",
        "nixpkgs-stable": "nixpkgs-stable",
        "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",
-        "ren": "ren",
-        "rep": "rep",
        "snipe-nvim-src": "snipe-nvim-src",
        "telescope-nvim-src": "telescope-nvim-src",
        "telescope-project-nvim-src": "telescope-project-nvim-src",
@ -648,7 +557,6 @@
        "tree-sitter-python": "tree-sitter-python",
        "tree-sitter-rasi": "tree-sitter-rasi",
        "tree-sitter-vimdoc": "tree-sitter-vimdoc",
-        "ucodenix": "ucodenix",
        "wallpapers": "wallpapers",
        "wsl": "wsl",
        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
@ -657,11 +565,11 @@
    "snipe-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1730493972,
-        "narHash": "sha256-9Q/ZbhtteS9SemQJ/3Nov1rshQgm1Beiw88/zgmJbRg=",
+        "lastModified": 1736108869,
+        "narHash": "sha256-sJ71eiE0XmMJkhNCkbY82R4eHzBOOKFrPa+nxLc1f8s=",
        "owner": "leath-dub",
        "repo": "snipe.nvim",
-        "rev": "64b3763c1b388ac5a3d5a2da615a3d0824af4a45",
+        "rev": "0d0a482ac713370196e4fc0025d5aaac5030104d",
        "type": "github"
      },
      "original": {
@ -672,16 +580,16 @@
    },
    "systems": {
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347925,
+        "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=",
        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-darwin",
+        "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-darwin",
        "type": "github"
      }
    },
@ -700,21 +608,6 @@
        "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": {
@ -735,11 +628,11 @@
    "telescope-project-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1725880250,
-        "narHash": "sha256-wO/cm5PT1L0hFr/CX466w0UimoFg/tWrDK8T0QeKZMU=",
+        "lastModified": 1733083023,
+        "narHash": "sha256-qEORRWYKBpK7fn7se8g+5uuVBJNu0T4JHSc0C2QzNDY=",
        "owner": "nvim-telescope",
        "repo": "telescope-project.nvim",
-        "rev": "796200876bb0fe8157b8eb1ce03d927d3827a052",
+        "rev": "1d7920e799fc5001dffc7bd10909a86e0358eaf4",
        "type": "github"
      },
      "original": {
@ -751,11 +644,11 @@
    "tiny-inline-diagnostic-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1731028203,
-        "narHash": "sha256-A4v8pZuzuH/MSWYF7Hg7ZQo2HNLqlE7dZMhylPEpTdM=",
+        "lastModified": 1736959343,
+        "narHash": "sha256-11+Z54shcy5oRevfTOu3dt5DtXhnYaH9zvktH6Lvxjs=",
        "owner": "rachartier",
        "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "86050f39a62de48734f1a2876d70d179b75deb7c",
+        "rev": "aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8",
        "type": "github"
      },
      "original": {
@ -784,11 +677,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1728963142,
-        "narHash": "sha256-h6L5eIItu3IOJBKSZCajHMhhencN1Fk/4dXgBMuVxYc=",
+        "lastModified": 1731338420,
+        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "597a5ed6ed4d932fd44697feec988f977081ae59",
+        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
        "type": "github"
      },
      "original": {
@ -834,11 +727,11 @@
    "tree-sitter-puppet": {
      "flake": false,
      "locked": {
-        "lastModified": 1713617121,
-        "narHash": "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI=",
+        "lastModified": 1734835631,
+        "narHash": "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=",
        "owner": "amaanq",
        "repo": "tree-sitter-puppet",
-        "rev": "584522f32495d648b18a53ccb52d988e60de127d",
+        "rev": "15f192929b7d317f5914de2b4accd37b349182a6",
        "type": "github"
      },
      "original": {
@ -850,11 +743,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1728966077,
-        "narHash": "sha256-pD4JedYrnz6d5pgzRPtKPY0XPRoot1FMI9XgTgONOyw=",
+        "lastModified": 1736288149,
+        "narHash": "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "7f4b9c2d8039701b0579b7c060a918f8548aa7cd",
+        "rev": "409b5d671eb0ea4972eeacaaca24bbec1acf79b1",
        "type": "github"
      },
      "original": {
@ -896,21 +789,24 @@
        "type": "github"
      }
    },
-    "ucodenix": {
+    "treefmt-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1731337052,
-        "narHash": "sha256-/wKkjAHHmaov6VWW7POdL+dUWtAWA9Zs6Ys/r7ugy00=",
-        "owner": "e-tho",
-        "repo": "ucodenix",
-        "rev": "5d8df57d4258d225dc9f5c2c4bb96855842cbac2",
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
        "type": "github"
      },
      "original": {
-        "owner": "e-tho",
-        "repo": "ucodenix",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
        "type": "github"
      }
    },
@ -933,17 +829,16 @@
    "wsl": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1730453870,
-        "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
+        "lastModified": 1736095716,
+        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "adb6bc4b661a43328752b4575be4968a4990c033",
+        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,5 +1,5 @@
 {
-  description = "My system";
+  description = "An opinionated flake containing the NixOS, nix-darwin, and home-manager configurations for multiple systems.";

  # Other flakes that we want to pull from
  inputs = {
@ -10,9 +10,6 @@
    # 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 = {
      url = "github:lnl7/nix-darwin/master";
@ -31,18 +28,18 @@
      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
    };

-    # Used for AMD CPU microcode
-    ucodenix.url = "github:e-tho/ucodenix";
-
    # Community packages; used for Firefox extensions
-    nur.url = "github:nix-community/nur";
-
-    # Use official Firefox binary for macOS
-    firefox-darwin = {
-      url = "github:bandithedoge/nixpkgs-firefox-darwin";
+    nur = {
+      url = "github:nix-community/nur";
      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";
@ -178,20 +175,12 @@
      flake = false;
    };

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

    # Nextcloud Apps
    nextcloud-news = {
@ -239,6 +228,7 @@
          dotfilesRepo = "https://github.com/nmasur/dotfiles";
          hostnames = {
            audiobooks = "read.${baseName}";
+            budget = "money.${baseName}";
            files = "files.${baseName}";
            git = "git.${baseName}";
            influxdb = "influxdb.${baseName}";
@ -249,6 +239,7 @@
            notifications = "ntfy.${baseName}";
            prometheus = "prom.${baseName}";
            paperless = "paper.${baseName}";
+            photos = "photos.${baseName}";
            secrets = "vault.${baseName}";
            stream = "stream.${baseName}";
            content = "cloud.${baseName}";
@ -261,16 +252,13 @@

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

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

      # 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 = {
-        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; };
-      };
+      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;
+      # };

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

      # For quickly applying home-manager settings with:
      # home-manager switch --flake .#tempest
-      homeConfigurations = {
+      homeConfigurations = rec {
+        default = personal;
+        work = buildHome {
+          pkgs = pkgsBySystem.aarch64-darwin;
+          modules = { };
+        };
+        personal = buildHome {
+        };
        tempest = nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
        lookingglass = darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
      };
@ -341,19 +398,11 @@
          x86_64-linux.arrow = inputs.nixos-generators.nixosGenerate rec {
            system = "x86_64-linux";
            format = "iso";
-            specialArgs = {
-              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
-              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-stable = import inputs.nixpkgs-stable { inherit system; };
-              pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
-            };
            modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
              (
                { ... }:
--- a/hosts/aarch64-darwin/default.nix
+++ b/hosts/aarch64-darwin/default.nix
@ -0,0 +1,16 @@
+# 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)
+]
--- a/hosts/aarch64-darwin/lookingglass/default.nix
+++ b/hosts/aarch64-darwin/lookingglass/default.nix
@ -26,7 +26,8 @@ inputs.darwin.lib.darwinSystem {
    inputs.mac-app-util.darwinModules.default
    {
      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
-      networking.hostName = "lookingglass";
+      networking.hostName = "NYCM-NMASUR2";
+      networking.computerName = "NYCM-NMASUR2";
      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
      gui.enable = true;
      theme = {
--- a/hosts/aarch64-linux/default.nix
+++ b/hosts/aarch64-linux/default.nix
@ -0,0 +1,20 @@
+# 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)
+]
--- a/hosts/default.nix
+++ b/hosts/default.nix
@ -0,0 +1,6 @@
+# Return a list of all hosts
+
+{
+  darwin-hosts = import ./aarch64-darwin;
+  linux-hosts = import ./x86_64-linux // import ./aarch64-linux;
+}
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -1,44 +1,32 @@
 # 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.

-{
-  inputs,
-  globals,
-  overlays,
-  ...
-}:
-
-inputs.nixpkgs.lib.nixosSystem rec {
-  system = "aarch64-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
-    ../../modules/common
-    ../../modules/nixos
-    {
-      nixpkgs.overlays = overlays;
-
+rec {
  # Hardware
-      server = true;
  networking.hostName = "flame";

-      # 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"
-      ];
+  nmasur.settings = {
+    username = "noah";
+    fullName = "Noah Masur";
+  };
+
+  nmasur.profiles = {
+    base.enable = true;
+    server.enable = true;
+    communications.enable = true;
+  };
+
+  home-manager.users."noah" = {
+    nmasur.settings = nmasur.settings;
+    nmasur.profiles = {
+      common.enable = true;
+      linux-base.enable = true;
+    };
+  };

  # File systems must be declared in order to boot

@ -55,84 +43,12 @@ inputs.nixpkgs.lib.nixosSystem rec {
    fsType = "vfat";
  };

-      # 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
-      services.n8n.enable = true;
-      services.ntfy-sh.enable = true;
-      services.uptime-kuma.enable = true;
-      system.autoUpgrade.enable = true;
-
  # Allows private remote access over the internet
-      cloudflareTunnel = {
-        enable = true;
+  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";
    };
-
-      # 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;
-    }
-  ];
 }
--- a/hosts/x86_64-linux/arrow/aws/ec2.tf
+++ b/hosts/x86_64-linux/arrow/aws/ec2.tf
--- a/hosts/x86_64-linux/arrow/aws/image.tf
+++ b/hosts/x86_64-linux/arrow/aws/image.tf
--- a/hosts/x86_64-linux/arrow/aws/main.tf
+++ b/hosts/x86_64-linux/arrow/aws/main.tf
--- a/hosts/x86_64-linux/arrow/aws/outputs.tf
+++ b/hosts/x86_64-linux/arrow/aws/outputs.tf
--- a/hosts/x86_64-linux/arrow/aws/variables.tf
+++ b/hosts/x86_64-linux/arrow/aws/variables.tf
--- a/hosts/x86_64-linux/arrow/default.nix
+++ b/hosts/x86_64-linux/arrow/default.nix
--- a/hosts/x86_64-linux/arrow/modules.nix
+++ b/hosts/x86_64-linux/arrow/modules.nix
--- a/hosts/x86_64-linux/arrow/vultr/main.tf
+++ b/hosts/x86_64-linux/arrow/vultr/main.tf
--- a/hosts/x86_64-linux/default.nix
+++ b/hosts/x86_64-linux/default.nix
@ -0,0 +1,20 @@
+# 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)
+]
--- a/hosts/x86_64-linux/hydra/default.nix
+++ b/hosts/x86_64-linux/hydra/default.nix
--- a/hosts/x86_64-linux/staff/default.nix
+++ b/hosts/x86_64-linux/staff/default.nix
--- a/hosts/x86_64-linux/swan/default.nix
+++ b/hosts/x86_64-linux/swan/default.nix
@ -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
@ -109,6 +105,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
      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;
@ -133,6 +130,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
        endpoint = "s3.us-west-002.backblazeb2.com";
        bucket = "noahmasur-backup";
        accessKeyId = "0026b0e73b2e2c80000000005";
+        resticBucket = "noahmasur-restic";
      };

      # Disable passwords, only use SSH key
--- a/hosts/x86_64-linux/tempest/default.nix
+++ b/hosts/x86_64-linux/tempest/default.nix
@ -17,7 +17,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
  modules = [
    globals
    inputs.home-manager.nixosModules.home-manager
-    inputs.ucodenix.nixosModules.default
    ../../modules/common
    ../../modules/nixos
    {
@ -42,6 +41,12 @@ 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;

@ -50,7 +55,6 @@ inputs.nixpkgs.lib.nixosSystem rec {

      # Allow firmware updates
      hardware.cpu.amd.updateMicrocode = true;
-      services.ucodenix.enable = true;

      # Helps reduce GPU fan noise under idle loads
      hardware.fancontrol.enable = true;
--- a/modules/aws/default.nix
+++ b/modules/aws/default.nix
@ -1,9 +0,0 @@
-{ ... }:
-{
-  # 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;
-}
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@ -1,41 +0,0 @@
-{
-  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 = [
-        pkgs._1password-cli
-      ] ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]);
-    };
-
-    # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app
-    # On Mac, does not apply: https://1password.community/discussion/142794/app-and-browser-integration
-    # However, the button doesn't work either:
-    # https://1password.community/discussion/140735/extending-support-for-trusted-web-browsers
-    environment.etc."1password/custom_allowed_browsers".text = ''
-      ${
-        config.home-manager.users.${config.user}.programs.firefox.package
-      }/Applications/Firefox.app/Contents/MacOS/firefox
-      firefox
-    '';
-  };
-}
--- a/modules/common/applications/alacritty.nix
+++ b/modules/common/applications/alacritty.nix
@ -1,107 +0,0 @@
-{
-  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;
-        };
-      };
-    };
-  };
-}
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@ -1,17 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./1password.nix
-    ./alacritty.nix
-    ./discord.nix
-    ./firefox.nix
-    ./kitty.nix
-    ./media.nix
-    ./obsidian.nix
-    ./qbittorrent.nix
-    ./slack.nix
-    ./wezterm.nix
-    ./yt-dlp.nix
-  ];
-}
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@ -1,34 +0,0 @@
-{
-  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
-        }
-      '';
-    };
-  };
-}
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -1,203 +0,0 @@
-{
-  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
-            "browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
-            "browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
-          };
-          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 = "";
-        };
-      };
-
-      # Mimic nixpkgs package environment for read-only profiles.ini management
-      # From: https://github.com/booxter/home-manager/commit/dd1602e306fec366280f5953c5e1b553e3d9672a
-      home.sessionVariables = {
-        MOZ_LEGACY_PROFILES = 1;
-        MOZ_ALLOW_DOWNGRADE = 1;
-      };
-
-      # launchd.user.envVariables = config.home-manager.users.${config.user}.home.sessionVariables;
-
-      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"
-            ''
-          )
-        }";
-      };
-    };
-  };
-}
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -1,118 +0,0 @@
-{
-  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.interactiveShellInit = # fish
-        ''
-          if test "$TERM" = "xterm-kitty"
-              alias icat="kitty +kitten icat"
-              alias ssh="kitty +kitten ssh"
-          end
-        '';
-
-      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;
-        };
-      };
-    };
-  };
-}
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@ -1,67 +0,0 @@
-{
-  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" ];
-        };
-      };
-    };
-  };
-}
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@ -1,28 +0,0 @@
-{
-  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" ];
-  };
-}
--- a/modules/common/applications/qbittorrent.nix
+++ b/modules/common/applications/qbittorrent.nix
@ -1,25 +0,0 @@
-{
-  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 ];
-    };
-  };
-}
--- a/modules/common/applications/slack.nix
+++ b/modules/common/applications/slack.nix
@ -1,24 +0,0 @@
-{
-  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 ];
-    };
-  };
-}
--- a/modules/common/applications/wezterm.nix
+++ b/modules/common/applications/wezterm.nix
@ -1,238 +0,0 @@
-{
-  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"},
-
-                -- Fix color blocks instead of text
-                front_end = "WebGpu",
-
-                -- 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 = ${if pkgs.stdenv.isDarwin then "'SUPER'" else "'ALT'"},
-                    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),
-                  },
-                },
-            }
-          '';
-        };
-      };
-    };
-}
--- a/modules/common/applications/yt-dlp.nix
+++ b/modules/common/applications/yt-dlp.nix
@ -1,38 +0,0 @@
-{
-  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";
-    };
-  };
-}
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -16,140 +16,135 @@
  ];

  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";
-    };
-    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 = {
-      audiobooks = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for audiobook server (Audiobookshelf).";
-      };
-      files = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for files server (Filebrowser).";
-      };
-      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.";
-      };
-      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";
+    # };
+    # 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).";
+    #   };
+    # };
  };

  config =
@ -158,25 +153,13 @@
    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;
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -1,220 +0,0 @@
-{
-  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";
-      };
-    };
-  };
-}
--- a/modules/common/mail/default.nix
+++ b/modules/common/mail/default.nix
@ -1,139 +0,0 @@
-{
-  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;
-              };
-            };
-        };
-      };
-    };
-  };
-}
--- a/modules/common/mail/himalaya.nix
+++ b/modules/common/mail/himalaya.nix
@ -1,26 +0,0 @@
-{ 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";
-      };
-    };
-  };
-}
--- a/modules/common/mail/system.nix
+++ b/modules/common/mail/system.nix
@ -1,35 +0,0 @@
-{
-  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;
-          };
-        };
-    };
-  };
-}
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -1,67 +0,0 @@
-{
-  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 && config.gui.enable) {
-          name = "Neovim wrapper";
-          exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} nvim %F";
-          mimeType = [
-            "text/plain"
-            "text/markdown"
-          ];
-        };
-        xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
-          "text/plain" = [ "nvim.desktop" ];
-          "text/markdown" = [ "nvim.desktop" ];
-        };
-      };
-  };
-}
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@ -1,12 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./haskell.nix
-    ./kubernetes.nix
-    ./lua.nix
-    ./python.nix
-    ./rust.nix
-    ./terraform.nix
-  ];
-}
--- a/modules/common/programming/kubernetes.nix
+++ b/modules/common/programming/kubernetes.nix
@ -1,164 +0,0 @@
-{
-  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";
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/common/programming/lua.nix
+++ b/modules/common/programming/lua.nix
@ -1,17 +0,0 @@
-{
-  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
-    ];
-  };
-}
--- a/modules/common/programming/python.nix
+++ b/modules/common/programming/python.nix
@ -1,27 +0,0 @@
-{
-  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";
-      };
-    };
-  };
-}
--- a/modules/common/programming/rust.nix
+++ b/modules/common/programming/rust.nix
@ -1,27 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.rust.enable = lib.mkEnableOption "Rust programming language.";
-
-  config = lib.mkIf config.rust.enable {
-
-    home-manager.users.${config.user} = {
-
-      programs.fish.shellAbbrs = {
-        ca = "cargo";
-      };
-
-      home.packages = with pkgs; [
-        cargo
-        rustc
-        clippy
-        gcc
-      ];
-    };
-  };
-}
--- a/modules/common/programming/terraform.nix
+++ b/modules/common/programming/terraform.nix
@ -1,26 +0,0 @@
-{
-  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
-      ];
-    };
-  };
-}
--- a/modules/common/repositories/default.nix
+++ b/modules/common/repositories/default.nix
@ -1,8 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./dotfiles.nix
-    ./notes.nix
-  ];
-}
--- a/modules/common/repositories/dotfiles.nix
+++ b/modules/common/repositories/dotfiles.nix
@ -1,33 +0,0 @@
-{
-  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;
-    };
-  };
-}
--- a/modules/common/repositories/notes.nix
+++ b/modules/common/repositories/notes.nix
@ -1,36 +0,0 @@
-{
-  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";
-      };
-    };
-  };
-}
--- a/modules/common/shell/atuin.nix
+++ b/modules/common/shell/atuin.nix
@ -1,39 +0,0 @@
-{ config, lib, ... }:
-{
-
-  # Shell history sync
-
-  options.atuin.enable = lib.mkEnableOption "Atuin";
-
-  config = {
-
-    home-manager.users.${config.user} = lib.mkIf config.atuin.enable {
-
-      programs.atuin = {
-        enable = true;
-        flags = [
-          "--disable-up-arrow"
-          "--disable-ctrl-r"
-        ];
-        settings = {
-          auto_sync = true;
-          update_check = false;
-          sync_address = "https://api.atuin.sh";
-          search_mode = "fuzzy";
-          filter_mode = "host"; # global, host, session, directory
-          search_mode_shell_up_key_binding = "fuzzy";
-          filter_mode_shell_up_key_binding = "session";
-          style = "compact"; # or auto,full
-          show_help = true;
-          history_filter = [ ];
-          secrets_filter = true;
-          enter_accept = false;
-          keymap_mode = "vim-normal";
-        };
-      };
-    };
-
-    # Give root user the same setup
-    home-manager.users.root.programs.atuin = config.home-manager.users.${config.user}.programs.atuin;
-  };
-}
--- a/modules/common/shell/bash/default.nix
+++ b/modules/common/shell/bash/default.nix
@ -1,24 +0,0 @@
-{
-  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;
-    };
-  };
-}
--- a/modules/common/shell/charm.nix
+++ b/modules/common/shell/charm.nix
@ -1,22 +0,0 @@
-{
-  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
-    ];
-  };
-}
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@ -1,18 +0,0 @@
-{ ... }:
-{
-  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
-  ];
-}
--- a/modules/common/shell/direnv.nix
+++ b/modules/common/shell/direnv.nix
@ -1,36 +0,0 @@
-{ 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
-  '';
-}
--- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish
+++ b/modules/common/shell/fish/functions/fish_user_key_bindings.fish
@ -1,22 +0,0 @@
-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'
--- a/modules/common/shell/fish/functions/fish_vi_cursor.fish
+++ b/modules/common/shell/fish/functions/fish_vi_cursor.fish
@ -1,122 +0,0 @@
-#!/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
--- a/modules/common/shell/fzf.nix
+++ b/modules/common/shell/fzf.nix
@ -1,45 +0,0 @@
-{ config, pkgs, ... }:
-{
-
-  # FZF is a fuzzy-finder for the terminal
-
-  home-manager.users.${config.user} = {
-
-    programs.fzf.enable = true;
-
-    programs.fish = {
-      functions = {
-        projects = {
-          description = "Jump to a project";
-          body = ''
-            set projdir ( \
-                fd \
-                    --search-path $HOME/dev \
-                    --type directory \
-                    --exact-depth 2 \
-                | ${pkgs.proximity-sort}/bin/proximity-sort $PWD \
-                | sed 's/\\/$//' \
-                | fzf --tiebreak=index \
-            )
-            and cd $projdir
-            and commandline -f execute
-          '';
-        };
-      };
-      shellAbbrs = {
-        lsf = "ls -lh | fzf";
-      };
-    };
-
-    # Global fzf configuration
-    home.sessionVariables =
-      let
-        fzfCommand = "fd --type file";
-      in
-      {
-        FZF_DEFAULT_COMMAND = fzfCommand;
-        FZF_CTRL_T_COMMAND = fzfCommand;
-        FZF_DEFAULT_OPTS = "-m --height 50% --border";
-      };
-  };
-}
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@ -1,195 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  home-packages = config.home-manager.users.${config.user}.home.packages;
-in
-{
-
-  options = {
-    gitName = lib.mkOption {
-      type = lib.types.str;
-      description = "Name to use for git commits";
-    };
-    gitEmail = lib.mkOption {
-      type = lib.types.str;
-      description = "Email to use for git commits";
-    };
-  };
-
-  config = {
-
-    home-manager.users.root.programs.git = {
-      enable = true;
-      extraConfig.safe.directory = config.dotfilesPath;
-    };
-
-    home-manager.users.${config.user} = {
-      programs.git = {
-        enable = true;
-        userName = config.gitName;
-        userEmail = config.gitEmail;
-        extraConfig = {
-          core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F";
-          interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
-          pager = {
-            branch = "false";
-          };
-          safe = {
-            directory = config.dotfilesPath;
-          };
-          pull = {
-            ff = "only";
-          };
-          push = {
-            autoSetupRemote = "true";
-          };
-          init = {
-            defaultBranch = "master";
-          };
-          rebase = {
-            autosquash = "true";
-          };
-          gpg = {
-            format = "ssh";
-            ssh.allowedSignersFile = "~/.config/git/allowed-signers";
-          };
-          # commit.gpgsign = true;
-          # tag.gpgsign = true;
-        };
-        ignores = [
-          ".direnv/**"
-          "result"
-        ];
-        includes = [
-          {
-            path = "~/.config/git/personal";
-            condition = "gitdir:~/dev/personal/";
-          }
-        ];
-      };
-
-      # Personal git config
-      # TODO: fix with variables
-      xdg.configFile."git/personal".text = ''
-        [user]
-            name = "${config.fullName}"
-            email = "7386960+nmasur@users.noreply.github.com"
-            signingkey = ~/.ssh/id_ed25519
-        [commit]
-            gpgsign = true
-        [tag]
-            gpgsign = true
-      '';
-
-      xdg.configFile."git/allowed-signers".text = ''
-        7386960+nmasur@users.noreply.github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
-      '';
-
-      programs.fish.shellAbbrs = {
-        g = "git";
-        gs = "git status";
-        gd = "git diff";
-        gds = "git diff --staged";
-        gdp = "git diff HEAD^";
-        ga = "git add";
-        gaa = "git add -A";
-        gac = "git commit -am";
-        gc = "git commit -m";
-        gca = "git commit --amend --no-edit";
-        gcae = "git commit --amend";
-        gu = "git pull";
-        gp = "git push";
-        gl = "git log --graph --decorate --oneline -20";
-        gll = "git log --graph --decorate --oneline";
-        gco = "git checkout";
-        gcom = ''git switch (git symbolic-ref refs/remotes/origin/HEAD | cut -d"/" -f4)'';
-        gcob = "git switch -c";
-        gb = "git branch";
-        gpd = "git push origin -d";
-        gbd = "git branch -d";
-        gbD = "git branch -D";
-        gdd = {
-          position = "anywhere";
-          setCursor = true;
-          expansion = "BRANCH=% git push origin -d $BRANCH and git branch -d $BRANCH";
-        };
-        gr = "git reset";
-        grh = "git reset --hard";
-        gm = "git merge";
-        gcp = "git cherry-pick";
-        cdg = "cd (git rev-parse --show-toplevel)";
-      };
-
-      # Required for fish commands
-      home.packages = with pkgs; [
-        fish
-        fzf
-        bat
-      ];
-
-      programs.fish.functions =
-        lib.mkIf (builtins.elem pkgs.fzf home-packages && builtins.elem pkgs.bat home-packages)
-          {
-            git = {
-              body = builtins.readFile ./fish/functions/git.fish;
-            };
-            git-add-fuzzy = {
-              body = builtins.readFile ./fish/functions/git-add-fuzzy.fish;
-            };
-            git-fuzzy-branch = {
-              argumentNames = "header";
-              body = builtins.readFile ./fish/functions/git-fuzzy-branch.fish;
-            };
-            git-checkout-fuzzy = {
-              body = ''
-                set branch (git-fuzzy-branch "checkout branch...")
-                and git checkout $branch
-              '';
-            };
-            git-delete-fuzzy = {
-              body = ''
-                set branch (git-fuzzy-branch "delete branch...")
-                and git branch -d $branch
-              '';
-            };
-            git-force-delete-fuzzy = {
-              body = ''
-                set branch (git-fuzzy-branch "force delete branch...")
-                and git branch -D $branch
-              '';
-            };
-            git-delete-both = {
-              argumentNames = "branch";
-              body = ''
-                git push origin -d $branch
-                git branch -d $branch
-              '';
-            };
-            git-merge-fuzzy = {
-              body = ''
-                set branch (git-fuzzy-branch "merge from...")
-                and git merge $branch
-              '';
-            };
-            git-show-fuzzy = {
-              body = builtins.readFile ./fish/functions/git-show-fuzzy.fish;
-            };
-            git-commits = {
-              body = builtins.readFile ./fish/functions/git-commits.fish;
-            };
-            git-history = {
-              body = builtins.readFile ./fish/functions/git-history.fish;
-            };
-            uncommitted = {
-              description = "Find uncommitted git repos";
-              body = builtins.readFile ./fish/functions/uncommitted.fish;
-            };
-          };
-    };
-  };
-}
--- a/modules/common/shell/jujutsu.nix
+++ b/modules/common/shell/jujutsu.nix
@ -1,18 +0,0 @@
-{ config, ... }:
-{
-
-  config = {
-
-    home-manager.users.${config.user}.programs.jujutsu = {
-      enable = true;
-
-      # https://github.com/martinvonz/jj/blob/main/docs/config.md
-      settings = {
-        user = {
-          name = config.home-manager.users.${config.user}.programs.git.userName;
-          email = config.home-manager.users.${config.user}.programs.git.userEmail;
-        };
-      };
-    };
-  };
-}
--- a/modules/common/shell/nixpkgs.nix
+++ b/modules/common/shell/nixpkgs.nix
@ -1,132 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  home-manager.users.${config.user} = {
-
-    programs.fish = {
-      shellAbbrs = {
-        n = "nix";
-        ns = "nix-shell -p";
-        nsf = "nix-shell --run fish -p";
-        nsr = "nix-shell-run";
-        nps = "nix repl --expr 'import <nixpkgs>{}'";
-        nixo = "man configuration.nix";
-        nixh = "man home-configuration.nix";
-        nr = "rebuild-nixos";
-        nro = "rebuild-nixos offline";
-        hm = "rebuild-home";
-      };
-      functions = {
-        nix-shell-run = {
-          body = ''
-            set program $argv[1]
-            if test (count $argv) -ge 2
-                commandline -r "nix run nixpkgs#$program -- $argv[2..-1]"
-            else
-                commandline -r "nix run nixpkgs#$program"
-            end
-            commandline -f execute
-          '';
-        };
-        nix-fzf = {
-          body = ''
-            commandline -i (nix-instantiate --eval --json \
-              -E 'builtins.attrNames (import <nixpkgs> {})' \
-              | jq '.[]' -r | fzf)
-            commandline -f repaint
-          '';
-        };
-        rebuild-nixos = {
-          body = ''
-            if test "$argv[1]" = "offline"
-                set option "--option substitute false"
-            end
-            git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "doas nixos-rebuild switch $option --flake ${config.dotfilesPath}#${config.networking.hostName}"
-            commandline --function execute
-          '';
-        };
-        rebuild-home = {
-          body = ''
-            git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
-            commandline --function execute
-          '';
-        };
-      };
-    };
-
-    # Provides "command-not-found" options
-    programs.nix-index = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-
-    # Create nix-index if doesn't exist
-    home.activation.createNixIndex =
-      let
-        cacheDir = "${config.homePath}/.cache/nix-index";
-      in
-      lib.mkIf config.home-manager.users.${config.user}.programs.nix-index.enable (
-        config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
-          if [ ! -d ${cacheDir} ]; then
-              $DRY_RUN_CMD ${pkgs.nix-index}/bin/nix-index -f ${pkgs.path}
-          fi
-        ''
-      );
-
-    # Set automatic generation cleanup for home-manager
-    nix.gc = {
-      automatic = config.nix.gc.automatic;
-      options = config.nix.gc.options;
-    };
-  };
-
-  nix = {
-
-    # Set channel to flake packages, used for nix-shell commands
-    nixPath = [ "nixpkgs=${pkgs.path}" ];
-
-    # Set registry to this flake's packages, used for nix X commands
-    registry.nixpkgs.to = {
-      type = "path";
-      path = builtins.toString pkgs.path;
-    };
-
-    # For security, only allow specific users
-    settings.allowed-users = [
-      "@wheel"
-      config.user
-    ];
-
-    # Enable features in Nix commands
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      warn-dirty = false
-    '';
-
-    gc = {
-      automatic = true;
-      options = "--delete-older-than 10d";
-    };
-
-    settings = {
-
-      # Add community Cachix to binary cache
-      # Don't use with macOS because blocked by corporate firewall
-      builders-use-substitutes = true;
-      substituters = lib.mkIf (!pkgs.stdenv.isDarwin) [ "https://nix-community.cachix.org" ];
-      trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-
-      # Scans and hard links identical files in the store
-      # Not working with macOS: https://github.com/NixOS/nix/issues/7273
-      auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
-    };
-  };
-}
--- a/modules/common/shell/starship.nix
+++ b/modules/common/shell/starship.nix
@ -1,72 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  home-manager.users.${config.user}.programs.starship = {
-    enable = true;
-    settings = {
-      add_newline = false; # Don't print new line at the start of the prompt
-      format = lib.concatStrings [
-        "$directory"
-        "$git_branch"
-        "$git_commit"
-        "$git_status"
-        "$hostname"
-        "$cmd_duration"
-        "$character"
-      ];
-      right_format = "$nix_shell";
-      character = {
-        success_symbol = "[❯](bold green)";
-        error_symbol = "[❯](bold red)";
-        vicmd_symbol = "[❮](bold green)";
-      };
-      cmd_duration = {
-        min_time = 5000;
-        show_notifications = if pkgs.stdenv.isLinux then false else true;
-        min_time_to_notify = 30000;
-        format = "[$duration]($style) ";
-      };
-      directory = {
-        truncate_to_repo = true;
-        truncation_length = 100;
-      };
-      git_branch = {
-        format = "[$symbol$branch]($style)";
-      };
-      git_commit = {
-        format = "( @ [$hash]($style) )";
-        only_detached = false;
-      };
-      git_status = {
-        format = "([$all_status$ahead_behind]($style) )";
-        conflicted = "=";
-        ahead = "⇡";
-        behind = "⇣";
-        diverged = "⇕";
-        untracked = "⋄";
-        stashed = "⩮";
-        modified = "∽";
-        staged = "+";
-        renamed = "»";
-        deleted = "✘";
-        style = "red";
-      };
-      hostname = {
-        ssh_only = true;
-        format = "on [$hostname](bold red) ";
-      };
-      nix_shell = {
-        format = "[$symbol $name]($style)";
-        symbol = "❄️";
-      };
-      python = {
-        format = "[\${version}\\(\${virtualenv}\\)]($style)";
-      };
-    };
-  };
-}
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -1,75 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-
-  ignorePatterns = ''
-    !.env*
-    !.github/
-    !.gitignore
-    !*.tfvars
-    .terraform/
-    .target/
-    /Library/'';
-in
-{
-
-  config = {
-
-    home-manager.users.${config.user} = {
-
-      home.packages = with pkgs; [
-        age # Encryption
-        bc # Calculator
-        delta # Fancy diffs
-        difftastic # Other fancy diffs
-        dig # DNS lookup
-        fd # find
-        htop # Show system processes
-        killall # Force quit
-        inetutils # Includes telnet, whois
-        jless # JSON viewer
-        jo # JSON output
-        jq # JSON manipulation
-        lf # File viewer
-        qrencode # Generate qr codes
-        rsync # Copy folders
-        ren # Rename files
-        # rep # Replace text in files
-        ripgrep # grep
-        sd # sed
-        tealdeer # Cheatsheets
-        tree # View directory hierarchy
-        vimv-rs # Batch rename files
-        unzip # Extract zips
-        dua # File sizes (du)
-        du-dust # Disk usage tree (ncdu)
-        duf # Basic disk information (df)
-      ];
-
-      programs.zoxide.enable = true; # Shortcut jump command
-
-      home.file = {
-        ".rgignore".text = ignorePatterns;
-        ".digrc".text = "+noall +answer"; # Cleaner dig commands
-      };
-
-      xdg.configFile."fd/ignore".text = ignorePatterns;
-
-      programs.bat = {
-        enable = true; # cat replacement
-        config = {
-          theme = config.theme.colors.batTheme;
-          pager = "less -R"; # Don't auto-exit if one screen
-        };
-      };
-
-      programs.fish.functions = {
-        ping = {
-          description = "Improved ping";
-          argumentNames = "target";
-          body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
-        };
-      };
-    };
-  };
-}
--- a/modules/common/shell/work.nix
+++ b/modules/common/shell/work.nix
@ -1,59 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-
-  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
-
-    home.packages =
-      let
-        ldap_scheme = "ldaps";
-        magic_prefix = "take";
-        ldap_port = 3269;
-        jq_parse = pkgs.writeShellScriptBin "ljq" ''
-          jq --slurp \
-            --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
-        '';
-        ldap_script = pkgs.writeShellScriptBin "ldap" ''
-          if ! [ "$LDAP_HOST" ]; then
-              echo "No LDAP_HOST specified!"
-              exit 1
-          fi
-          SEARCH_FILTER="$@"
-          ldapsearch -LLL \
-              -B -o ldif-wrap=no \
-              -E pr=5000/prompt \
-              -H "${ldap_scheme}://''${LDAP_HOST}:${builtins.toString ldap_port}" \
-              -D "${pkgs.lib.toUpper magic_prefix}2\\${pkgs.lib.toLower config.user}" \
-              -w "$(${pkgs._1password-cli}/bin/op item get T2 --fields label=password --reveal)" \
-              -b "dc=''${LDAP_HOST//./,dc=}" \
-              -s "sub" -x "(cn=''${SEARCH_FILTER})" \
-              | ${jq_parse}/bin/ljq
-        '';
-        ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
-          if ! [ "$LDAP_HOST" ]; then
-              echo "No LDAP_HOST specified!"
-              exit 1
-          fi
-          ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
-        '';
-        ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
-          if ! [ "$LDAP_HOST" ]; then
-              echo "No LDAP_HOST specified!"
-              exit 1
-          fi
-          ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
-        '';
-      in
-      [
-        ldap_script
-        ldapm_script
-        ldapg_script
-        jq_parse
-      ];
-  };
-}
--- a/modules/darwin/alacritty.nix
+++ b/modules/darwin/alacritty.nix
@ -1,656 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  # MacOS-specific settings for Alacritty
-  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
-    programs.alacritty.settings = {
-      font.size = lib.mkForce 20.0;
-      shell.program = "${pkgs.fish}/bin/fish";
-      window.startup_mode = "SimpleFullScreen";
-      key_bindings = [
-        {
-          key = "F";
-          mods = "Super";
-          action = "ToggleSimpleFullscreen";
-        }
-        {
-          key = "F";
-          mods = "Control|Shift";
-          action = "SearchForward";
-        }
-        {
-          key = "L";
-          mods = "Super";
-          chars = "\\x1F";
-        }
-        # Some Mac key combinations need to be manually added
-        {
-          key = "Return";
-          mods = "Shift";
-          chars = "\\x1b[13;2u";
-        }
-        {
-          key = "Return";
-          mods = "Control";
-          chars = "\\x1b[13;5u";
-        }
-        {
-          key = "Return";
-          mods = "Control|Shift";
-          chars = "\\x1b[13;6u";
-        }
-
-        {
-          key = "N";
-          mods = "Command";
-          action = "SpawnNewInstance";
-        }
-        {
-          key = "PageUp";
-          action = "ScrollPageUp";
-        }
-        {
-          key = "PageUp";
-          mods = "Alt";
-          chars = "\\x1B[5~";
-        }
-        {
-          key = "PageUp";
-          mods = "Shift";
-          chars = "\\x1B[5~";
-        }
-        {
-          key = "PageDown";
-          action = "ScrollPageDown";
-        }
-        {
-          key = "PageDown";
-          mods = "Alt";
-          chars = "\\x1B[6~";
-        }
-        {
-          key = "PageDown";
-          mods = "Shift";
-          chars = "\\x1B[6~";
-        }
-        {
-          key = "Home";
-          action = "ScrollToTop";
-        }
-        {
-          key = "Home";
-          mods = "Alt";
-          chars = "\\x1BOH";
-        }
-        {
-          key = "Home";
-          mods = "Shift";
-          chars = "\\x1B[H";
-        }
-        {
-          key = "End";
-          action = "ScrollToBottom";
-        }
-        {
-          key = "End";
-          mods = "Alt";
-          chars = "\\x1BOF";
-        }
-        {
-          key = "End";
-          mods = "Shift";
-          chars = "\\x1B[F";
-        }
-        {
-          key = "Tab";
-          mods = "Alt";
-          chars = "\\x1B	";
-        }
-        {
-          key = "Tab";
-          mods = "Alt|Shift";
-          chars = "\\x1Bx1B[Z";
-        }
-        # {
-        #   key = "Back";
-        #   chars = "\\x7F";
-        # }
-        {
-          key = "Back";
-          mods = "Alt";
-          chars = "\\x1Bx7F";
-        }
-        {
-          key = "Back";
-          mods = "Alt|Shift";
-          chars = "\\x1Bx08";
-        }
-        {
-          key = "Space";
-          mods = "Control";
-          chars = "\\x00";
-        }
-        {
-          key = "Space";
-          mods = "Alt";
-          chars = "\\x20";
-        }
-        {
-          key = "Left";
-          mods = "Alt";
-          chars = "\\x1Bb";
-        }
-        {
-          key = "Left";
-          mods = "Alt|Shift";
-          chars = "\\x1Bx1B[D";
-        }
-        {
-          key = "Right";
-          mods = "Alt";
-          chars = "\\x1Bf";
-        }
-        {
-          key = "Right";
-          mods = "Alt|Shift";
-          chars = "\\x1Bx1B[C";
-        }
-        {
-          key = "Down";
-          mods = "Alt";
-          chars = "\\x1Bx1B[B";
-        }
-        {
-          key = "Down";
-          mods = "Alt|Shift";
-          chars = "\\x1Bx1B[B";
-        }
-        {
-          key = "Up";
-          mods = "Alt";
-          chars = "\\x1Bx1B[A";
-        }
-        {
-          key = "Up";
-          mods = "Alt|Shift";
-          chars = "\\x1Bx1B[A";
-        }
-        {
-          key = "A";
-          mods = "Alt";
-          chars = "\\x1Ba";
-        }
-        {
-          key = "A";
-          mods = "Alt|Shift";
-          chars = "\\x1BA";
-        }
-        {
-          key = "B";
-          mods = "Alt";
-          chars = "\\x1Bb";
-        }
-        {
-          key = "B";
-          mods = "Alt|Shift";
-          chars = "\\x1BB";
-        }
-        {
-          key = "C";
-          mods = "Alt";
-          chars = "\\x1Bc";
-        }
-        {
-          key = "C";
-          mods = "Alt|Shift";
-          chars = "\\x1BC";
-        }
-        {
-          key = "D";
-          mods = "Alt";
-          chars = "\\x1Bd";
-        }
-        {
-          key = "D";
-          mods = "Alt|Shift";
-          chars = "\\x1BD";
-        }
-        {
-          key = "E";
-          mods = "Alt";
-          chars = "\\x1Be";
-        }
-        {
-          key = "E";
-          mods = "Alt|Shift";
-          chars = "\\x1BE";
-        }
-        {
-          key = "F";
-          mods = "Alt";
-          chars = "\\x1Bf";
-        }
-        {
-          key = "F";
-          mods = "Alt|Shift";
-          chars = "\\x1BF";
-        }
-        {
-          key = "G";
-          mods = "Alt";
-          chars = "\\x1Bg";
-        }
-        {
-          key = "G";
-          mods = "Alt|Shift";
-          chars = "\\x1BG";
-        }
-        {
-          key = "H";
-          mods = "Alt";
-          chars = "\\x1Bh";
-        }
-        {
-          key = "H";
-          mods = "Alt|Shift";
-          chars = "\\x1BH";
-        }
-        {
-          key = "I";
-          mods = "Alt";
-          chars = "\\x1Bi";
-        }
-        {
-          key = "I";
-          mods = "Alt|Shift";
-          chars = "\\x1BI";
-        }
-        {
-          key = "J";
-          mods = "Alt";
-          chars = "\\x1Bj";
-        }
-        {
-          key = "J";
-          mods = "Alt|Shift";
-          chars = "\\x1BJ";
-        }
-        {
-          key = "K";
-          mods = "Alt";
-          chars = "\\x1Bk";
-        }
-        {
-          key = "K";
-          mods = "Alt|Shift";
-          chars = "\\x1BK";
-        }
-        {
-          key = "L";
-          mods = "Alt";
-          chars = "\\x1Bl";
-        }
-        {
-          key = "L";
-          mods = "Alt|Shift";
-          chars = "\\x1BL";
-        }
-        {
-          key = "M";
-          mods = "Alt";
-          chars = "\\x1Bm";
-        }
-        {
-          key = "M";
-          mods = "Alt|Shift";
-          chars = "\\x1BM";
-        }
-        {
-          key = "N";
-          mods = "Alt";
-          chars = "\\x1Bn";
-        }
-        {
-          key = "N";
-          mods = "Alt|Shift";
-          chars = "\\x1BN";
-        }
-        {
-          key = "O";
-          mods = "Alt";
-          chars = "\\x1Bo";
-        }
-        {
-          key = "O";
-          mods = "Alt|Shift";
-          chars = "\\x1BO";
-        }
-        {
-          key = "P";
-          mods = "Alt";
-          chars = "\\x1Bp";
-        }
-        {
-          key = "P";
-          mods = "Alt|Shift";
-          chars = "\\x1BP";
-        }
-        {
-          key = "Q";
-          mods = "Alt";
-          chars = "\\x1Bq";
-        }
-        {
-          key = "Q";
-          mods = "Alt|Shift";
-          chars = "\\x1BQ";
-        }
-        {
-          key = "R";
-          mods = "Alt";
-          chars = "\\x1Br";
-        }
-        {
-          key = "R";
-          mods = "Alt|Shift";
-          chars = "\\x1BR";
-        }
-        {
-          key = "S";
-          mods = "Alt";
-          chars = "\\x1Bs";
-        }
-        {
-          key = "S";
-          mods = "Alt|Shift";
-          chars = "\\x1BS";
-        }
-        {
-          key = "T";
-          mods = "Alt";
-          chars = "\\x1Bt";
-        }
-        {
-          key = "T";
-          mods = "Alt|Shift";
-          chars = "\\x1BT";
-        }
-        {
-          key = "U";
-          mods = "Alt";
-          chars = "\\x1Bu";
-        }
-        {
-          key = "U";
-          mods = "Alt|Shift";
-          chars = "\\x1BU";
-        }
-        {
-          key = "V";
-          mods = "Alt";
-          chars = "\\x1Bv";
-        }
-        {
-          key = "V";
-          mods = "Alt|Shift";
-          chars = "\\x1BV";
-        }
-        {
-          key = "W";
-          mods = "Alt";
-          chars = "\\x1Bw";
-        }
-        {
-          key = "W";
-          mods = "Alt|Shift";
-          chars = "\\x1BW";
-        }
-        {
-          key = "X";
-          mods = "Alt";
-          chars = "\\x1Bx";
-        }
-        {
-          key = "X";
-          mods = "Alt|Shift";
-          chars = "\\x1BX";
-        }
-        {
-          key = "Y";
-          mods = "Alt";
-          chars = "\\x1By";
-        }
-        {
-          key = "Y";
-          mods = "Alt|Shift";
-          chars = "\\x1BY";
-        }
-        {
-          key = "Z";
-          mods = "Alt";
-          chars = "\\x1Bz";
-        }
-        {
-          key = "Z";
-          mods = "Alt|Shift";
-          chars = "\\x1BZ";
-        }
-        {
-          key = "Key1";
-          mods = "Alt";
-          chars = "\\x1B1";
-        }
-        {
-          key = "Key1";
-          mods = "Alt|Shift";
-          chars = "\\x1B!";
-        }
-        {
-          key = "Key2";
-          mods = "Alt";
-          chars = "\\x1B2";
-        }
-        {
-          key = "Key2";
-          mods = "Alt|Shift";
-          chars = "\\x1B#";
-        }
-        {
-          key = "Key3";
-          mods = "Alt";
-          chars = "\\x1B3";
-        }
-        {
-          key = "Key3";
-          mods = "Alt|Shift";
-          chars = "\\x1B#";
-        }
-        {
-          key = "Key4";
-          mods = "Alt";
-          chars = "\\x1B4";
-        }
-        {
-          key = "Key4";
-          mods = "Alt|Shift";
-          chars = "\\x1B$";
-        }
-        {
-          key = "Key5";
-          mods = "Alt";
-          chars = "\\x1B5";
-        }
-        {
-          key = "Key5";
-          mods = "Alt|Shift";
-          chars = "\\x1B%";
-        }
-        {
-          key = "Key6";
-          mods = "Alt";
-          chars = "\\x1B6";
-        }
-        {
-          key = "Key6";
-          mods = "Alt|Shift";
-          chars = "\\x1B^";
-        }
-        {
-          key = "Key7";
-          mods = "Alt";
-          chars = "\\x1B7";
-        }
-        {
-          key = "Key7";
-          mods = "Alt|Shift";
-          chars = "\\x1B&";
-        }
-        {
-          key = "Key8";
-          mods = "Alt";
-          chars = "\\x1B8";
-        }
-        {
-          key = "Key8";
-          mods = "Alt|Shift";
-          chars = "\\x1B*";
-        }
-        {
-          key = "Key9";
-          mods = "Alt";
-          chars = "\\x1B9";
-        }
-        {
-          key = "Key9";
-          mods = "Alt|Shift";
-          chars = "\\x1B(";
-        }
-        {
-          key = "Key0";
-          mods = "Alt";
-          chars = "\\x1B0";
-        }
-        {
-          key = "Key0";
-          mods = "Alt|Shift";
-          chars = "\\x1B)";
-        }
-        {
-          key = "Minus";
-          mods = "Alt";
-          chars = "\\x1B-";
-        }
-        {
-          key = "Minus";
-          mods = "Alt|Shift";
-          chars = "\\x1B_";
-        }
-        {
-          key = "Equals";
-          mods = "Alt";
-          chars = "\\x1B=";
-        }
-        {
-          key = "Equals";
-          mods = "Alt|Shift";
-          chars = "\\x1B+";
-        }
-        {
-          key = "LBracket";
-          mods = "Alt";
-          chars = "\\x1B[";
-        }
-        {
-          key = "LBracket";
-          mods = "Alt|Shift";
-          chars = "\\x1B{";
-        }
-        {
-          key = "RBracket";
-          mods = "Alt";
-          chars = "\\x1B]";
-        }
-        {
-          key = "RBracket";
-          mods = "Alt|Shift";
-          chars = "\\x1B}";
-        }
-        {
-          key = "Backslash";
-          mods = "Alt";
-          chars = "\\x1B\\\\";
-        }
-        {
-          key = "Backslash";
-          mods = "Alt|Shift";
-          chars = "\\x1B|";
-        }
-        {
-          key = "Semicolon";
-          mods = "Alt";
-          chars = "\\x1B;";
-        }
-        {
-          key = "Semicolon";
-          mods = "Alt|Shift";
-          chars = "\\x1B =";
-        }
-        {
-          key = "Apostrophe";
-          mods = "Alt";
-          chars = "\\x1B'";
-        }
-        {
-          key = "Apostrophe";
-          mods = "Alt|Shift";
-          chars = ''\x1B"'';
-        }
-        {
-          key = "Comma";
-          mods = "Alt";
-          chars = "\\x1B;";
-        }
-        {
-          key = "Comma";
-          mods = "Alt|Shift";
-          chars = "\\x1B<";
-        }
-        {
-          key = "Period";
-          mods = "Alt";
-          chars = "\\x1B.";
-        }
-        {
-          key = "Period";
-          mods = "Alt|Shift";
-          chars = "\\x1B>";
-        }
-        {
-          key = "Slash";
-          mods = "Alt";
-          chars = "\\x1B/";
-        }
-        {
-          key = "Slash";
-          mods = "Alt|Shift";
-          chars = "\\x1B?";
-        }
-        {
-          key = "Grave";
-          mods = "Alt";
-          chars = "\\x1B`";
-        }
-        {
-          key = "Grave";
-          mods = "Alt|Shift";
-          chars = "\\x1B~";
-        }
-      ];
-    };
-  };
-}
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@ -1,18 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./alacritty.nix
-    ./fish.nix
-    ./fonts.nix
-    ./hammerspoon.nix
-    ./homebrew.nix
-    ./kitty.nix
-    ./networking.nix
-    ./nixpkgs.nix
-    ./system.nix
-    ./tmux.nix
-    ./user.nix
-    ./utilities.nix
-  ];
-}
--- a/modules/darwin/fish.nix
+++ b/modules/darwin/fish.nix
@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-
-  config = {
-
-    # MacOS-specific settings for Fish
-    programs.fish.useBabelfish = true;
-    programs.fish.babelfishPackage = pkgs.babelfish;
-  };
-}
--- a/modules/darwin/fonts.nix
+++ b/modules/darwin/fonts.nix
@ -1,22 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
-
-    home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ];
-
-    programs.alacritty.settings = {
-      font.normal.family = "VictorMono";
-    };
-
-    programs.kitty.font = {
-      package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; });
-      name = "VictorMono Nerd Font Mono";
-    };
-  };
-}
--- a/modules/darwin/hammerspoon.nix
+++ b/modules/darwin/hammerspoon.nix
@ -1,43 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  # Hammerspoon - MacOS custom automation scripting
-
-  config = lib.mkIf pkgs.stdenv.isDarwin {
-
-    home-manager.users.${config.user} = {
-      xdg.configFile."hammerspoon/init.lua".source = ./hammerspoon/init.lua;
-      xdg.configFile."hammerspoon/Spoons/ControlEscape.spoon".source = ./hammerspoon/Spoons/ControlEscape.spoon;
-      xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source = ./hammerspoon/Spoons/DismissAlerts.spoon;
-      xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source = pkgs.substituteAll {
-        src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
-        firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
-        discord = "${pkgs.discord}/Applications/Discord.app";
-        wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
-        obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
-        slack = "${pkgs.slack}/Applications/Slack.app";
-      };
-      xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source = ./hammerspoon/Spoons/MoveWindow.spoon;
-
-      home.activation.reloadHammerspoon =
-        config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ]
-          ''
-            $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
-            $DRY_RUN_CMD sleep 1
-            $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
-          '';
-    };
-
-    homebrew.casks = [ "hammerspoon" ];
-
-    system.activationScripts.postUserActivation.text = ''
-      defaults write org.hammerspoon.Hammerspoon MJConfigFile "${config.homePath}/.config/hammerspoon/init.lua"
-      sudo killall Dock
-    '';
-  };
-}
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@ -1,53 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  # Homebrew - Mac-specific packages that aren't in Nix
-  config = lib.mkIf pkgs.stdenv.isDarwin {
-
-    # Requires Homebrew to be installed
-    system.activationScripts.preUserActivation.text = ''
-      if ! xcode-select --version 2>/dev/null; then
-        $DRY_RUN_CMD xcode-select --install
-      fi
-      if ! /opt/homebrew/bin/brew --version 2>/dev/null; then
-        $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      fi
-    '';
-
-    # Add homebrew paths to CLI path
-    home-manager.users.${config.user}.home.sessionPath = [ "/opt/homebrew/bin/" ];
-
-    homebrew = {
-      enable = true;
-      onActivation = {
-        autoUpdate = false; # Don't update during rebuild
-        cleanup = "zap"; # Uninstall all programs not declared
-        upgrade = true;
-      };
-      global = {
-        brewfile = true; # Run brew bundle from anywhere
-        lockfiles = false; # Don't save lockfile (since running from anywhere)
-      };
-      brews = [
-        "trash" # Delete files and folders to trash instead of rm
-      ];
-      casks = [
-        "1password" # 1Password will not launch from Nix on macOS
-        # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
-        "keybase" # GUI on Nix not available for macOS
-        # "logitech-g-hub" # Mouse and keyboard management
-        "logitune" # Logitech webcam firmware
-        "meetingbar" # Show meetings in menu bar
-        "scroll-reverser" # Different scroll style for mouse vs. trackpad
-        "notunes" # Don't launch Apple Music with the play button
-        "steam" # Not packaged for Nixon macOS
-        # "epic-games" # Not packaged for Nix
-      ];
-    };
-  };
-}
--- a/modules/darwin/networking.nix
+++ b/modules/darwin/networking.nix
@ -1,16 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  config = lib.mkIf pkgs.stdenv.isDarwin {
-    networking = {
-      computerName = config.networking.hostName;
-      # Adjust if necessary
-      # hostName = "";
-    };
-  };
-}
--- a/modules/darwin/nixpkgs.nix
+++ b/modules/darwin/nixpkgs.nix
@ -1,37 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
-
-    programs.fish = {
-      shellAbbrs = {
-        nr = lib.mkForce "rebuild-darwin";
-        nro = lib.mkForce "rebuild-darwin offline";
-      };
-      functions = {
-        rebuild-darwin = {
-          body = ''
-            if test "$argv[1]" = "offline"
-                set option "--option substitute false"
-            end
-            git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#lookingglass"
-            commandline --function execute
-          '';
-        };
-        rebuild-home = lib.mkForce {
-          body = ''
-            git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
-            commandline --function execute
-          '';
-        };
-      };
-    };
-  };
-}
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@ -1,206 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  config = lib.mkIf pkgs.stdenv.isDarwin {
-
-    services.nix-daemon.enable = true;
-
-    # This setting only applies to Darwin, different on NixOS
-    nix.gc.interval = {
-      Hour = 12;
-      Minute = 15;
-      Day = 1;
-    };
-
-    environment.shells = [ pkgs.fish ];
-
-    security.pam.enableSudoTouchIdAuth = true;
-
-    system = {
-
-      stateVersion = 5;
-
-      keyboard = {
-        remapCapsLockToControl = true;
-        enableKeyMapping = true; # Allows for skhd
-      };
-
-      defaults = {
-        NSGlobalDomain = {
-
-          # Set to dark mode
-          AppleInterfaceStyle = "Dark";
-
-          # Don't change from dark to light automatically
-          # AppleInterfaceSwitchesAutomatically = false;
-
-          # Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
-          AppleKeyboardUIMode = 3;
-
-          # Only hide menu bar in fullscreen
-          _HIHideMenuBar = false;
-
-          # Expand save panel by default
-          NSNavPanelExpandedStateForSaveMode = true;
-
-          # Expand print panel by default
-          PMPrintingExpandedStateForPrint = true;
-
-          # Replace press-and-hold with key repeat
-          ApplePressAndHoldEnabled = false;
-
-          # Set a fast key repeat rate
-          KeyRepeat = 2;
-
-          # Shorten delay before key repeat begins
-          InitialKeyRepeat = 12;
-
-          # Save to local disk by default, not iCloud
-          NSDocumentSaveNewDocumentsToCloud = false;
-
-          # Disable autocorrect capitalization
-          NSAutomaticCapitalizationEnabled = false;
-
-          # Disable autocorrect smart dashes
-          NSAutomaticDashSubstitutionEnabled = false;
-
-          # Disable autocorrect adding periods
-          NSAutomaticPeriodSubstitutionEnabled = false;
-
-          # Disable autocorrect smart quotation marks
-          NSAutomaticQuoteSubstitutionEnabled = false;
-
-          # Disable autocorrect spellcheck
-          NSAutomaticSpellingCorrectionEnabled = false;
-        };
-
-        dock = {
-          # Automatically show and hide the dock
-          autohide = true;
-
-          # Add translucency in dock for hidden applications
-          showhidden = true;
-
-          # Enable spring loading on all dock items
-          enable-spring-load-actions-on-all-items = true;
-
-          # Highlight hover effect in dock stack grid view
-          mouse-over-hilite-stack = true;
-
-          mineffect = "genie";
-          orientation = "bottom";
-          show-recents = false;
-          tilesize = 44;
-
-          persistent-apps = [
-            "/Applications/1Password.app"
-            "${pkgs.slack}/Applications/Slack.app"
-            "/System/Applications/Calendar.app"
-            "${pkgs.firefox-bin}/Applications/Firefox.app"
-            "/System/Applications/Messages.app"
-            "/System/Applications/Mail.app"
-            "/Applications/zoom.us.app"
-            "${pkgs.discord}/Applications/Discord.app"
-            "${pkgs.obsidian}/Applications/Obsidian.app"
-            "${pkgs.wezterm}/Applications/WezTerm.app"
-          ];
-        };
-
-        finder = {
-
-          # Default Finder window set to column view
-          FXPreferredViewStyle = "clmv";
-
-          # Finder search in current folder by default
-          FXDefaultSearchScope = "SCcf";
-
-          # Disable warning when changing file extension
-          FXEnableExtensionChangeWarning = false;
-
-          # Allow quitting of Finder application
-          QuitMenuItem = true;
-        };
-
-        # Disable "Are you sure you want to open" dialog
-        LaunchServices.LSQuarantine = false;
-
-        # Disable trackpad tap to click
-        trackpad.Clicking = false;
-
-        # Where to save screenshots
-        screencapture.location = "~/Downloads";
-
-        CustomUserPreferences = {
-          # Disable disk image verification
-          "com.apple.frameworks.diskimages" = {
-            skip-verify = true;
-            skip-verify-locked = true;
-            skip-verify-remote = true;
-          };
-          # Avoid creating .DS_Store files on network or USB volumes
-          "com.apple.desktopservices" = {
-            DSDontWriteNetworkStores = true;
-            DSDontWriteUSBStores = true;
-          };
-          "com.apple.dock" = {
-            magnification = true;
-            largesize = 48;
-          };
-          # Require password immediately after screen saver begins
-          "com.apple.screensaver" = {
-            askForPassword = 1;
-            askForPasswordDelay = 0;
-          };
-          "com.apple.finder" = {
-            # Disable the warning before emptying the Trash
-            WarnOnEmptyTrash = false;
-
-            # Finder search in current folder by default
-            FXDefaultSearchScope = "SCcf";
-
-            # Default Finder window set to column view
-            FXPreferredViewStyle = "clmv";
-          };
-          "leits.MeetingBar" = {
-            eventTimeFormat = ''"show"'';
-            eventTitleFormat = ''"none"'';
-            eventTitleIconFormat = ''"iconCalendar"'';
-            slackBrowser = ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
-            zoomBrowser = ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
-            teamsBrowser = ''{"deletable":true,"arguments":"","name":"Teams","path":""}'';
-            KeyboardShortcuts_joinEventShortcut = ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
-            timeFormat = ''"12-hour"'';
-          };
-        };
-
-        CustomSystemPreferences = {
-
-        };
-      };
-
-      # Settings that don't have an option in nix-darwin
-      activationScripts.postActivation.text = ''
-        echo "Allow apps from anywhere"
-        SPCTL=$(spctl --status)
-        if ! [ "$SPCTL" = "assessments disabled" ]; then
-            sudo spctl --master-disable
-        fi
-      '';
-
-      # User-level settings
-      activationScripts.postUserActivation.text = ''
-        echo "Show the ~/Library folder"
-        chflags nohidden ~/Library
-
-        echo "Reduce Menu Bar padding"
-        defaults write -globalDomain NSStatusItemSelectionPadding -int 6
-        defaults write -globalDomain NSStatusItemSpacing -int 6
-      '';
-    };
-  };
-}
--- a/modules/darwin/user.nix
+++ b/modules/darwin/user.nix
@ -1,34 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  config = lib.mkIf pkgs.stdenv.isDarwin {
-
-    users.users."${config.user}" = {
-      # macOS user
-      home = config.homePath;
-      # shell = pkgs.fish; # Default shell
-    };
-
-    # This might fix the shell issues
-    # users.knownUsers = [ config.user ];
-
-    home-manager.users.${config.user} = {
-
-      # Default shell setting doesn't work
-      home.sessionVariables = {
-        SHELL = "${pkgs.fish}/bin/fish";
-      };
-
-      # Used for aerc
-      xdg.enable = true;
-    };
-
-    # Fix for: 'Error: HOME is set to "/var/root" but we expect "/var/empty"'
-    home-manager.users.root.home.homeDirectory = lib.mkForce "/var/root";
-  };
-}
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@ -1,71 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-
-  unfreePackages = [
-    "consul"
-    "vault-bin"
-    "teams"
-  ];
-
-  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
-
-    home.packages = [
-      pkgs.visidata # CSV inspector
-      pkgs.dos2unix # Convert Windows text files
-      pkgs.inetutils # Includes telnet
-      pkgs.pandoc # Convert text documents
-      pkgs.mpd # TUI slideshows
-      pkgs.mpv # Video player
-      pkgs.gnupg # Encryption
-      pkgs.awscli2
-      pkgs.ssm-session-manager-plugin
-      pkgs.awslogs
-      pkgs.stu # TUI for AWS S3
-      pkgs.google-cloud-sdk
-      pkgs.vault-bin
-      pkgs.consul
-      pkgs.noti # Create notifications programmatically
-      pkgs.ipcalc # Make IP network calculations
-      pkgs.teams
-      pkgs.cloudflared # Allow connecting to Cloudflare tunnels
-      (pkgs.writeShellApplication {
-        name = "ocr";
-        runtimeInputs = [ pkgs.tesseract ];
-        text = builtins.readFile ../../modules/common/shell/bash/scripts/ocr.sh;
-      })
-      (pkgs.writeShellApplication {
-        name = "ec2";
-        runtimeInputs = [
-          pkgs.awscli2
-          pkgs.jq
-          pkgs.fzf
-        ];
-        text = builtins.readFile ../../modules/common/shell/bash/scripts/aws-ec2.sh;
-      })
-      (pkgs.writeShellApplication {
-        name = "tfinit";
-        runtimeInputs = [
-          pkgs.terraform
-          pkgs.gawk
-          pkgs.git
-        ];
-        text = builtins.readFile ../../modules/common/shell/bash/scripts/terraform-init.sh;
-      })
-    ];
-
-    programs.fish.shellAbbrs = {
-      # Add noti for ghpr in Darwin
-      ghpr = lib.mkForce "gh pr create && sleep 3 && noti gh run watch";
-      grw = lib.mkForce "noti gh run watch";
-
-      # Shortcut to edit hosts file
-      hosts = "sudo nvim /etc/hosts";
-    };
-  };
-}
--- a/modules/nixos/applications/calendar.nix
+++ b/modules/nixos/applications/calendar.nix
@ -1,37 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options = {
-    calendar = {
-      enable = lib.mkEnableOption {
-        description = "Enable calendar.";
-        default = false;
-      };
-    };
-  };
-
-  config = lib.mkIf (config.gui.enable && config.calendar.enable) {
-    home-manager.users.${config.user} = {
-
-      accounts.calendar.accounts.default = {
-        basePath = "other/calendars"; # Where to save calendars in ~ directory
-        name = "personal";
-        local.type = "filesystem";
-        primary = true;
-        remote = {
-          passwordCommand = [ "" ];
-          type = "caldav";
-          url = "https://${config.hostnames.content}/remote.php/dav/principals/users/${config.user}";
-          userName = config.user;
-        };
-      };
-
-      home.packages = with pkgs; [ gnome-calendar ];
-    };
-  };
-}
--- a/modules/nixos/applications/calibre.nix
+++ b/modules/nixos/applications/calibre.nix
@ -1,29 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options = {
-    calibre = {
-      enable = lib.mkEnableOption {
-        description = "Enable Calibre.";
-        default = false;
-      };
-    };
-  };
-
-  config = lib.mkIf (config.gui.enable && config.calibre.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ calibre ];
-      # home.sessionVariables = { CALIBRE_USE_DARK_PALETTE = 1; };
-    };
-
-    # Forces Calibre to use dark mode
-    environment.sessionVariables = {
-      CALIBRE_USE_DARK_PALETTE = "1";
-    };
-  };
-}
--- a/modules/nixos/applications/default.nix
+++ b/modules/nixos/applications/default.nix
@ -1,9 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./calendar.nix
-    ./calibre.nix
-    ./nautilus.nix
-  ];
-}
--- a/modules/nixos/applications/nautilus.nix
+++ b/modules/nixos/applications/nautilus.nix
@ -1,55 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options = {
-    nautilus = {
-      enable = lib.mkEnableOption {
-        description = "Enable Nautilus file manager.";
-        default = false;
-      };
-    };
-  };
-
-  # Install Nautilus file manager
-  config = lib.mkIf (config.gui.enable && config.nautilus.enable) {
-
-    # Quick preview with spacebar
-    services.gnome.sushi.enable = true;
-    environment.systemPackages = [ pkgs.nautilus ];
-
-    home-manager.users.${config.user} = {
-
-      # Quick button for launching nautilus
-      xsession.windowManager.i3.config.keybindings = {
-        "${
-          config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
-        }+n" = "exec --no-startup-id ${pkgs.nautilus}/bin/nautilus";
-      };
-
-      # Generates a QR code and previews it with sushi
-      programs.fish.functions = {
-        qr = {
-          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.sushi}/bin/sushi /tmp/qr.png";
-        };
-      };
-
-      # Set Nautilus as default for opening directories
-      xdg.mimeApps = {
-        associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-        defaultApplications."inode/directory" = lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
-      };
-    };
-
-    # Delete Trash files older than 1 week
-    systemd.user.services.empty-trash = {
-      description = "Empty Trash on a regular basis";
-      wantedBy = [ "default.target" ];
-      script = "${pkgs.trash-cli}/bin/trash-empty 7";
-    };
-  };
-}
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@ -1,12 +0,0 @@
-{ ... }:
-{
-
-  imports = [
-    ./applications
-    ./gaming
-    ./graphical
-    ./hardware
-    ./services
-    ./system
-  ];
-}
--- a/modules/nixos/gaming/chiaki.nix
+++ b/modules/nixos/gaming/chiaki.nix
@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.gaming.chiaki.enable = lib.mkEnableOption "Chiaki PlayStation remote play client.";
-
-  config = lib.mkIf config.gaming.chiaki.enable {
-    environment.systemPackages = with pkgs; [ chiaki ];
-  };
-}
--- a/modules/nixos/gaming/default.nix
+++ b/modules/nixos/gaming/default.nix
@ -1,29 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  imports = [
-    ./chiaki.nix
-    ./dwarf-fortress.nix
-    ./legendary.nix
-    ./lutris.nix
-    ./minecraft-server.nix
-    ./moonlight.nix
-    ./ryujinx.nix
-    ./steam.nix
-  ];
-
-  options.gaming.enable = lib.mkEnableOption "Enable gaming features.";
-
-  config = lib.mkIf (config.gaming.enable && pkgs.stdenv.isLinux) {
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
-    programs.gamemode.enable = true;
-  };
-}
--- a/modules/nixos/gaming/legendary.nix
+++ b/modules/nixos/gaming/legendary.nix
@ -1,60 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  home-packages = config.home-manager.users.${config.user}.home.packages;
-in
-{
-
-  options.gaming.legendary.enable = lib.mkEnableOption "Legendary Epic Games launcher.";
-
-  config = lib.mkIf config.gaming.legendary.enable {
-    environment.systemPackages = with pkgs; [
-      legendary-gl
-      wineWowPackages.stable # 32-bit and 64-bit wineWowPackages, see https://nixos.wiki/wiki/Wine
-      heroic # GUI launcher
-    ];
-
-    home-manager.users.${config.user} = {
-
-      xdg.configFile."legendary/config.ini".text = ''
-        [Legendary]
-        ; Disables the automatic update check
-        disable_update_check = false
-        ; Disables the notice about an available update on exit
-        disable_update_notice = true
-        ; Set install directory
-        install_dir = ${config.homePath}/media/games
-        ; Make output quiet
-        log_level = error
-      '';
-
-      home.file =
-        let
-          ignorePatterns = ''
-            .wine/
-            drive_c/'';
-        in
-        {
-          ".rgignore".text = ignorePatterns;
-          ".fdignore".text = ignorePatterns;
-        };
-
-      programs.fish.functions = lib.mkIf (builtins.elem pkgs.fzf home-packages) {
-        epic-games = {
-          body = ''
-            set game (legendary list 2>/dev/null \
-                | awk '/^ \* / { print $0; }' \
-                | sed -e 's/ (.*)$//' -e 's/ \* //' \
-                | fzf)
-            and legendary launch "$game" &> /dev/null
-          '';
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/gaming/lutris.nix
+++ b/modules/nixos/gaming/lutris.nix
@ -1,18 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.gaming.lutris.enable = lib.mkEnableOption "Lutris game installer.";
-
-  config = lib.mkIf config.gaming.lutris.enable {
-    environment.systemPackages = with pkgs; [
-      lutris
-      amdvlk # Vulkan drivers (probably already installed)
-      wineWowPackages.stable # 32-bit and 64-bit wineWowPackages
-    ];
-  };
-}
--- a/modules/nixos/gaming/moonlight.nix
+++ b/modules/nixos/gaming/moonlight.nix
@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.gaming.moonlight.enable = lib.mkEnableOption "Enable Moonlight game streaming client.";
-
-  config = lib.mkIf config.gaming.moonlight.enable {
-    environment.systemPackages = with pkgs; [ moonlight-qt ];
-  };
-}
--- a/modules/nixos/gaming/ryujinx.nix
+++ b/modules/nixos/gaming/ryujinx.nix
@ -1,19 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.gaming.ryujinx.enable = lib.mkEnableOption "Ryujinx Nintendo Switch application.";
-
-  config = lib.mkIf config.gaming.ryujinx.enable {
-    environment.systemPackages = with pkgs; [ ryujinx ];
-
-    home-manager.users.${config.user}.xdg.desktopEntries.ryujinx = lib.mkIf pkgs.stdenv.isLinux {
-      name = "Ryujinx";
-      exec = "env DOTNET_EnableAlternateStackCheck=1 Ryujinx -r /home/${config.user}/media/games/ryujinx/ %f";
-    };
-  };
-}
--- a/modules/nixos/graphical/default.nix
+++ b/modules/nixos/graphical/default.nix
@ -1,54 +0,0 @@
-{ lib, ... }:
-{
-
-  imports = [
-    ./dunst.nix
-    ./fonts.nix
-    ./gtk.nix
-    ./i3.nix
-    ./picom.nix
-    ./polybar.nix
-    ./rofi.nix
-    ./xorg.nix
-  ];
-
-  options = {
-
-    launcherCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for launching";
-    };
-    systemdSearch = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for interacting with systemd";
-    };
-    altTabCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for choosing windows";
-    };
-    audioSwitchCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for switching audio sink";
-    };
-    brightnessCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for adjusting brightness";
-    };
-    calculatorCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for quick calculations";
-    };
-    toggleBarCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to hide and show the status bar.";
-    };
-    powerCommand = lib.mkOption {
-      type = lib.types.str;
-      description = "Command to use for power options menu";
-    };
-    wallpaper = lib.mkOption {
-      type = lib.types.path;
-      description = "Wallpaper background image file";
-    };
-  };
-}
--- a/modules/nixos/graphical/dmenu.nix
+++ b/modules/nixos/graphical/dmenu.nix
@ -1,17 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-
-  options.gui.dmenu.enable = lib.mkEnableOption "dmenu launcher.";
-
-  config = lib.mkIf (config.services.xserver.enable && config.dmenu.enable) {
-
-    home-manager.users.${config.user}.home.packages = [ pkgs.dmenu ];
-    gui.launcherCommand = "${pkgs.dmenu}/bin/dmenu_run";
-  };
-}
--- a/modules/nixos/graphical/dunst.nix
+++ b/modules/nixos/graphical/dunst.nix
@ -1,29 +0,0 @@
-{ config, ... }:
-
-{
-
-  config = {
-
-    home-manager.users.${config.user}.services.dunst = {
-      enable = false;
-      settings = {
-        global = {
-          width = 300;
-          height = 200;
-          offset = "30x50";
-          origin = "top-right";
-          transparency = 0;
-          padding = 20;
-          horizontal_padding = 20;
-          frame_color = config.theme.colors.base03;
-        };
-
-        urgency_normal = {
-          background = config.theme.colors.base00;
-          foreground = config.theme.colors.base05;
-          timeout = 10;
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/graphical/fonts.nix
+++ b/modules/nixos/graphical/fonts.nix
@ -1,34 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  fontName = "Victor Mono";
-in
-{
-
-  config = lib.mkIf (config.gui.enable && pkgs.stdenv.isLinux) {
-
-    fonts.packages = with pkgs; [
-      victor-mono # Used for Vim and Terminal
-      (nerdfonts.override { fonts = [ "Hack" ]; }) # For Polybar, Rofi
-    ];
-    fonts.fontconfig.defaultFonts.monospace = [ fontName ];
-
-    home-manager.users.${config.user} = {
-      xsession.windowManager.i3.config.fonts = {
-        names = [ "pango:${fontName}" ];
-        # style = "Regular";
-        # size = 11.0;
-      };
-      services.polybar.config."bar/main".font-0 = "Hack Nerd Font:size=10;2";
-      programs.rofi.font = "Hack Nerd Font 14";
-      programs.alacritty.settings.font.normal.family = fontName;
-      programs.kitty.font.name = fontName;
-      services.dunst.settings.global.font = "Hack Nerd Font 14";
-    };
-  };
-}
--- a/modules/nixos/graphical/gtk.nix
+++ b/modules/nixos/graphical/gtk.nix
@ -1,58 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options = {
-    gtk.theme = {
-      name = lib.mkOption {
-        type = lib.types.str;
-        description = "Theme name for GTK applications";
-      };
-      package = lib.mkOption {
-        type = lib.types.package;
-        description = "Theme package for GTK applications";
-        default = pkgs.gnome-themes-extra;
-      };
-    };
-  };
-
-  config = lib.mkIf config.gui.enable {
-
-    home-manager.users.${config.user} = {
-
-      gtk =
-        let
-          gtkExtraConfig = {
-            gtk-application-prefer-dark-theme = config.theme.dark;
-          };
-        in
-        {
-          enable = true;
-          theme = {
-            name = config.gtk.theme.name;
-            package = config.gtk.theme.package;
-          };
-          gtk3.extraConfig = gtkExtraConfig;
-          gtk4.extraConfig = gtkExtraConfig;
-        };
-    };
-
-    # Required for setting GTK theme (for preferred-color-scheme in browser)
-    services.dbus.packages = [ pkgs.dconf ];
-    programs.dconf.enable = true;
-
-    # Make the login screen dark
-    services.xserver.displayManager.lightdm.greeters.gtk.theme = {
-      name = config.gtk.theme.name;
-      package = config.gtk.theme.package;
-    };
-
-    environment.sessionVariables = {
-      GTK_THEME = config.gtk.theme.name;
-    };
-  };
-}
--- a/modules/nixos/graphical/i3.nix
+++ b/modules/nixos/graphical/i3.nix
@ -1,300 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-
-  lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
-  lockUpdate = "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
-  terminal = "wezterm";
-in
-{
-
-  config = lib.mkIf pkgs.stdenv.isLinux {
-
-    services.xserver.windowManager = {
-      i3 = {
-        enable = config.services.xserver.enable;
-      };
-    };
-
-    environment.systemPackages = with pkgs; [
-      feh # Wallpaper
-      playerctl # Media control
-    ];
-
-    home-manager.users.${config.user} = {
-      xsession.windowManager.i3 = {
-        enable = config.services.xserver.enable;
-        config =
-          let
-            modifier = "Mod4"; # Super key
-            ws1 = "1:I";
-            ws2 = "2:II";
-            ws3 = "3:III";
-            ws4 = "4:IV";
-            ws5 = "5:V";
-            ws6 = "6:VI";
-            ws7 = "7:VII";
-            ws8 = "8:VIII";
-            ws9 = "9:IX";
-            ws10 = "10:X";
-          in
-          {
-            modifier = modifier;
-            assigns = {
-              "${ws1}" = [ { class = "Firefox"; } ];
-              "${ws2}" = [
-                { class = "aerc"; }
-                { class = "kitty"; }
-                { class = "obsidian"; }
-                { class = "wezterm"; }
-              ];
-              "${ws3}" = [ { class = "discord"; } ];
-              "${ws4}" = [
-                { class = "steam"; }
-                { class = "Steam"; }
-              ];
-            };
-            bars = [ { command = "echo"; } ]; # Disable i3bar
-            colors =
-              let
-                background = config.theme.colors.base00;
-                inactiveBackground = config.theme.colors.base01;
-                border = config.theme.colors.base01;
-                inactiveBorder = config.theme.colors.base01;
-                text = config.theme.colors.base07;
-                inactiveText = config.theme.colors.base04;
-                urgentBackground = config.theme.colors.base08;
-                indicator = "#00000000";
-              in
-              {
-                background = config.theme.colors.base00;
-                focused = {
-                  inherit
-                    background
-                    indicator
-                    text
-                    border
-                    ;
-                  childBorder = background;
-                };
-                focusedInactive = {
-                  inherit indicator;
-                  background = inactiveBackground;
-                  border = inactiveBorder;
-                  childBorder = inactiveBackground;
-                  text = inactiveText;
-                };
-                # placeholder = { };
-                unfocused = {
-                  inherit indicator;
-                  background = inactiveBackground;
-                  border = inactiveBorder;
-                  childBorder = inactiveBackground;
-                  text = inactiveText;
-                };
-                urgent = {
-                  inherit text indicator;
-                  background = urgentBackground;
-                  border = urgentBackground;
-                  childBorder = urgentBackground;
-                };
-              };
-            floating.modifier = modifier;
-            focus = {
-              mouseWarping = true;
-              newWindow = "urgent";
-              followMouse = false;
-            };
-            keybindings = {
-
-              # Adjust screen brightness
-              "Shift+F12" =
-                # Disable dynamic sleep
-                # https://github.com/rockowitz/ddcutil/issues/323
-                "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-              "Shift+F11" = "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-              "XF86MonBrightnessUp" = "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 + 30";
-              "XF86MonBrightnessDown" = "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --disable-dynamic-sleep --display 2 setvcp 10 - 30";
-
-              # Media player controls
-              "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
-              "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
-              "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
-              "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-
-              # Launchers
-              "${modifier}+Return" = "exec --no-startup-id ${
-                config.home-manager.users.${config.user}.programs.rofi.terminal
-              }; workspace ${ws2}; layout tabbed";
-              "${modifier}+space" = "exec --no-startup-id ${config.launcherCommand}";
-              "${modifier}+Shift+s" = "exec --no-startup-id ${config.systemdSearch}";
-              "${modifier}+Shift+a" = "exec --no-startup-id ${config.audioSwitchCommand}";
-              "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
-              "${modifier}+Shift+period" = "exec --no-startup-id ${config.powerCommand}";
-              "${modifier}+Shift+m" = "exec --no-startup-id ${config.brightnessCommand}";
-              "${modifier}+c" = "exec --no-startup-id ${config.calculatorCommand}";
-              "${modifier}+Shift+c" = "reload";
-              "${modifier}+Shift+r" = "restart";
-              "${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
-              "${modifier}+Shift+x" = "exec ${lockCmd}";
-              "${modifier}+Mod1+h" = "exec --no-startup-id ${
-                config.home-manager.users.${config.user}.programs.rofi.terminal
-              } -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-              "${modifier}+Mod1+r" = "exec --no-startup-id ${
-                config.home-manager.users.${config.user}.programs.rofi.terminal
-              } -e sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-
-              # Window options
-              "${modifier}+q" = "kill";
-              "${modifier}+b" = "exec ${config.toggleBarCommand}";
-              "${modifier}+f" = "fullscreen toggle";
-              "${modifier}+h" = "focus left";
-              "${modifier}+j" = "focus down";
-              "${modifier}+k" = "focus up";
-              "${modifier}+l" = "focus right";
-              "${modifier}+Left" = "focus left";
-              "${modifier}+Down" = "focus down";
-              "${modifier}+Up" = "focus up";
-              "${modifier}+Right" = "focus right";
-              "${modifier}+Shift+h" = "move left";
-              "${modifier}+Shift+j" = "move down";
-              "${modifier}+Shift+k" = "move up";
-              "${modifier}+Shift+l" = "move right";
-              "${modifier}+Shift+Left" = "move left";
-              "${modifier}+Shift+Down" = "move down";
-              "${modifier}+Shift+Up" = "move up";
-              "${modifier}+Shift+Right" = "move right";
-
-              # Tiling
-              "${modifier}+i" = "split h";
-              "${modifier}+v" = "split v";
-              "${modifier}+s" = "layout stacking";
-              "${modifier}+t" = "layout tabbed";
-              "${modifier}+e" = "layout toggle split";
-              "${modifier}+Shift+space" = "floating toggle";
-              "${modifier}+Control+space" = "focus mode_toggle";
-              "${modifier}+a" = "focus parent";
-
-              # Workspaces
-              "${modifier}+1" = "workspace ${ws1}";
-              "${modifier}+2" = "workspace ${ws2}";
-              "${modifier}+3" = "workspace ${ws3}";
-              "${modifier}+4" = "workspace ${ws4}";
-              "${modifier}+5" = "workspace ${ws5}";
-              "${modifier}+6" = "workspace ${ws6}";
-              "${modifier}+7" = "workspace ${ws7}";
-              "${modifier}+8" = "workspace ${ws8}";
-              "${modifier}+9" = "workspace ${ws9}";
-              "${modifier}+0" = "workspace ${ws10}";
-
-              # Move windows
-              "${modifier}+Shift+1" = "move container to workspace ${ws1}; workspace ${ws1}";
-              "${modifier}+Shift+2" = "move container to workspace ${ws2}; workspace ${ws2}";
-              "${modifier}+Shift+3" = "move container to workspace ${ws3}; workspace ${ws3}";
-              "${modifier}+Shift+4" = "move container to workspace ${ws4}; workspace ${ws4}";
-              "${modifier}+Shift+5" = "move container to workspace ${ws5}; workspace ${ws5}";
-              "${modifier}+Shift+6" = "move container to workspace ${ws6}; workspace ${ws6}";
-              "${modifier}+Shift+7" = "move container to workspace ${ws7}; workspace ${ws7}";
-              "${modifier}+Shift+8" = "move container to workspace ${ws8}; workspace ${ws8}";
-              "${modifier}+Shift+9" = "move container to workspace ${ws9}; workspace ${ws9}";
-              "${modifier}+Shift+0" = "move container to workspace ${ws10}; workspace ${ws10}";
-
-              # Move screens
-              "${modifier}+Control+l" = "move workspace to output right";
-              "${modifier}+Control+h" = "move workspace to output left";
-
-              # Resizing
-              "${modifier}+r" = ''mode "resize"'';
-              "${modifier}+Control+Shift+h" = "resize shrink width 10 px or 10 ppt";
-              "${modifier}+Control+Shift+j" = "resize grow height 10 px or 10 ppt";
-              "${modifier}+Control+Shift+k" = "resize shrink height 10 px or 10 ppt";
-              "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
-            };
-            modes = { };
-            startup = [
-              {
-                command = "feh --bg-fill ${config.wallpaper}";
-                always = true;
-                notification = false;
-              }
-              {
-                command = "i3-msg workspace ${ws2}, move workspace to output right";
-                notification = false;
-              }
-              {
-                command = "i3-msg workspace ${ws1}, move workspace to output left";
-                notification = false;
-              }
-            ];
-            window = {
-              border = 0;
-              hideEdgeBorders = "smart";
-              titlebar = false;
-            };
-            workspaceAutoBackAndForth = false;
-            workspaceOutputAssign = [ ];
-            # gaps = {
-            # bottom = 8;
-            # top = 8;
-            # left = 8;
-            # right = 8;
-            # horizontal = 15;
-            # vertical = 15;
-            # inner = 15;
-            # outer = 0;
-            # smartBorders = "off";
-            # smartGaps = false;
-            # };
-          };
-        extraConfig = "";
-      };
-
-      programs.fish.functions = {
-        update-lock-screen = lib.mkIf config.services.xserver.enable {
-          description = "Update lockscreen with wallpaper";
-          body = lockUpdate;
-        };
-      };
-
-      # Update lock screen cache only if cache is empty
-      home.activation.updateLockScreenCache =
-        let
-          cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
-        in
-        lib.mkIf config.services.xserver.enable (
-          config.home-manager.users.${config.user}.lib.dag.entryAfter [ "writeBoundary" ] ''
-            if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
-                $DRY_RUN_CMD ${lockUpdate}
-            fi
-          ''
-        );
-    };
-
-    # Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service
-    systemd.services.lock = {
-      enable = config.services.xserver.enable;
-      description = "Lock the screen on resume from suspend";
-      before = [
-        "sleep.target"
-        "suspend.target"
-      ];
-      serviceConfig = {
-        User = config.user;
-        Type = "simple";
-        Environment = "DISPLAY=:0";
-        TimeoutSec = "infinity";
-        ExecStart = lockCmd;
-        ExecStartPost = "${pkgs.coreutils-full}/bin/sleep 1";
-      };
-      wantedBy = [
-        "sleep.target"
-        "suspend.target"
-      ];
-    };
-  };
-}
--- a/modules/nixos/graphical/picom.nix
+++ b/modules/nixos/graphical/picom.nix
@ -1,57 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
-    home-manager.users.${config.user} = {
-
-      services.picom = {
-        enable = true;
-        backend = "glx";
-        settings = {
-          blur = false;
-          blurExclude = [ ];
-          inactiveDim = "0.05";
-          noDNDShadow = false;
-          noDockShadow = false;
-          # shadow-radius = 20
-          # '';
-          # shadow-radius = 20
-          # corner-radius = 10
-          # blur-size = 20
-          # rounded-corners-exclude = [
-          # "window_type = 'dock'",
-          # "class_g = 'i3-frame'"
-          # ]
-          # '';
-        };
-        fade = false;
-        inactiveOpacity = 1.0;
-        menuOpacity = 1.0;
-        opacityRules = [
-          "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'" # Hide tabbed windows
-        ];
-        shadow = false;
-        shadowExclude = [ ];
-        shadowOffsets = [
-          (-10)
-          (-10)
-        ];
-        shadowOpacity = 0.5;
-        vSync = true;
-      };
-
-      xsession.windowManager.i3.config.startup = [
-        {
-          command = "systemctl --user restart picom";
-          always = true;
-          notification = false;
-        }
-      ];
-    };
-  };
-}
--- a/modules/nixos/graphical/polybar.nix
+++ b/modules/nixos/graphical/polybar.nix
@ -1,235 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
-
-    toggleBarCommand = "polybar-msg cmd toggle";
-
-    home-manager.users.${config.user} = {
-
-      services.polybar = {
-        enable = true;
-        package = pkgs.polybar.override {
-          pulseSupport = true;
-          githubSupport = true;
-          i3Support = true;
-        };
-        script = "polybar &";
-        config = {
-          "bar/main" = {
-            bottom = false;
-            width = "100%";
-            height = "22pt";
-            radius = 0;
-            # offset-y = -5;
-            # offset-y = "5%";
-            # dpi = 96;
-            background = config.theme.colors.base01;
-            foreground = config.theme.colors.base05;
-            line-size = "3pt";
-            border-top-size = 0;
-            border-right-size = 0;
-            border-left-size = 0;
-            border-bottom-size = "4pt";
-            border-color = config.theme.colors.base00;
-            padding-left = 2;
-            padding-right = 2;
-            module-margin = 1;
-            modules-left = "i3";
-            modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date power";
-            cursor-click = "pointer";
-            cursor-scroll = "ns-resize";
-            enable-ipc = true;
-            tray-position = "right";
-            # wm-restack = "generic";
-            # wm-restack = "bspwm";
-            # wm-restack = "i3";
-            # override-redirect = true;
-          };
-          "module/i3" =
-            let
-              padding = 2;
-            in
-            {
-              type = "internal/i3";
-              pin-workspaces = false;
-              show-urgent = true;
-              strip-wsnumbers = true;
-              index-sort = true;
-              enable-click = true;
-              wrapping-scroll = true;
-              fuzzy-match = true;
-              format = "<label-state> <label-mode>";
-              label-focused = "%name%";
-              label-focused-foreground = config.theme.colors.base01;
-              label-focused-background = config.theme.colors.base05;
-              label-focused-underline = config.theme.colors.base03;
-              label-focused-padding = padding;
-              label-unfocused = "%name%";
-              label-unfocused-padding = padding;
-              label-visible = "%name%";
-              label-visible-underline = config.theme.colors.base01;
-              label-visible-padding = padding;
-              label-urgent = "%name%";
-              label-urgent-foreground = config.theme.colors.base00;
-              label-urgent-background = config.theme.colors.base08;
-              label-urgent-underline = config.theme.colors.base0F;
-              label-urgent-padding = padding;
-            };
-          "module/xworkspaces" = {
-            type = "internal/xworkspaces";
-            label-active = "%name%";
-            label-active-background = config.theme.colors.base05;
-            label-active-foreground = config.theme.colors.base01;
-            label-active-underline = config.theme.colors.base03;
-            label-active-padding = 1;
-            label-occupied = "%name%";
-            label-occupied-padding = 1;
-            label-urgent = "%name%";
-            label-urgent-background = config.theme.colors.base08;
-            label-urgent-padding = 1;
-            label-empty = "%name%";
-            label-empty-foreground = config.theme.colors.base06;
-            label-empty-padding = 1;
-          };
-          "module/xwindow" = {
-            type = "internal/xwindow";
-            label = "%title:0:60:...%";
-          };
-          # "module/filesystem" = {
-          # type = "internal/fs";
-          # interval = 25;
-          # mount-0 = "/";
-          # label-mounted = "%{F#F0C674}%mountpoint%%{F-} %percentage_used%%";
-          # label-unmounted = "%mountpoint% not mounted";
-          # label-unmounted-foreground = colors.disabled;
-          # };
-          "module/mailcount" = {
-            type = "custom/script";
-            interval = 10;
-            format = "<label>";
-            exec = builtins.toString (
-              pkgs.writeShellScript "mailcount.sh" ''
-                ${pkgs.notmuch}/bin/notmuch new --quiet 2>&1>/dev/null
-                UNREAD=$(
-                    ${pkgs.notmuch}/bin/notmuch count \
-                        is:inbox and \
-                        is:unread and \
-                        folder:main/Inbox \
-                        2>/dev/null
-                )
-                if [ $UNREAD = "0" ]; then
-                  echo ""
-                else
-                  echo "%{T2}%{T-} $UNREAD "
-                fi
-              ''
-            );
-            click-left = "i3-msg 'exec --no-startup-id kitty --class aerc aerc'; sleep 0.15; i3-msg '[class=aerc] focus'";
-          };
-          "module/network" = {
-            type = "internal/network";
-            interface-type = "wired";
-            interval = 3;
-            accumulate-stats = true;
-            format-connected = "<label-connected>";
-            format-disconnected = "<label-disconnected>";
-            label-connected = "";
-            label-disconnected = "";
-          };
-          "module/pulseaudio" = {
-            type = "internal/pulseaudio";
-            # format-volume-prefix = "VOL ";
-            # format-volume-prefix-foreground = colors.primary;
-            format-volume = "<ramp-volume> <label-volume>";
-            # format-volume-background = colors.background;
-            # label-volume-background = colors.background;
-            format-volume-foreground = config.theme.colors.base04;
-            label-volume = "%percentage%%";
-            label-muted = "󰝟 ---";
-            label-muted-foreground = config.theme.colors.base03;
-            ramp-volume-0 = "";
-            ramp-volume-1 = "󰕾";
-            ramp-volume-2 = "";
-            click-right = config.audioSwitchCommand;
-          };
-          # "module/xkeyboard" = {
-          # type = "internal/xkeyboard";
-          # blacklist-0 = "num lock";
-          # label-layout = "%layout%";
-          # label-layout-foreground = colors.primary;
-          # label-indicator-padding = 2;
-          # label-indicator-margin = 1;
-          # label-indicator-foreground = colors.background;
-          # label-indicator-background = colors.secondary;
-          # };
-          # "module/memory" = {
-          # type = "internal/memory";
-          # interval = 2;
-          # format-prefix = "RAM ";
-          # format-prefix-foreground = colors.primary;
-          # label = "%percentage_used:2%%";
-          # };
-          # "module/cpu" = {
-          # type = "internal/cpu";
-          # interval = 2;
-          # format-prefix = "CPU ";
-          # format-prefix-foreground = colors.primary;
-          # label = "%percentage:2%%";
-          # };
-          # "network-base" = {
-          # type = "internal/network";
-          # interval = 5;
-          # format-connected = "<label-connected>";
-          # format-disconnected = "<label-disconnected>";
-          # label-disconnected = "%{F#F0C674}%ifname%%{F#707880} disconnected";
-          # };
-          # "module/wlan" = {
-          # "inherit" = "network-base";
-          # interface-type = "wireless";
-          # label-connected = "%{F#F0C674}%ifname%%{F-} %essid% %local_ip%";
-          # };
-          # "module/eth" = {
-          # "inherit" = "network-base";
-          # interface-type = "wired";
-          # label-connected = "%{F#F0C674}%ifname%%{F-} %local_ip%";
-          # };
-          "module/date" = {
-            type = "internal/date";
-            interval = 1;
-            date = "%d %b %l:%M %p";
-            date-alt = "%Y-%m-%d %H:%M:%S";
-            label = "%date%";
-            label-foreground = config.theme.colors.base06;
-            # format-background = colors.background;
-          };
-          "module/power" = {
-            type = "custom/text";
-            content = "  ";
-            click-left = config.powerCommand;
-            click-right = "polybar-msg cmd restart";
-            content-foreground = config.theme.colors.base04;
-          };
-          "settings" = {
-            screenchange-reload = true;
-            pseudo-transparency = false;
-          };
-        };
-      };
-
-      xsession.windowManager.i3.config.startup = [
-        {
-          command = "pkill polybar; polybar -r main";
-          always = true;
-          notification = false;
-        }
-      ];
-    };
-  };
-}
--- a/modules/nixos/graphical/rofi.nix
+++ b/modules/nixos/graphical/rofi.nix
@ -1,194 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-
-  rofi = config.home-manager.users.${config.user}.programs.rofi.finalPackage;
-in
-{
-
-  imports = [
-    ./rofi/power.nix
-    ./rofi/brightness.nix
-  ];
-
-  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {
-
-    home-manager.users.${config.user} = {
-
-      home.packages = with pkgs; [
-        jq # Required for rofi-systemd
-      ];
-
-      programs.rofi = {
-        enable = true;
-        cycle = true;
-        location = "center";
-        pass = { };
-        plugins = [
-          pkgs.rofi-calc
-          pkgs.rofi-emoji
-          pkgs.rofi-systemd
-        ];
-        theme =
-          let
-            inherit (config.home-manager.users.${config.user}.lib.formats.rasi) mkLiteral;
-          in
-          {
-
-            # Inspired by https://github.com/sherubthakur/dotfiles/blob/master/users/modules/desktop-environment/rofi/launcher.rasi
-
-            "*" = {
-              background-color = mkLiteral config.theme.colors.base00;
-              foreground-color = mkLiteral config.theme.colors.base07;
-              text-color = mkLiteral config.theme.colors.base07;
-              border-color = mkLiteral config.theme.colors.base04;
-            };
-
-            # Holds the entire window
-            "#window" = {
-              transparency = "real";
-              background-color = mkLiteral config.theme.colors.base00;
-              text-color = mkLiteral config.theme.colors.base07;
-              border = mkLiteral "4px";
-              border-color = mkLiteral config.theme.colors.base04;
-              border-radius = mkLiteral "4px";
-              width = mkLiteral "850px";
-              padding = mkLiteral "15px";
-            };
-
-            # Wrapper around bar and results
-            "#mainbox" = {
-              background-color = mkLiteral config.theme.colors.base00;
-              border = mkLiteral "0px";
-              border-radius = mkLiteral "0px";
-              border-color = mkLiteral config.theme.colors.base04;
-              children = map mkLiteral [
-                "inputbar"
-                "message"
-                "listview"
-              ];
-              spacing = mkLiteral "10px";
-              padding = mkLiteral "10px";
-            };
-
-            # Unknown
-            "#textbox-prompt-colon" = {
-              expand = false;
-              str = ":";
-              margin = mkLiteral "0px 0.3em 0em 0em";
-              text-color = mkLiteral config.theme.colors.base07;
-            };
-
-            # Command prompt left of the input
-            "#prompt" = {
-              enabled = false;
-            };
-
-            # Actual text box
-            "#entry" = {
-              placeholder-color = mkLiteral config.theme.colors.base03;
-              expand = true;
-              horizontal-align = "0";
-              placeholder = "";
-              padding = mkLiteral "0px 0px 0px 5px";
-              blink = true;
-            };
-
-            # Top bar
-            "#inputbar" = {
-              children = map mkLiteral [
-                "prompt"
-                "entry"
-              ];
-              border = mkLiteral "1px";
-              border-radius = mkLiteral "4px";
-              padding = mkLiteral "6px";
-            };
-
-            # Results
-            "#listview" = {
-              background-color = mkLiteral config.theme.colors.base00;
-              padding = mkLiteral "0px";
-              columns = 1;
-              lines = 12;
-              spacing = "5px";
-              cycle = true;
-              dynamic = true;
-              layout = "vertical";
-            };
-
-            # Each result
-            "#element" = {
-              orientation = "vertical";
-              border-radius = mkLiteral "0px";
-              padding = mkLiteral "5px 0px 5px 5px";
-            };
-            "#element.selected" = {
-              border = mkLiteral "1px";
-              border-radius = mkLiteral "4px";
-              border-color = mkLiteral config.theme.colors.base07;
-              background-color = mkLiteral config.theme.colors.base04;
-              text-color = mkLiteral config.theme.colors.base00;
-            };
-
-            "#element-text" = {
-              expand = true;
-              # horizontal-align = mkLiteral "0.5";
-              vertical-align = mkLiteral "0.5";
-              margin = mkLiteral "0px 2.5px 0px 2.5px";
-            };
-            "#element-text.selected" = {
-              background-color = mkLiteral config.theme.colors.base04;
-              text-color = mkLiteral config.theme.colors.base00;
-            };
-
-            # Not sure how to get icons
-            "#element-icon" = {
-              size = mkLiteral "18px";
-              border = mkLiteral "0px";
-              padding = mkLiteral "2px 5px 2px 2px";
-              background-color = mkLiteral config.theme.colors.base00;
-            };
-            "#element-icon.selected" = {
-              background-color = mkLiteral config.theme.colors.base04;
-              text-color = mkLiteral config.theme.colors.base00;
-            };
-          };
-        xoffset = 0;
-        yoffset = -20;
-        extraConfig = {
-          show-icons = true;
-          kb-cancel = "Escape,Super+space";
-          modi = "window,run,ssh,emoji,calc,systemd";
-          sort = true;
-          # levenshtein-sort = true;
-        };
-      };
-
-      home.file.".local/share/rofi/themes" = {
-        recursive = true;
-        source = ./rofi/themes;
-      };
-    };
-
-    launcherCommand = ''${rofi}/bin/rofi -modes drun -show drun -theme-str '@import "launcher.rasi"' '';
-    systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
-    altTabCommand = "${rofi}/bin/rofi -show window -modi window";
-    calculatorCommand = "${rofi}/bin/rofi -modes calc -show calc";
-    audioSwitchCommand = "${
-      (pkgs.writeShellApplication {
-        name = "switch-audio";
-        runtimeInputs = [
-          pkgs.ponymix
-          rofi
-        ];
-        text = builtins.readFile ./rofi/pulse-sink.sh;
-      })
-    }/bin/switch-audio";
-  };
-}
--- a/modules/nixos/graphical/xorg.nix
+++ b/modules/nixos/graphical/xorg.nix
@ -1,45 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  config = lib.mkIf config.gui.enable {
-
-    # Enable touchpad support
-    services.libinput.enable = true;
-
-    # Enable the X11 windowing system.
-    services.xserver = {
-      enable = config.gui.enable;
-
-      # Login screen
-      displayManager = {
-        lightdm = {
-          enable = config.services.xserver.enable;
-          background = config.wallpaper;
-
-          # Show default user
-          # Also make sure /var/lib/AccountsService/users/<user> has SystemAccount=false
-          extraSeatDefaults = ''
-            greeter-hide-users = false
-          '';
-        };
-      };
-    };
-
-    environment.systemPackages = with pkgs; [
-      xclip # Clipboard
-    ];
-
-    home-manager.users.${config.user} = {
-
-      programs.fish.shellAliases = {
-        pbcopy = "xclip -selection clipboard -in";
-        pbpaste = "xclip -selection clipboard -out";
-      };
-    };
-  };
-}
--- a/Show More
+++ b/Show More