Compare commits
9 Commits
706ed1e2e7
...
lineage
| Author | SHA1 | Date | |
|---|---|---|---|
| 5956cbe20e | |||
| a6ef8ff9c5 | |||
| 1090058c08 | |||
| 6609158c5d | |||
| 4040855adb | |||
|
|
9c2a72669f | ||
| f2fc3599a8 | |||
| cfba74467f | |||
|
|
7a240b42c3 |
@@ -8,7 +8,6 @@ vim.o.smartindent = true -- Automatically indent new lines
|
||||
vim.o.wrap = false -- Disable line wrapping
|
||||
vim.o.cursorline = true -- Highlight the current line
|
||||
vim.o.termguicolors = true -- Enable 24-bit RGB colors
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
vim.filetype.add({ extension = { svx = "markdown" } })
|
||||
vim.opt.listchars = { tab = "\\│\\", nbsp = "␣", trail = "·", extends = "›", precedes = "‹", leadmultispace = "│ " }
|
||||
vim.opt.list = true
|
||||
@@ -21,6 +20,21 @@ require('plugins.lsp')
|
||||
require('plugins.diffview')
|
||||
require('plugins.which-key')
|
||||
require('plugins.codecompanion')
|
||||
require('plugins.fff')
|
||||
|
||||
local kitten = vim.fn.expand("~/.local/share/kitty-ssh-kitten/kitty/bin/kitten")
|
||||
vim.opt.clipboard = "unnamedplus"
|
||||
vim.g.clipboard = {
|
||||
name = 'OSC 52',
|
||||
copy = {
|
||||
['+'] = require('vim.ui.clipboard.osc52').copy('+'),
|
||||
-- ['*'] = require('vim.ui.clipboard.osc52').copy('*'),
|
||||
},
|
||||
paste = {
|
||||
['+'] = require('vim.ui.clipboard.osc52').paste('+'),
|
||||
-- ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
|
||||
},
|
||||
}
|
||||
|
||||
vim.cmd('syntax enable')
|
||||
|
||||
|
||||
19
.config/nvim/lazy-lock.json
Normal file
19
.config/nvim/lazy-lock.json
Normal file
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
|
||||
"image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "c953789db7fd28eafe5eb5659846d34b5024b3cc" },
|
||||
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
|
||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "79c9a15be5731bc8694840a8fb0c9141c20a80c0" },
|
||||
"nvim-treesitter": { "branch": "main", "commit": "19c729dae6e0eeb79423df0cf37780aa9a7cc3b7" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }
|
||||
}
|
||||
18
.config/nvim/lua/plugins/fff.lua
Normal file
18
.config/nvim/lua/plugins/fff.lua
Normal file
@@ -0,0 +1,18 @@
|
||||
vim.pack.add({ 'https://github.com/dmtrKovalenko/fff.nvim' })
|
||||
|
||||
vim.api.nvim_create_autocmd('PackChanged', {
|
||||
callback = function(ev)
|
||||
local name, kind = ev.data.spec.name, ev.data.kind
|
||||
if name == 'fff.nvim' and (kind == 'install' or kind == 'update') then
|
||||
if not ev.data.active then vim.cmd.packadd('fff.nvim') end
|
||||
require('fff.download').download_or_build_binary()
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
vim.g.fff = {
|
||||
lazy_sync = true,
|
||||
debug = { enabled = true, show_scores = true },
|
||||
}
|
||||
|
||||
vim.keymap.set('n', 'ff', function() require('fff').live_grep() end, { desc = 'FFFind files' })
|
||||
@@ -1,9 +1,22 @@
|
||||
{
|
||||
"plugins": {
|
||||
"codecompanion.nvim": {
|
||||
"rev": "5b87dd95a5b62bbf198ef147b96d22751ccc1faa",
|
||||
"src": "https://www.github.com/olimorris/codecompanion.nvim",
|
||||
"version": "19.0.0 - 20.0.0"
|
||||
},
|
||||
"conform.nvim": {
|
||||
"rev": "40dcec5555f960b0a04340d76eabdf4efe78599d",
|
||||
"src": "https://github.com/stevearc/conform.nvim"
|
||||
},
|
||||
"diffview.nvim": {
|
||||
"rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
|
||||
"src": "https://github.com/sindrets/diffview.nvim"
|
||||
},
|
||||
"fff.nvim": {
|
||||
"rev": "fbee146c44c99b02fc00ad1d5d32f44e53e2aeec",
|
||||
"src": "https://github.com/dmtrKovalenko/fff.nvim"
|
||||
},
|
||||
"mason-lspconfig.nvim": {
|
||||
"rev": "a324581a3c83fdacdb9804b79de1cbe00ce18550",
|
||||
"src": "https://github.com/mason-org/mason-lspconfig.nvim"
|
||||
@@ -39,6 +52,10 @@
|
||||
"plenary.nvim": {
|
||||
"rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
|
||||
"src": "https://github.com/nvim-lua/plenary.nvim"
|
||||
},
|
||||
"which-key.nvim": {
|
||||
"rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
|
||||
"src": "https://github.com/folke/which-key.nvim"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -37,6 +37,12 @@
|
||||
# prompt_char # prompt symbol
|
||||
)
|
||||
|
||||
function prompt_my_zmx_session() {
|
||||
if [[ -n $ZMX_SESSION ]]; then
|
||||
p10k segment -b '%k' -f '%f' -t "[$ZMX_SESSION]"
|
||||
fi
|
||||
}
|
||||
|
||||
# The list of segments shown on the right. Fill it with less important segments.
|
||||
# Right prompt on the last prompt line (where you are typing your commands) gets
|
||||
# automatically hidden when the input line reaches it. Right prompt above the
|
||||
@@ -110,6 +116,7 @@
|
||||
# battery # internal battery
|
||||
# wifi # wifi speed
|
||||
# example # example user-defined segment (see prompt_example function below)
|
||||
my_zmx_session
|
||||
)
|
||||
|
||||
# Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you.
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
#set-option -g remain-on-exit on
|
||||
set-option -g default-shell /bin/zsh
|
||||
set -g history-limit 30000
|
||||
set -g mouse on
|
||||
# Allow Tmux to pass through OSC 52 escape sequences
|
||||
set -g allow-passthrough on
|
||||
|
||||
set -g mouse on
|
||||
set -g set-clipboard on
|
||||
|
||||
12
.zshrc
12
.zshrc
@@ -17,6 +17,13 @@ export ZSH_CUSTOM="$HOME/.config/zsh_custom"
|
||||
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
|
||||
if [[ -n $ZMX_SESSION ]]; then
|
||||
export PS1="[$ZMX_SESSION] ${PS1}"
|
||||
fi
|
||||
|
||||
export ANDROID_PW_FILE="/tmp/key_list.txt"
|
||||
export EDITOR="nvim"
|
||||
|
||||
# Set list of themes to pick from when loading at random
|
||||
# Setting this variable when ZSH_THEME=random will cause zsh to load
|
||||
# a theme from this variable instead of looking in $ZSH/themes/
|
||||
@@ -118,3 +125,8 @@ source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.config/zsh_custom/10-p10k.zsh.
|
||||
[[ ! -f ~/.config/zsh_custom/10-p10k.zsh ]] || source ~/.config/zsh_custom/10-p10k.zsh
|
||||
export USE_CCACHE=1
|
||||
export CCACHE_EXEC=/usr/bin/ccache
|
||||
ccache -M 50G > /dev/null
|
||||
|
||||
path=("$HOME/.nix-profile/bin" $path)
|
||||
|
||||
Reference in New Issue
Block a user