This commit is contained in:
2025-08-17 11:55:32 -04:00
parent 91bf7b150f
commit 5bac05e0de
5 changed files with 65 additions and 86 deletions

View File

@@ -1,32 +1,28 @@
return { return {
-- { {
-- 'milanglacier/minuet-ai.nvim', 'milanglacier/minuet-ai.nvim',
-- dependencies = { dependencies = {
-- 'nvim-lua/plenary.nvim', 'nvim-lua/plenary.nvim',
-- 'Saghen/blink.cmp' 'Saghen/blink.cmp'
-- }, },
-- config = function() config = function()
-- require('minuet').setup { require('minuet').setup {
-- provider = 'openai_fim_compatible', provider = 'openai_fim_compatible',
-- n_completions = 1, -- recommend for local model for resource saving n_completions = 1, -- recommend for local model for resource saving
-- -- I recommend beginning with a small context window size and incrementally -- I recommend beginning with a small context window size and incrementally
-- -- expanding it, depending on your local computing power. A context window -- expanding it, depending on your local computing power. A context window
-- -- of 512, serves as an good starting point to estimate your computing -- of 512, serves as an good starting point to estimate your computing
-- -- power. Once you have a reliable estimate of your local computing power, -- power. Once you have a reliable estimate of your local computing power,
-- -- you should adjust the context window to a larger value. -- you should adjust the context window to a larger value.
-- context_window = 8192, context_window = 512,
-- provider_options = { provider_options = {
-- openai_fim_compatible = { openai_fim_compatible = {
-- -- For Windows users, TERM may not be present in environment variables. -- For Windows users, TERM may not be present in environment variables.
-- -- Consider using APPDATA instead. -- Consider using APPDATA instead.
-- api_key = 'TERM', api_key = 'TERM',
-- name = 'Llama.cpp', name = 'Llama.cpp',
-- end_point = 'http://172.16.10.19:1234/v1/completions', end_point = 'http://127.0.0.1:1234/v1/completions',
-- model = 'qwen/qwen3-coder-30b', model = 'codellama-7b-instruct',
-- optional = {
-- max_tokens = 512,
-- top_p = 0.9,
-- },
-- template = { -- template = {
-- prompt = function(context_before_cursor, context_after_cursor, _) -- prompt = function(context_before_cursor, context_after_cursor, _)
-- return '<|fim_prefix|>' -- return '<|fim_prefix|>'
@@ -37,11 +33,11 @@ return {
-- end, -- end,
-- suffix = false, -- suffix = false,
-- }, -- },
-- }, },
-- }, },
-- } }
-- end, end,
-- }, },
{ {
'saghen/blink.cmp', 'saghen/blink.cmp',
-- optional: provides snippets for the snippet source -- optional: provides snippets for the snippet source
@@ -82,7 +78,7 @@ return {
-- Default list of enabled providers defined so that you can extend it -- Default list of enabled providers defined so that you can extend it
-- elsewhere in your config, without redefining it, due to `opts_extend` -- elsewhere in your config, without redefining it, due to `opts_extend`
sources = { sources = {
default = { 'lsp', 'path', 'snippets', 'buffer' }, default = { 'lsp', 'path', 'snippets', 'buffer', 'minuet' },
}, },
-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation, -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
@@ -91,24 +87,23 @@ return {
-- See the fuzzy documentation for more information -- See the fuzzy documentation for more information
fuzzy = { implementation = "prefer_rust_with_warning" } fuzzy = { implementation = "prefer_rust_with_warning" }
}, },
opts_extend = { "sources.default" }, config = function()
-- config = function() require('blink-cmp').setup {
-- require('blink-cmp').setup { sources = {
-- sources = { default = { 'lsp', 'path', 'buffer', 'snippets', 'minuet' },
-- default = { 'lsp', 'path', 'buffer', 'snippets', 'minuet' }, providers = {
-- providers = { minuet = {
-- minuet = { name = 'minuet',
-- name = 'minuet', module = 'minuet.blink',
-- module = 'minuet.blink', async = true,
-- async = true, -- Should match minuet.config.request_timeout * 1000,
-- -- Should match minuet.config.request_timeout * 1000, -- since minuet.config.request_timeout is in seconds
-- -- since minuet.config.request_timeout is in seconds timeout_ms = 3000,
-- timeout_ms = 3000, score_offset = 50, -- Gives minuet higher priority among suggestions
-- score_offset = 50, -- Gives minuet higher priority among suggestions },
-- }, },
-- }, },
-- }, }
-- } end
-- end
} }
} }

View File

@@ -1,7 +1,7 @@
"$schema" = 'https://starship.rs/config-schema.json' "$schema" = 'https://starship.rs/config-schema.json'
format = """ format = """
[](red)\ [ ](bg:red)\
$os\ $os\
$username\ $username\
[](bg:peach fg:red)\ [](bg:peach fg:red)\
@@ -23,7 +23,7 @@ $python\
$conda\ $conda\
[](fg:sapphire bg:lavender)\ [](fg:sapphire bg:lavender)\
$time\ $time\
[ ](fg:lavender)\ [ ](fg:lavender)\
$cmd_duration $cmd_duration
$line_break\ $line_break\
$character""" $character"""

View File

@@ -61,8 +61,8 @@ client.background $base
# Gaps and borders # Gaps and borders
gaps inner 0 gaps inner 0
gaps outer 0 gaps outer 0
default_border normal 2 default_border pixel 2
default_floating_border normal 2 default_floating_border pixel 2
font pango:"JetBrainsMono Nerd Font" Normal 10 font pango:"JetBrainsMono Nerd Font" Normal 10

View File

@@ -3,16 +3,15 @@
"position": "top", // Waybar position (top|bottom|left|right) "position": "top", // Waybar position (top|bottom|left|right)
// "width": 1280, // Waybar width // "width": 1280, // Waybar width
// Choose the order of the modules // Choose the order of the modules
"modules-left": ["sway/workspaces"], "modules-left": ["sway/workspaces", "pulseaudio", "clock"],
"modules-center": ["pulseaudio", "clock"],
"modules-right": ["tray", "memory", "battery", "custom/power"], "modules-right": ["tray", "memory", "battery", "custom/power"],
"sway/workspaces": { "sway/workspaces": {
"disable-scroll": true, "disable-scroll": true,
"sort-by-name": true, "sort-by-name": true,
"format": " {index} {icon} ", "format": " {index} {icon} ",
"format-icons": { "format-icons": {
"default": "", "default": "",
"focused": "", "focused": "",
}, },
}, },
"tray": { "tray": {

View File

@@ -3,35 +3,26 @@
* { * {
font-family: JetBrainsMono Nerd Font; font-family: JetBrainsMono Nerd Font;
min-height: 0; min-height: 0;
padding: 0;
} }
#waybar { #waybar {
background: transparent; background-color: @base;
color: @text; color: @text;
margin: 5px 5px;
} }
#workspaces { #workspaces {
border-radius: 1rem; background-color: @red;
margin: 5px;
background-color: @surface0;
margin-left: 1rem;
} }
#workspaces button { #workspaces button {
color: @lavender; color: @crust;
border-radius: 1rem; border: 0;
padding: 0.4rem; transition-duration: 0;
} }
#workspaces button.active { #workspaces button.active {
color: @sky; color: @sky;
border-radius: 1rem;
}
#workspaces button:hover {
color: @sapphire;
border-radius: 1rem;
} }
#custom-music, #custom-music,
@@ -44,12 +35,10 @@
#custom-power { #custom-power {
background-color: @surface0; background-color: @surface0;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
margin: 5px 0;
} }
#clock { #clock {
color: @blue; color: @blue;
border-radius: 0px 1rem 1rem 0px;
margin-right: 1rem; margin-right: 1rem;
} }
@@ -70,12 +59,11 @@
} }
#backlight, #battery { #backlight, #battery {
border-radius: 0; border-radius: 0;
} }
#pulseaudio { #pulseaudio {
color: @maroon; color: @maroon;
border-radius: 1rem 0px 0px 1rem;
margin-left: 1rem; margin-left: 1rem;
} }
@@ -85,17 +73,14 @@
} }
#custom-lock { #custom-lock {
border-radius: 1rem 0px 0px 1rem; color: @lavender;
color: @lavender;
} }
#custom-power { #custom-power {
margin-right: 1rem; background-color: @red;
border-radius: 0px 1rem 1rem 0px; color: @crust;
color: @red;
} }
#tray { #tray {
margin-right: 1rem; margin-right: 1rem;
border-radius: 1rem;
} }