try building mole for eblume

relates to #68
2025-07-06 22:30:13 +00:00 · 2024-06-26 16:24:35 -04:00
25 changed files with 213 additions and 270 deletions
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -19,14 +19,12 @@ jobs:
        uses: actions/checkout@v3
      - name: Install Nix
        uses: DeterminateSystems/nix-installer-action@v11
-        with:
-          nix-package-url: https://releases.nixos.org/nix/nix-2.18.4/nix-2.18.4-x86_64-linux.tar.xz
      - name: Check Nixpkgs Inputs
        uses: DeterminateSystems/flake-checker-action@v7
      - name: Add Nix Cache
        uses: DeterminateSystems/magic-nix-cache-action@v6
      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v23
+        uses: DeterminateSystems/update-flake-lock@v21
        id: update
        with:
          pr-title: "Update flake.lock" # Title of PR to be created
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "baleia-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1721805312,
-        "narHash": "sha256-qA1x5kplP2I8bURO0I4R0gt/zeznu9hQQ+XHptLGuwc=",
+        "lastModified": 1717182435,
+        "narHash": "sha256-duI3myrJSvmtjF9n7NVrVOsuSo1O3JEypA5ghBHsULc=",
        "owner": "m00qek",
        "repo": "baleia.nvim",
-        "rev": "1b25eac3ac03659c3d3af75c7455e179e5f197f7",
+        "rev": "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1",
        "type": "github"
      },
      "original": {
@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722609272,
-        "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
+        "lastModified": 1718662658,
+        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
+        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
        "type": "github"
      },
      "original": {
@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722476845,
-        "narHash": "sha256-7gZ8uf3qOox8Vrwd+p9EhUHHLhhK8lis/5KcXGmIaow=",
+        "lastModified": 1718846788,
+        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "7e1b215a0a96efb306ad6440bf706d2b307dc267",
+        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
        "type": "github"
      },
      "original": {
@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722732833,
-        "narHash": "sha256-SHglwNkIChlKLgkbkaZNB8HtITOezsUEajJgFOP13jw=",
+        "lastModified": 1718930737,
+        "narHash": "sha256-+nKJ/VP6X+hirXqRry3GzdNn4OJvOdB4nRnJY22ixFw=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "1e21b72d579f06362e01f594b713fa1d51622c21",
+        "rev": "087919070dffc9798a8cb753e97babe287f06c25",
        "type": "github"
      },
      "original": {
@ -267,11 +267,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722630065,
-        "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
+        "lastModified": 1718983978,
+        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "afc892db74d65042031a093adb6010c4c3378422",
+        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
        "type": "github"
      },
      "original": {
@ -291,11 +291,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719942949,
-        "narHash": "sha256-srSQac7dhXtisqu4XwPGrK8qcmT2rflJJ1mRIV9j0Qk=",
+        "lastModified": 1718893255,
+        "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=",
        "owner": "hraban",
        "repo": "mac-app-util",
-        "rev": "63f269f737cafb2219ba38780c1ecb1dc24bc4a2",
+        "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc",
        "type": "github"
      },
      "original": {
@ -304,72 +304,55 @@
        "type": "github"
      }
    },
-    "markview-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722404473,
-        "narHash": "sha256-mhRg/cszW/3oXdC1yvbpCeqWQA9WLW5FvcqGd/wBTnE=",
-        "owner": "OXY2DEV",
-        "repo": "markview.nvim",
-        "rev": "d0ccc97b5c988fb28e5033abdf7b832b9dfaf897",
-        "type": "github"
-      },
-      "original": {
-        "owner": "OXY2DEV",
-        "repo": "markview.nvim",
-        "type": "github"
-      }
-    },
    "nextcloud-cookbook": {
      "flake": false,
      "locked": {
-        "lastModified": 1719431638,
-        "narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
+        "lastModified": 1702545935,
+        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
+        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
      }
    },
    "nextcloud-external": {
      "flake": false,
      "locked": {
-        "lastModified": 1710338675,
-        "narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
+        "lastModified": 1699624334,
+        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
+        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
      }
    },
    "nextcloud-news": {
      "flake": false,
      "locked": {
-        "lastModified": 1718102703,
-        "narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
+        "lastModified": 1703426420,
+        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
+        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
      }
    },
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1722742894,
-        "narHash": "sha256-HlqO7xlMSRGgBtwi0t5oz5v7iw0zTSHysc9wGVRwGZI=",
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
+        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
+        "type": "file",
+        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
+        "type": "file",
+        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
      }
    },
    "nix2vim": {
@ -395,11 +378,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1722128034,
-        "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=",
+        "lastModified": 1712450863,
+        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc",
+        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
        "type": "github"
      },
      "original": {
@ -416,11 +399,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722214420,
-        "narHash": "sha256-qfHC1p5hcErGcE672/KhBkyWYloekQpqIxtcbcUVYkA=",
+        "lastModified": 1718025593,
+        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "75cbb2a5e19c18840d105a72d036c6c92fc46c5d",
+        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
        "type": "github"
      },
      "original": {
@ -431,11 +414,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1722421184,
-        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "lastModified": 1718895438,
+        "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
+        "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
        "type": "github"
      },
      "original": {
@ -463,11 +446,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1722739987,
-        "narHash": "sha256-jOZZQ2CrTx2R9zu+AZu57APxI0iDINhcmeyMKZiM1ls=",
+        "lastModified": 1719001822,
+        "narHash": "sha256-rbEP1CTzYvdSAKf1a729De9t8GMIrZ5GmD+PdYCnrgg=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "d95fbf93429f5c9f4e41249212d2386a995f0cc3",
+        "rev": "e7edcaeae9db01224266febe88eb7d3411055636",
        "type": "github"
      },
      "original": {
@ -479,11 +462,11 @@
    "nvim-lint-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1719415114,
-        "narHash": "sha256-a9Mfoi1NzQ3b1w1VUqqJZddyCZYyacRnc128t5X3Wb0=",
+        "lastModified": 1717789608,
+        "narHash": "sha256-LNYFxAM9lQNNOIOc+IgKgbSRp2U09B/9HivSCwMyUpQ=",
        "owner": "mfussenegger",
        "repo": "nvim-lint",
-        "rev": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0",
+        "rev": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce",
        "type": "github"
      },
      "original": {
@ -512,11 +495,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1722137182,
-        "narHash": "sha256-cGBGvguDYyWfTkalBCMQTiQALKDCckUpXgfZZpJpqcg=",
+        "lastModified": 1717900986,
+        "narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "48d0e82f9434691cc50d970898142a8c084a49d6",
+        "rev": "2086e564c4d23fea714e8a6d63b881e551af2f41",
        "type": "github"
      },
      "original": {
@ -528,11 +511,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1722677148,
-        "narHash": "sha256-Aesf0i3fFDvzB/J+serrn+kf9zK7m5spEXg8xn3AbFI=",
+        "lastModified": 1718957498,
+        "narHash": "sha256-GEuKEAZxLGMkyjdJGzrIKNR1X10RHlACC6s1lNOq7aw=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "a7a3b9c10e8a5fe0da05ebb65db3ed1d164e612d",
+        "rev": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23",
        "type": "github"
      },
      "original": {
@ -587,7 +570,6 @@
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
        "mac-app-util": "mac-app-util",
-        "markview-nvim-src": "markview-nvim-src",
        "nextcloud-cookbook": "nextcloud-cookbook",
        "nextcloud-external": "nextcloud-external",
        "nextcloud-news": "nextcloud-news",
@ -603,10 +585,8 @@
        "nvim-treesitter-src": "nvim-treesitter-src",
        "ren": "ren",
        "rep": "rep",
-        "stu": "stu",
        "telescope-nvim-src": "telescope-nvim-src",
        "telescope-project-nvim-src": "telescope-project-nvim-src",
-        "tiny-inline-diagnostic-nvim-src": "tiny-inline-diagnostic-nvim-src",
        "toggleterm-nvim-src": "toggleterm-nvim-src",
        "tree-sitter-bash": "tree-sitter-bash",
        "tree-sitter-ini": "tree-sitter-ini",
@ -620,22 +600,6 @@
        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
      }
    },
-    "stu": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1721633982,
-        "narHash": "sha256-JLsUMZDXK89QmHLlGG9i5L+1e/redjk5ff6NiZdNsYo=",
-        "owner": "lusingander",
-        "repo": "stu",
-        "rev": "aefd555fb3e128d40f8bd80d37aa5c6e5d8bc011",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lusingander",
-        "repo": "stu",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -714,22 +678,6 @@
        "type": "github"
      }
    },
-    "tiny-inline-diagnostic-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722199694,
-        "narHash": "sha256-GyJANobsPKFAJJLxb3bANKjOSGGwX0xmm9HkwBzkPuE=",
-        "owner": "rachartier",
-        "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "ca50af9dc3cd88647077330b4728f4d0a7e754c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rachartier",
-        "repo": "tiny-inline-diagnostic.nvim",
-        "type": "github"
-      }
-    },
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
@ -816,11 +764,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1721001135,
-        "narHash": "sha256-H6t98tuXJW2VD5Ay+rOfnp9p5ZljyPxvtIy60PycMUQ=",
+        "lastModified": 1714528221,
+        "narHash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "0dee05ef958ba2eae88d1e65f24b33cad70d4367",
+        "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7",
        "type": "github"
      },
      "original": {
@ -887,11 +835,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722253092,
-        "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
+        "lastModified": 1718710563,
+        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
+        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -127,14 +127,6 @@
      url = "github:mfussenegger/nvim-lint";
      flake = false;
    };
-    markview-nvim-src = {
-      url = "github:OXY2DEV/markview.nvim";
-      flake = false;
-    };
-    tiny-inline-diagnostic-nvim-src = {
-      url = "github:rachartier/tiny-inline-diagnostic.nvim";
-      flake = false;
-    };

    # Tree-Sitter Grammars
    tree-sitter-bash = {
@ -182,33 +174,26 @@
      flake = false;
    };

-    # Stu - TUI for S3
-    stu = {
-      url = "github:lusingander/stu";
-      flake = false;
-    };
-
    # Nextcloud Apps
    nextcloud-news = {
      # https://github.com/nextcloud/news/releases
-      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
+      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
      flake = false;
    };
    nextcloud-external = {
      # https://github.com/nextcloud-releases/external/releases
-      url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
+      url = "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
      flake = false;
    };
    nextcloud-cookbook = {
      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
-      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
+      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
      flake = false;
    };
    nextcloud-snappymail = {
      # https://github.com/the-djmaze/snappymail/releases
      # https://snappymail.eu/repository/nextcloud
-      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz";
-      # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
+      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
      flake = false;
    };
  };
@ -263,7 +248,6 @@
        (import ./overlays/betterlockscreen.nix)
        (import ./overlays/gh-collaborators.nix)
        (import ./overlays/ren-rep.nix inputs)
-        (import ./overlays/stu.nix inputs)
      ];

      # System types to support.
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -34,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;
@ -53,7 +54,6 @@ inputs.darwin.lib.darwinSystem {
      _1password.enable = true;
      slack.enable = true;
      wezterm.enable = true;
-      yt-dlp.enable = true;
    }
  ];
 }
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@ -8,6 +8,7 @@
    ./firefox.nix
    ./kitty.nix
    ./media.nix
+    ./mole.nix
    ./obsidian.nix
    ./qbittorrent.nix
    ./slack.nix
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -34,13 +34,10 @@
      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.fish.shellAliases = {
+        icat = "kitty +kitten icat";
+        ssh = "kitty +kitten ssh";
+      };

      programs.kitty = {
        enable = true;
--- 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/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -19,11 +19,9 @@
      pkgs.vimPlugins.fidget-nvim
      pkgs.vimPlugins.nvim-lint
      pkgs.vimPlugins.vim-table-mode
-      pkgs.vimPlugins.tiny-inline-diagnostic-nvim
    ];

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

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

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

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

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

--- 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/lua/keybinds.lua
+++ b/modules/common/neovim/lua/keybinds.lua
@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
 key("n", "cq", ":cclose<CR>")

 -- Other
-key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
-key("n", "Y", "y$") --- Copy to end of line
+key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
+key("n", "Y", "y$")                                         --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
-key("v", "D", "y'>gp") --- Duplicate selected
-key("x", "<Leader>p", '"_dP') --- Paste but keep register
+key("v", "D", "y'>gp")                                      --- Duplicate selected
+key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
--- a/modules/common/shell/bash/scripts/terraform-init.sh
+++ b/modules/common/shell/bash/scripts/terraform-init.sh
@ -6,15 +6,14 @@ BUCKET_NAME_PART_1="t2"
 BUCKET_NAME_PART_2="global"
 BUCKET_NAME_PART_3="terraformstate"

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

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

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

 if [ -z "${AWS_ACCOUNT_NUMBER}" ]; then
    AWS_ACCOUNT_NUMBER=$(
-        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' "$WORKFLOW_FILE" | # Grab account number
+        awk '/AWS_ACCOUNT_NUMBER: .*/ {print $2}' $WORKFLOW_FILE | # Grab account number
            echo "$(
                read -r s
                s=${s//\'/}
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@ -106,6 +106,7 @@
            "${pkgs.discord}/Applications/Discord.app"
            "${pkgs.obsidian}/Applications/Obsidian.app"
            "${pkgs.wezterm}/Applications/WezTerm.app"
+            "/System/Applications/System Settings.app"
          ];
        };

--- a/modules/darwin/user.nix
+++ b/modules/darwin/user.nix
@ -14,9 +14,6 @@
      # 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
--- a/modules/darwin/utilities.nix
+++ b/modules/darwin/utilities.nix
@ -19,6 +19,7 @@
      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
@ -26,14 +27,12 @@
      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 ];
--- a/modules/nixos/applications/nautilus.nix
+++ b/modules/nixos/applications/nautilus.nix
@ -20,7 +20,7 @@

    # Quick preview with spacebar
    services.gnome.sushi.enable = true;
-    environment.systemPackages = [ pkgs.nautilus ];
+    environment.systemPackages = [ pkgs.gnome.nautilus ];

    home-manager.users.${config.user} = {

@ -28,13 +28,13 @@
      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";
+        }+n" = "exec --no-startup-id ${pkgs.gnome.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";
+          body = "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
        };
      };

--- a/modules/nixos/hardware/audio.nix
+++ b/modules/nixos/hardware/audio.nix
@ -36,6 +36,8 @@ in
 {

  config = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
+    sound.enable = true;
+
    # Enable PipeWire
    services.pipewire = {
      enable = true;
--- a/modules/nixos/hardware/mouse.nix
+++ b/modules/nixos/hardware/mouse.nix
@ -21,15 +21,5 @@
      accelProfile = "flat";
      accelSpeed = "1.15";
    };
-
-    # Cursor
-    home-manager.users.${config.user}.home.pointerCursor = {
-      name = "Adwaita";
-      package = pkgs.adwaita-icon-theme;
-      size = 24;
-      gtk.enable = true;
-      x11.enable = true;
-    };
-
  };
 }
--- a/modules/nixos/services/caddy.nix
+++ b/modules/nixos/services/caddy.nix
@ -91,16 +91,8 @@
      );
    };

-    systemd.services.caddy.serviceConfig = {
-
-      # Allows Caddy to serve lower ports (443, 80)
-      AmbientCapabilities = "CAP_NET_BIND_SERVICE";
-
-      # Prevent flooding of logs by rate-limiting
-      LogRateLimitIntervalSec = "5s"; # Limit period
-      LogRateLimitBurst = 100; # Limit threshold
-
-    };
+    # Allows Caddy to serve lower ports (443, 80)
+    systemd.services.caddy.serviceConfig.AmbientCapabilities = "CAP_NET_BIND_SERVICE";

    # Required for web traffic to reach this machine
    networking.firewall.allowedTCPPorts = [
--- a/modules/nixos/services/grafana.nix
+++ b/modules/nixos/services/grafana.nix
@ -885,28 +885,6 @@ in
                              }
                            ];
                          }
-                          {
-                            matcher = {
-                              id = "byName";
-                              options = "localhost:8086";
-                            };
-                            properties = [
-                              {
-                                id = "displayName";
-                                value = "InfluxDB";
-                              }
-                              {
-                                id = "links";
-                                value = [
-                                  {
-                                    targetBlank = true;
-                                    title = "";
-                                    url = "https://${config.hostnames.influxdb}";
-                                  }
-                                ];
-                              }
-                            ];
-                          }
                          {
                            matcher = {
                              id = "byName";
@ -951,28 +929,6 @@ in
                              }
                            ];
                          }
-                          {
-                            matcher = {
-                              id = "byName";
-                              options = "localhost:9000";
-                            };
-                            properties = [
-                              {
-                                id = "displayName";
-                                value = "The Lounge";
-                              }
-                              {
-                                id = "links";
-                                value = [
-                                  {
-                                    targetBlank = true;
-                                    title = "";
-                                    url = "https://${config.hostnames.irc}";
-                                  }
-                                ];
-                              }
-                            ];
-                          }
                          {
                            matcher = {
                              id = "byName";
@ -2365,7 +2321,7 @@ in
                      datasourceUid = promUid;
                      model = {
                        editorMode = "code";
-                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
+                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
                        hide = false;
                        instant = true;
                        intervalMs = 1000;
@ -2462,7 +2418,7 @@ in
                  execErrState = "Error";
                  for = "5m";
                  annotations = {
-                    description = "Cloudflare Tunnel for {{ index $labels \"job\" }}.";
+                    description = "Cloudflare Tunnel for {{ $job }}.";
                    summary = "Cloudflare Tunnel is down.";
                  };
                  isPaused = false;
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@ -26,8 +26,6 @@
        trusted_domains = [ config.hostnames.content ];
        trusted_proxies = [ "127.0.0.1" ];
        maintenance_window_start = 4; # Run jobs at 4am UTC
-        log_type = "file";
-        loglevel = 1; # Include all actions in the log
      };
      extraAppsEnable = true;
      extraApps = {
--- a/modules/nixos/services/victoriametrics.nix
+++ b/modules/nixos/services/victoriametrics.nix
@ -38,10 +38,6 @@ in

  config = {

-    services.victoriametrics.extraOptions = [
-      "-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
-    ];
-
    systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
      description = "VictoriaMetrics basic auth proxy";
      after = [ "network.target" ];
--- a/modules/nixos/system/journald.nix
+++ b/modules/nixos/system/journald.nix
@ -4,10 +4,7 @@
  # How long to keep journalctl entries
  # This helps to make sure log disk usage doesn't grow too unwieldy
  services.journald.extraConfig = ''
-    SystemMaxUse=4G
-    SystemKeepFree=10G
-    SystemMaxFileSize=128M
-    SystemMaxFiles=500
+    SystemMaxUse=100M
    MaxFileSec=1month
    MaxRetentionSec=2month
  '';
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -38,7 +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;
-    markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
-    tiny-inline-diagnostic-nvim = plugin "tiny-inline-diagnostic-nvim" inputs.tiny-inline-diagnostic-nvim-src;
  };
 }
--- a/overlays/stu.nix
+++ b/overlays/stu.nix
@ -1,17 +0,0 @@
-inputs: _final: prev: {
-
-  stu = prev.rustPlatform.buildRustPackage {
-    pname = "stu";
-    version = "0.5.0";
-    src = inputs.stu;
-    cargoHash = "sha256-gUolS7HXkTddxDWDGir4YC+2tJjgB/CCQC49SSRaR6U=";
-    buildInputs =
-      if prev.stdenv.isDarwin then
-        [
-          prev.darwin.apple_sdk.frameworks.CoreGraphics
-          prev.darwin.apple_sdk.frameworks.AppKit
-        ]
-      else
-        [ ];
-  };
-}