diff --git a/home/nvim/default.nix b/home/nvim/default.nix index c576a18..ab64738 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -35,6 +35,10 @@ #C/C++ clang-tools + #Kotlin + ktlint + kotlin-language-server + #Python ruff black @@ -177,6 +181,8 @@ { import = "lazyvim.plugins.extras.lang.yaml" }, { import = "lazyvim.plugins.extras.lang.toml" }, { import = "lazyvim.plugins.extras.lang.docker" }, + { import = "lazyvim.plugins.extras.lang.kotlin" }, + { import = "lazyvim.plugins.extras.lang.dart" }, { import = "plugins" }, -- treesitter handled by xdg.configFile."nvim/parser", put this line at the end of spec to clear ensure_installed { "nvim-treesitter/nvim-treesitter", @@ -199,11 +205,13 @@ with plugins; [ bash c - lua - python go + lua rust java + dart + kotlin + python javascript typescript tsx diff --git a/home/nvim/lua/plugins/format.lua b/home/nvim/lua/plugins/format.lua index 1cdda20..a07089e 100644 --- a/home/nvim/lua/plugins/format.lua +++ b/home/nvim/lua/plugins/format.lua @@ -29,6 +29,8 @@ return { -- C/C++ opts.formatters_by_ft.c = { "clang_format" } opts.formatters_by_ft.cpp = { "clang_format" } + -- Kotlin + opts.formatters_by_ft.kotlin = { "ktlint" } -- Python opts.formatters_by_ft.python = { "black", "ruff_format" } -- JS/TS/Web @@ -43,6 +45,15 @@ return { opts.formatters_by_ft.yaml = { "yamlfmt" } -- TOML opts.formatters_by_ft.toml = { "taplo" } + -- Dart / Flutter + opts.formatters_by_ft.dart = { + command = "dart", + args = function(ctx) + return { "format", ctx.bufname } + end, + stdin = false, + exit_codes = { 0 }, + } opts.default_format_opts = { timeout_ms = 1500, lsp_format = "fallback", diff --git a/modules/system/environment.nix b/modules/system/environment.nix index af4c924..539bdca 100644 --- a/modules/system/environment.nix +++ b/modules/system/environment.nix @@ -55,6 +55,7 @@ in { yt-dlp #Android + edl xxd file binwalk @@ -82,6 +83,9 @@ in { gnumake rustc cargo + dart + kotlin + flutter jdk17 python312 pnpm diff --git a/modules/system/nix.nix b/modules/system/nix.nix index 7403c6a..fcd59d6 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -44,7 +44,7 @@ with lib; { }; }; nixpkgs = { - config.allowUnfree = false; + config.allowUnfree = true; hostPlatform = "x86_64-linux"; }; }