try building mole for eblume

relates to #68
fix: replace kitty with wezterm in macos tiling layout
2025-07-06 16:40:14 +00:00 · 2024-06-26 16:24:35 -04:00 · 2024-06-24 09:53:09 -04:00 · 2024-06-23 17:43:36 -04:00 · 2024-06-23 11:42:43 -04:00 · 2024-06-23 09:08:36 -04:00
44 changed files with 799 additions and 224 deletions
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -11,10 +11,10 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v3
      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
+        uses: DeterminateSystems/nix-installer-action@v11
      - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
+        uses: DeterminateSystems/flake-checker-action@v7
      - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
+        uses: DeterminateSystems/magic-nix-cache-action@v6
      - name: Check the Flake
        run: nix flake check
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -18,13 +18,13 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v3
      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
+        uses: DeterminateSystems/nix-installer-action@v11
      - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
+        uses: DeterminateSystems/flake-checker-action@v7
      - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
+        uses: DeterminateSystems/magic-nix-cache-action@v6
      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v19
+        uses: DeterminateSystems/update-flake-lock@v21
        id: update
        with:
          pr-title: "Update flake.lock" # Title of PR to be created
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## System Features

 | Feature        | Program                                             | Configuration                                 |
-| ---            | ---                                                 | ---                                           |
+|----------------|-----------------------------------------------------|-----------------------------------------------|
 | OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
 | Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
 | Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
@ -21,7 +21,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## User Features

 | Feature      | Program                                                                          | Configuration                                      |
-| ---          | ---                                                                              | ---                                                |
+|--------------|----------------------------------------------------------------------------------|----------------------------------------------------|
 | Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
 | Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
 | Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
@ -38,7 +38,7 @@ configuration may be difficult to translate to a non-Nix system.
 ## macOS Features

 | Feature  | Program                                     | Configuration                        |
-| ---      | ---                                         | ---                                  |
+|----------|---------------------------------------------|--------------------------------------|
 | Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |

 # Diagram
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "baleia-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1704551058,
-        "narHash": "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs=",
+        "lastModified": 1717182435,
+        "narHash": "sha256-duI3myrJSvmtjF9n7NVrVOsuSo1O3JEypA5ghBHsULc=",
        "owner": "m00qek",
        "repo": "baleia.nvim",
-        "rev": "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495",
+        "rev": "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1",
        "type": "github"
      },
      "original": {
@ -49,6 +49,21 @@
        "type": "github"
      }
    },
+    "cl-nix-lite": {
+      "locked": {
+        "lastModified": 1717972076,
+        "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
+        "owner": "hraban",
+        "repo": "cl-nix-lite",
+        "rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hraban",
+        "repo": "cl-nix-lite",
+        "type": "github"
+      }
+    },
    "cmp-nvim-lsp-src": {
      "flake": false,
      "locked": {
@ -72,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716511055,
-        "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=",
+        "lastModified": 1718662658,
+        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532",
+        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
        "type": "github"
      },
      "original": {
@ -93,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716773194,
-        "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=",
+        "lastModified": 1718846788,
+        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "10986091e47fb1180620b78438512b294b7e8f67",
+        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
        "type": "github"
      },
      "original": {
@ -130,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716857077,
-        "narHash": "sha256-IvdZLdbPqJFkIbcDjMCMbdhrHjhS6k0SZk9IvJAI/fI=",
+        "lastModified": 1718930737,
+        "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "539f092808e92ffbab69d8dc307f7db88d721a9c",
+        "rev": "087919070dffc9798a8cb753e97babe287f06c25",
        "type": "github"
      },
      "original": {
@ -144,6 +159,23 @@
      }
    },
    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1697816753,
+        "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
+        "owner": "hraban",
+        "repo": "flake-compat",
+        "rev": "6025bade1336a36014639bc3f67eacc853dab78f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hraban",
+        "ref": "fixed-output",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
@ -163,6 +195,23 @@
      "inputs": {
        "systems": "systems"
      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "id": "flake-utils",
+        "type": "indirect"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
      "locked": {
        "lastModified": 1705309234,
        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -177,9 +226,9 @@
        "type": "github"
      }
    },
-    "flake-utils_2": {
+    "flake-utils_3": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1710146030,
@ -218,11 +267,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716847642,
-        "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=",
+        "lastModified": 1718983978,
+        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa",
+        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
        "type": "github"
      },
      "original": {
@ -232,19 +281,26 @@
        "type": "github"
      }
    },
-    "kitty-scrollback-nvim-src": {
-      "flake": false,
+    "mac-app-util": {
+      "inputs": {
+        "cl-nix-lite": "cl-nix-lite",
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1716487246,
-        "narHash": "sha256-yHyco+ftcpJAVWhwA8ItKa0IZgNJZjCQQjuyVG93xUs=",
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "rev": "08960ad9a96ff6ea6269157dbd4a8a499f7a4311",
+        "lastModified": 1718893255,
+        "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=",
+        "owner": "hraban",
+        "repo": "mac-app-util",
+        "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc",
        "type": "github"
      },
      "original": {
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
+        "owner": "hraban",
+        "repo": "mac-app-util",
        "type": "github"
      }
    },
@ -290,29 +346,28 @@
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1714909152,
-        "narHash": "sha256-CsAUnbA/9XiVuk96pOK+E++lp8BlJITtfExWcb9rqPk=",
-        "type": "tarball",
+        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
+        "type": "file",
        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
      },
      "original": {
-        "type": "tarball",
+        "type": "file",
        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
      }
    },
    "nix2vim": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1715598267,
-        "narHash": "sha256-xriYT6Tu6THN0n3ZOVLy3C0x61OVQOe9U1XvLhg463M=",
+        "lastModified": 1718621825,
+        "narHash": "sha256-bSfjwRgKKpLyjEDPRAF1hlJKc7QDoqopalHwNCB/eAA=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "fa1b1cbf6c17883143fcbbc840e5ecf6557af072",
+        "rev": "1db11dbf8a4d124e02244fa5c4ff219b672a8e5b",
        "type": "github"
      },
      "original": {
@ -344,11 +399,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716210724,
-        "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=",
+        "lastModified": 1718025593,
+        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94",
+        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
        "type": "github"
      },
      "original": {
@ -359,11 +414,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1716509168,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "lastModified": 1718895438,
+        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
        "type": "github"
      },
      "original": {
@ -391,11 +446,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1716892974,
-        "narHash": "sha256-THmLi8tNElts9aPkHV68tyON6LgaMvfrmu8j4h4v6Aw=",
+        "lastModified": 1719001822,
+        "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "f45a1ca97c3e7b5ec5d970977b5ec44b5f466857",
+        "rev": "e7edcaeae9db01224266febe88eb7d3411055636",
        "type": "github"
      },
      "original": {
@ -407,11 +462,11 @@
    "nvim-lint-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1716409152,
-        "narHash": "sha256-L5G634dM8kFWH+WxLCaMx+XY6Pzd++m0O4qRH1dS5PA=",
+        "lastModified": 1717789608,
+        "narHash": "sha256-LNYFxAM9lQNNOIOc+IgKgbSRp2U09B/9HivSCwMyUpQ=",
        "owner": "mfussenegger",
        "repo": "nvim-lint",
-        "rev": "e19842a05aae484957ad20710444757bc0a61d63",
+        "rev": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce",
        "type": "github"
      },
      "original": {
@ -440,11 +495,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1716876666,
-        "narHash": "sha256-rj/LdWQUSBcbxsUKfZp7N/qVC9/sWc/5PYwHVpBRm2U=",
+        "lastModified": 1717900986,
+        "narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "5a87ffe35c4739ffb6b62052572583ad277a20ae",
+        "rev": "2086e564c4d23fea714e8a6d63b881e551af2f41",
        "type": "github"
      },
      "original": {
@ -456,11 +511,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1716878762,
-        "narHash": "sha256-gXlbgvF9dtHof8xDSxGsACGCInMucjT3jiKB1T+VOm8=",
+        "lastModified": 1718957498,
+        "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "ea2b137f35fb1e87a6471ec311805920fdf45745",
+        "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23",
        "type": "github"
      },
      "original": {
@ -514,7 +569,7 @@
        "firefox-darwin": "firefox-darwin",
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
-        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
+        "mac-app-util": "mac-app-util",
        "nextcloud-cookbook": "nextcloud-cookbook",
        "nextcloud-external": "nextcloud-external",
        "nextcloud-news": "nextcloud-news",
@ -575,6 +630,21 @@
        "type": "github"
      }
    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "telescope-nvim-src": {
      "flake": false,
      "locked": {
@ -727,11 +797,11 @@
    "tree-sitter-vimdoc": {
      "flake": false,
      "locked": {
-        "lastModified": 1713806200,
-        "narHash": "sha256-+QbLL5EC3oNiwd7h7MW/mutHhGPUHhbYTQcu6x6atcI=",
+        "lastModified": 1717834376,
+        "narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
        "owner": "neovim",
        "repo": "tree-sitter-vimdoc",
-        "rev": "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4",
+        "rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
        "type": "github"
      },
      "original": {
@ -758,18 +828,18 @@
    },
    "wsl": {
      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1716640344,
-        "narHash": "sha256-AZKQs+KrL70le0RZH8XqZJMc2SahU4LpfEJ2Vd5SWzM=",
+        "lastModified": 1718710563,
+        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "020cd466170204e448b24b246045599fce69ad91",
+        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -37,6 +37,12 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    # Better App install management in macOS
+    mac-app-util = {
+      url = "github:hraban/mac-app-util";
+      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
+    };
+
    # Manage disk format and partitioning
    disko = {
      url = "github:nix-community/disko";
@ -117,10 +123,6 @@
      url = "github:j-hui/fidget.nvim/v1.4.5";
      flake = false;
    };
-    kitty-scrollback-nvim-src = {
-      url = "github:mikesmithgh/kitty-scrollback.nvim";
-      flake = false;
-    };
    nvim-lint-src = {
      url = "github:mfussenegger/nvim-lint";
      flake = false;
@ -191,7 +193,7 @@
    nextcloud-snappymail = {
      # https://github.com/the-djmaze/snappymail/releases
      # https://snappymail.eu/repository/nextcloud
-      url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
+      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
      flake = false;
    };
  };
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -79,6 +79,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
      services.gitea.enable = true;
      services.vaultwarden.enable = true;
      services.minecraft-server.enable = true; # Setup Minecraft server
+      system.autoUpgrade.enable = true;

      # Allows private remote access over the internet
      cloudflareTunnel = {
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -23,6 +23,7 @@ inputs.darwin.lib.darwinSystem {
      }
    )
    inputs.home-manager.darwinModules.home-manager
+    inputs.mac-app-util.darwinModules.default
    {
      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
      networking.hostName = "lookingglass";
@ -33,6 +34,7 @@ inputs.darwin.lib.darwinSystem {
        dark = true;
      };
      mail.user = globals.user;
+      mole.enable = true;
      atuin.enable = true;
      charm.enable = true;
      neovim.enable = true;
@ -51,6 +53,7 @@ inputs.darwin.lib.darwinSystem {
      kubernetes.enable = true;
      _1password.enable = true;
      slack.enable = true;
+      wezterm.enable = true;
    }
  ];
 }
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -8,9 +8,11 @@
  ...
 }:

-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
  system = "x86_64-linux";
-  specialArgs = { };
+  specialArgs = {
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
  modules = [
    globals
    inputs.home-manager.nixosModules.home-manager
@ -105,6 +107,7 @@ inputs.nixpkgs.lib.nixosSystem {
      services.samba.enable = true;
      services.paperless.enable = true;
      services.postgresql.enable = true;
+      system.autoUpgrade.enable = false;

      # Allows private remote access over the internet
      cloudflareTunnel = {
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -112,6 +112,7 @@ inputs.nixpkgs.lib.nixosSystem {
      mullvad.enable = false;
      rust.enable = true;
      terraform.enable = true;
+      wezterm.enable = true;
      yt-dlp.enable = true;
      gaming = {
        dwarf-fortress.enable = true;
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@ -8,9 +8,11 @@
    ./firefox.nix
    ./kitty.nix
    ./media.nix
+    ./mole.nix
    ./obsidian.nix
    ./qbittorrent.nix
    ./slack.nix
+    ./wezterm.nix
    ./yt-dlp.nix
  ];
 }
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -159,11 +159,15 @@

      xdg.mimeApps = {
        associations.added = {
-          "text.html" = [ "firefox.desktop" ];
+          "text/html" = [ "firefox.desktop" ];
        };
        defaultApplications = {
-          "text.html" = [ "firefox.desktop" ];
+          "text/html" = [ "firefox.desktop" ];
        };
+        associations.removed = {
+          "text/html" = [ "wine-extension-htm.desktop" ];
+        };
+
      };

      xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -22,7 +22,7 @@
    environment =
      { }
      // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
-        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
+        sessionVariables.ROFI_SYSTEMD_TERM = lib.mkDefault "${pkgs.kitty}/bin/kitty";
      };

    home-manager.users.${config.user} = {
@ -31,7 +31,7 @@
      xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "kitty";

      # Set the Rofi terminal for running programs
-      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
+      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");

      # Display images in the terminal
      programs.fish.shellAliases = {
@ -50,18 +50,9 @@

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

-          # Required for kitty-scrollback.nvim
-          allow_remote_control = "socket-only";
-          listen_on = "unix:/tmp/kitty";
-          action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
-
          # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
          background = config.theme.colors.base00;
          foreground = config.theme.colors.base05;
--- a/modules/common/applications/mole.nix
+++ b/modules/common/applications/mole.nix
@ -0,0 +1,110 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+
+  # Build kdl-py
+  kdl-py = pkgs.python311.pkgs.buildPythonPackage rec {
+    pname = "kdl-py";
+    version = "1.2.0";
+    pyproject = true;
+    src = pkgs.fetchPypi {
+      inherit pname version;
+      hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM=";
+    };
+    build-system = [ pkgs.python311.pkgs.setuptools ];
+    # has no tests
+    doCheck = false;
+  };
+
+  mole = pkgs.python311.pkgs.buildPythonPackage rec {
+    pname = "mole";
+    version = "0.7.1";
+    pyproject = true;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "eblume";
+      repo = pname;
+      rev = "30bb052a97050b1fa89c287855d834f7952b195a";
+      sha256 = "sha256-DUWsfyICCfFQ2ZQBYSQVoA3eLdKC8djUylKgGdHIyJo=";
+    };
+
+    patches = [
+      (builtins.toString (
+        pkgs.writeText "pyproject.toml.patch" ''
+          diff --git a/pyproject.toml b/pyproject.toml
+          index 12ce0f5..787e978 100644
+          --- a/pyproject.toml
+          +++ b/pyproject.toml
+          @@ -12,11 +12,11 @@ packages = [
+           [tool.poetry.dependencies]
+           python = "^3.11"
+           # Now back to the regular dependencies
+          -typer = {extras = ["all"], version = "^0.9"}
+          +typer = {extras = ["all"], version = "^0.12"}
+           todoist-api-python = "^2.1.3"
+           openai = "^1.2.4"
+           rich = "^13.4.2"
+          -watchdog = "^3.0.0"
+          +watchdog = "^4.0.0"
+           pydub = "^0.25.1"
+           requests = "^2.31.0"
+           pyyaml = "^6.0.1"
+        ''
+      ))
+    ];
+
+    # Used during build time
+    nativeBuildInputs = [ pkgs.python311Packages.poetry-core ];
+
+    # Used during run time
+    buildInputs = [
+      pkgs._1password
+      pkgs.nb-cli
+    ];
+
+    # Both build and run time
+    propagatedBuildInputs = [
+      pkgs.python311Packages.typer
+      pkgs.python311Packages.todoist-api-python
+      pkgs.python311Packages.openai
+      pkgs.python311Packages.rich
+      pkgs.python311Packages.watchdog
+      pkgs.python311Packages.pydub
+      pkgs.python311Packages.requests
+      pkgs.python311Packages.pyyaml
+      pkgs.python311Packages.pydantic
+      pkgs.python311Packages.pendulum
+      kdl-py
+      pkgs.ffmpeg
+    ];
+
+    build-system = [ pkgs.python311.pkgs.setuptools ];
+
+    # has no tests
+    doCheck = false;
+
+  };
+
+in
+{
+
+  options = {
+    mole = {
+      enable = lib.mkEnableOption {
+        description = "Enable Mole.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf config.mole.enable {
+    home-manager.users.${config.user} = {
+      home.packages = [ mole ];
+    };
+  };
+}
--- a/modules/common/applications/wezterm.nix
+++ b/modules/common/applications/wezterm.nix
@ -0,0 +1,235 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+
+  options = {
+    wezterm = {
+      enable = lib.mkEnableOption {
+        description = "Enable WezTerm terminal.";
+        default = false;
+      };
+    };
+  };
+
+  config =
+    let
+      font = config.home-manager.users.${config.user}.programs.kitty.font.name;
+    in
+    lib.mkIf (config.gui.enable && config.wezterm.enable) {
+
+      # Set the Rofi-Systemd terminal for viewing logs
+      # Using optionalAttrs because only available in NixOS
+      environment =
+        { }
+        // lib.attrsets.optionalAttrs (builtins.hasAttr "sessionVariables" config.environment) {
+          sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.wezterm}/bin/wezterm";
+        };
+
+      home-manager.users.${config.user} = {
+
+        # Set the i3 terminal
+        xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "wezterm";
+
+        # Set the Rofi terminal for running programs
+        programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.wezterm}/bin/wezterm";
+
+        # Display images in the terminal
+        programs.fish.shellAliases = {
+          icat = lib.mkForce "wezterm imgcat";
+        };
+
+        programs.wezterm = {
+          enable = true;
+          colorSchemes = {
+            myTheme = {
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
+              cursor_bg = config.theme.colors.base05;
+              cursor_fg = config.theme.colors.base00;
+              cursor_border = config.theme.colors.base05;
+              selection_bg = config.theme.colors.base05;
+              selection_fg = config.theme.colors.base00;
+              scrollbar_thumb = config.theme.colors.base03;
+              ansi = [
+                config.theme.colors.base01 # black
+                config.theme.colors.base0F # maroon
+                config.theme.colors.base0B # green
+                config.theme.colors.base0A # olive
+                config.theme.colors.base0D # navy
+                config.theme.colors.base0E # purple
+                config.theme.colors.base0C # teal
+                config.theme.colors.base06 # silver
+              ];
+              brights = [
+                config.theme.colors.base03 # grey
+                config.theme.colors.base08 # red
+                config.theme.colors.base0B # lime
+                config.theme.colors.base0A # yellow
+                config.theme.colors.base0D # blue
+                config.theme.colors.base0E # fuchsia
+                config.theme.colors.base0C # aqua
+                config.theme.colors.base07 # white
+              ];
+              compose_cursor = config.theme.colors.base09; # orange
+              copy_mode_active_highlight_bg = {
+                Color = config.theme.colors.base03;
+              };
+              copy_mode_active_highlight_fg = {
+                Color = config.theme.colors.base07;
+              };
+              copy_mode_inactive_highlight_bg = {
+                Color = config.theme.colors.base02;
+              };
+              copy_mode_inactive_highlight_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_label_bg = {
+                Color = config.theme.colors.base02;
+              };
+              quick_select_label_fg = {
+                Color = config.theme.colors.base06;
+              };
+              quick_select_match_bg = {
+                Color = config.theme.colors.base03;
+              };
+              quick_select_match_fg = {
+                Color = config.theme.colors.base07;
+              };
+            };
+          };
+          extraConfig = ''
+            return {
+                color_scheme = "myTheme",
+
+                -- Scrollback
+                scrollback_lines = 10000,
+
+                -- Window
+                window_padding = {
+                  left = 10,
+                  right = 10,
+                  top = 10,
+                  bottom = 10,
+                },
+
+                font = wezterm.font('${font}', { weight = 'Bold'}),
+                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
+
+                -- Tab Bar
+                hide_tab_bar_if_only_one_tab = true,
+                window_frame = {
+                  font = wezterm.font('${font}', { weight = 'Bold'}),
+                  font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
+                },
+
+                colors = {
+                  tab_bar = {
+                    active_tab = {
+                      bg_color = '${config.theme.colors.base00}',
+                      fg_color = '${config.theme.colors.base04}',
+                    },
+                  },
+                },
+
+                -- Disable audio
+                audible_bell = "Disabled",
+
+                initial_rows = 80,
+                initial_cols = 200,
+
+                keys = {
+                  -- sends completion string for fish autosuggestions
+                  {
+                    key = 'Enter',
+                    mods = 'SHIFT',
+                    action = wezterm.action.SendString '\x1F'
+                  },
+                  -- ctrl-shift-h was "hide"
+                  {
+                    key = 'H',
+                    mods = 'SHIFT|CTRL',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- alt-enter was "fullscreen"
+                  {
+                    key = 'Enter',
+                    mods = 'ALT',
+                    action = wezterm.action.DisableDefaultAssignment
+                  },
+                  -- make super-f "fullscreen"
+                  {
+                    key = 'f',
+                    mods = 'SUPER',
+                    action = wezterm.action.ToggleFullScreen
+                  },
+                  -- super-t open new tab in new dir
+                  {
+                    key = 't',
+                    mods = 'SUPER',
+                    action = wezterm.action.SpawnCommandInNewTab {
+                      cwd = wezterm.home_dir,
+                    },
+                  },
+                  -- shift-super-t open new tab in same dir
+                  {
+                    key = 't',
+                    mods = 'SUPER|SHIFT',
+                    action = wezterm.action.SpawnTab 'CurrentPaneDomain'
+                  },
+                  -- project switcher
+                  {
+                     key = 'P',
+                     mods = 'SUPER',
+                     action = wezterm.action_callback(function(window, pane)
+                       local choices = {}
+
+                       wezterm.log_info "working?"
+
+                       function scandir(directory)
+                           local i, t, popen = 0, {}, io.popen
+                           local pfile = popen('${pkgs.fd}/bin/fd --search-path "'..directory..'" --type directory --exact-depth 2 | ${pkgs.proximity-sort}/bin/proximity-sort "'..os.getenv("HOME").."/dev/work"..'"')
+                           for filename in pfile:lines() do
+                               i = i + 1
+                               t[i] = filename
+                           end
+                           pfile:close()
+                           return t
+                       end
+
+                       for _, v in pairs(scandir(os.getenv("HOME").."/dev")) do
+                         table.insert(choices, { label = v })
+                       end
+
+                       window:perform_action(
+                         wezterm.action.InputSelector {
+                           action = wezterm.action_callback(function(window, pane, id, label)
+                             if not id and not label then
+                               wezterm.log_info "cancelled"
+                             else
+                               window:perform_action(
+                                 wezterm.action.SpawnCommandInNewTab {
+                                   cwd = label,
+                                 },
+                                 pane
+                               )
+                             end
+                           end),
+                           fuzzy = true,
+                           title = "Select Project",
+                           choices = choices,
+                         },
+                         pane
+                       )
+                     end),
+                  },
+                },
+            }
+          '';
+        };
+      };
+    };
+}
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -158,7 +158,11 @@
          };
        };
        extraConfig = {
-          general.unsafe-accounts-conf = true;
+          general = {
+            unsafe-accounts-conf = true;
+            # log-file = "~/.cache/aerc.log";
+            # log-level = "debug";
+          };
          viewer = {
            pager = "${pkgs.less}/bin/less -R";
          };
--- a/modules/common/neovim/config/completion.nix
+++ b/modules/common/neovim/config/completion.nix
@ -26,15 +26,15 @@

    # Basic completion keybinds
    mapping = {
-      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
-      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
-      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
-      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<C-n>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
+      "['<C-p>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })";
+      "['<Down>']" = dsl.rawLua "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
+      "['<Up>']" = dsl.rawLua "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select }, { 'i', 'c' })";
      "['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
      "['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
      "['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
-      "['<CR>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
-      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<C-y>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })";
+      "['<C-r>']" = dsl.rawLua "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })";
      "['<Esc>']" = dsl.rawLua ''
        function(_)
            cmp.mapping({
@ -44,7 +44,7 @@
            vim.cmd("stopinsert") --- Abort and leave insert mode
        end
      '';
-      "['<C-l>']" = dsl.rawLua ''
+      "['<C-k>']" = dsl.rawLua ''
        cmp.mapping(function(_)
            if require("luasnip").expand_or_jumpable() then
                require("luasnip").expand_or_jump()
@ -131,13 +131,41 @@
  lua = ''
    -- Use buffer source for `/`
    require('cmp').setup.cmdline("/", {
-        sources = {
-            { name = "buffer", keyword_length = 5 },
+        mapping = {
+            ['<C-n>'] = {
+                c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
            },
+            ['<C-p>'] = {
+                c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-y>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
+            },
+            ['<C-r>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
+            },
+        },
+        sources = require('cmp').config.sources({
+            { name = "buffer", keyword_length = 5 },
+        }),
    })

    -- Use cmdline & path source for ':'
    require('cmp').setup.cmdline(":", {
+        mapping = {
+            ['<C-n>'] = {
+                c = require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-p>'] = {
+                c = require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert }, { 'i', 'c' })
+            },
+            ['<C-y>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Insert, select = true, }, { 'i', 'c' })
+            },
+            ['<C-r>'] = {
+                c = require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, }, { 'i', 'c' })
+            },
+        },
        sources = require('cmp').config.sources({
            { name = "path" },
        }, {
--- a/modules/common/neovim/config/github.lua
+++ b/modules/common/neovim/config/github.lua
@ -2,8 +2,11 @@
 vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })

 -- Pop a terminal to watch the current run
-local gitwatch =
-    require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+local gitwatch = require("toggleterm.terminal").Terminal:new({
+    cmd = "fish --interactive --init-command 'gh run watch'",
+    hidden = true,
+    direction = "float",
+})

 -- Set a toggle for this terminal
 function GITWATCH_TOGGLE()
@ -11,4 +14,4 @@ function GITWATCH_TOGGLE()
 end

 -- Keymap to toggle the run
-vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
+vim.keymap.set("n", "<Leader>W", GITWATCH_TOGGLE)
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -18,6 +18,7 @@
      pkgs.vimPlugins.conform-nvim
      pkgs.vimPlugins.fidget-nvim
      pkgs.vimPlugins.nvim-lint
+      pkgs.vimPlugins.vim-table-mode
    ];

    setup.fidget = { };
@ -88,7 +89,7 @@
        rust = [ "rustfmt" ];
        sh = [ "shfmt" ];
        terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
-        hcl = if config.terraform then [ "terraform_fmt" ] else [ ];
+        hcl = [ "hcl" ];
      };
      formatters = {
        lua.command = "${pkgs.stylua}/bin/stylua";
@ -105,6 +106,7 @@
          ];
        };
        terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+        hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
      };
    };

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

  # Initialize some plugins
@ -24,7 +23,6 @@
  };
  setup.glow = { };
  setup.which-key = { };
-  setup.kitty-scrollback = { };

  vim.o = {
    termguicolors = true; # Set to truecolor
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -26,7 +26,6 @@
    pkgs.vimPlugins.playground # Tree-sitter experimenting
    pkgs.vimPlugins.nginx-vim
    pkgs.vimPlugins.vim-helm
-    pkgs.vimPlugins.baleia-nvim # Clean ANSI from kitty scrollback
    # pkgs.vimPlugins.hmts-nvim # Tree-sitter injections for home-manager
    (pkgs.vimUtils.buildVimPlugin {
      pname = "nmasur";
--- a/modules/common/neovim/config/toggleterm.nix
+++ b/modules/common/neovim/config/toggleterm.nix
@ -14,6 +14,11 @@
    open_mapping = dsl.rawLua "[[<c-\\>]]";
    hide_numbers = true;
    direction = "float";
+    float_opts = {
+      width = dsl.rawLua "vim.o.columns - 4";
+      height = dsl.rawLua "vim.o.lines - 4";
+      row = 0;
+    };
  };

  lua = ''
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -48,12 +48,6 @@ in
          };
        };

-        # Set Neovim as the kitty terminal "scrollback" (vi mode) option.
-        # Requires removing some of the ANSI escape codes that are sent to the
-        # scrollback using sed and baleia, as well as removing several
-        # unnecessary features.
-        programs.kitty.settings.scrollback_pager = "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
-
        # Create a desktop option for launching Neovim from a file manager
        # (Requires launching the terminal and then executing Neovim)
        xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
--- a/modules/common/neovim/lua/settings.lua
+++ b/modules/common/neovim/lua/settings.lua
@ -19,9 +19,7 @@ vim.api.nvim_create_autocmd("FileType", {

 vim.api.nvim_create_autocmd("FileType", {
    pattern = "markdown",
-    callback = function()
-        vim.o.formatoptions = vim.o.formatopions + "a"
-    end,
+    command = "TableModeEnable",
 })

 vim.api.nvim_create_autocmd("FileType", {
--- a/modules/common/programming/python.nix
+++ b/modules/common/programming/python.nix
@ -14,7 +14,7 @@

      home.packages = with pkgs; [
        # python310 # Standard Python interpreter
-        nodePackages.pyright # Python language server
+        pyright # Python language server
        black # Python formatter
        python310Packages.flake8 # Python linter
      ];
--- a/modules/common/shell/bash/scripts/aws-ec2.sh
+++ b/modules/common/shell/bash/scripts/aws-ec2.sh
@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Retrieve list of AWS instances
+# Use enter to jump into their sessions with SSM
+
+# Specify AWS_PROFILE and AWS_REGION before running this script
+
+aws ec2 describe-instances \
+    --filters "Name=instance-state-name,Values=running" |
+    jq -r \
+        '.Reservations[]
+        | .Instances[]
+        | .InstanceId + " - " +
+        (.PrivateIpAddress // "n/a") + " - " +
+        (.PublicIpAddress // "n/a") + " - " +
+        (.Tags // [] | from_entries | .Name // "n/a")' |
+    fzf \
+        --height 100% \
+        --layout reverse \
+        --header $'Press Enter to start SSM session\nInstance ID - Private IP - Public IP - Name' \
+        --preview "aws ec2 describe-instances --instance-ids \"\$(echo {} | cut -d' ' -f1)\" | jq -r '.Reservations[].Instances[0]'" \
+        --bind "enter:become(aws ssm start-session --target \$(echo {} | cut -d' ' -f1))"
--- a/modules/common/shell/bash/scripts/terraform-init.sh
+++ b/modules/common/shell/bash/scripts/terraform-init.sh
@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+export AWS_PROFILE="gs"
+
+BUCKET_NAME_PART_1="t2"
+BUCKET_NAME_PART_2="global"
+BUCKET_NAME_PART_3="terraformstate"
+
+WORKFLOW_FILE=".github/workflows/terraform.yml"
+
+if [ ! -f $WORKFLOW_FILE ]; then
+    WORKFLOW_FILE=".github/workflows/apply.yml"
+fi
+
+AWS_ACCOUNT_NUMBER=$(
+    awk '/aws_account_number: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
+        echo "$(
+            read -r s
+            s=${s//\'/}
+            echo "$s"
+        )" # Remove single quote if it exists
+)
+
+if [ -z "${AWS_ACCOUNT_NUMBER}" ]; then
+    AWS_ACCOUNT_NUMBER=$(
+        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
+            echo "$(
+                read -r s
+                s=${s//\'/}
+                echo "$s"
+            )" # Remove single quote if it exists
+    )
+fi
+
+REPOSITORY=$(
+    git remote get-url origin |
+        awk -F'/' -v OFS='/' '{print $(NF-1),$NF }' |
+        echo "$(
+            read -r s
+            s=${s%.git}
+            echo "$s"
+        )" # Remove .git suffix if it exists
+)
+BRANCH=$(git branch --show-current)
+
+terraform init \
+    -backend-config="region=us-east-1" \
+    -backend-config="bucket=${BUCKET_NAME_PART_1}${BUCKET_NAME_PART_2}${BUCKET_NAME_PART_3}" \
+    -backend-config="workspace_key_prefix=accounts/${AWS_ACCOUNT_NUMBER}/${REPOSITORY}" \
+    -backend-config="key=state.tfstate" \
+    -backend-config="dynamodb_table=global-tf-state-lock" \
+    -upgrade
+
+terraform workspace select "$BRANCH"
--- a/modules/darwin/hammerspoon.nix
+++ b/modules/darwin/hammerspoon.nix
@ -18,7 +18,7 @@
        src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
        firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
        discord = "${pkgs.discord}/Applications/Discord.app";
-        kitty = "${pkgs.kitty}/Applications/kitty.app";
+        wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
        obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
        slack = "${pkgs.slack}/Applications/Slack.app";
      };
--- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
@ -56,7 +56,7 @@ function obj:init()
    -- Launcher shortcuts
    self.launcher:bind("ctrl", "space", function() end)
    self.launcher:bind("", "return", function()
-        self:switch("@kitty@")
+        self:switch("@wezterm@")
    end)
    self.launcher:bind("", "C", function()
        self:switch("Calendar.app")
--- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
+++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
@ -41,7 +41,7 @@ local function worklayout()
        local u = hs.geometry.unitrect
        -- set the layout
        local left = {
-            { "kitty", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
+            { "WezTerm", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
        }
        local right = {
            { "Slack", nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1), nil, nil, visible = true },
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@ -105,7 +105,7 @@
            "/Applications/zoom.us.app"
            "${pkgs.discord}/Applications/Discord.app"
            "${pkgs.obsidian}/Applications/Obsidian.app"
-            "${pkgs.kitty}/Applications/kitty.app"
+            "${pkgs.wezterm}/Applications/WezTerm.app"
            "/System/Applications/System Settings.app"
          ];
        };
--- a/modules/darwin/user.nix
+++ b/modules/darwin/user.nix
@ -11,7 +11,7 @@
    users.users."${config.user}" = {
      # macOS user
      home = config.homePath;
-      shell = pkgs.fish; # Default shell
+      # shell = pkgs.fish; # Default shell
    };

    home-manager.users.${config.user} = {
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@ -15,29 +15,47 @@

  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {

-    home.packages = with pkgs; [
-      visidata # CSV inspector
-      dos2unix # Convert Windows text files
-      inetutils # Includes telnet
-      youtube-dl # Convert web videos
-      pandoc # Convert text documents
-      mpd # TUI slideshows
-      mpv # Video player
-      gnupg # Encryption
-      awscli2
-      ssm-session-manager-plugin
-      awslogs
-      google-cloud-sdk
-      vault-bin
-      consul
-      noti # Create notifications programmatically
-      ipcalc # Make IP network calculations
-      teams
-      (writeShellApplication {
+    home.packages = [
+      pkgs.visidata # CSV inspector
+      pkgs.dos2unix # Convert Windows text files
+      pkgs.inetutils # Includes telnet
+      pkgs.youtube-dl # Convert web videos
+      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.google-cloud-sdk
+      pkgs.vault-bin
+      pkgs.consul
+      pkgs.noti # Create notifications programmatically
+      pkgs.ipcalc # Make IP network calculations
+      pkgs.teams
+      (pkgs.writeShellApplication {
        name = "ocr";
-        runtimeInputs = [ tesseract ];
+        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 = {
--- a/modules/nixos/gaming/default.nix
+++ b/modules/nixos/gaming/default.nix
@ -19,10 +19,9 @@
  options.gaming.enable = lib.mkEnableOption "Enable gaming features.";

  config = lib.mkIf (config.gaming.enable && pkgs.stdenv.isLinux) {
-    hardware.opengl = {
+    hardware.graphics = {
      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
    };
    programs.gamemode.enable = true;
  };
--- a/modules/nixos/graphical/i3.nix
+++ b/modules/nixos/graphical/i3.nix
@ -9,6 +9,7 @@ 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
 {

@ -47,9 +48,10 @@ in
            assigns = {
              "${ws1}" = [ { class = "Firefox"; } ];
              "${ws2}" = [
-                { class = "kitty"; }
                { class = "aerc"; }
+                { class = "kitty"; }
                { class = "obsidian"; }
+                { class = "wezterm"; }
              ];
              "${ws3}" = [ { class = "discord"; } ];
              "${ws4}" = [
@ -126,7 +128,9 @@ in
              "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";

              # Launchers
-              "${modifier}+Return" = "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
+              "${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}";
@ -138,8 +142,12 @@ in
              "${modifier}+Shift+r" = "restart";
              "${modifier}+Shift+q" = ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
              "${modifier}+Shift+x" = "exec ${lockCmd}";
-              "${modifier}+Mod1+h" = "exec --no-startup-id kitty sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
-              "${modifier}+Mod1+r" = "exec --no-startup-id kitty sh -c 'doas nixos-rebuild switch --flake ${config.dotfilesPath}#${config.networking.hostName} || read'";
+              "${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";
--- a/modules/nixos/graphical/rofi.nix
+++ b/modules/nixos/graphical/rofi.nix
@ -18,9 +18,6 @@ in

  config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) {

-    # Set the Rofi-Systemd terminal for viewing logs
-    environment.sessionVariables.ROFI_SYSTEMD_TERM = lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty";
-
    home-manager.users.${config.user} = {

      home.packages = with pkgs; [
--- a/modules/nixos/services/jellyfin.nix
+++ b/modules/nixos/services/jellyfin.nix
@ -54,9 +54,8 @@
    ];

    # Enable VA-API for hardware transcoding
-    hardware.opengl = {
+    hardware.graphics = {
      enable = true;
-      driSupport = true;
      extraPackages = [ pkgs.libva ];
    };
    environment.systemPackages = [ pkgs.libva-utils ];
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@ -9,7 +9,7 @@
  config = lib.mkIf config.services.nextcloud.enable {

    services.nextcloud = {
-      package = pkgs.nextcloud28; # Required to specify
+      package = pkgs.nextcloud29; # Required to specify
      configureRedis = true;
      datadir = "/data/nextcloud";
      database.createLocally = true;
@ -28,8 +28,9 @@
        maintenance_window_start = 4; # Run jobs at 4am UTC
      };
      extraAppsEnable = true;
-      extraApps = with config.services.nextcloud.package.packages.apps; {
-        inherit calendar contacts;
+      extraApps = {
+        calendar = config.services.nextcloud.package.packages.apps.calendar;
+        contacts = config.services.nextcloud.package.packages.apps.contacts;
        # These apps are defined and pinned by overlay in flake.
        news = pkgs.nextcloudApps.news;
        external = pkgs.nextcloudApps.external;
--- a/modules/nixos/services/victoriametrics.nix
+++ b/modules/nixos/services/victoriametrics.nix
@ -12,7 +12,7 @@ let

  username = "prometheus";

-  prometheusConfig = (pkgs.formats.yaml { }).generate "prometheus.yml" {
+  prometheusConfig = {
    scrape_configs = [
      {
        job_name = config.networking.hostName;
@ -38,8 +38,6 @@ in

  config = {

-    services.victoriametrics.extraOptions = [ "-promscrape.config=${prometheusConfig}" ];
-
    systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
      description = "VictoriaMetrics basic auth proxy";
      after = [ "network.target" ];
@ -85,21 +83,18 @@ in

    # VMAgent

-    services.vmagent.prometheusConfig = prometheusConfig; # Overwritten below
-    systemd.services.vmagent.serviceConfig = lib.mkIf config.services.vmagent.enable {
-      ExecStart = lib.mkForce ''
-        ${pkgs.victoriametrics}/bin/vmagent \
-                -promscrape.config=${prometheusConfig} \
-                -remoteWrite.url="https://${config.hostnames.prometheus}/api/v1/write" \
-                -remoteWrite.basicAuth.username=${username} \
-                -remoteWrite.basicAuth.passwordFile=${config.secrets.vmagent.dest}'';
+    services.vmagent = {
+      prometheusConfig = prometheusConfig;
+      remoteWrite = {
+        url = "https://${config.hostnames.prometheus}/api/v1/write";
+        basicAuthUsername = username;
+        basicAuthPasswordFile = config.secrets.vmagent.dest;
+      };
    };

    secrets.vmagent = lib.mkIf config.services.vmagent.enable {
      source = ../../../private/prometheus.age;
      dest = "${config.secretsDirectory}/vmagent";
-      owner = "vmagent";
-      group = "vmagent";
    };
    systemd.services.vmagent-secret = lib.mkIf config.services.vmagent.enable {
      requiredBy = [ "vmagent.service" ];
--- a/modules/nixos/system/auto-upgrade.nix
+++ b/modules/nixos/system/auto-upgrade.nix
@ -11,7 +11,7 @@

  # Update the system daily by pointing it at the flake repository
  system.autoUpgrade = {
-    enable = config.server; # Only auto upgrade servers
+    enable = lib.mkDefault false; # Don't enable by default
    dates = "09:33";
    flake = "git+${config.dotfilesRepo}";
    randomizedDelaySec = "25min";
--- a/overlays/kitty-scrollback-nvim.patch
+++ b/overlays/kitty-scrollback-nvim.patch
@ -1,13 +0,0 @@
-diff --git a/lua/kitty-scrollback/health.lua b/lua/kitty-scrollback/health.lua
-index 9d87dfa..a231b8d 100644
--- a/lua/kitty-scrollback/health.lua
-+++ b/lua/kitty-scrollback/health.lua
-@@ -234,7 +234,7 @@ local function check_kitty_debug_config()
- end
- 
- local function check_kitty_scrollback_nvim_version()
-  local current_version = nil
-+  local current_version = 'master'
-   local tag_cmd = { 'git', 'describe', '--exact-match', '--tags' }
-   local ksb_dir =
-     vim.fn.fnamemodify(vim.api.nvim_get_runtime_file('lua/kitty-scrollback', false)[1], ':h:h')
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -38,11 +38,5 @@ in
    base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
    baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
    hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
-    kitty-scrollback-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "kitty-scrollback-nvim";
-      src = inputs.kitty-scrollback-nvim-src;
-      version = "master";
-      patches = [ ./kitty-scrollback-nvim.patch ];
-    };
  };
 }
--- a/templates/poetry/flake.nix
+++ b/templates/poetry/flake.nix
@ -1,29 +1,44 @@
 {
  description = "Python project flake";
-
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
-  inputs.poetry2nix.url = "github:nix-community/poetry2nix";
-
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs";
+    poetry2nix.url = "github:nix-community/poetry2nix";
+  };
  outputs =
+    { nixpkgs, poetry2nix, ... }:
+    let
+      projectDir = ./.;
+      supportedSystems = [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    in
    {
-      self,
-      nixpkgs,
-      flake-utils,
-      poetry2nix,
-    }:
-    flake-utils.lib.eachDefaultSystem (
+      packages = forAllSystems (
        system:
        let
          pkgs = import nixpkgs {
            inherit system;
-          overlays = [ poetry2nix.overlay ];
+            overlays = [ poetry2nix.overlays.default ];
          };
-        projectDir = ./.;
        in
        {
-        defaultPackage = pkgs.poetry2nix.mkPoetryApplication { inherit projectDir; };
-        devShells.default = pkgs.mkShell {
+          default = pkgs.poetry2nix.mkPoetryApplication { inherit projectDir; };
+        }
+      );
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = [ poetry2nix.overlays.default ];
+          };
+        in
+        {
+          default = pkgs.mkShell {
            buildInputs = [
              (pkgs.poetry2nix.mkPoetryEnv { inherit projectDir; })
              pkgs.poetry
@ -31,4 +46,5 @@
          };
        }
      );
+    };
 }
--- a/windows/autohotkey/RemapCapsCtrlEscapeV2.ahk
+++ b/windows/autohotkey/RemapCapsCtrlEscapeV2.ahk
@ -0,0 +1,24 @@
+#Requires AutoHotkey v2.0
+#SingleInstance
+
+ih := InputHook("B L1 T1", "{Esc}")
+
+*Ctrl::
+{
+	ih.Start()
+	reason := ih.Wait()
+	if (reason = "Stopped") {
+		Send "{Esc}"
+	} else if (reason = "Max") {
+		Send "{Blind}{Ctrl down}" ih.Input
+	}
+}
+
+*Ctrl up::
+{
+	if (ih.InProgress) {
+		ih.Stop()
+	} else {
+		Send "{Ctrl up}"
+	}
+}
--- a/windows/caps-lock-ctrl.reg
+++ b/windows/caps-lock-ctrl.reg
@ -0,0 +1,8 @@
+Windows Registry Editor Version 5.00
+
+; Changes registry to map Caps Lock key to Ctrl key
+; More info here: https://www.autohotkey.com/boards/viewtopic.php?p=468638#p468638
+; And here: https://superuser.com/a/949533
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout]
+"Scancode Map"=hex:00,00,00,00,00,00,00,00,02,00,00,00,1d,00,3a,00,00,00,00,00
Author	SHA1	Message	Date
Noah Masur	068cdbf5d4	try building mole for eblume relates to #68	2024-06-26 16:24:35 -04:00
Noah Masur	c86188d734	fix: replace kitty with wezterm in macos tiling layout	2024-06-24 09:53:09 -04:00
Noah Masur	f1cdd4ae98	fix: renamed and deprecated graphics options (2)	2024-06-23 17:43:36 -04:00
Noah Masur	332921edd3	fix: open html emails in browser	2024-06-23 11:42:43 -04:00
Noah Masur	cc69cbaa6c	tweak wezterm padding to match kitty	2024-06-23 09:08:36 -04:00
Noah Masur	d165428a37	more wezterm aesthetic tweaks	2024-06-23 09:06:36 -04:00
Noah Masur	3e7955533e	fix: vmagent updates no longer require systemd manual attributes. the dynamicuser now uses loadcredential to retrieve secrets	2024-06-23 08:55:41 -04:00
Noah Masur	0b9886f93e	fix: renamed and deprecated graphics options	2024-06-23 08:54:51 -04:00
Noah Masur	2f39eb2ceb	replace kitty with wezterm on linux (tempest)	2024-06-23 08:54:30 -04:00
Noah Masur	cf19085158	update lockfile and i guess rebuild everything on macos	2024-06-21 17:08:38 -06:00
Noah Masur	a387950c9a	different new tab actions for wezterm	2024-06-21 17:08:25 -06:00
Noah Masur	dec46bcc97	fix: pyright is now an independent package	2024-06-20 17:25:51 -06:00
Noah Masur	0d6230b3dc	fix markdown tables format in github	2024-06-19 11:02:18 -06:00
Noah Masur	517ae65cf1	upgrade to nextcloud 29	2024-06-19 10:59:26 -06:00
Noah Masur	6f4ee32e8e	fix warning in nix with expression	2024-06-19 10:59:17 -06:00
Noah Masur	2c2f366c47	disable autoupgrade for swan, make explicit	2024-06-19 10:58:47 -06:00
Noah Masur	e509943103	add nixpkgs-caddy into swan	2024-06-19 10:51:16 -06:00
Noah Masur	8937d214f1	update lockfile	2024-06-19 10:44:13 -06:00
Noah Masur	af4161c4f4	make mac apps available in spotlight	2024-06-18 18:22:05 -06:00
Noah Masur	0a225d6599	set neovim completion to work in cmdline (command) mode	2024-06-18 18:08:49 -06:00
Noah Masur	b78bbf2003	fix: wezterm fullscreen keybind	2024-06-18 12:50:04 -06:00
Noah Masur	97cfaf0708	wezterm fuzzy jump to project	2024-06-17 15:34:46 -06:00
Noah Masur	dceb0c5c65	fix: atuin keybind for wezterm	2024-06-17 09:49:07 -06:00
Noah Masur	a309e96754	remove kitty-scrollback-nvim feature	2024-06-17 09:37:25 -06:00
Noah Masur	83e95b306d	add tf init to darwin	2024-06-16 19:00:28 -06:00
Noah Masur	6742103195	add wezterm to lookingglass	2024-06-16 18:59:43 -06:00
Noah Masur	57ce387402	wezterm completion for fish autosuggestions	2024-06-16 18:58:57 -06:00
Noah Masur	265144d957	update style of wezterm tab bar	2024-06-16 18:31:52 -06:00
Noah Masur	f0b9bfc0a7	add wezterm potential kitty replacement	2024-06-16 18:02:10 -06:00
Noah Masur	a4c9813341	tfinit shortcut script	2024-06-13 15:59:10 +01:00
Noah Masur	b051885b52	reduce toggleterm float margin	2024-06-12 12:07:47 +01:00
Noah Masur	985e69b4b8	fix: kitty scrollback nvim behavior	2024-06-07 14:05:24 -04:00
Noah Masur	8e9d556cfe	markdown fix with vim-table-mode	2024-06-06 17:08:40 -04:00
Noah Masur	99581ae1ea	fix: fallback for ec2 script and only show running instances	2024-06-05 17:58:22 -04:00
Noah Masur	96d410e1b2	fix: hcl formatting and markdown errors	2024-06-05 16:49:19 -04:00
Noah Masur	8e88d70a52	add ec2 list and ssm session fzf script also fix lint issues on home packages	2024-06-05 15:14:36 -04:00
Noah Masur	8b1032ebda	gh watch keybind for neovim toggleterm	2024-06-05 13:54:13 -04:00
Noah Masur	e55ee05c5c	use separate keybinds for neovim completion features	2024-06-05 13:54:13 -04:00
Noah Masur	0cdae3569e	remove flake-utils from poetry template	2024-06-05 13:54:13 -04:00
Noah Masur	0f1cbe2e06	update detsys actions	2024-06-02 14:04:28 -04:00
Noah Masur	7a22e798fc	autohotkey v2 for windows	2024-06-02 08:08:05 -04:00
Noah Masur	196d2e53e0	Create caps-lock-ctrl.reg for windows	2024-06-02 07:43:15 -04:00