From 575d803160f7e02667152466ddb88783873ef48a Mon Sep 17 00:00:00 2001
From: Dennis <me@dnsc.io>
Date: Thu, 30 Jan 2025 22:24:49 +0100
Subject: [PATCH] Reconfigures org mode and zen mode

---
 flake.lock                                    |  6 +++---
 .../nvim/config/lua/plugins/orgmode.lua       | 21 ++++++++++++++++---
 .../nvim/config/lua/plugins/which-key.lua     |  1 +
 .../nvim/config/lua/plugins/zen-mode.lua      | 12 ++++++++++-
 hosts/dnsc-air/default.nix                    |  5 ++---
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 63b65aa..c2c4990 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737672001,
-        "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
+        "lastModified": 1737885640,
+        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
+        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
         "type": "github"
       },
       "original": {
diff --git a/home/modules/nvim/config/lua/plugins/orgmode.lua b/home/modules/nvim/config/lua/plugins/orgmode.lua
index 93efdc7..0790e15 100644
--- a/home/modules/nvim/config/lua/plugins/orgmode.lua
+++ b/home/modules/nvim/config/lua/plugins/orgmode.lua
@@ -18,9 +18,24 @@ return {
       org_startup_folded = "content",
       org_ellipsis = "  ",
       org_capture_templates = {
-        t = { description = "Task", template = "* TODO %?\n" },
-        l = { description = "Link", template = "* TODO [[%x]]%?" },
-        a = { description = "Task at line", template = "* TODO %?\nat: %a" },
+        t = { description = "(t)odo", template = "* TODO %?\n" },
+        a = { description = "Todo (a)t line", template = "* TODO %?\nat: %a" },
+        l = { description = "(l)ink", template = "* %x%?" },
+        j = {
+          description = "(j)ournal entry",
+          template = "\n** %?",
+          datetree = {
+            tree_type = "custom",
+            tree = {
+              {
+                format = "%Y-%m-%d",
+                pattern = "^(%d%d%d%d)-(%d%d)-(%d%d)$",
+                order = { 1 },
+              },
+            },
+          },
+          target = "~/orgnzr/journal.org",
+        },
       },
     })
 
diff --git a/home/modules/nvim/config/lua/plugins/which-key.lua b/home/modules/nvim/config/lua/plugins/which-key.lua
index 71ccc53..cda5850 100644
--- a/home/modules/nvim/config/lua/plugins/which-key.lua
+++ b/home/modules/nvim/config/lua/plugins/which-key.lua
@@ -179,5 +179,6 @@ return {
       mode = "n",
     },
     { "<leader>xr", "<cmd>source $MYVIMRC<cr>", desc = "Reload config", mode = "n" },
+    { "<leader>z", "<cmd>ZenMode<cr>", desc = "Toggle ZenMode", mode = "n" },
   },
 }
diff --git a/home/modules/nvim/config/lua/plugins/zen-mode.lua b/home/modules/nvim/config/lua/plugins/zen-mode.lua
index a6ff8e2..bd97926 100644
--- a/home/modules/nvim/config/lua/plugins/zen-mode.lua
+++ b/home/modules/nvim/config/lua/plugins/zen-mode.lua
@@ -1,4 +1,14 @@
 return {
   "folke/zen-mode.nvim",
-  opts = {},
+  opts = {
+    window = {
+      backdrop = 1,
+      width = 100,
+      options = {
+        number = false,
+        relativenumber = false,
+        signcolumn = "no",
+      },
+    },
+  },
 }
diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index 619d95a..50ace99 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -30,6 +30,8 @@
     ripgrep
     fzf
     fd
+    sd
+    bat
     fortune
     neofetch
     neovim
@@ -57,9 +59,6 @@
       "tree-sitter"
       "yt-dlp"
       "zoxide"
-      "nuspell"
-      "aspell"
-      "enchant"
       "pinentry"
       "pinentry-mac"
       "shellcheck"