fix nvim config

This commit is contained in:
Johannes Knopp
2026-02-22 17:06:22 +01:00
parent 4093701fca
commit 545f8ab328
10 changed files with 95 additions and 120 deletions

View File

@ -15,7 +15,7 @@ source = ./workspaces.conf
$terminal = ghostty $terminal = ghostty
$fileManager = thunar $fileManager = thunar
$menu = wofi --show drun $menu = env XDG_CURRENT_DESKTOP=Hyprland wofi --show drun
################# #################
### AUTOSTART ### ### AUTOSTART ###
@ -24,12 +24,13 @@ $menu = wofi --show drun
# Autostart necessary processes (like notifications daemons, status bars, etc.) # Autostart necessary processes (like notifications daemons, status bars, etc.)
# Or execute your favorite apps at launch like this: # Or execute your favorite apps at launch like this:
# exec-once = waybar # exec-once = waybar
exec-once = /usr/lib//hhyprpolkitagent/hyprpolkitagent exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
exec-once = hyprpanel exec-once = hyprpanel
exec-once = dunst exec-once = dunst
exec-once = firefox exec-once = firefox
exec-once = hyprpaper exec-once = hyprpaper
exec-once = [workspace 9 silent] deezer-desktop exec-once = [workspace 9 silent] deezer-desktop
exec-once = scripts/close-monokai-popup.sh
# gnome keyring secret service # gnome keyring secret service
exec-once = dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE exec-once = dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE
@ -262,6 +263,12 @@ bind = $mainMod SHIFT, right, movewindow, r
bind = $mainMod SHIFT, up, movewindow, u bind = $mainMod SHIFT, up, movewindow, u
bind = $mainMod SHIFT, down, movewindow, d bind = $mainMod SHIFT, down, movewindow, d
# Resize
binde = $mainMod ALT, left, resizeactive, -20 0
binde = $mainMod ALT, right, resizeactive, 20 0
binde = $mainMod ALT, up, resizeactive, 0 -20
binde = $mainMod ALT, down, resizeactive, 0 20
# Example special workspace (scratchpad) # Example special workspace (scratchpad)
bind = $mainMod, S, togglespecialworkspace, magic bind = $mainMod, S, togglespecialworkspace, magic
bind = $mainMod SHIFT, S, movetoworkspace, special:magic bind = $mainMod SHIFT, S, movetoworkspace, special:magic
@ -342,11 +349,10 @@ windowrule {
windowrule { windowrule {
name = jetbrains-tab-drag name = jetbrains-tab-drag
match:class = ^(jetbrains-.*|android-studio)$ match:class = ^(jetbrains-.*|android-studio)$
match:title = ^(\s*)$ match:title = ^(\s*|Delete|Replace All)$
no_initial_focus = 1 no_initial_focus = 1
stay_focused = 1 stay_focused = 1
float = 1 float = 1
center = 1 center = 1
} }

View File

@ -1,8 +1,7 @@
# Generated by nwg-displays on 2025-12-26 at 06:40:37. Do not edit manually. # Generated by nwg-displays on 2026-02-09 at 00:39:06. Do not edit manually.
monitor=DP-1,2560x1440@165.0,6626x876,1.0 monitor=DP-1,2560x1440@165.0,6626x876,1.0
monitor=DP-2,2560x1440@165.0,4066x876,1.0 monitor=DP-2,2560x1440@165.0,4066x876,1.0
monitor=HDMI-A-1,disable
monitor=HDMI-A-2,1920x1080@60.0,9186x396,1.0 monitor=HDMI-A-2,1920x1080@60.0,9186x396,1.0
monitor=HDMI-A-2,transform,3 monitor=HDMI-A-2,transform,3
monitor=HDMI-A-1,3840x2160@60.0,226x156,1.0
monitor=HDMI-A-1,disable

View File

@ -0,0 +1,30 @@
#!/usr/bin/env bash
SOCKET="/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
handle_line() {
local line="$1"
# Split into EVENT and DATA (EVENT>>DATA)
local event="${line%%>>*}"
local data="${line#*>>}"
case "$event" in
openwindow)
# Data format:
# WINDOWADDRESS,WORKSPACENAME,WINDOWCLASS,WINDOWTITLE
local addr ws class title
IFS=, read -r addr ws class title <<< "$data"
if [[ "$class" == "jetbrains-webstorm" && "$title" == "Monokai Pro Trial" ]]; then
# closewindow expects address with 0x prefix
hyprctl dispatch closewindow "address:0x$addr"
fi
;;
esac
}
socat -U - "UNIX-CONNECT:$SOCKET" | while read -r line; do
handle_line "$line"
done

View File

@ -12,6 +12,7 @@
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
"flutter-tools.nvim": { "branch": "main", "commit": "293dfc78162ab185bca5f81bb32155dcf45114bf" }, "flutter-tools.nvim": { "branch": "main", "commit": "293dfc78162ab185bca5f81bb32155dcf45114bf" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
"lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" }, "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
"lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
@ -19,7 +20,6 @@
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
"mason.nvim": { "branch": "main", "commit": "4da89f3ab04783da990f9bd40aaa36c22e59375b" }, "mason.nvim": { "branch": "main", "commit": "4da89f3ab04783da990f9bd40aaa36c22e59375b" },
"monokai-nightasty.nvim": { "branch": "main", "commit": "8be5e1c6e1d59873505e81b161e923264dfa5c1a" }, "monokai-nightasty.nvim": { "branch": "main", "commit": "8be5e1c6e1d59873505e81b161e923264dfa5c1a" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"none-ls-extras.nvim": { "branch": "main", "commit": "03955d165621300965a6d685c8f399ec7efd5785" }, "none-ls-extras.nvim": { "branch": "main", "commit": "03955d165621300965a6d685c8f399ec7efd5785" },
"none-ls.nvim": { "branch": "main", "commit": "0b457958cb958c16850b5a1fb38bbcd982909181" }, "none-ls.nvim": { "branch": "main", "commit": "0b457958cb958c16850b5a1fb38bbcd982909181" },
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" }, "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
@ -34,7 +34,6 @@
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
"vim-floaterm": { "branch": "master", "commit": "a11b930f55324e9b05e2ef16511fe713f1b456a7" }, "vim-floaterm": { "branch": "master", "commit": "a11b930f55324e9b05e2ef16511fe713f1b456a7" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
} }

View File

@ -39,6 +39,7 @@ return {
['<Enter>'] = cmp.mapping.confirm({ select = true }), ['<Enter>'] = cmp.mapping.confirm({ select = true }),
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'lazydev', group_index = 0 },
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },
{ name = 'buffer' }, { name = 'buffer' },

View File

@ -8,7 +8,7 @@ return {
'LazyGitFilter', 'LazyGitFilter',
'LazyGitFilterCurrentFile', 'LazyGitFilterCurrentFile',
}, },
depedencies = { dependencies = {
'nvim-lua/plenary.nvim', 'nvim-lua/plenary.nvim',
}, },
} }

View File

@ -5,11 +5,17 @@ return {
'williamboman/mason.nvim', 'williamboman/mason.nvim',
'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lsp',
{ 'antosha417/nvim-lsp-file-operations', config = true }, { 'antosha417/nvim-lsp-file-operations', config = true },
{ 'folke/neodev.nvim', opts = {} }, {
'folke/lazydev.nvim',
ft = 'lua',
opts = {
library = {
{ path = '${3rd}/luv/library', words = { 'vim%.uv' } },
},
},
},
}, },
config = function() config = function()
local lspconfig = vim.lsp
local mason_lspconfig = require('mason-lspconfig')
local cmp_nvim_lsp = require('cmp_nvim_lsp') local cmp_nvim_lsp = require('cmp_nvim_lsp')
local keymap = vim.keymap local keymap = vim.keymap
local wk = require('which-key') local wk = require('which-key')
@ -37,98 +43,40 @@ return {
end, end,
}) })
-- Apply default capabilities to all servers
local capabilities = cmp_nvim_lsp.default_capabilities() local capabilities = cmp_nvim_lsp.default_capabilities()
mason_lspconfig.setup_handlers({ vim.lsp.config('*', { capabilities = capabilities })
-- default handler for installed servers
function(server_name) -- lua_ls: suppress vim global warnings, improve completion
lspconfig.enable(server_name, { vim.lsp.config('lua_ls', {
capabilities = capabilities, settings = {
}) Lua = {
end, diagnostics = {
-- TODO add lsp configs globals = { 'vim' },
['lua_ls'] = function() },
lspconfig.enable('lua_ls', { completion = {
capabilities = capabilities, callSnippet = 'Replace',
settings = { },
Lua = { },
diagnostics = { },
globals = { 'vim' },
},
completion = {
callSnippet = 'Replace'
},
}
}
})
end,
['emmet_ls'] = function()
-- capabilities.textDocument.completion.completionItem.snippetSupport = true
lspconfig.enable('emmet_ls', {
capabilities = capabilities,
filetypes = {
'html',
'css',
'sass',
'scss',
'less',
'javascript',
'javascriptreact',
'typescript',
'typescriptreact',
'svelte',
'vue',
}
})
end,
['ts_ls'] = function()
lspconfig.enable('ts_ls', {
capabilities = capabilities,
cmd = { "typescript-language-server", "--stdio" },
init_options = {
hostInfo = "neovim",
-- preferences = {
-- includePackagesJsonAutoImports = "on",
-- }
}
})
end,
['hyprls'] = function ()
lspconfig.hyprls.setup({
capabilities = capabilities,
cmd = { "hyprls" },
root_dir = function(fname)
return vim.fn.getcwd()
end,
})
end,
-- ['pyright'] = function()
-- lspconfig['pyright'].setup({
-- -- cmd = { "pyright-langserver", "--stdio" },
-- -- filetypes = { "python" },
-- -- root_dir = function(filename)
-- -- return util.root_pattern(unpack(root_files))(filename) or util.path.dirname(filename)
-- -- end,
-- -- settings = {
-- -- python = {
-- -- analysis = {
-- -- autoSearchPaths = true,
-- -- diagnosticMode = "workspace",
-- -- useLibraryCodeForTypes = true
-- -- }
-- -- }
-- -- }
-- capabilities = capabilities,
-- settings = {
-- python = {
-- analysis = {
-- useLibraryCodeForTypes = true,
-- typeCheckingMode = "basic",
-- -- configPath = vim.fn.expand('./pyrightconfig.json')
-- }
-- }
-- },
-- })
-- end,
}) })
end
-- ts_ls: explicit host info
vim.lsp.config('ts_ls', {
cmd = { 'typescript-language-server', '--stdio' },
init_options = {
hostInfo = 'neovim',
},
})
-- hyprls: not managed by mason, enable manually
vim.lsp.config('hyprls', {
cmd = { 'hyprls' },
filetypes = { 'hyprlang' },
root_dir = function(fname)
return vim.fn.getcwd()
end,
})
vim.lsp.enable('hyprls')
end,
} }

View File

@ -1,6 +1,6 @@
return { return {
{ 'williamboman/mason.nvim', commit = '4da89f3' }, { 'williamboman/mason.nvim' },
{ 'williamboman/mason-lspconfig.nvim', commit = '1a31f82' }, { 'williamboman/mason-lspconfig.nvim' },
{ 'WhoIsSethDaniel/mason-tool-installer.nvim' }, { 'WhoIsSethDaniel/mason-tool-installer.nvim' },
config = function() config = function()
local mason = require('mason') local mason = require('mason')
@ -10,14 +10,14 @@ return {
mason.setup({ mason.setup({
ui = { ui = {
icons = { icons = {
package_installed = "", package_installed = '',
package_pending = "", package_pending = '',
package_uninstalled = "", package_uninstalled = '',
}, },
}, },
pip = { pip = {
upgrade_pip = true, upgrade_pip = true,
} },
}) })
mason_lspconfig.setup({ mason_lspconfig.setup({
@ -39,7 +39,7 @@ return {
-- 'black', -- 'black',
-- 'pylint', -- 'pylint',
-- 'eslint_d', -- 'eslint_d',
} },
}) })
end, end,
} }

View File

@ -1,8 +0,0 @@
# export DJANGO_SETTINGS_MODULE=config.settings.dev
export DATABASE_HOST=127.0.0.1
export DATABASE_NAME=cerenim
export DATABASE_USER=brainhero
export DATABASE_PORT=5432
export DATABASE_DJANGO_SCHEMA=django
export SECRET_KEY=abasdjkasd
export DATABASE_PASSWORD=abcdefghijk