diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..b654d98 --- /dev/null +++ b/.config/alacritty/alacritty.toml @@ -0,0 +1,48 @@ +[colors.bright] +black = "#666666" +blue = "#3b8eea" +cyan = "#29b8db" +green = "#23d18b" +magenta = "#d670d6" +red = "#f14c4c" +white = "#e5e5e5" +yellow = "#f5f543" + +[colors.cursor] +cursor = "#cccccc" +text = "#1d1f21" + +[colors.normal] +black = "#000000" +blue = "#2472c8" +cyan = "#11a8cd" +green = "#0dbc79" +magenta = "#bc3fbc" +red = "#cd3131" +white = "#e5e5e5" +yellow = "#e5e510" + +[colors.primary] +background = "#241F31" +foreground = "#D4D4D4" + +[env] +LANG = "en_US.UTF-8" +LC_CTYPE = "en_US.UTF-8" +TERM = "alacritty" + +[font] +size = 15.5 + +[font.normal] +family = "UbuntuMono Nerd Font" +style = "Regular" + +[[keyboard.bindings]] +action = "ToggleFullscreen" +key = "F11" + +[window] +opacity = 1 +#decorations = "none" +#startup_mode = "Maximized" diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml deleted file mode 100644 index 520443a..0000000 --- a/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,47 +0,0 @@ -env: - TERM: alacritty - LANG: "en_US.UTF-8" - LC_CTYPE: en_US.UTF-8 - -font: - normal: - family: "UbuntuMono Nerd Font" - style: Regular - - size: 15.5 - -key_bindings: - - { key: F11, action: ToggleFullscreen } - -window: - opacity: 1 - decorations: none - startup_mode: Maximized - -colors: - primary: - background: "#241F31" - foreground: "#D4D4D4" - cursor: - text: "#1d1f21" - cursor: "#cccccc" - normal: - black: "#000000" - red: "#cd3131" - green: "#0dbc79" - yellow: "#e5e510" - blue: "#2472c8" - magenta: "#bc3fbc" - cyan: "#11a8cd" - white: "#e5e5e5" - bright: - black: "#666666" - red: "#f14c4c" - green: "#23d18b" - yellow: "#f5f543" - blue: "#3b8eea" - magenta: "#d670d6" - cyan: "#29b8db" - white: "#e5e5e5" - -theme: vscode.dark diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 84a18c7..6d02e18 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,6 +1,6 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -htop_version=3.2.2 +htop_version=3.3.0 config_reader_min_version=3 fields=46 47 1 hide_kernel_threads=1 @@ -39,17 +39,17 @@ column_meter_modes_0=1 1 column_meters_1=DiskIO NetworkIO column_meter_modes_1=1 1 tree_view=0 -sort_key=47 +sort_key=46 tree_sort_key=46 sort_direction=-1 tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PERCENT_CPU PERCENT_MEM Command -.sort_key=PERCENT_MEM +.sort_key=PERCENT_CPU .tree_sort_key=PERCENT_CPU -.tree_view=0 .tree_view_always_by_pid=0 +.tree_view=0 .sort_direction=-1 .tree_sort_direction=-1 .all_branches_collapsed=0 diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 0c48546..f8be995 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,20 +1,20 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" }, - "lazy.nvim": { "branch": "main", "commit": "9788a19ec0b4036028e78aec702634b4b89d3470" }, - "neodev.nvim": { "branch": "main", "commit": "b094a663ccb71733543d8254b988e6bebdbdaca4" }, - "noice.nvim": { "branch": "main", "commit": "8f1b53ab85f83e0687d0f267085ad781ec240432" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, - "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-tree.lua": { "branch": "master", "commit": "40b9b887d090d5da89a84689b4ca0304a9649f62" }, - "nvim-treesitter": { "branch": "master", "commit": "1bfefd1f98dae54576a54b59b42379b275a00414" }, - "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" }, - "onedark.nvim": { "branch": "master", "commit": "b9acd92ded2ba155867ca5af9d618e933d96e3b0" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, - "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" } + "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "neodev.nvim": { "branch": "main", "commit": "aaeb44589cab39c2545a328661af355622d68479" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-treesitter": { "branch": "master", "commit": "e0420e73c9cf4a9fe49d576be313718831a3822d" }, + "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, + "onedark.nvim": { "branch": "master", "commit": "dc3bad0121298f89b50aaff8599d1946e07eb4c2" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, + "telescope.nvim": { "branch": "master", "commit": "0902bb39ebaf76e655addc65130eb79b29abe6d2" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/keys.lua b/.config/nvim/lua/config/keys.lua index 5894a42..a5a2902 100644 --- a/.config/nvim/lua/config/keys.lua +++ b/.config/nvim/lua/config/keys.lua @@ -26,7 +26,7 @@ map("v", ">", ">gv") map("n", "gr", vim.lsp.buf.references, "References") map("n", "gd", vim.lsp.buf.definition, "Definition") map({ "n", "i" }, "", vim.lsp.buf.hover, "Hover") -map("n", "", vim.lsp.buf.rename, "Rename") +map({ "n", "i" }, "", vim.lsp.buf.rename, "Rename") map({ "n", "i" }, "", vim.lsp.buf.format, "Format") map("n", "ca", vim.lsp.buf.code_action, "Code action") diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index dcc8ee0..be474f0 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -55,6 +55,7 @@ return { local opts = { completion = { + -- autocomplete = false, completeopt = "menu,menuone,noinsert", }, formatting = { @@ -69,7 +70,7 @@ return { [""] = cmp.mapping.complete(), [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.abort(), + [""] = cmp.mapping.abort(), [""] = cmp.mapping.confirm({ select = true }), }, -- snippet = { @@ -77,16 +78,17 @@ return { -- require("luasnip").lsp_expand(args.body) -- end, -- }, + -- preselect = cmp.PreselectMode.None, sources = { { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "path" }, + -- { name = "luasnip" }, + -- { name = "buffer" }, + -- { name = "path" }, }, window = { completion = { border = "rounded", - scrollbar = false + scrollbar = false, }, documentation = { border = "rounded", diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index c4f1681..762954c 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -7,6 +7,7 @@ return { opts = { servers = { clangd = {}, + gdscript = {}, gopls = {}, lua_ls = { settings = { diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 681eaf1..f16d640 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -15,7 +15,7 @@ return { extensions = { project = { base_dirs = { - { path = "~/projects", max_depth = 2 }, + { path = "~/projects", max_depth = 3 }, }, order_by = "desc", sync_with_nvim_tree = true, diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index de48028..3bf4ce1 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -13,6 +13,12 @@ return { "regex", "vim", + -- go + "go", + "gomod", + "gowork", + "gosum", + -- web dev "html", "css", @@ -20,11 +26,8 @@ return { "typescript", "svelte", - -- go - "go", - "gomod", - "gowork", - "gosum", + -- game dev + "gdscript", }, highlight = { enable = true }, indent = { enable = true }, diff --git a/.config/vscode/settings.json b/.config/vscode/settings.json index f0f9088..90257fc 100644 --- a/.config/vscode/settings.json +++ b/.config/vscode/settings.json @@ -25,14 +25,17 @@ "gitProjectManager.openInNewWindow": false, "gitProjectManager.storeRepositoriesBetweenSessions": false, "go.gopath": "~/.go", + "go.toolsManagement.autoUpdate": true, + "godot_tools.gdscript_lsp_server_port": 6005, + "godot_tools.editor_path": "/usr/bin/godot", "security.workspace.trust.enabled": false, "telemetry.telemetryLevel": "off", "window.menuBarVisibility": "hidden", "window.zoomLevel": 1, - "workbench.activityBar.visible": false, + "workbench.activityBar.location": "hidden", "workbench.colorTheme": "One Dark Pro Darker", "workbench.editor.enablePreview": false, - "workbench.editor.showTabs": false, + "workbench.editor.showTabs": "none", "workbench.iconTheme": "material-icon-theme", "workbench.layoutControl.enabled": false, "workbench.startupEditor": "none",