mal0/dotfiles
1
0
Fork 0
Code Pull Requests Actions Releases Activity

pre lua

Browse Source
This commit is contained in:
Acid
2026-05-16 20:19:04 -04:00
parent 650f8b70d2
commit f04bdc503f
3 changed files with 165 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/hypr/hyprland.conf
+12 -16
View File
@@ -117,7 +117,6 @@ animations {
}
dwindle {
pseudotile = yes
preserve_split = yes
}
@@ -154,12 +153,22 @@ bind = $mainMod,F,fullscreen,
bind = $mainMod, D, exec, $menu
bind = $mainMod, S , exec, $apps
bind = CONTROLALT, L, exec, $powermenu
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
bind = $mainMod, L, exec, loginctl lock-session
bind = $mainMod, G, exec, $mouseConstrain
bind = $mainMod, n, exec, ~/.config/quickshell/network/network_toggle.sh
# Example special workspace (scratchpad)
bind = $mainMod ALT, S, togglespecialworkspace, magic
bind = $mainMod SHIFT, S, movetoworkspace, special:magic
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
# media keys
bind= ,XF86AudioMute ,exec, ~/.config/dunstthree/dunstthree.sh mute
@@ -238,16 +247,3 @@ windowrule = workspace 10, match:class ^(krita)$
windowrule = workspace 10, match:class ^(org.inkscape.Inkscape)$
windowrule = workspace 10, match:class ^(sqlitebrowser)$
windowrule = workspace 10, match:class ^(veracrypt)$
windowrule = workspace 6, match:class ^(Agemo)$
# Example special workspace (scratchpad)
bind = $mainMod ALT, S, togglespecialworkspace, magic
bind = $mainMod SHIFT, S, movetoworkspace, special:magic
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
desktop/nvim/init.lua
+124 -124
View File
@@ -19,38 +19,38 @@ require("cmpConf")
-- remove_trailing_whitespace on save
vim.api.nvim_create_autocmd("BufWritePre", {
pattern = "*",
callback = function()
require("functions").remove_trailing_whitespace()
end,
pattern = "*",
callback = function()
require("functions").remove_trailing_whitespace()
end,
})
-- treat qss as css
vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
pattern = "*.qss",
command = "set filetype=css",
pattern = "*.qss",
command = "set filetype=css",
})
-- set spelling on these files
vim.api.nvim_create_autocmd("FileType", {
pattern = { "markdown", "text" },
callback = function()
vim.opt_local.spell = true
end,
pattern = { "markdown", "text" },
callback = function()
vim.opt_local.spell = true
end,
})
vim.api.nvim_create_autocmd("TextYankPost", {
callback = function()
vim.highlight.on_yank()
end,
callback = function()
vim.highlight.on_yank()
end,
})
-- Auto-open the preview window whenever Oil finishes rendering
vim.api.nvim_create_autocmd("User", {
pattern = "OilEnter",
callback = function()
require("oil").open_preview()
end,
pattern = "OilEnter",
callback = function()
require("oil").open_preview()
end,
})
--############
@@ -59,11 +59,11 @@ vim.api.nvim_create_autocmd("User", {
-- telescope
require("telescope").setup({
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown({}),
},
},
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown({}),
},
},
})
require("telescope").load_extension("ui-select")
@@ -78,96 +78,96 @@ require("lsnip")
require("colorizer").setup()
-- this is an autocomand to force colorizer to attach to some files
vim.api.nvim_exec(
[[
[[
augroup ColorizerAttach
autocmd!
autocmd BufRead,BufNewFile *.config,*.rasi,*.conf,*.qss,*.css :ColorizerAttachToBuffer
augroup END
]],
false
false
)
--'''''''''''''' Theme ''''''''''''''''''''''''''''''''''''''''''''''''
local function force_backgraund(color)
color = color or "catppuccin-mocha"
vim.cmd.colorscheme(color)
color = color or "catppuccin-mocha"
vim.cmd.colorscheme(color)
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
end
force_backgraund()
--"''''''''Neotree''''''''''''''''''''''''''''''''''''''''''''''''''''''''
require("neo-tree").setup({
close_if_last_window = true,
filesystem = {
hijack_netrw_behavior = "disabled",
},
window = {
width = 25,
},
close_if_last_window = true,
filesystem = {
hijack_netrw_behavior = "disabled",
},
window = {
width = 25,
},
})
--'''''''''''''nvim-ts-autotag'''''''''''''''''''''''''''''''''''''''''
require("nvim-ts-autotag").setup({
opts = {
enable_close = true, -- Auto close tags
enable_rename = true, -- Auto rename pairs of tags
enable_close_on_slash = false, -- Auto close on trailing </
},
opts = {
enable_close = true, -- Auto close tags
enable_rename = true, -- Auto rename pairs of tags
enable_close_on_slash = false, -- Auto close on trailing </
},
})
--''''''''''''''''''''''''rainbow'''''''''''''''''''''''''''''''''''''''
require("rainbow-delimiters.setup").setup({
strategy = {},
query = {},
highlight = {},
strategy = {},
query = {},
highlight = {},
})
--''''''''''Lualine''''''''''''''''''''''''''''''''''''''''''''''''''''
require("lualine").setup({
options = {
theme = "catppuccin-mocha",
icons_enabled = true,
component_separators = { left = " ", right = " " },
section_separators = { left = "|", right = "|" },
globalstatus = true,
},
options = {
theme = "catppuccin-mocha",
icons_enabled = true,
component_separators = { left = " ", right = " " },
section_separators = { left = "|", right = "|" },
globalstatus = true,
},
sections = {
lualine_z = {
function()
local line = vim.fn.line(".")
local total = vim.fn.line("$")
local percent = math.floor((line / total) * 100)
return string.format("%3d%%%% %d☰", percent, total)
end,
},
},
sections = {
lualine_z = {
function()
local line = vim.fn.line(".")
local total = vim.fn.line("$")
local percent = math.floor((line / total) * 100)
return string.format("%3d%%%% %d☰", percent, total)
end,
},
},
})
--'''''''''Barbar'''''''''''''''''''''''''''''''''''''''''''''''''''
require("barbar").setup({
animation = false,
auto_hide = 1,
tabpages = false,
clickable = true,
icons = {
buffer_index = true,
buffer_number = false,
diagnostics = {
[vim.diagnostic.severity.ERROR] = { enabled = true, icon = "" },
[vim.diagnostic.severity.WARN] = { enabled = true, icon = "" },
[vim.diagnostic.severity.INFO] = { enabled = false },
[vim.diagnostic.severity.HINT] = { enabled = false },
},
filetype = {
enabled = true,
},
separator = { left = "▎", right = "" },
modified = { button = "●" },
pinned = { button = "車", filename = true },
},
animation = false,
auto_hide = 1,
tabpages = false,
clickable = true,
icons = {
buffer_index = true,
buffer_number = false,
diagnostics = {
[vim.diagnostic.severity.ERROR] = { enabled = true, icon = "" },
[vim.diagnostic.severity.WARN] = { enabled = true, icon = "" },
[vim.diagnostic.severity.INFO] = { enabled = false },
[vim.diagnostic.severity.HINT] = { enabled = false },
},
filetype = {
enabled = true,
},
separator = { left = "▎", right = "" },
modified = { button = "●" },
pinned = { button = "車", filename = true },
},
})
-- '''''''''''' highlight ''''''''''''''''''''''''''''''''''''''''
@@ -175,55 +175,55 @@ require("local-highlight").setup({ animate = { enabled = false } })
--'''''''''''''''OIL'''''''''''''''''''''''''''''''''''''''''''''''
require("oil").setup({
default_file_explorer = true,
keymaps = {
["?"] = { "actions.show_help", mode = "n" },
["<CR>"] = "actions.select",
["<C-s>"] = { "actions.select", opts = { vertical = true } },
["<C-h>"] = { "actions.select", opts = { horizontal = true } },
["<C-t>"] = { "actions.select", opts = { tab = true } },
["-"] = { "actions.parent", mode = "n" },
["_"] = { "actions.open_cwd", mode = "n" },
["gs"] = { "actions.change_sort", mode = "n" },
["gx"] = "actions.open_external",
["H"] = { "actions.toggle_hidden", mode = "n" },
},
lsp_file_methods = {
enabled = true,
timeout_ms = 1000,
autosave_changes = false,
},
float = {
preview_split = "right",
},
preview_win = {
update_on_cursor_moved = true,
preview_method = "fast_scratch",
},
default_file_explorer = true,
keymaps = {
["?"] = { "actions.show_help", mode = "n" },
["<CR>"] = "actions.select",
["<C-s>"] = { "actions.select", opts = { vertical = true } },
["<C-h>"] = { "actions.select", opts = { horizontal = true } },
["<C-t>"] = { "actions.select", opts = { tab = true } },
["-"] = { "actions.parent", mode = "n" },
["_"] = { "actions.open_cwd", mode = "n" },
["gs"] = { "actions.change_sort", mode = "n" },
["gx"] = "actions.open_external",
["H"] = { "actions.toggle_hidden", mode = "n" },
},
lsp_file_methods = {
enabled = true,
timeout_ms = 1000,
autosave_changes = false,
},
float = {
preview_split = "right",
},
preview_win = {
update_on_cursor_moved = true,
preview_method = "fast_scratch",
},
})
-- ''''''''''''''autopairs'''''''''''''''''''''''''''''''''''''''
local npairs = require("nvim-autopairs")
npairs.setup({
check_ts = true,
ts_config = {
lua = { "string" }, -- it will not add a pair on that treesitter node
javascript = { "template_string" },
java = false, -- don't check treesitter on java
},
fast_wrap = {
map = "<M-e>",
chars = { "{", "[", "(", '"', "'" },
pattern = [=[[%'%"%>%]%)%}%,]]=],
end_key = "$",
before_key = "h",
after_key = "l",
cursor_pos_before = true,
keys = "qwertyuiopzxcvbnmasdfghjkl",
manual_position = true,
highlight = "Search",
highlight_grey = "Comment",
},
check_ts = true,
ts_config = {
lua = { "string" }, -- it will not add a pair on that treesitter node
javascript = { "template_string" },
java = false, -- don't check treesitter on java
},
fast_wrap = {
map = "<M-e>",
chars = { "{", "[", "(", '"', "'" },
pattern = [=[[%'%"%>%]%)%}%,]]=],
end_key = "$",
before_key = "h",
after_key = "l",
cursor_pos_before = true,
keys = "qwertyuiopzxcvbnmasdfghjkl",
manual_position = true,
highlight = "Search",
highlight_grey = "Comment",
},
})
local cmp = require("cmp")
desktop/nvim/lua/lspConfig.lua
+29 -3
View File
@@ -49,7 +49,6 @@ end
-- Mason-LSPconfig setup
local servers = {
"stylua",
"clangd",
"vtsls",
"pyright",
@@ -91,7 +90,7 @@ vim.lsp.config("pyright", {
})
vim.lsp.enable("pyright")
-- RUFF
----------- RUFF
vim.lsp.config("ruff", {
filetypes = { "python" },
init_options = {
@@ -117,7 +116,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
vim.lsp.enable("ruff")
--django experimental
--------- django experimental
vim.lsp.config("djls", {
cmd = { "djls", "serve" },
filetypes = { "htmldjango", "html", "python" },
@@ -126,6 +125,33 @@ vim.lsp.config("djls", {
vim.lsp.enable("djls")
-------------- LUA
vim.lsp.config("lua_ls", {
capabilities = capabilities,
on_attach = lsp_attach,
settings = {
Lua = {
workspace = {
library = {
"/usr/share/hypr/stubs",
-- Neovim Lua runtime completion
vim.env.VIMRUNTIME,
-- Your nvim config Lua files
vim.fn.stdpath("config") .. "/lua",
},
checkThirdParty = false,
},
diagnostics = {
enable = true,
globals = { "vim", "hl" },
},
},
},
})
vim.lsp.enable("lua_ls")
--''''''''''''''''Non-ls/null-ls''''''''''''''''
local null_ls = require("null-ls")
local helpers = require("null-ls.helpers")