diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index dbd611ca..cb5065f7 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -14,7 +14,9 @@
       "brscan5"
       "brscan5-etc-files"
       "facetimehd-firmware"
+      "notion-app"
       "slack"
+      "terraform"
       "uhk-agent"
       "uhk-udev-rules"
       "veracrypt"
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 97898446..dbbe36b9 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -10,6 +10,7 @@ final: prev: with prev; {
   mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
   mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
   mu = writeShellScriptBin "mu" (import ./mu.nix final);
+  notion-repackaged = import ./notion-repackaged.nix final;
   notes = writeShellScriptBin "notes" (import ./notes.nix final);
   psos = writeShellScriptBin "psos" (import ./psos.nix final);
   psos-docs = import ./psos-docs.nix final;
diff --git a/pkgs/notion-repackaged.nix b/pkgs/notion-repackaged.nix
new file mode 100644
index 00000000..763e8eaf
--- /dev/null
+++ b/pkgs/notion-repackaged.nix
@@ -0,0 +1,33 @@
+self:
+with self;
+let
+  pname = "notion-app";
+  version = "3.12.2-1";
+
+  src = fetchurl {
+     url = "https://github.com/sdkane/notion-repackaged/releases/download/v${version}/Notion-${version}.AppImage";
+     sha256 = "sha256-QM5qcMOkMmxFcoqokcl5wxYTOHbYCfPkAU1iKtsQG68=";
+  };
+
+  appimageContents = appimageTools.extract { inherit pname version src; };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
+    mkdir -p $out/share/icons
+    cp -r ${appimageContents}/usr/share/icons/hicolor/0x0/apps/notion-app.png $out/share/icons/notion-app.png
+  '';
+
+  meta = with lib; {
+    description = "Notion Desktop builds for Windows, MacOS and Linux.";
+    homepage = "https://github.com/sdkane/notion-repackaged";
+    license = licenses.unfree;
+    maintainers = [];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "notion-app";
+  };
+}
diff --git a/users/teutat3s/mnx.nix b/users/teutat3s/mnx.nix
index a47bf38b..bc27ba0b 100644
--- a/users/teutat3s/mnx.nix
+++ b/users/teutat3s/mnx.nix
@@ -47,8 +47,10 @@ in
           home.packages = with pkgs; [
             zoom-us
             slack
+            notion-repackaged
             prr
             tmate
+            jira-cli-go
           ];
         };
   };