Nvim: add minuet and some other stuff

.config/awesome/rc.lua

@@ -70,7 +70,7 @@ awful.layout.layouts = {
     awful.layout.suit.tile.left,
     -- awful.layout.suit.tile.bottom,
     -- awful.layout.suit.tile.top,
-    -- awful.layout.suit.fair,
+    awful.layout.suit.fair,
     -- awful.layout.suit.fair.horizontal,
     -- awful.layout.suit.spiral,
     -- awful.layout.suit.spiral.dwindle,
@@ -269,8 +269,8 @@ root.buttons(gears.table.join(
 
 -- {{{ Key bindings
 globalkeys = gears.table.join(
-    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
-              {description="show help", group="awesome"}),
+    -- awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
+    --           {description="show help", group="awesome"}),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
               {description = "view previous", group = "tag"}),
     awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
@@ -314,8 +314,10 @@ globalkeys = gears.table.join(
         {description = "go back", group = "client"}),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
+    awful.key({ modkey,           }, "t", function () awful.spawn(terminal) end,
               {description = "open a terminal", group = "launcher"}),
+    awful.key({ modkey,           }, "s", function () awful.spawn("pavucontrol") end,
+              {description = "open pavucontrol", group = "launcher"}),
     awful.key({ modkey, "Control" }, "r", awesome.restart,
               {description = "reload awesome", group = "awesome"}),
     awful.key({ modkey, "Shift"   }, "c", awesome.quit,
@@ -384,8 +386,8 @@ clientkeys = gears.table.join(
               {description = "move to master", group = "client"}),
     awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
               {description = "move to screen", group = "client"}),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
-              {description = "toggle keep on top", group = "client"}),
+    -- awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
+    --           {description = "toggle keep on top", group = "client"}),
     awful.key({ modkey,           }, "n",
         function (c)
             -- The client currently has the input focus, so it cannot be
@@ -482,13 +484,15 @@ root.keys(globalkeys)
 -- }}}
 
 -- {{{ Rules
+local function custom_focus_filter(c) return awful.client.focus.filter(c) and c.name:find("^Meet - ") ~= nil end
 -- Rules to apply to new clients (through the "manage" signal).
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
       properties = { border_width = beautiful.border_width,
                      border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
+                     --focus = awful.client.focus.filter,
+                     focus = custom_focus_filter,
                      raise = true,
                      keys = clientkeys,
                      buttons = clientbuttons,
@@ -530,7 +534,7 @@ awful.rules.rules = {
 
     -- Add titlebars to normal clients and dialogs
     { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = false }
+      }, properties = { titlebars_enabled = true }
     },
 
     -- Set Firefox to always map on the tag named "1" on screen 1 and disable
@@ -620,10 +624,10 @@ do
   {
     "xset b off",
     "xdotool key --clearmodifiers Num_Lock",
-    "autorandr -c",
+    --"autorandr -c",
     "pasystray -m 100",
     "cbatticon",
-    "barrierc --disable-crypto 192.168.10.2:24800",
+    "barrierc --disable-crypto 192.168.10.99:24800",
     "xbindkeys -f /home/kmcr/.config/xbindkeysrc",
   }
   for _,i in ipairs(cmds_once) do
@@ -635,7 +639,7 @@ do
     "nm-applet",
     "blueman-applet",
     "flameshot",
-    "feh --no-xinerama --bg-scale /home/kmcr/.config/i3/wallpaper.jpg",
+    "feh --bg-center /home/kmcr/Downloads/gruvbox_spac.jpg"
   }
   for _,i in ipairs(cmds_single_instance) do
     awful.spawn.single_instance(i)

.config/nvim/lua/plugins/blink.lua

@@ -6,6 +6,7 @@ return { {
     'xzbdmw/colorful-menu.nvim',
     'disrupted/blink-cmp-conventional-commits',
     'moyiz/blink-emoji.nvim',
+    'milanglacier/minuet-ai.nvim',
   },
 
   -- use a release tag to download pre-built binaries
@@ -22,7 +23,10 @@ return { {
     -- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate)
     -- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept
     -- See the full "keymap" documentation for information on defining your own keymap.
-    keymap = { preset = 'default' },
+    keymap = {
+      preset = 'default',
+      --['A-y'] = require('minuet').make_blink_map()
+    },
 
     appearance = {
       -- -- Sets the fallback highlight groups to nvim-cmp's highlight groups
@@ -37,7 +41,7 @@ return { {
     -- Default list of enabled providers defined so that you can extend it
     -- elsewhere in your config, without redefining it, due to `opts_extend`
     sources = {
-      default = { 'conventional_commits', 'lsp', 'path', 'snippets', 'buffer', 'emoji', 'codecompanion' },
+      default = { 'conventional_commits', 'lsp', 'path', 'snippets', 'buffer', 'emoji', 'codecompanion', --[[ 'minuet' ]] },
       providers = {
         conventional_commits = {
           name = "Conventional Commits",
@@ -53,9 +57,18 @@ return { {
           score_offset = 15,
           opts = { insert = true },
           should_show_items = function()
-            return vim.tbl_contains({"gitcommit", "markdown" }, vim.o.filetype)
+            return vim.tbl_contains({ "gitcommit", "markdown" }, vim.o.filetype)
           end,
-        }
+        },
+        minuet = {
+          name = 'minuet',
+          module = 'minuet.blink',
+          async = true,
+          -- Should match minuet.config.request_timeout * 1000,
+          -- since minuet.config.request_timeout is in seconds
+          timeout_ms = 3000,
+          score_offset = 50, -- Gives minuet higher priority among suggestions
+        },
       }
     },
 
@@ -75,6 +88,7 @@ return { {
           }
         }
       },
+      --trigger = { prefetch_on_insert = false },
 
       accept = { auto_brackets = { enabled = false }, },
       ghost_text = { enabled = false },

.config/nvim/lua/plugins/codecompanion.lua

@@ -31,7 +31,7 @@ return {
           },
           schema = {
             model = {
-              default = "gemma3:12b",
+              default = "deepseek-r1:32b",
             },
             num_ctx = {
               default = 16384,

.config/nvim/lua/plugins/comment.lua

@@ -1,5 +1,23 @@
-return {
+return {{
   -- 'gcc' to toggle comments
   'numToStr/Comment.nvim',
   config = true
-}
+}, {
+    "soemre/commentless.nvim",
+    cmd = "Commentless",
+    keys = {
+        {
+            "z/",
+            function()
+                require("commentless").toggle()
+            end,
+            desc = "Toggle Comments",
+        },
+    },
+    dependencies = {
+        "nvim-treesitter/nvim-treesitter",
+    },
+    opts = {
+        -- Customize Configuration
+    },
+}}

.config/nvim/lua/plugins/lspconfig.lua

@@ -9,7 +9,8 @@ return {
   },
   config = function()
     local nvim_lsp = require('lspconfig')
-    require('clangd_extensions').setup({
+    vim.lsp.config('clangd_extensions', {
+    -- require('clangd_extensions').setup({
       ast = {
         -- These are unicode, should be available in any font
         role_icons = {
@@ -40,6 +41,7 @@ return {
         }
       }
     })
+    vim.lsp.enable('clangd_extensions')
     --local lsp_signature = require('lsp_signature')
 
     -- Mappings.
@@ -164,14 +166,14 @@ return {
     --   single_file_support = true,
     --   settings = {
     --     matlab = {
-    --       indexWorkspace = false,
+    --       -- indexWorkspace = false,
     --       installPath = "/usr/local/MATLAB/R2024b",
-    --       matlabConnectionTiming = "onStart",
-    --       telemetry = true,
+    --       -- matlabConnectionTiming = "onStart",
+    --       -- telemetry = true,
     --     },
     --   }
     -- })
-    --
+
     nvim_lsp.typos_lsp.setup({
       cmd = { 'typos-lsp' },
       filetypes = { '*' },

.gitconfig

@@ -1,5 +1,3 @@
-[push]
-	default = simple
 [user]
 	name = Robert Kmieć
 	email = KmcR@viessmann.com
@@ -7,38 +5,57 @@
 	editor = nvim
 	pager = delta
 	autocrlf = false
-	excludesfile = /home/rkmiec/.config/git/ignore
+	excludesfile = ~/.config/git/ignore
 	symlinks = true
 	attributesfile = ~/.gitattributes
 	fsmonitor = true
-	#attributesfile = ~/.gitattributes
+	untrackedCache = true
+[init]
+	defaultBranch = master
+[advice]
+	detachedHead = false
 [help]
 	autocorrect = 1
 [color]
 	ui = true
+[column]
+	ui = auto
 [grep]
 	linenumber = true
-[sendemail]
-	smtpencryption = tls
-	smtpserver = smtp.gmail.com
-	smtpuser = robert.r.kmiec@gmail.com
-	smtpserverport = 587
-[merge]
-	conflictstyle = diff3
-	tool = nfugitive
-[mergetool "nfugitive"]
-	cmd = nvim -c "Gvdiffsplit!" "$MERGED"
-[diff]
-	tool = nvimdiff
-[difftool "nvimdiff"]
-	cmd = nvim -d "$LOCAL" "$REMOTE"
-[diff "markdown"]
-	xfuncname = "^#+.*$"
+	parrernType = perl
+[fetch]
+	writeCommitGraph = true
+	all = true
+  #pruneTags = true
+[push]
+	default = simple
+	autoSetupRemote = true
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[pull]
+	rebase = true
+[rebase]
+	autosquash = true
+	autostash = true
+	updateRefs = true
+[commit]
+	template = .gitmessage
+	verbose = false
+; [mergetool "vimdiff"]
+;		cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[submodule]
+	recurse = false
+	fetchJobs = 4
+[rerere]
+	enabled = true
+	autoupdate = true
+[branch]
+	sort = committerdate
+[tag]
+	sort = version:refname
 [alias]
 	cm = commit
 	co = checkout
@@ -51,39 +68,48 @@
 	diff-image = "!f() { cd -- \"${GIT_PREFIX:-.}\"; GIT_DIFF_IMAGE_ENABLED=1 git diff \"$@\"; }; f"
 [interactive]
 	diffFilter = delta --color-only
-[delta]
-	features = side-by-side line-numbers decorations
-	whitespace-error-style = 22 reverse
-[delta "decorations"]
-	commit-decoration-style = bold yellow box ul
-	file-style = bold yellow ul
-	file-decoration-style = none
-[pull]
-	rebase = true
-[commit]
-	template = .gitmessage
-	verbose = false
-[mergetool "vimdiff"]
-	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
-[init]
-	defaultBranch = master
+[merge]
+	conflictstyle = zdiff3
+	tool = nfugitive
+[mergetool "nfugitive"]
+	cmd = nvim -c "Gvdiffsplit!" "$MERGED"
+[diff]
+	tool = nvimdiff
+	colorMoved = plain
+	algorithm = histogram
+	renames = true
+	mnemonicPrefix = true
+[difftool "nvimdiff"]
+	cmd = nvim -d "$LOCAL" "$REMOTE"
 [diff "image"]
 	command = /home/kmcr/tools/git-diff-image/git_diff_image
 	textconv = imgcat
 [diff "model"]
 	command = /home/kmcr/tools/git-diff-image/git_diff_image
 	textconv = imgcat
-[advice]
-	detachedHead = false
-[submodule]
-	recurse = false
-[rerere]
-	enabled = true
-[column]
-	ui = auto
-[branch]
-	sort = -commiterdate
-[fetch]
-	writeCommitGraph = true
+[diff "markdown"]
+	xfuncname = "^#+.*$"
+[delta]
+	features = decorations
+	navigate = true
+	dark = true
+	side-by-side = true
+	line-numbers = true
+	hyperlinks = true
+	whitespace-error-style = 22 reverse
+	# colorMoved support
+	map-styles = bold purple => syntax magenta, bold cyan => syntax blue
+	true-color = always
+[delta "decorations"]
+	commit-decoration-style = bold yellow box ul
+	file-style = bold yellow ul
+	file-decoration-style = none
 [maintenance]
 	repo = /home/kmcr/repos/hems/hemsmilsimulation
+[sendemail]
+	smtpencryption = tls
+	smtpserver = smtp.gmail.com
+	smtpuser = robert.r.kmiec@gmail.com
+	smtpserverport = 587
+[feature]
+	experimental = true