Compare commits

...

8 Commits

8 changed files with 125 additions and 31 deletions

View File

@ -1,4 +1,105 @@
[gd_resource type="EditorSettings" format=2] [gd_resource type="EditorSettings" load_steps=20 format=2]
[sub_resource type="InputEventKey" id=1]
control = true
command = true
scancode = 78
unicode = 78
[sub_resource type="InputEventKey" id=2]
scancode = 16777224
unicode = 16777224
[sub_resource type="InputEventKey" id=3]
control = true
command = true
scancode = 68
unicode = 68
[sub_resource type="InputEventKey" id=4]
alt = true
scancode = 16777231
unicode = 16777231
[sub_resource type="InputEventKey" id=5]
alt = true
scancode = 16777233
unicode = 16777233
[sub_resource type="InputEventKey" id=6]
alt = true
scancode = 16777232
unicode = 16777232
[sub_resource type="InputEventKey" id=7]
control = true
command = true
scancode = 16777234
unicode = 16777234
[sub_resource type="InputEventKey" id=8]
control = true
command = true
scancode = 16777232
unicode = 16777232
[sub_resource type="InputEventKey" id=9]
scancode = 16777248
unicode = 16777248
[sub_resource type="InputEventKey" id=10]
alt = true
scancode = 70
unicode = 70
[sub_resource type="InputEventKey" id=11]
control = true
command = true
scancode = 72
unicode = 72
[sub_resource type="InputEventKey" id=12]
alt = true
scancode = 86
unicode = 86
[sub_resource type="InputEventKey" id=13]
control = true
command = true
scancode = 69
unicode = 69
[sub_resource type="InputEventKey" id=14]
control = true
command = true
scancode = 73
unicode = 73
[sub_resource type="InputEventKey" id=15]
control = true
command = true
scancode = 78
unicode = 78
[sub_resource type="InputEventKey" id=16]
scancode = 16777224
unicode = 16777224
[sub_resource type="InputEventKey" id=17]
scancode = 16777245
unicode = 16777245
[sub_resource type="InputEventKey" id=18]
control = true
command = true
scancode = 82
unicode = 82
[sub_resource type="InputEventKey" id=19]
control = true
command = true
scancode = 83
unicode = 83
[resource] [resource]
text_editor/highlighting/symbol_color = Color( 0.67, 0.785, 1, 1 ) text_editor/highlighting/symbol_color = Color( 0.67, 0.785, 1, 1 )

View File

@ -4,25 +4,23 @@
interface/theme/base_color = Color(0.21, 0.24, 0.29, 1) interface/theme/base_color = Color(0.21, 0.24, 0.29, 1)
interface/theme/accent_color = Color(0.44, 0.73, 0.98, 1) interface/theme/accent_color = Color(0.44, 0.73, 0.98, 1)
interface/theme/contrast = 0.3 interface/theme/contrast = 0.3
text_editor/theme/highlighting/symbol_color = Color(0.67, 0.785, 1, 1) text_editor/theme/highlighting/symbol_color = Color(0.67, 0.79, 1, 1)
text_editor/theme/highlighting/keyword_color = Color(1, 0.44, 0.52, 1) text_editor/theme/highlighting/keyword_color = Color(1, 0.44, 0.52, 1)
text_editor/theme/highlighting/control_flow_keyword_color = Color(1, 0.55, 0.8, 1) text_editor/theme/highlighting/control_flow_keyword_color = Color(1, 0.55, 0.8, 1)
text_editor/theme/highlighting/base_type_color = Color(0.26, 1, 0.76, 1) text_editor/theme/highlighting/base_type_color = Color(0.26, 1, 0.76, 1)
text_editor/theme/highlighting/engine_type_color = Color(0.556, 1, 0.856, 1) text_editor/theme/highlighting/engine_type_color = Color(0.56, 1, 0.86, 1)
text_editor/theme/highlighting/user_type_color = Color(0.778, 1, 0.928, 1) text_editor/theme/highlighting/user_type_color = Color(0.78, 1, 0.93, 1)
text_editor/theme/highlighting/comment_color = Color(0.8025, 0.81, 0.8225, 0.5) text_editor/theme/highlighting/comment_color = Color(0.8025, 0.81, 0.8225, 0.5)
text_editor/theme/highlighting/string_color = Color(1, 0.925, 0.63, 1) text_editor/theme/highlighting/string_color = Color(1, 0.93, 0.63, 1)
text_editor/theme/highlighting/background_color = Color(0.1155, 0.132, 0.1595, 1) text_editor/theme/highlighting/background_color = Color(0.1155, 0.132, 0.1595, 1)
text_editor/theme/highlighting/completion_background_color = Color(0.21, 0.24, 0.29, 1) text_editor/theme/highlighting/completion_background_color = Color(0.21, 0.24, 0.29, 1)
text_editor/theme/highlighting/completion_selected_color = Color(1, 1, 1, 0.07) text_editor/theme/highlighting/completion_selected_color = Color(1, 1, 1, 0.07)
text_editor/theme/highlighting/completion_existing_color = Color(1, 1, 1, 0.14) text_editor/theme/highlighting/completion_existing_color = Color(1, 1, 1, 0.14)
text_editor/theme/highlighting/completion_scroll_color = Color(1, 1, 1, 0.07)
text_editor/theme/highlighting/completion_font_color = Color(0.8025, 0.81, 0.8225, 1) text_editor/theme/highlighting/completion_font_color = Color(0.8025, 0.81, 0.8225, 1)
text_editor/theme/highlighting/text_color = Color(0.8025, 0.81, 0.8225, 1) text_editor/theme/highlighting/text_color = Color(0.8025, 0.81, 0.8225, 1)
text_editor/theme/highlighting/line_number_color = Color(0.8025, 0.81, 0.8225, 0.5) text_editor/theme/highlighting/line_number_color = Color(0.8025, 0.81, 0.8225, 0.5)
text_editor/theme/highlighting/safe_line_number_color = Color(0.8025, 0.972, 0.8225, 0.75) text_editor/theme/highlighting/safe_line_number_color = Color(0.8025, 0.972, 0.8225, 0.75)
text_editor/theme/highlighting/caret_color = Color(1, 1, 1, 1) text_editor/theme/highlighting/caret_color = Color(1, 1, 1, 1)
text_editor/theme/highlighting/text_selected_color = Color(0.084, 0.096, 0.116, 1)
text_editor/theme/highlighting/selection_color = Color(0.44, 0.73, 0.98, 0.4) text_editor/theme/highlighting/selection_color = Color(0.44, 0.73, 0.98, 0.4)
text_editor/theme/highlighting/brace_mismatch_color = Color(1, 0.47, 0.42, 1) text_editor/theme/highlighting/brace_mismatch_color = Color(1, 0.47, 0.42, 1)
text_editor/theme/highlighting/current_line_color = Color(1, 1, 1, 0.07) text_editor/theme/highlighting/current_line_color = Color(1, 1, 1, 0.07)
@ -33,9 +31,12 @@ text_editor/theme/highlighting/function_color = Color(0.34, 0.7, 1, 1)
text_editor/theme/highlighting/member_variable_color = Color(0.736, 0.88, 1, 1) text_editor/theme/highlighting/member_variable_color = Color(0.736, 0.88, 1, 1)
text_editor/theme/highlighting/mark_color = Color(1, 0.47, 0.42, 0.3) text_editor/theme/highlighting/mark_color = Color(1, 0.47, 0.42, 0.3)
text_editor/theme/highlighting/breakpoint_color = Color(1, 0.47, 0.42, 1) text_editor/theme/highlighting/breakpoint_color = Color(1, 0.47, 0.42, 1)
text_editor/theme/highlighting/code_folding_color = Color(1, 1, 1, 0.7) text_editor/theme/highlighting/code_folding_color = Color(1, 1, 1, 0.27)
text_editor/theme/highlighting/search_result_color = Color(1, 1, 1, 0.07) text_editor/theme/highlighting/search_result_color = Color(1, 1, 1, 0.07)
text_editor/behavior/files/auto_reload_scripts_on_external_change = true
text_editor/completion/add_type_hints = true text_editor/completion/add_type_hints = true
debugger/profiler_frame_history_size = 600
network/http_proxy/port = -1
text_editor/external/use_external_editor = true text_editor/external/use_external_editor = true
text_editor/external/exec_path = "/home/ensar/bin/nvimremote" text_editor/external/exec_path = "/home/ensar/bin/nvimremote"
text_editor/external/exec_flags = "NeovimGodot /tmp/godotnvim.sock {file} {line} {col}" text_editor/external/exec_flags = "NeovimGodot /tmp/godotnvim.sock {file} {line} {col}"
@ -43,8 +44,6 @@ asset_library/available_urls = {
"godotengine.org (Official)": "https://godotengine.org/asset-library/api" "godotengine.org (Official)": "https://godotengine.org/asset-library/api"
} }
asset_library/use_threads = true asset_library/use_threads = true
network/http_proxy/host = ""
network/http_proxy/port = -1
export/android/android_sdk_path = "" export/android/android_sdk_path = ""
export/android/debug_keystore = "" export/android/debug_keystore = ""
export/android/debug_keystore_user = "androiddebugkey" export/android/debug_keystore_user = "androiddebugkey"
@ -84,7 +83,6 @@ interface/editors/default_signal_callback_name = "_on_{node_name}_{signal_name}"
filesystem/file_server/port = 6010 filesystem/file_server/port = 6010
filesystem/file_server/password = "" filesystem/file_server/password = ""
debugger/auto_switch_to_remote_scene_tree = false debugger/auto_switch_to_remote_scene_tree = false
debugger/profiler_frame_history_size = 600
debugger/profiler_frame_max_functions = 64 debugger/profiler_frame_max_functions = 64
debugger/remote_scene_tree_refresh_interval = 1.0 debugger/remote_scene_tree_refresh_interval = 1.0
debugger/remote_inspect_refresh_interval = 0.2 debugger/remote_inspect_refresh_interval = 0.2
@ -94,7 +92,6 @@ network/debug_adapter/sync_breakpoints = false
editors/3d/manipulator_gizmo_size = 80 editors/3d/manipulator_gizmo_size = 80
editors/3d/manipulator_gizmo_opacity = 0.9 editors/3d/manipulator_gizmo_opacity = 0.9
editors/3d/navigation/show_viewport_rotation_gizmo = true editors/3d/navigation/show_viewport_rotation_gizmo = true
text_editor/behavior/files/auto_reload_scripts_on_external_change = true
text_editor/behavior/files/auto_reload_and_parse_scripts_on_save = true text_editor/behavior/files/auto_reload_and_parse_scripts_on_save = true
text_editor/behavior/files/open_dominant_script_on_scene_change = true text_editor/behavior/files/open_dominant_script_on_scene_change = true
text_editor/script_list/script_temperature_enabled = true text_editor/script_list/script_temperature_enabled = true
@ -104,7 +101,6 @@ text_editor/script_list/sort_scripts_by = 0
text_editor/script_list/list_script_names_as = 0 text_editor/script_list/list_script_names_as = 0
editors/grid_map/preview_size = 64 editors/grid_map/preview_size = 64
editors/3d_gizmos/gizmo_colors/path = Color(0.5, 0.5, 1, 0.8) editors/3d_gizmos/gizmo_colors/path = Color(0.5, 0.5, 1, 0.8)
editors/3d_gizmos/gizmo_colors/instantiated = Color(0.7, 0.7, 0.7, 0.6)
editors/3d_gizmos/gizmo_colors/skeleton = Color(1, 0.8, 0.4, 1) editors/3d_gizmos/gizmo_colors/skeleton = Color(1, 0.8, 0.4, 1)
editors/3d_gizmos/gizmo_colors/selected_bone = Color(0.8, 0.3, 0, 1) editors/3d_gizmos/gizmo_colors/selected_bone = Color(0.8, 0.3, 0, 1)
editors/3d_gizmos/gizmo_settings/bone_axis_length = 0.1 editors/3d_gizmos/gizmo_settings/bone_axis_length = 0.1
@ -120,7 +116,6 @@ network/language_server/use_thread = false
editors/3d_gizmos/gizmo_colors/camera = Color(0.8, 0.4, 0.8, 1) editors/3d_gizmos/gizmo_colors/camera = Color(0.8, 0.4, 0.8, 1)
editors/3d_gizmos/gizmo_colors/stream_player_3d = Color(0.4, 0.8, 1, 1) editors/3d_gizmos/gizmo_colors/stream_player_3d = Color(0.4, 0.8, 1, 1)
editors/3d_gizmos/gizmo_colors/occluder = Color(0.8, 0.5, 1, 1) editors/3d_gizmos/gizmo_colors/occluder = Color(0.8, 0.5, 1, 1)
editors/3d_gizmos/gizmo_colors/shape = Color(0.5, 0.7, 1, 1)
editors/3d_gizmos/gizmo_colors/visibility_notifier = Color(0.8, 0.5, 0.7, 1) editors/3d_gizmos/gizmo_colors/visibility_notifier = Color(0.8, 0.5, 0.7, 1)
editors/3d_gizmos/gizmo_colors/particles = Color(0.8, 0.7, 0.4, 1) editors/3d_gizmos/gizmo_colors/particles = Color(0.8, 0.7, 0.4, 1)
editors/3d_gizmos/gizmo_colors/particle_collision = Color(0.5, 0.7, 1, 1) editors/3d_gizmos/gizmo_colors/particle_collision = Color(0.5, 0.7, 1, 1)
@ -133,7 +128,6 @@ editors/3d_gizmos/gizmo_colors/navigation_edge = Color(0.5, 1, 1, 1)
editors/3d_gizmos/gizmo_colors/navigation_edge_disabled = Color(0.7, 0.7, 0.7, 1) editors/3d_gizmos/gizmo_colors/navigation_edge_disabled = Color(0.7, 0.7, 0.7, 1)
editors/3d_gizmos/gizmo_colors/navigation_solid = Color(0.5, 1, 1, 0.4) editors/3d_gizmos/gizmo_colors/navigation_solid = Color(0.5, 1, 1, 0.4)
editors/3d_gizmos/gizmo_colors/navigation_solid_disabled = Color(0.7, 0.7, 0.7, 0.4) editors/3d_gizmos/gizmo_colors/navigation_solid_disabled = Color(0.7, 0.7, 0.7, 0.4)
editors/3d_gizmos/gizmo_colors/joint = Color(0.5, 0.8, 1, 1)
editors/3d_gizmos/gizmo_colors/joint_body_a = Color(0.6, 0.8, 1, 1) editors/3d_gizmos/gizmo_colors/joint_body_a = Color(0.6, 0.8, 1, 1)
editors/3d_gizmos/gizmo_colors/joint_body_b = Color(0.6, 0.9, 1, 1) editors/3d_gizmos/gizmo_colors/joint_body_b = Color(0.6, 0.9, 1, 1)
editors/3d_gizmos/gizmo_colors/fog_volume = Color(0.5, 0.7, 1, 1) editors/3d_gizmos/gizmo_colors/fog_volume = Color(0.5, 0.7, 1, 1)

View File

@ -8,3 +8,7 @@ x-scheme-handler/discord-647066573147996161=discord-647066573147996161.desktop
[Added Associations] [Added Associations]
x-scheme-handler/sms=org.gnome.Shell.Extensions.GSConnect.desktop; x-scheme-handler/sms=org.gnome.Shell.Extensions.GSConnect.desktop;
x-scheme-handler/tel=org.gnome.Shell.Extensions.GSConnect.desktop; x-scheme-handler/tel=org.gnome.Shell.Extensions.GSConnect.desktop;
application/pdf=libreoffice-writer.desktop;
image/png=org.kde.krita.desktop;
text/x-kotlin=nvim.desktop;
application/json=nvim.desktop;

View File

@ -0,0 +1,3 @@
{
"workspace.checkThirdParty": false
}

View File

@ -21,6 +21,7 @@ null_ls.setup({
null_ls.builtins.formatting.clang_format.with({ null_ls.builtins.formatting.clang_format.with({
filetypes = { "cpp", "c" }, filetypes = { "cpp", "c" },
}), }),
null_ls.builtins.diagnostics.clang_check,
-- Cmake -- Cmake
null_ls.builtins.formatting.cmake_format, null_ls.builtins.formatting.cmake_format,
@ -77,4 +78,4 @@ vim.api.nvim_create_user_command(
vim.diagnostic.setloclist, vim.diagnostic.setloclist,
{ desc = "Show LSP buffer warnings in a location list" } { desc = "Show LSP buffer warnings in a location list" }
) )
vim.api.nvim_create_user_command("Format", vim.lsp.buf.formatting, { desc = "Format current buffer using LSP" }) vim.api.nvim_create_user_command("Format", vim.lsp.buf.format, { desc = "Format current buffer using LSP" })

View File

@ -50,13 +50,14 @@ local servers = {
"gdscript", "gdscript",
"gopls", "gopls",
"hls", "hls",
"html",
"jedi_language_server",
"jsonls", "jsonls",
"kotlin_language_server", "kotlin_language_server",
"lemminx", "lemminx",
"lua_ls", "lua_ls",
"mint", "mint",
"omnisharp", "omnisharp",
"pyright",
"solang", "solang",
"terraformls", "terraformls",
"tsserver", "tsserver",
@ -67,19 +68,6 @@ for _, lsp in ipairs(servers) do
lspconfig[lsp].setup(vim.tbl_extend("force", common_config, configuration_overrides[lsp] or {})) lspconfig[lsp].setup(vim.tbl_extend("force", common_config, configuration_overrides[lsp] or {}))
end end
-- Lua bultin lsp
local nlua_capabilities = vim.deepcopy(common_config.capabilities)
nlua_capabilities.textDocument.formatting = false
nlua_capabilities.textDocument.rangeFormatting = false
require("nlua.lsp.nvim").setup(
lspconfig,
vim.tbl_extend("force", common_config, {
-- Tell LSP which globals should be considered real
globals = {},
capabilities = nlua_capabilities,
})
)
-- Flutter tools -- Flutter tools
require("flutter-tools").setup({ require("flutter-tools").setup({
lsp = common_config, lsp = common_config,

View File

@ -481,6 +481,9 @@ local rust_config = {
start = "cargo run", start = "cargo run",
dispatch = "cargo test", dispatch = "cargo test",
}, },
["Cargo.toml"] = {
type = "crate",
},
["src/*.rs"] = { ["src/*.rs"] = {
type = "source", type = "source",
}, },

View File

@ -2,7 +2,7 @@ direnv 2.32.1
nodejs 18.1.0 nodejs 18.1.0
python system python system
ruby 3.0.0 ruby 3.0.0
neovim 0.8.2 neovim 0.9.0
java openjdk-17.0.2 java openjdk-17.0.2
rust stable rust stable
golang 1.19.1 golang 1.19.1