diff --git a/autostart/stylix-activate-gnome.desktop b/autostart/stylix-activate-gnome.desktop index 89c43fb..cfdafe6 120000 --- a/autostart/stylix-activate-gnome.desktop +++ b/autostart/stylix-activate-gnome.desktop @@ -1 +1 @@ -/nix/store/5wnlp588q55mib7r6bhlga2minnq66cw-home-manager-files/.config/autostart/stylix-activate-gnome.desktop \ No newline at end of file +/nix/store/8313dmsfcjk6c6sacsi8mzc7cw9inl12-home-manager-files/.config/autostart/stylix-activate-gnome.desktop \ No newline at end of file diff --git a/autostart/stylix-activate-kde.desktop b/autostart/stylix-activate-kde.desktop index 7026480..64a2f39 120000 --- a/autostart/stylix-activate-kde.desktop +++ b/autostart/stylix-activate-kde.desktop @@ -1 +1 @@ -/nix/store/5wnlp588q55mib7r6bhlga2minnq66cw-home-manager-files/.config/autostart/stylix-activate-kde.desktop \ No newline at end of file +/nix/store/8313dmsfcjk6c6sacsi8mzc7cw9inl12-home-manager-files/.config/autostart/stylix-activate-kde.desktop \ No newline at end of file diff --git a/home-manager/home.nix b/home-manager/home.nix index 9ff2271..4959caf 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -214,8 +214,8 @@ programs.git = { enable = true; settings = { - user.name = "Lukrecja"; - user.email = "lusiaaa425@gmail.com"; + user.name = "Lukrecja PleskaczyƄska"; + user.email = "lukrecjaaa@proton.com"; credential.helper = "store"; http."https://git.bgs.local:3000/" = { sslCAInfo = "/home/lusia/VSTech-vpn/bgs-git-ca.crt"; diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index 9a1390c..5339e59 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -4,31 +4,11 @@ local servers = { "html", "cssls", "rust_analyzer" } vim.lsp.enable(servers) -- Configure rust-analyzer with enhanced settings +-- Project-specific settings (features, target, etc.) go in rust-analyzer.toml vim.lsp.config.rust_analyzer = { cmd = { "rust-analyzer" }, filetypes = { "rust" }, root_markers = { "Cargo.toml", "rust-project.json" }, - settings = { - ["rust-analyzer"] = { - cargo = { - allFeatures = true, - loadOutDirsFromCheck = true, - buildScripts = { - enable = true, - }, - }, - checkOnSave = true, - check = { - command = "clippy", - }, - procMacro = { - enable = true, - }, - diagnostics = { - enable = true, - }, - }, - }, } --- read :h vim.lsp.config for changing options of lsp servers +-- read :h vim.lsp.config for changing options of lsp servers diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index daa97b5..75fa434 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -27,8 +27,8 @@ return { }, }, keymap = { - [""] = { "fallback" }, -- Enter only inserts newline, doesn't accept - [""] = { "select_and_accept", "snippet_forward", "fallback" }, -- Tab accepts + [""] = { "accept", "fallback" }, -- Enter accepts only when an item is selected; otherwise newline + [""] = { "cancel", "fallback" }, -- Esc closes completion and stays in insert mode when menu is visible }, }, },