diff --git a/configs/mise/config.toml b/configs/mise/config.toml index 34c8e14..0c6b009 100644 --- a/configs/mise/config.toml +++ b/configs/mise/config.toml @@ -45,6 +45,9 @@ yazi = "latest" zoxide = "latest" watchexec = "latest" "npm:@hoppscotch/cli" = "latest" +kotlin = "latest" +gradle = "latest" +"npm:@immich/cli" = "latest" [settings] lockfile = true diff --git a/configs/nvim/lua/aleidk/options.lua b/configs/nvim/lua/aleidk/options.lua index eb0f4419..2334a40 100644 --- a/configs/nvim/lua/aleidk/options.lua +++ b/configs/nvim/lua/aleidk/options.lua @@ -31,7 +31,7 @@ opt.ignorecase = true -- Ignore case opt.inccommand = 'split' -- Preview substitutions live, as you type! opt.mouse = "a" -- Enable mouse mode opt.nrformats = 'blank,bin,hex' -opt.number = true -- Print line number +opt.number = true -- Print line number opt.pumblend = 10 -- Popup blend opt.pumheight = 10 -- Maximum number of entries in a popup -- opt.relativenumber = true -- Relative line numbers @@ -168,6 +168,7 @@ vim.lsp.enable({ "hyprls", "intelephense", "jsonls", + "kotlin_lsp", "lua_ls", "nushell", "pyright", diff --git a/configs/nvim/lua/aleidk/plugins/formatter.lua b/configs/nvim/lua/aleidk/plugins/formatter.lua index 91b09b4..be07723 100644 --- a/configs/nvim/lua/aleidk/plugins/formatter.lua +++ b/configs/nvim/lua/aleidk/plugins/formatter.lua @@ -15,6 +15,7 @@ return { css = { "biome" }, go = { "gofumpt", "goimports_reviser", "golines" }, html = { "djlint", "prettierd", stop_after_first = true }, + kotlin = { "ktlint" }, htmldjango = { "djlint", stop_after_first = true }, javascript = { "biome" }, javascriptreact = { "biome" }, diff --git a/configs/nvim/lua/aleidk/plugins/linters.lua b/configs/nvim/lua/aleidk/plugins/linters.lua index 4e13ecd..f73dc84 100644 --- a/configs/nvim/lua/aleidk/plugins/linters.lua +++ b/configs/nvim/lua/aleidk/plugins/linters.lua @@ -9,6 +9,7 @@ return { lint.linters_by_ft = { -- astro = { "eslint_d" }, + kotlin = { "ktlint" }, python = { "ruff" }, sh = { "shellcheck" }, NeogitCommitMessage = { "gitlint" }, diff --git a/configs/nvim/lua/aleidk/plugins/treesitter.lua b/configs/nvim/lua/aleidk/plugins/treesitter.lua index caab40c..012ccd0 100644 --- a/configs/nvim/lua/aleidk/plugins/treesitter.lua +++ b/configs/nvim/lua/aleidk/plugins/treesitter.lua @@ -21,7 +21,7 @@ return { init = function() -- HACK: for filetypes that doesn't start treesitter hightlight on it's own vim.api.nvim_create_autocmd("FileType", { - pattern = { "gleam", "go" }, + pattern = { "gleam", "go", "kotlin" }, callback = function() vim.treesitter.start() end, diff --git a/configs/yazi/keymap.toml b/configs/yazi/keymap.toml index bcecc1e..c20f2ca 100644 --- a/configs/yazi/keymap.toml +++ b/configs/yazi/keymap.toml @@ -44,6 +44,7 @@ prepend_keymap = [ { on = ["", "k"], run = "shell 'ya pub-to 0 TransferUpload --list \"$@\"'", desc = "Upload with transfer.nvim" }, { on = ["", "d"], run = ["shell 'ya pub-to 0 DiffRemote --orphan --list \"$@\"'", "quit"], desc = "Diff with transfer.nvim" }, { on = ["", ""], run = ["shell 'ya pub-to 0 TransferDirDiff --list \"$@\"'"], desc = "Diff directory with transfer.nvim" }, + ] [input] diff --git a/configs/yazi/yazi.toml b/configs/yazi/yazi.toml index 8c7ce85..96b9bac 100644 --- a/configs/yazi/yazi.toml +++ b/configs/yazi/yazi.toml @@ -4,7 +4,7 @@ [mgr] ratio = [1, 3, 4] -sort_by = "alphabetical" +sort_by = "natural" sort_sensitive = false sort_reverse = false sort_dir_first = true @@ -32,6 +32,7 @@ open = [{ run = 'xdg-open "$@"', desc = "Open", for = "linux" }, { run = 'open " reveal = [{ run = 'open -R "$1"', desc = "Reveal", for = "macos" }, { run = 'explorer /select, "%1"', orphan = true, desc = "Reveal", for = "windows" }, { run = '''exiftool "$1"; echo "Press enter to exit"; read''', block = true, desc = "Show EXIF", for = "unix" }] extract = [{ run = 'ya pub extract --list "$@"', desc = "Extract here", for = "unix" }, { run = 'ya pub extract --list %*', desc = "Extract here", for = "windows" }] play = [{ run = 'mpv "$@"', orphan = true, for = "unix" }, { run = 'mpv "%1"', orphan = true, for = "windows" }, { run = '''mediainfo "$1"; echo "Press enter to exit"; read''', block = true, desc = "Show media info", for = "unix" }] +upload_img = [{ run = 'immich upload --recursive "$@" || read -n 1 -p "press anything to exit"', desc = "Upload image to Immich server", for = "linux", block = true }] [open] rules = [ @@ -46,7 +47,7 @@ rules = [ { mime = "application/x-{tar,bzip*,7z-compressed,xz,rar}", use = ["extract", "reveal"] }, # Image - { mime = "image/*", use = ["open", "reveal"] }, + { mime = "image/*", use = ["open", "upload_img"] }, # Media { mime = "{audio,video}/*", use = ["play", "open", "reveal"] },