6 Commits

Author SHA1 Message Date
jozamudi 8630f6318e chore: update waybar, nvim llm plugin, and sway config
- Replace sway window module with hyprland submap in waybar
- Move clock to right side and update display format
- Enable battery time display and update workspace button styling
- Update nvim llm plugin model ID, backend URL, and FIM tokens
- Uncomment default terminal and add GTK/Qt wayland env vars in sway
2026-05-04 16:59:40 -07:00
jozamudi 0784b17f26 feat(hyprland): replace sway modules with hyprland equivalents (submap, window) 2026-05-04 16:33:56 -07:00
jozamudi cd2d55137b fix(hyprland): switch workspaces module and add active workspace styling 2026-05-04 16:31:17 -07:00
jozamudi 2ad618af1b feat: nvim; llm inline llm autocomplete 2026-03-08 10:17:22 -07:00
jozamudi 7ebe8337b0 hyprlock: reduce input field size, move clock to bottom 2026-03-07 15:18:27 -08:00
jozamudi cad7412741 refactor: adjust hyprland, kitty, and nvim settings
- hyprland: add hy3 plugin config, prefer kitty terminal, change shift+exit to E
- kitty: reduce font size to 10.5
- nvim: change indent width to 2 spaces
- nvim: replace avante with parrot (Ollama provider)
- nvim: temporarily disable treesitter install
2026-03-07 15:12:35 -08:00
14 changed files with 129 additions and 107 deletions
+16 -1
View File
@@ -35,6 +35,7 @@ monitor=,preferred,auto,auto
# Set programs that you use # Set programs that you use
$terminal = kitty $terminal = kitty
#$terminal = foot
$fileManager = nautilus $fileManager = nautilus
$menu = wofi --show drun -GI $menu = wofi --show drun -GI
@@ -214,9 +215,23 @@ misc {
xwayland { xwayland {
force_zero_scaling = true force_zero_scaling = true
} }
env = GTK_SCALE,1 env = GTK_SCALE,1
env = XCURSOR_SIZE,32 env = XCURSOR_SIZE,32
plugin {
hy3 {
tabs {
# height of the tab bar
height = 2 # default: 22
# render the window title on the bar
render_text = false # default: true
}
}
}
############# #############
### INPUT ### ### INPUT ###
@@ -266,7 +281,7 @@ bind = $mainMod, M, exec, hyprlock
bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod SHIFT, SPACE, togglefloating,
bind = $mainMod SHIFT, Q, hy3:killactive, bind = $mainMod SHIFT, Q, hy3:killactive,
bind = $mainMod SHIFT, M, exit, bind = $mainMod SHIFT, E, exit,
bind = $mainMod SHIFT, S, pin bind = $mainMod SHIFT, S, pin
+3 -3
View File
@@ -6,7 +6,7 @@ background {
input-field { input-field {
monitor = monitor =
size = 20%, 5% size = 15%, 5%
font_family = Noto Sans font_family = Noto Sans
dots_size = 0.08 dots_size = 0.08
} }
@@ -15,6 +15,6 @@ input-field {
label { label {
monitor = monitor =
text = $TIME text = $TIME
font_size = 80 font_size = 200
position = 0, -10 position = 0, 200
} }
+6 -8
View File
@@ -3,19 +3,18 @@
"spacing": 2, // Gaps between modules (4px) "spacing": 2, // Gaps between modules (4px)
"modules-left": [ "modules-left": [
"hyprland/workspaces", "hyprland/workspaces",
"hyprland/mode", "hyprland/submap",
"hyprland/scratchpad",
"hyprland/window" "hyprland/window"
], ],
"modules-center": [ //"modules-center": [
//"sway/window" //"sway/window"
"clock", //],
],
"modules-right": [ "modules-right": [
//"mpd", //"mpd",
"pulseaudio", "pulseaudio",
//"network", //"network",
"battery", "battery",
"clock",
"tray" "tray"
//"custom/power" //"custom/power"
], ],
@@ -40,7 +39,7 @@
"clock": { "clock": {
//"timezone": "America/Los_Angeles", //"timezone": "America/Los_Angeles",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": "{:%c}", "format": "{:%r %Y-%m-%d}",
//"format": "{:%R %p %Y-%m-%d}", //"format": "{:%R %p %Y-%m-%d}",
//"format-alt": "{:%Y-%m-%d}" //"format-alt": "{:%Y-%m-%d}"
}, },
@@ -50,8 +49,7 @@
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
//"format": "{time} {capacity}% {icon}", "format": "{time} {capacity}% {icon}",
"format": "{capacity}% {icon}",
"format-full": "{capacity}% {icon}", "format-full": "{capacity}% {icon}",
"format-charging": "{capacity}% C", "format-charging": "{capacity}% C",
"format-plugged": "{capacity}% P", "format-plugged": "{capacity}% P",
+18 -8
View File
@@ -4,7 +4,7 @@
/*font-family: "JetBrainsMono NF";*/ /*font-family: "JetBrainsMono NF";*/
font-family: "JetBrainsMonoNFM-Regular"; font-family: "JetBrainsMonoNFM-Regular";
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: normal;
} }
window#waybar { window#waybar {
@@ -49,7 +49,7 @@ button:hover {
#workspaces button { #workspaces button {
padding: 0 4px; padding: 0 4px;
/*background-color: transparent;*/ background-color: transparent;
color: #ffffff; color: #ffffff;
} }
@@ -57,15 +57,25 @@ button:hover {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
} }
#workspaces button.focused { #workspaces button.active {
background-color: #64727D; background-color: #eb4d4b;
/*box-shadow: inset 0 -3px #ffffff;*/ box-shadow: inset 0 -3px #ffffff;
color: #ffffff;
font-weight: bold;
} }
#workspaces button.urgent { #workspaces button.urgent {
background-color: #eb4d4b; background-color: #eb4d4b;
} }
#workspaces button.visible {
background-color: #64727D;
}
#workspaces button.empty {
background-color: transparent;
}
#mode { #mode {
background-color: #64727D; background-color: #64727D;
box-shadow: inset 0 -3px #ffffff; box-shadow: inset 0 -3px #ffffff;
@@ -93,17 +103,17 @@ button:hover {
} }
#window, #window,
#workspaces { #workspaces-hyprland {
margin: 0 4px; margin: 0 4px;
} }
/* If workspaces is the leftmost module, omit left margin */ /* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces { .modules-left > widget:first-child > #workspaces-hyprland {
margin-left: 0; margin-left: 0;
} }
/* If workspaces is the rightmost module, omit right margin */ /* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces { .modules-right > widget:last-child > #workspaces-hyprland {
margin-right: 0; margin-right: 0;
} }
+1 -6
View File
@@ -1,4 +1,4 @@
font_size 11.5 font_size 10.5
#text_composition_strategy legacy #text_composition_strategy legacy
#modify_font cell_width 95% #modify_font cell_width 95%
@@ -9,11 +9,6 @@ cursor_trail_start_threshold 0
shell_integration no-cursor shell_integration no-cursor
cursor_trail_decay 0.01 0.15 cursor_trail_decay 0.01 0.15
cursor_shape block cursor_shape block
cursor_blink true
map cmd+c copy_to_clipboard
map cmd+v paste_from_clipboard
map shift+insert paste_from_clipboard
linux_display_server wayland linux_display_server wayland
wayland_enable_ime yes wayland_enable_ime yes
+3 -3
View File
@@ -16,9 +16,9 @@ vim.cmd("set number")
vim.cmd("set relativenumber") vim.cmd("set relativenumber")
vim.cmd("set expandtab") vim.cmd("set expandtab")
vim.cmd("set shiftwidth=4") vim.cmd("set shiftwidth=2")
vim.cmd("set softtabstop=4") vim.cmd("set softtabstop=2")
vim.cmd("set tabstop=4") vim.cmd("set tabstop=2")
vim.cmd("set smartindent") vim.cmd("set smartindent")
vim.cmd("set backspace=indent,eol,start") vim.cmd("set backspace=indent,eol,start")
-63
View File
@@ -1,63 +0,0 @@
return {
"yetone/avante.nvim",
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
-- ⚠️ must add this setting! ! !
build = vim.fn.has("win32") ~= 0
and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
or "make",
event = "VeryLazy",
version = false, -- Never set this value to "*"! Never!
---@module 'avante'
---@type avante.Config
opts = {
-- add any opts here
-- this file can contain specific instructions for your project
instructions_file = "avante.md",
-- for example
provider = "ollama",
providers = {
ollama = {
model = "devstral-small-2:24b-32k",
--is_env_set = require("avante.providers.ollama").check_endpoint_alive,
},
},
},
dependencies = {
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
--- The below dependencies are optional,
"nvim-mini/mini.pick", -- for file_selector provider mini.pick
"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
"ibhagwan/fzf-lua", -- for file_selector provider fzf
"stevearc/dressing.nvim", -- for input provider dressing
"folke/snacks.nvim", -- for input provider snacks
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
"zbirenbaum/copilot.lua", -- for providers='copilot'
{
-- support for image pasting
"HakonHarnes/img-clip.nvim",
event = "VeryLazy",
opts = {
-- recommended settings
default = {
embed_image_as_base64 = false,
prompt_for_file_name = false,
drag_and_drop = {
insert_mode = true,
},
-- required for Windows users
use_absolute_path = true,
},
},
},
{
-- Make sure to set this up properly if you have lazy=true
'MeanderingProgrammer/render-markdown.nvim',
opts = {
file_types = { "markdown", "Avante" },
},
ft = { "markdown", "Avante" },
},
},
}
+52
View File
@@ -0,0 +1,52 @@
return {
"huggingface/llm.nvim",
config = function()
local llm = require('llm')
llm.setup({
api_token = nil, -- cf Install paragraph
model = "Qwen/Qwen3.5-9B", -- the model ID, behavior depends on backend
backend = "openai", -- backend ID, "huggingface" | "ollama" | "openai" | "tgi"
url = "http://192.168.200.12:8123", -- the http url of the backend
tokens_to_clear = { "<|endoftext|>" }, -- tokens to remove from the model's output
-- parameters that are added to the request body, values are arbitrary, you can set any field:value pair here it will be passed as is to the backend
request_body = {
temperature=0.6,
top_p=0.95,
top_k=20,
min_p=0.0,
presence_penalty=0.0,
repetition_penalty=1.0,
max_new_tokens = 2000,
chat_template_kwargs='{"enable_thinking": False}',
},
-- set this if the model supports fill in the middle
fim = {
enabled = true,
prefix = "<|fim_prefix|>",
middle = "<|fim_middle|>",
suffix = "<|fim_suffix|>",
},
debounce_ms = 100,
accept_keymap = "<Tab>",
dismiss_keymap = "<S-Tab>",
tls_skip_verify_insecure = false,
-- llm-ls configuration, cf llm-ls section
--lsp = {
-- bin_path = nil,
-- host = nil,
-- port = nil,
-- cmd_env = nil, -- or { LLM_LOG_LEVEL = "DEBUG" } to set the log level of llm-ls
-- version = "0.5.3",
--},
tokenizer = {
repository = "Qwen/Qwen3.5-9B",
api_token = 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,
}, -- cf Tokenizer paragraph
context_window = 5000, -- max number of tokens for the context window
enable_suggestions_on_startup = false,
enable_suggestions_on_files = "*", -- pattern matching syntax to enable suggestions on specific files, either a string or a list of strings
disable_url_path_completion = false, -- cf Backend
})
end
}
+1
View File
@@ -3,6 +3,7 @@ return {
dependencies = { dependencies = {
{"mason-org/mason.nvim"}, {"mason-org/mason.nvim"},
{'neovim/nvim-lspconfig'}, {'neovim/nvim-lspconfig'},
{'nvim-mini/mini.nvim'}, {'nvim-mini/mini.nvim'},
{'nvim-mini/mini.completion'}, {'nvim-mini/mini.completion'},
}, },
+1 -1
View File
@@ -2,6 +2,6 @@ return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
build = ":TSUpdate", build = ":TSUpdate",
config = function() config = function()
require("nvim-treesitter").install({}) --require("nvim-treesitter").install({})
end end
} }
+6 -1
View File
@@ -6,8 +6,8 @@ font 'JetBrainsMonoNFM-Regular' 9
#set $mod Mod1 #set $mod Mod1
set $mod Mod4 set $mod Mod4
#set $term kitty -1
set $term kitty set $term kitty
#set $term foot
#set $term ghostty #set $term ghostty
set $menu wofi -S drun -GI set $menu wofi -S drun -GI
@@ -17,6 +17,10 @@ set $down j
set $up k set $up k
set $right l set $right l
#env GDK_BACKEND=wayland
#env QT_QPA_PLATFORM=wayland
set $laptop eDP-1 set $laptop eDP-1
include ~/.config/sway/config.d/* include ~/.config/sway/config.d/*
@@ -90,3 +94,4 @@ bindsym $mod+Ctrl+y exec : | wl-copy -p
exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway
View File
+3 -4
View File
@@ -2,10 +2,9 @@
{ {
"spacing": 2, // Gaps between modules (4px) "spacing": 2, // Gaps between modules (4px)
"modules-left": [ "modules-left": [
"sway/workspaces", "hyprland/workspaces",
"sway/mode", "hyprland/submap",
"sway/scratchpad", "hyprland/window"
"sway/window"
], ],
//"modules-center": [ //"modules-center": [
//"sway/window" //"sway/window"
+17 -7
View File
@@ -49,7 +49,7 @@ button:hover {
#workspaces button { #workspaces button {
padding: 0 4px; padding: 0 4px;
/*background-color: transparent;*/ background-color: transparent;
color: #ffffff; color: #ffffff;
} }
@@ -57,15 +57,25 @@ button:hover {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
} }
#workspaces button.focused { #workspaces button.active {
background-color: #64727D; background-color: #eb4d4b;
/*box-shadow: inset 0 -3px #ffffff;*/ box-shadow: inset 0 -3px #ffffff;
color: #ffffff;
font-weight: bold;
} }
#workspaces button.urgent { #workspaces button.urgent {
background-color: #eb4d4b; background-color: #eb4d4b;
} }
#workspaces button.visible {
background-color: #64727D;
}
#workspaces button.empty {
background-color: transparent;
}
#mode { #mode {
background-color: #64727D; background-color: #64727D;
box-shadow: inset 0 -3px #ffffff; box-shadow: inset 0 -3px #ffffff;
@@ -93,17 +103,17 @@ button:hover {
} }
#window, #window,
#workspaces { #workspaces-hyprland {
margin: 0 4px; margin: 0 4px;
} }
/* If workspaces is the leftmost module, omit left margin */ /* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces { .modules-left > widget:first-child > #workspaces-hyprland {
margin-left: 0; margin-left: 0;
} }
/* If workspaces is the rightmost module, omit right margin */ /* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces { .modules-right > widget:last-child > #workspaces-hyprland {
margin-right: 0; margin-right: 0;
} }