From adb2595344258546e7c2d2f5ec1d066dcf1b206f Mon Sep 17 00:00:00 2001 From: Martin Pander Date: Thu, 13 Nov 2025 08:42:39 +0100 Subject: [PATCH] Things --- nix/flake.lock | 18 ++++++------- nix/flake.nix | 3 +++ nix/user/dev.nix | 1 + nix/user/git.nix | 34 +++++++++++++------------ nix/user/profiles/work.nix | 8 +++--- nix/user/sh.nix | 2 +- nix/user/tmux.nix | 4 +-- nvim/filetype.lua | 52 +++++++++++++++++++++++--------------- nvim/plugins.lua | 47 +++++++++++++++++++++------------- 9 files changed, 99 insertions(+), 70 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index 93b778a..df31b1c 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1759106866, - "narHash": "sha256-GjLvAl7qxGxKtop6ghasxjQ1biTT7pA+WU45byzMl/4=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "619ae569293b6427d23cce4854eb4f3c33af3eec", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1762627886, + "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index 36043f9..4b43ebd 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -79,6 +79,9 @@ ./user/profiles/work.nix ./common.nix ./user/task.nix + { + nixpkgs.config.allowUnfree = true; + } ]; }; }; diff --git a/nix/user/dev.nix b/nix/user/dev.nix index 384df76..d1e6e37 100644 --- a/nix/user/dev.nix +++ b/nix/user/dev.nix @@ -9,5 +9,6 @@ home.packages = with pkgs; [ visidata + claude-code ]; } diff --git a/nix/user/git.nix b/nix/user/git.nix index ff59b05..067fe8e 100644 --- a/nix/user/git.nix +++ b/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 = { diff --git a/nix/user/profiles/work.nix b/nix/user/profiles/work.nix index 5a21078..353d8ff 100644 --- a/nix/user/profiles/work.nix +++ b/nix/user/profiles/work.nix @@ -6,15 +6,15 @@ home.stateVersion = "23.11"; # Please read the comment before changing. - programs.git = { - userName = "Martin Pander"; - userEmail = "martin.pander@knowtion.de"; + programs.git.settings.user = { + name = "Martin Pander"; + email = "martin.pander@knowtion.de"; }; home.packages = with pkgs; [ yaml-language-server marksman - dockerfile-language-server-nodejs + dockerfile-language-server ]; programs.zsh.profileExtra = '' diff --git a/nix/user/sh.nix b/nix/user/sh.nix index 177d8c7..00b2b50 100644 --- a/nix/user/sh.nix +++ b/nix/user/sh.nix @@ -89,7 +89,7 @@ home.packages = with pkgs; [ fd - du-dust + dust glow ripgrep-all viddy diff --git a/nix/user/tmux.nix b/nix/user/tmux.nix index b876739..3d61f34 100644 --- a/nix/user/tmux.nix +++ b/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-m display-popup -E -xC -yC -w 95% -h 95% "vim /mnt/c/Users/marti/Documents/notes/Work/mbpr.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-p display-popup -E -xC -yC -w 95% -h 95% -d "/mnt/c/Users/marti/Documents/notes/Work/development/" "vim mbpr.md" ####################################### # status line diff --git a/nvim/filetype.lua b/nvim/filetype.lua index d0a039f..36e3a85 100644 --- a/nvim/filetype.lua +++ b/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 }) -lspconfig.gopls.setup({ capabilities = capabilities }) -lspconfig.marksman.setup({ capabilities = capabilities }) -lspconfig.rust_analyzer.setup({ - capabilities = capabilities, - settings = { - ["rust-analyzer"] = { - checkOnSave = { - 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 }) +vim.lsp.enable('ruff') +vim.lsp.enable('gopls') +vim.lsp.enable('marksman') +vim.lsp.enable('rust_analyzer') +vim.lsp.enable('dockerls') +vim.lsp.enable('docker_compose_language_service') +vim.lsp.enable('clangd') +vim.lsp.enable('sqls') +vim.lsp.enable('zls') +vim.lsp.enable('omnisharp') +vim.lsp.enable('yamlls') + +-- lspconfig.gopls.setup({ capabilities = capabilities }) +-- lspconfig.marksman.setup({ capabilities = capabilities }) +-- lspconfig.rust_analyzer.setup({ +-- capabilities = capabilities, +-- settings = { +-- ["rust-analyzer"] = { +-- checkOnSave = { +-- 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"}, diff --git a/nvim/plugins.lua b/nvim/plugins.lua index 27b7d4f..02df1d8 100644 --- a/nvim/plugins.lua +++ b/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({ - capabilities = capabilities - -- you can add other fields for setting up lsp server in this table + if ls ~= nil then + vim.lsp.config(ls).setup({ + capabilities = capabilities + -- you can add other fields for setting up lsp server in this table }) + end end require('ufo').setup() @@ -423,18 +421,11 @@ require("obsidian").setup({ date_format = "%Y-%m-%d %a", time_format = "%H:%M", }, - ui = { - checkboxes = { - [" "] = { 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" } - }, + checkbox = { + order = { " ", ">", "x", "!", "~" }, }, disable_frontmatter = false, - note_frontmatter_func = function(note) + frontmatter_func = function(note) -- Add the title of the note as an alias. if note.title then note:add_alias(note.title) @@ -455,6 +446,7 @@ require("obsidian").setup({ return path:with_suffix(".md") end, daily_notes = daily_notes, + legacy_commands = false, }) require('render-markdown').setup({ @@ -462,4 +454,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 }, + }, + }, })