From 73a868bf582cf58c2a61e8080293890fbed2c926 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 3 Jun 2025 12:42:12 +0200 Subject: [PATCH 1/8] updates dnsc-work config --- hosts/dnsc-work/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 4a13182..152983e 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -47,6 +47,14 @@ nil nurl shellcheck + lazygit + ffmpeg + tree-sitter + zoxide + sqlite + fnm + imagemagick + rsync ]; # Homebrew @@ -55,6 +63,7 @@ onActivation = { autoUpdate = true; + upgrade = true; cleanup = "zap"; }; @@ -65,16 +74,6 @@ brews = [ "mas" - "lazygit" - "ffmpeg" - "tree-sitter" - "yt-dlp" - "zoxide" - "sqlite" - # "rsync" -> Can't install due to: https://github.com/fastlane/fastlane/discussions/27962 - "fnm" - "imagemagick" - "todo-txt" "watchman" "pnpm" "pkg-config" From e72ddd642b431a3060b3edcf0241a8af398fc299 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 3 Jun 2025 12:46:13 +0200 Subject: [PATCH 2/8] xcode manual install for dnsc-work --- hosts/dnsc-work/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 152983e..3b07c6d 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -69,7 +69,7 @@ masApps = { Bitwarden = 1352778147; - XCode = 497799835; + # XCode = 497799835; }; brews = [ From 21ff475f93bf564d292cef555d2adb2339ddd0db Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 4 Jun 2025 08:23:15 +0200 Subject: [PATCH 3/8] configures code companion --- modules/nvim/config/lazy-lock.json | 2 ++ modules/nvim/config/lua/plugins/blink.lua | 5 +++- .../nvim/config/lua/plugins/codecompanion.lua | 25 +++++++++++++++++++ modules/nvim/config/lua/plugins/mini.diff.lua | 9 +++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 modules/nvim/config/lua/plugins/codecompanion.lua create mode 100644 modules/nvim/config/lua/plugins/mini.diff.lua diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json index 749b42c..dec8414 100644 --- a/modules/nvim/config/lazy-lock.json +++ b/modules/nvim/config/lazy-lock.json @@ -1,6 +1,7 @@ { "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, + "codecompanion.nvim": { "branch": "main", "commit": "3d62ac3ebe840245b157e169d06b8d87ee878dc5" }, "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" }, @@ -9,6 +10,7 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "mini.diff": { "branch": "main", "commit": "f7bcd3cb4561f7d3a02ae9afafeda899c82f7108" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" }, diff --git a/modules/nvim/config/lua/plugins/blink.lua b/modules/nvim/config/lua/plugins/blink.lua index 525895e..1f288bb 100644 --- a/modules/nvim/config/lua/plugins/blink.lua +++ b/modules/nvim/config/lua/plugins/blink.lua @@ -28,7 +28,10 @@ return { }, sources = { default = { "lazydev", "lsp", "path", "snippets", "buffer" }, - per_filetype = { sql = { "dadbod" } }, + per_filetype = { + sql = { "dadbod" }, + codecompanion = { "codecompanion" }, + }, providers = { dadbod = { module = "vim_dadbod_completion.blink" }, lazydev = { diff --git a/modules/nvim/config/lua/plugins/codecompanion.lua b/modules/nvim/config/lua/plugins/codecompanion.lua new file mode 100644 index 0000000..1b71fe0 --- /dev/null +++ b/modules/nvim/config/lua/plugins/codecompanion.lua @@ -0,0 +1,25 @@ +return { + "olimorris/codecompanion.nvim", + opts = { + strategies = { + chat = { + adapter = "anthropic", + }, + inline = { + adapter = "anthropic", + }, + }, + }, + config = function() + vim.cmd([[cab cc CodeCompanion]]) + end, + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-treesitter/nvim-treesitter", + }, + keys = { + { "ac", "CodeCompanionChat Toggle", desc = "Open companion chat", mode = "n" }, + { "aa", "CodeCompanionActions", desc = "Open companion actions", mode = "n" }, + { "ga", "CodeCompanionChat Add", desc = "Add selection to chat", mode = "v" }, + }, +} diff --git a/modules/nvim/config/lua/plugins/mini.diff.lua b/modules/nvim/config/lua/plugins/mini.diff.lua new file mode 100644 index 0000000..d8627ff --- /dev/null +++ b/modules/nvim/config/lua/plugins/mini.diff.lua @@ -0,0 +1,9 @@ +return { + "echasnovski/mini.diff", + config = function() + local diff = require("mini.diff") + diff.setup({ + source = diff.gen_source.none(), + }) + end, +} From d6d992ec1321c6b2643e71d9ca65966c16700e9e Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 4 Jun 2025 08:32:55 +0200 Subject: [PATCH 4/8] updates codecompanion config --- modules/nvim/config/lazy-lock.json | 26 +++++++++--------- .../nvim/config/lua/plugins/codecompanion.lua | 27 ++++++++++--------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json index dec8414..65a03d2 100644 --- a/modules/nvim/config/lazy-lock.json +++ b/modules/nvim/config/lazy-lock.json @@ -1,36 +1,36 @@ { "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, + "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, "codecompanion.nvim": { "branch": "main", "commit": "3d62ac3ebe840245b157e169d06b8d87ee878dc5" }, - "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, + "conform.nvim": { "branch": "master", "commit": "b529dd4897c85c3188cc787084089a9d55843093" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, + "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, "mini.diff": { "branch": "main", "commit": "f7bcd3cb4561f7d3a02ae9afafeda899c82f7108" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" }, - "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, - "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, - "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" }, - "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" }, + "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "oil.nvim": { "branch": "master", "commit": "5b6068aad7d2057dd399fac73b7fb2cdf23ccd6e" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "ff577b44bd3ab642acec0f134a7bf26b7278d137" }, - "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" }, - "schemastore.nvim": { "branch": "main", "commit": "0cd099d94b1d61565ee1d44c4afad42f9a170ad1" }, + "render-markdown.nvim": { "branch": "main", "commit": "dd620561843d5a62c917fffe77f2923c965d12c7" }, + "rose-pine": { "branch": "main", "commit": "6b9840790cc7acdfadde07f308d34b62dd9cc675" }, + "schemastore.nvim": { "branch": "main", "commit": "9c4dbc346c0be7016cf56220bafb964fd8ef87d3" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "todo.txt-vim": { "branch": "master", "commit": "3bb5f9cf0d6c7ee91b476a97054c336104d2b6f5" }, "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" }, - "vim-dadbod": { "branch": "master", "commit": "fa31d0ffeebaa59cf97a81e7f92194cced54a13f" }, + "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, "vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" }, - "vim-dadbod-ui": { "branch": "master", "commit": "460432301a5cb280ea265ddfa15c9f3dcd1d26b7" }, + "vim-dadbod-ui": { "branch": "master", "commit": "2900a1617b3df1a48683d872eadbe1101146a49a" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } diff --git a/modules/nvim/config/lua/plugins/codecompanion.lua b/modules/nvim/config/lua/plugins/codecompanion.lua index 1b71fe0..466b65d 100644 --- a/modules/nvim/config/lua/plugins/codecompanion.lua +++ b/modules/nvim/config/lua/plugins/codecompanion.lua @@ -1,16 +1,17 @@ return { "olimorris/codecompanion.nvim", - opts = { - strategies = { - chat = { - adapter = "anthropic", - }, - inline = { - adapter = "anthropic", - }, - }, - }, config = function() + require("codecompanion").setup({ + strategies = { + chat = { + adapter = "anthropic", + }, + inline = { + adapter = "anthropic", + }, + }, + }) + vim.cmd([[cab cc CodeCompanion]]) end, dependencies = { @@ -18,8 +19,8 @@ return { "nvim-treesitter/nvim-treesitter", }, keys = { - { "ac", "CodeCompanionChat Toggle", desc = "Open companion chat", mode = "n" }, - { "aa", "CodeCompanionActions", desc = "Open companion actions", mode = "n" }, - { "ga", "CodeCompanionChat Add", desc = "Add selection to chat", mode = "v" }, + { "cc", "CodeCompanionChat Toggle", desc = "Open companion chat", mode = "n" }, + { "ca", "CodeCompanionActions", desc = "Open companion actions", mode = "n" }, + { "ga", "CodeCompanionChat Add", desc = "Add selection", mode = "v" }, }, } From 765bd4ebf92bbc87f933d5fc8935465f60387dc7 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 4 Jun 2025 08:49:14 +0200 Subject: [PATCH 5/8] adds gmp as needed dependency to ruby --- hosts/dnsc-work/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 3b07c6d..6f6fcd2 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -85,6 +85,7 @@ "librsvg" "pixman" "python-setuptools" + "gmp" "rbenv" ]; From 7515daa003ba388c4b61102dee46e5f03ef19ac6 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 5 Jun 2025 08:51:49 +0200 Subject: [PATCH 6/8] adds 1password cli to work mac --- hosts/dnsc-work/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 6f6fcd2..40d2235 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -87,6 +87,7 @@ "python-setuptools" "gmp" "rbenv" + "1password-cli" ]; casks = [ From 6afbf3f8712dff9df393ce40ad8db7a5cdcb5271 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 5 Jun 2025 08:55:02 +0200 Subject: [PATCH 7/8] installs 1password as cask --- hosts/dnsc-work/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 40d2235..2bcbca0 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -87,7 +87,6 @@ "python-setuptools" "gmp" "rbenv" - "1password-cli" ]; casks = [ @@ -105,6 +104,7 @@ "karabiner-elements" "wezterm" "1password" + "1password-cli" "android-studio" "zulu@17" "postman" From 93fb2ecdf985f7d822c04665053a6b4b3d71a033 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 11 Jun 2025 15:39:58 +0200 Subject: [PATCH 8/8] removes rsync from work machine --- hosts/dnsc-work/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 2bcbca0..f5e2466 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -54,7 +54,7 @@ sqlite fnm imagemagick - rsync + # rsync ]; # Homebrew