Merge work

nix/flake.nix

@@ -76,6 +76,9 @@
             ./user/profiles/work.nix
             ./common.nix
             ./user/task.nix
+            {
+              nixpkgs.config.allowUnfree = true;
+            }
           ];
         };
       };

nix/user/dev.nix

@@ -9,5 +9,6 @@
 
   home.packages = with pkgs; [
     visidata
+    claude-code
   ];
 }

nix/user/git.nix

@@ -3,23 +3,20 @@
 {
   programs.git = {
     enable = true;
+    settings = {
+      alias = {
+        st = "status";
+        ci = "commit";
+        co = "checkout";
+        br = "branch";
+        pl = "pull";
+        ps = "push";
+        sw = "switch";
+        mno =" merge --no-ff";
+        lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
+        cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
+      };
 
-    aliases = {
-      st = "status";
-      ci = "commit";
-      co = "checkout";
-      br = "branch";
-      pl = "pull";
-      ps = "push";
-      sw = "switch";
-      mno =" merge --no-ff";
-      lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
-      cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
-    };
-
-    difftastic.enable = true;
-
-    extraConfig = {
       column.ui = "auto";
       branch.sort = "-committerdate";
       tag.sort = "version:refname";
@@ -62,6 +59,11 @@
     ];
   };
 
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
+  };
+
   programs.lazygit = {
     enable = true;
     settings = {

nix/user/profiles/work.nix

@@ -6,15 +6,15 @@
 
   home.stateVersion = "23.11"; # Please read the comment before changing.
 
-  programs.git = {
+  programs.git.settings.user = {
-    userName = "Martin Pander";
+    name = "Martin Pander";
-    userEmail = "martin.pander@knowtion.de";
+    email = "martin.pander@knowtion.de";
   };
 
   home.packages = with pkgs; [
     yaml-language-server
     marksman
-    dockerfile-language-server-nodejs
+    dockerfile-language-server
   ];
 
   programs.zsh.profileExtra = ''

nix/user/sh.nix

@@ -89,7 +89,7 @@
 
   home.packages = with pkgs; [
     fd
-    du-dust
+    dust
     glow
     ripgrep-all
     viddy

nix/user/tmux.nix

@@ -28,8 +28,8 @@
       bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
       bind C-g display-popup -E -d "#{pane_current_path}" -xC -yC -w 95% -h 95% "lazygit"
       bind C-t display-popup -E -xC -yC -w 95% -h 95% "tasksquire"
-      bind C-n display-popup -E -xC -yC -w 95% -h 95% "vim /mnt/c/Users/marti/Documents/notes/Work/quick_notes.md"
+      bind C-n display-popup -E -xC -yC -w 95% -h 95% -d "/mnt/c/Users/marti/Documents/notes/Work/" "vim quick_notes.md"
-      bind C-m display-popup -E -xC -yC -w 95% -h 95% "vim /mnt/c/Users/marti/Documents/notes/Work/mbpr.md"
+      bind C-p display-popup -E -xC -yC -w 95% -h 95% -d "/mnt/c/Users/marti/Documents/notes/Work/development/" "vim mbpr.md"
 
       #######################################
       # status line

nvim/filetype.lua

@@ -1,5 +1,4 @@
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
-local lspconfig = require("lspconfig")
 
 vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true })
 
@@ -22,26 +21,37 @@ vim.api.nvim_create_autocmd('FileType', {
 -- require('dap-python').setup()
 -- require('dap-go').setup()
 
-lspconfig.ruff.setup({ capabilities = capabilities })
+vim.lsp.enable('ruff')
-lspconfig.gopls.setup({ capabilities = capabilities })
+vim.lsp.enable('gopls')
-lspconfig.marksman.setup({ capabilities = capabilities })
+vim.lsp.enable('marksman')
-lspconfig.rust_analyzer.setup({
+vim.lsp.enable('rust_analyzer')
-  capabilities = capabilities,
+vim.lsp.enable('dockerls')
-  settings = {
+vim.lsp.enable('docker_compose_language_service')
-  ["rust-analyzer"] = {
+vim.lsp.enable('clangd')
-    checkOnSave = {
+vim.lsp.enable('sqls')
-      command = "clippy",
+vim.lsp.enable('zls')
-    },
+vim.lsp.enable('omnisharp')
-  },
+vim.lsp.enable('yamlls')
-  },
+
-})
+-- lspconfig.gopls.setup({ capabilities = capabilities })
-lspconfig.dockerls.setup({ capabilities = capabilities })
+-- lspconfig.marksman.setup({ capabilities = capabilities })
-lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
+-- lspconfig.rust_analyzer.setup({
-lspconfig.clangd.setup({ capabilities = capabilities })
+--   capabilities = capabilities,
-lspconfig.sqls.setup({ capabilities = capabilities })
+--   settings = {
-lspconfig.zls.setup({ capabilities = capabilities })
+--   ["rust-analyzer"] = {
-lspconfig.omnisharp.setup({ capabilities = capabilities })
+--     checkOnSave = {
-lspconfig.yamlls.setup({ capabilities = capabilities })
+--       command = "clippy",
+--     },
+--   },
+--   },
+-- })
+-- lspconfig.dockerls.setup({ capabilities = capabilities })
+-- lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
+-- lspconfig.clangd.setup({ capabilities = capabilities })
+-- lspconfig.sqls.setup({ capabilities = capabilities })
+-- lspconfig.zls.setup({ capabilities = capabilities })
+-- lspconfig.omnisharp.setup({ capabilities = capabilities })
+-- lspconfig.yamlls.setup({ capabilities = capabilities })
 
 require("conform").setup({
   go = {"gofmt"},

nvim/plugins.lua

@@ -138,10 +138,6 @@ cmp.setup.cmdline(':', {
 })
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
-local lspconfig = require("lspconfig")
--- lspconfig.svelte.setup({ capabilities = capabilities })
--- lspconfig.flow.setup({ capabilities = capabilities })
--- lspconfig.nil_ls.setup({ capabilities = capabilities })
 
 capabilities.textDocument.foldingRange = {
     dynamicRegistration = false,
@@ -150,10 +146,12 @@ capabilities.textDocument.foldingRange = {
 
 local language_servers = vim.lsp.get_clients() -- or list servers manually like {'gopls', 'clangd'}
 for _, ls in ipairs(language_servers) do
-    require('lspconfig')[ls].setup({
+  if ls ~= nil then
-        capabilities = capabilities
+    vim.lsp.config(ls).setup({
-        -- you can add other fields for setting up lsp server in this table
+      capabilities = capabilities
+      -- you can add other fields for setting up lsp server in this table
     })
+  end
 end
 require('ufo').setup()
 
@@ -423,38 +421,34 @@ require("obsidian").setup({
       date_format = "%Y-%m-%d %a",
       time_format = "%H:%M",
   },
-  ui = {
+  checkbox = {
-  checkboxes = {
+    order = { " ", ">", "x", "!", "~" },
-      [" "] = { char = "󰄱", hl_group = "ObsidianTodo" },
-      [">"] = { char = "", hl_group = "ObsidianRightArrow" },
-      ["x"] = { char = "", hl_group = "ObsidianDone" },
-      ["~"] = { char = "󰰱", hl_group = "ObsidianTilde" },
-      ["!"] = { char = "", hl_group = "ObsidianImportant" },
-      ["?"] = { char = "?", hl_group = "ObsidianImportant" }
-    },
   },
-  disable_frontmatter = false,
+  frontmatter = {
-  note_frontmatter_func = function(note)
+    enabled = true,
-    -- Add the title of the note as an alias.
+    func = function(note)
-    if note.title then
+      -- Add the title of the note as an alias.
-      note:add_alias(note.title)
+      if note.title then
-    end
+        note:add_alias(note.title)
-
-    local out = { id = note.id, tags = note.tags }
-
-    if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
-      for k, v in pairs(note.metadata) do
-        out[k] = v
       end
-    end
 
-    return out
+      local out = { id = note.id, tags = note.tags }
-  end,
+
+      if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
+        for k, v in pairs(note.metadata) do
+          out[k] = v
+        end
+      end
+
+      return out
+    end,
+  },
   note_path_func = function(spec)
     local path = spec.dir / spec.title
     return path:with_suffix(".md")
   end,
   daily_notes = daily_notes,
+  legacy_commands = false,
 })
 
 require('render-markdown').setup({
@@ -462,4 +456,25 @@ require('render-markdown').setup({
   file_types = { 'markdown'},
   completions = { lsp = { enabled = true } },
   render_modes = { 'n', 'c', 't' },
+  checkbox = {
+        enabled = true,
+        render_modes = false,
+        bullet = false,
+        right_pad = 1,
+        unchecked = {
+            icon = '󰄱 ',
+            highlight = 'RenderMarkdownUnchecked',
+            scope_highlight = nil,
+        },
+        checked = {
+            icon = '󰱒 ',
+            highlight = 'RenderMarkdownChecked',
+            scope_highlight = nil,
+        },
+        custom = {
+            next = { raw = '[!]', rendered = ' ', highlight = 'RenderMarkdownNext', scope_highlight = nil },
+            ongoing = { raw = '[>]', rendered = '▶ ', highlight = 'RenderMarkdownOngoing', scope_highlight = nil },
+            waiting = { raw = '[~]', rendered = '󰥔 ', highlight = 'RenderMarkdownWaiting', scope_highlight = nil },
+        },
+    },
 })