diff --git a/dot_config/helix/config.toml b/dot_config/helix/config.toml deleted file mode 100644 index 8fc1dc0..0000000 --- a/dot_config/helix/config.toml +++ /dev/null @@ -1,27 +0,0 @@ -theme = "catppuccin_frappe" - -[editor] -auto-format = false -auto-pairs = false -auto-save = true -# completion-replace = true -cursorline = true -idle-timeout = 0 -rulers = [100] -text-width = 100 - -[editor.lsp] -goto-reference-include-declaration = false - -[editor.cursor-shape] -insert = "bar" - -[editor.smart-tab] -supersede-menu = true - -[keys.normal.space] -space = "file_picker" -"," = "buffer_picker" - -[editor.whitespace.render] -newline = "all" diff --git a/dot_config/helix/languages.toml b/dot_config/helix/languages.toml deleted file mode 100644 index 43315a5..0000000 --- a/dot_config/helix/languages.toml +++ /dev/null @@ -1,45 +0,0 @@ -[language-server.eslint] -args = ["--stdio"] -command = "vscode-eslint-language-server" - -[language-server.eslint.config] -# format = true -nodePath = "" -# onIgnoredFiles = "off" -# packageManager = "yarn" -quiet = false -rulesCustomizations = [] -run = "onType" -# useESLintClass = false -validate = "on" -codeAction = { disableRuleComment = { enable = true, location = "separateLine" }, showDocumentation = { enable = true } } -# codeActionsOnSave = { mode = "all" } -experimental = {} -problems = { shortenToSingleLine = false } -# workingDirectory = { mode = "auto" } - -# [language-server.jdtls] -# args = ["--jvm-arg=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044"] - -[language-server.jdtls.config.java.autobuild] -enabled = true - -[language-server.jdtls.config.java.completion] -maxResults = 1000 - -[language-server.jdtls.config.java.format.settings] -url = "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml" - -[[language]] -name = "typescript" -language-servers = [ "typescript-language-server", "eslint" ] -indent = { tab-width = 4, unit = " " } - -[[language]] -name = "tsx" -language-servers = [ "typescript-language-server", "eslint" ] -indent = { tab-width = 4, unit = " " } - -[[language]] -name = "java" -indent = { tab-width = 4, unit = " " } diff --git a/dot_config/home-manager/home-hx.nix b/dot_config/home-manager/home-hx.nix new file mode 100644 index 0000000..0bf7749 --- /dev/null +++ b/dot_config/home-manager/home-hx.nix @@ -0,0 +1,64 @@ +{ + enable = true; + defaultEditor = true; + settings.theme = "catppuccin_frappe"; + + settings.editor.auto-format = false; + settings.editor.auto-pairs = false; + settings.editor.auto-save = true; + # settings.editor.completion-replace = true; + settings.editor.cursorline = true; + settings.editor.idle-timeout = 0; + settings.editor.rulers = [100]; + settings.editor.text-width = 100; + + settings.editor.lsp.goto-reference-include-declaration = false; + + settings.editor.cursor-shape.insert = "bar"; + + settings.editor.smart-tab.supersede-menu = true; + + settings.keys.normal.space.space = "file_picker"; + settings.keys.normal.space."," = "buffer_picker"; + + settings.editor.whitespace.render.newline = "all"; + + languages.language-server.eslint.args = ["--stdio"]; + languages.language-server.eslint.command = "vscode-eslint-language-server"; + + languages.language-server.eslint.config.nodePath = ""; + languages.language-server.eslint.config.quiet = false; + languages.language-server.eslint.config.rulesCustomizations = []; + languages.language-server.eslint.config.run = "onType"; + languages.language-server.eslint.config.validate = "on"; + languages.language-server.eslint.config.codeAction.disableRuleComment.enable = true; + languages.language-server.eslint.config.codeAction.disableRuleComment.location = "separateLine"; + languages.language-server.eslint.config.codeAction.showDocumentation.enable = true; + languages.language-server.eslint.config.problems.shortenToSingleLine = false; + + languages.language-server.jdtls.config.java.autobuild.enabled = true; + + languages.language-server.jdtls.config.java.completion.maxResults = 1000; + + languages.language-server.jdtls.config.java.format.settings.url = "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml"; + + languages.languages = [ + { + name = "typescript"; + language-servers = [ "typescript-language-server" "eslint" ]; + indent.tab-width = 4; + indent.unit = " "; + } + { + name = "tsx"; + language-servers = [ "typescript-language-server" "eslint" ]; + indent.tab-width = 4; + indent.unit = " "; + } + { + name = "java"; + indent.tab-width = 4; + indent.unit = " "; + } + ]; +} diff --git a/dot_config/home-manager/home.nix b/dot_config/home-manager/home.nix index 8b4d30a..fbaad01 100644 --- a/dot_config/home-manager/home.nix +++ b/dot_config/home-manager/home.nix @@ -123,8 +123,7 @@ # programs.gh.enable = true; programs.git.enable = true; programs.git.delta.enable = true; - programs.helix.enable = true; - programs.helix.defaultEditor = true; + programs.helix = import ./home-hx.nix; # programs.ion.enable = true; # programs.java.enable = true; # programs.java.package = pkgs.jdk17;