diff --git a/nvim/.config/nvim/lua/ink/init.lua b/nvim/.config/nvim/lua/ink/init.lua index 9066f4e..6d1808f 100644 --- a/nvim/.config/nvim/lua/ink/init.lua +++ b/nvim/.config/nvim/lua/ink/init.lua @@ -1,5 +1,6 @@ require("ink.remap") require("ink.lsp") +require("ink.tabline") vim.opt.hlsearch = false -- do not highlight matches vim.wo.number = true diff --git a/nvim/.config/nvim/lua/ink/remap.lua b/nvim/.config/nvim/lua/ink/remap.lua index 910ec8d..58c67c9 100644 --- a/nvim/.config/nvim/lua/ink/remap.lua +++ b/nvim/.config/nvim/lua/ink/remap.lua @@ -41,6 +41,11 @@ map("v", "p", '"_dP', { desc = "Paste without yanking underlying text" }) map("n", "gl", "`.", { desc = "Jump to the last change in the file" }) +map("n", "C-d", "zz") +map("n", "C-u", "zz") +map("n", "C-f", "zz") +map("n", "C-b", "zz") + -- map('n', '', 'za', { desc = 'Toggle cursor fold' }) -- map('n', '', 'zm', { desc = 'Toggle all folds at cursor' }) -- map('n', '', 'zM', { desc = 'Close all open folds' }) diff --git a/nvim/.config/nvim/lua/ink/tabline.lua b/nvim/.config/nvim/lua/ink/tabline.lua new file mode 100644 index 0000000..c0c821d --- /dev/null +++ b/nvim/.config/nvim/lua/ink/tabline.lua @@ -0,0 +1,27 @@ +--- @return string +local function tab_info() + local fname = vim.fn.expand("%:p") + if fname == "" then + return "" + end + return "%#WildMenu# " .. fname .. " %*" +end + +--- @return string +local function filestatus() + if vim.bo.modified == true then + return "%#Error# ● %*" + end + if vim.bo.readonly == true then + return "%#Error#  %*" + end + return "" +end + +TabLine = function() + return table.concat({ + tab_info(), + filestatus(), + }) +end +vim.opt.tabline = "%!v:lua.TabLine()" diff --git a/nvim/.config/nvim/lua/plugins/basic.lua b/nvim/.config/nvim/lua/plugins/basic.lua index 0d63462..2efb06a 100644 --- a/nvim/.config/nvim/lua/plugins/basic.lua +++ b/nvim/.config/nvim/lua/plugins/basic.lua @@ -37,4 +37,52 @@ return { require("mini.surround").setup() end, }, + { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + opts = {}, + keys = { + { + "zk", + mode = { "n", "x", "o" }, + function() + require("flash").jump() + end, + desc = "Flash", + }, + { + "Zk", + mode = { "n", "x", "o" }, + function() + require("flash").treesitter() + end, + desc = "Flash Treesitter", + }, + { + "r", + mode = "o", + function() + require("flash").remote() + end, + desc = "Remote Flash", + }, + { + "R", + mode = { "o", "x" }, + function() + require("flash").treesitter_search() + end, + desc = "Treesitter Search", + }, + { + "", + mode = { "c" }, + function() + require("flash").toggle() + end, + desc = "Toggle Flash Search", + }, + }, + }, } diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases index eb88359..19671f5 100644 --- a/zsh/.zsh_aliases +++ b/zsh/.zsh_aliases @@ -13,18 +13,18 @@ alias egrep='egrep --color=auto' alias d='dirs -v' for index ({1..9}) alias "c$index"="cd +${index}"; unset index -# alias tf="aws-vault exec feedzai-main -d 8h -- terraform" -# alias tfi="aws-vault exec feedzai-main -d 8h -- terraform init" -# alias tfp="aws-vault exec feedzai-main -d 8h -- terraform plan -lock=false" -# alias tfa="aws-vault exec feedzai-main -d 8h -- terraform apply" -# alias tfu="aws-vault exec feedzai-main -d 8h -- terraform get -update" -# -# alias tg="aws-vault exec feedzai-main -d 8h -- terragrunt" -# alias tgi="aws-vault exec feedzai-main -d 8h -- terragrunt init" -# alias tgp="aws-vault exec feedzai-main -d 8h -- terragrunt plan -lock=false" -# alias tga="aws-vault exec feedzai-main -d 8h -- terragrunt apply" -# alias tgu="aws-vault exec feedzai-main -d 8h -- terragrunt get -update" -# alias tgg="aws-vault exec feedzai-main -d 8h -- terragrunt graph-dependencies" +alias tf="aws-vault exec feedzai-main -d 8h -- terraform" +alias tfi="aws-vault exec feedzai-main -d 8h -- terraform init" +alias tfp="aws-vault exec feedzai-main -d 8h -- terraform plan -lock=false" +alias tfa="aws-vault exec feedzai-main -d 8h -- terraform apply" +alias tfu="aws-vault exec feedzai-main -d 8h -- terraform get -update" + +alias tg="aws-vault exec feedzai-main -d 8h -- terragrunt" +alias tgi="aws-vault exec feedzai-main -d 8h -- terragrunt init" +alias tgp="aws-vault exec feedzai-main -d 8h -- terragrunt plan -lock=false" +alias tga="aws-vault exec feedzai-main -d 8h -- terragrunt apply" +alias tgu="aws-vault exec feedzai-main -d 8h -- terragrunt get -update" +alias tgg="aws-vault exec feedzai-main -d 8h -- terragrunt graph-dependencies" alias idot='dot -Tsvg -Goverlap=scale -Grankdir=RL -Gbgcolor="#282a36" -Ncolor="#f8f8f2" -Ecolor="#f8f8f2" -Nfontcolor="#f8f8f2" -Gfontname="PragmataPro Mono Liga Regular" -Gfontsize=13 -Nfontname="PragmataPro" -Nfontsize=13 -Nshape=box -Earrowhead=normal'