diff --git a/home/darwin.nix b/home/darwin.nix index 1ac14ab..6d4f1d7 100644 --- a/home/darwin.nix +++ b/home/darwin.nix @@ -18,6 +18,7 @@ ./modules/wezterm ./modules/nvim ./modules/lazygit + ./modules/jrnl ]; programs.home-manager.enable = true; diff --git a/home/modules/jrnl/default.nix b/home/modules/jrnl/default.nix new file mode 100644 index 0000000..9eb250f --- /dev/null +++ b/home/modules/jrnl/default.nix @@ -0,0 +1,9 @@ +{ config, ... }: + +{ + xdg.configFile."jrnl" = { + # mkOutOfStoreSymlink needs an absolute path, otherwise it does not work: https://github.com/nix-community/home-manager/issues/676#issuecomment-1595795685 + # TODO: At least make the location of the config folder dynamic so that it works on other machines + source = config.lib.file.mkOutOfStoreSymlink /Users/dennis/dev/nix-config/home/modules/jrnl/jrnl.yaml; + }; +} diff --git a/home/modules/jrnl/jrnl.yaml b/home/modules/jrnl/jrnl.yaml new file mode 100644 index 0000000..c7c7642 --- /dev/null +++ b/home/modules/jrnl/jrnl.yaml @@ -0,0 +1,19 @@ +colors: + body: none + date: black + tags: yellow + title: cyan +default_hour: 9 +default_minute: 0 +editor: nvim +encrypt: false +highlight: true +indent_character: "|" +journals: + default: + journal: /Users/dennis/notes/journal.txt +linewrap: 79 +tagsymbols: "#@" +template: false +timeformat: "%F %r" +version: v4.1 diff --git a/home/modules/nvim/config/lazy-lock.json b/home/modules/nvim/config/lazy-lock.json index d70f05b..f02dcfc 100644 --- a/home/modules/nvim/config/lazy-lock.json +++ b/home/modules/nvim/config/lazy-lock.json @@ -8,16 +8,17 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" }, "fzf-lua": { "branch": "main", "commit": "54005a680b8115a3596c845c6e448299601c09eb" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "go.nvim": { "branch": "master", "commit": "f058a8c622edf24d27b8ef82fabffdbbc1d55707" }, "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" }, - "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" }, @@ -25,9 +26,8 @@ "nvim-treesitter": { "branch": "master", "commit": "f09a2215b8fed4c2e86f2dd1912e14166958c06a" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "oil.nvim": { "branch": "master", "commit": "548587d68b55e632d8a69c92cefd981f360634fa" }, - "org-bullets.nvim": { "branch": "main", "commit": "21437cfa99c70f2c18977bffd423f912a7b832ea" }, - "orgmode": { "branch": "master", "commit": "0ebe2e3c8a24137a86ac20b9f35c2a574a71035d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "render-markdown.nvim": { "branch": "main", "commit": "92256e02db70c474f97fc461b6b6bc4aff7a499a" }, "rose-pine": { "branch": "main", "commit": "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3" }, "schemastore.nvim": { "branch": "main", "commit": "9bac14f8e4951ed57d32a6944d8e3969d50e4d67" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, diff --git a/home/modules/nvim/config/lua/plugins/lsp.lua b/home/modules/nvim/config/lua/plugins/lsp.lua index b32bc32..c4d20f9 100644 --- a/home/modules/nvim/config/lua/plugins/lsp.lua +++ b/home/modules/nvim/config/lua/plugins/lsp.lua @@ -236,6 +236,7 @@ return { { name = "path" }, { name = "buffer", keyword_length = 3 }, { name = "luasnip" }, -- For luasnip users. + { name = "render-markdown" }, }), }) diff --git a/home/modules/nvim/config/lua/plugins/markdown.lua b/home/modules/nvim/config/lua/plugins/markdown.lua new file mode 100644 index 0000000..5e0ee21 --- /dev/null +++ b/home/modules/nvim/config/lua/plugins/markdown.lua @@ -0,0 +1,8 @@ +return { + "MeanderingProgrammer/render-markdown.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons", "jghauser/follow-md-links.nvim" }, + opts = { + ft = { "markdown" }, + completions = { lsp = { enabled = true } }, + }, +} diff --git a/home/modules/wezterm/config/startup.lua b/home/modules/wezterm/config/startup.lua index 93e74cc..2202264 100644 --- a/home/modules/wezterm/config/startup.lua +++ b/home/modules/wezterm/config/startup.lua @@ -18,38 +18,6 @@ wezterm.on("gui-startup", function(cmd) args = args, }) - -- W: dnsc-v2 - local dnsc_v2_root = helpers.project_dir() .. "/dnsc-v2" - local _, dnsc_v2_root_pane, _ = mux.spawn_window({ - workspace = "dnsc-v2", - cwd = dnsc_v2_root, - args = args, - }) - - local _ = dnsc_v2_root_pane:split({ - direction = "Left", - size = 0.7, - cwd = dnsc_v2_root, - }) - - -- dnsc_v2_root_pane:send_text("npm run dev\n") - - -- W: freed - local freed_root = helpers.project_dir() .. "/freed" - local _, freed_root_pane, _ = mux.spawn_window({ - workspace = "freed", - cwd = freed_root, - args = args, - }) - - local _ = freed_root_pane:split({ - direction = "Left", - size = 0.7, - cwd = freed_root, - }) - - -- freed_root_pane:send_text("air\n") - mux.set_active_workspace("dennis") end)