feat(nvim): remove neorg

flake.nix

@@ -35,6 +35,7 @@
             gpgSigningKey = "4AA25D647AA54CC7";
             gpgSSHKeys = [ "1F937AC8F77ED74CE24EAAE79B5601F73C6D115F" ];
             theme = "dark";
+            vimwikiPath = "~/vimwiki";
           };
         };
         "mmandl@NB11313" = home-manager.lib.homeManagerConfiguration {
@@ -55,6 +56,7 @@
             gpgSigningKey = "088ED38F036C7AF2";
             gpgSSHKeys = [ "AEB2BF3FF9CF9529E9A3C6F1A202D21686FF9278" ];
             theme = "dark";
+            vimwikiPath = "~/vimwiki";
           };
         };
       };

git/default.nix

@@ -67,7 +67,7 @@
       };
 
       aliases = {
-        graph = "log --graph --all --max-count 32";
+        graph = "log --graph";
       };
 
       ignores = [

horsch/zsh.nix

@@ -14,6 +14,10 @@
       ssh smartcan "systemctl restart smartcan-''${1}"
     }
 
+    function fu-build {
+      ./kas-container build kas/kas-ttc-image-horsch.yml
+    }
+
     function fu-reboot {
       ssh fusion "reboot"
     }

neovim/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, theme, ... }:
+{ pkgs, theme, vimwikiPath, ... }:
 {
   # symlink for a stable path
   home.file.".vscode-extensions/vscode-lldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb;
@@ -81,7 +81,7 @@
         lsp-status-nvim
         rustaceanvim
         neodev-nvim
-        null-ls-nvim
+        none-ls-nvim
         lsp_lines-nvim
         lsp-inlayhints-nvim
 
@@ -89,9 +89,8 @@
         nvim-dap
         nvim-dap-ui
 
-        # neorg
-        neorg
-        neorg-telescope
+        # vim-wiki
+        vimwiki
       ];
 
       withNodeJs = true;
@@ -102,8 +101,8 @@
         terraform-ls
         tflint
         bash-language-server
+        prettierd
         nodePackages.yaml-language-server
-        nodePackages.prettier
         nodePackages.eslint_d
         nodePackages.typescript-language-server
         nodePackages.typescript
@@ -128,6 +127,9 @@
 
         #clipboard
         xclip
+
+        #vimwiki
+        vimwiki-markdown
       ];
 
       extraLuaPackages = luaPackages: [
@@ -137,8 +139,6 @@
 
       extraConfig = ''
         lua << EOF
-            vim.o.guifont = "DejaVu Sans Mono:h10"
-
             ${builtins.readFile ./keymaps.lua }
             ${builtins.readFile ./options.lua }
             ${builtins.readFile ./commands.lua }
@@ -156,15 +156,21 @@
             ${builtins.readFile ./nvim-cmp.lua }
             ${builtins.readFile ./telescope.lua }
 
-            ${builtins.readFile ./themes.lua }
-            vim.opt.background = '${theme}'
+            do
+              local vim_theme = "${theme}";
+              ${builtins.readFile ./themes.lua }
+            end
 
             ${builtins.readFile ./project-nvim.lua }
             ${builtins.readFile ./dap.lua }
-            ${builtins.readFile ./neorg.lua }
             ${builtins.readFile ./illuminate.lua }
             ${builtins.readFile ./wilder.lua }
 
+            do
+              local vimwiki_path = "${vimwikiPath}"
+              ${builtins.readFile ./vimwiki.lua }
+            end
+
             vim.g.gitblame_date_format = "%r"
 
             require("nvim-autopairs").setup({})

neovim/lspconfig.lua

@@ -161,8 +161,9 @@ vim.g.rustaceanvim = {
 local null_ls = require("null-ls")
 null_ls.setup({
   sources = {
-    null_ls.builtins.formatting.prettier,
-    null_ls.builtins.diagnostics.tsc,
+    null_ls.builtins.formatting.prettierd.with({
+      extra_filetypes = { "vimwiki" },
+    }),
   },
   on_attach = on_attach,
 })

neovim/neorg.lua

@@ -1,16 +0,0 @@
-local neorg = require("neorg")
-
-neorg.setup({
-  load = {
-    ["core.defaults"] = {},
-    ["core.concealer"] = {},
-    ["core.dirman"] = {
-      config = {
-        workspaces = {
-          notes = "~/notes",
-        },
-        default_workspace = "notes",
-      },
-    },
-  }
-})

neovim/themes.lua

@@ -1 +1,2 @@
 vim.cmd("colorscheme solarized")
+vim.opt.background = vim_theme

neovim/treesitter.lua

@@ -91,3 +91,5 @@ require('nvim-treesitter.configs').setup({
     },
   },
 })
+
+vim.treesitter.language.register("markdown", "vimwiki")

neovim/vimwiki.lua

@@ -0,0 +1,12 @@
+vim.g.vimwiki_list = {
+  {
+    path = vimwiki_path,
+    syntax = "markdown",
+    ext = ".md",
+    path_html = "~/vimwiki_html",
+    custom_wiki2html = "vimwiki_markdown",
+  }
+}
+
+-- disable global markdown hijacking
+vim.g.vimwiki_global_ext = 0

shell/eza.nix

@@ -2,7 +2,9 @@
 {
   programs.eza = {
     enable = true;
+    enableZshIntegration = true;
     git = true;
+    icons = true;
     extraOptions = [ "--group-directories-first" ];
   };
 }

shell/shell_aliases.nix

@@ -3,9 +3,10 @@
 {
   home.shellAliases = {
     g = "git";
-    gg = "git graph";
+    gg = "git graph --all --max-count 32";
     gs = "git status";
     gd = "git diff";
     k = "kubectl";
+    ww = "nvim -c VimwikiIndex";
   };
 }