mirror of
https://github.com/Ajetski/dotfiles.git
synced 2025-09-30 05:23:17 -09:00
fiddle with config over break
This commit is contained in:
parent
8a6aa14bf0
commit
59345ebb5c
@ -27,6 +27,58 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "easy enter",
|
||||
"manipulators": [
|
||||
{
|
||||
"type": "basic",
|
||||
"from": {
|
||||
"simultaneous": [
|
||||
{
|
||||
"key_code": "n"
|
||||
},
|
||||
{
|
||||
"key_code": "m"
|
||||
}
|
||||
],
|
||||
"modifiers": {
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [
|
||||
{
|
||||
"key_code": "return_or_enter"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "easy backspace",
|
||||
"manipulators": [
|
||||
{
|
||||
"type": "basic",
|
||||
"from": {
|
||||
"simultaneous": [
|
||||
{
|
||||
"key_code": "j"
|
||||
},
|
||||
{
|
||||
"key_code": "k"
|
||||
}
|
||||
],
|
||||
"modifiers": {
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [
|
||||
{
|
||||
"key_code": "delete_or_backspace"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "home row modifiers",
|
||||
"manipulators": [
|
||||
@ -119,6 +171,36 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "caps lock to escape or meh if held",
|
||||
"manipulators": [
|
||||
{
|
||||
"type": "basic",
|
||||
"from": {
|
||||
"key_code": "caps_lock",
|
||||
"modifiers": {
|
||||
"optional": [
|
||||
"any"
|
||||
]
|
||||
}
|
||||
},
|
||||
"to_if_alone": [
|
||||
{
|
||||
"key_code": "escape"
|
||||
}
|
||||
],
|
||||
"to_if_held_down": [
|
||||
{
|
||||
"key_code": "left_shift",
|
||||
"modifiers": [
|
||||
"left_control",
|
||||
"left_option"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
function ColorMyPencils(color)
|
||||
color = color or "nightfox"
|
||||
color = color or "catppuccin"
|
||||
vim.cmd.colorscheme(color)
|
||||
end
|
||||
|
||||
|
||||
@ -4,8 +4,7 @@ local ui = require("harpoon.ui")
|
||||
vim.keymap.set("n", "<leader>a", mark.add_file)
|
||||
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
|
||||
|
||||
vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
|
||||
vim.keymap.set("n", "<C-n>", function() ui.nav_file(1) end)
|
||||
vim.keymap.set("n", "<C-g>", function() ui.nav_file(2) end)
|
||||
vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
|
||||
vim.keymap.set("n", "<C-b>", function() ui.nav_file(4) end)
|
||||
vim.keymap.set("n", "<C-t>", function() ui.nav_file(5) end)
|
||||
vim.keymap.set("n", "<C-m>", function() ui.nav_file(3) end)
|
||||
vim.keymap.set("n", "<C-t>", function() ui.nav_file(4) end)
|
||||
|
||||
@ -22,21 +22,21 @@ lsp.configure('sumneko_lua', {
|
||||
|
||||
|
||||
local cmp = require('cmp')
|
||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||
local cmp_select = { behavior = cmp.PreselectMode.None } --cmp.SelectBehavior.Select }
|
||||
local cmp_mappings = lsp.defaults.cmp_mappings({
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-k>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-j>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
})
|
||||
|
||||
-- disable completion with tab
|
||||
-- this helps with copilot setup
|
||||
cmp_mappings['<Tab>'] = nil
|
||||
cmp_mappings['<S-Tab>'] = nil
|
||||
|
||||
lsp.setup_nvim_cmp({
|
||||
mapping = cmp_mappings
|
||||
mapping = cmp_mappings,
|
||||
sources = {
|
||||
{
|
||||
name = 'conjure'
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
lsp.set_preferences({
|
||||
|
||||
@ -2,7 +2,7 @@ local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
|
||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
||||
vim.keymap.set('n', '<leader>fd', builtin.lsp_document_symbols, {})
|
||||
vim.keymap.set('n', '<leader>fs', builtin.lsp_document_symbols, {})
|
||||
vim.keymap.set('n', '<leader>fw', builtin.lsp_workspace_symbols, {})
|
||||
vim.keymap.set('n', '<leader>fm', builtin.marks, {})
|
||||
vim.keymap.set('n', '<leader>fk', builtin.keymaps, {})
|
||||
|
||||
@ -2,3 +2,6 @@ require("ajet.packer")
|
||||
require("ajet.remap")
|
||||
require("ajet.set")
|
||||
require("ajet.treesitter")
|
||||
require("ajet.rusttools")
|
||||
require("ajet.telescope")
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
vim.cmd([[packadd packer.nvim]])
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
@ -6,7 +6,7 @@ return require('packer').startup(function(use)
|
||||
'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
||||
requires = { { 'nvim-lua/plenary.nvim' } }
|
||||
}
|
||||
use('EdenEast/nightfox.nvim')
|
||||
--use('EdenEast/nightfox.nvim')
|
||||
use({ 'nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' } })
|
||||
use('nvim-treesitter/playground')
|
||||
use('theprimeagen/harpoon')
|
||||
@ -54,4 +54,19 @@ return require('packer').startup(function(use)
|
||||
"iamcco/markdown-preview.nvim",
|
||||
run = function() vim.fn["mkdp#util#install"]() end,
|
||||
})
|
||||
use({
|
||||
'simrat39/rust-tools.nvim',
|
||||
requires = {
|
||||
{ 'neovim/nvim-lspconfig' }
|
||||
},
|
||||
})
|
||||
use("petertriho/nvim-scrollbar")
|
||||
use({ "nvim-lualine/lualine.nvim",
|
||||
requires = { 'kyazdani42/nvim-web-devicons', opt = true }
|
||||
})
|
||||
use({ "nvim-tree/nvim-tree.lua", requires = { "nvim-tree/nvim-web-devicons" } })
|
||||
use { "catppuccin/nvim", as = "catppuccin" }
|
||||
use('Olical/conjure')
|
||||
use('TravonteD/tree-sitter-fennel')
|
||||
use('PaterJason/cmp-conjure')
|
||||
end)
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = " "
|
||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||
|
||||
vim.keymap.set("n", "<leader>cc", vim.cmd.cclose)
|
||||
vim.keymap.set("n", "<leader>co", vim.cmd.copen)
|
||||
|
||||
vim.keymap.set("n", "<C-s>", vim.cmd.w)
|
||||
|
||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||
@ -9,8 +13,8 @@ vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||
vim.keymap.set("n", "J", "mzJ`z")
|
||||
vim.keymap.set("n", "<C-d>", "<C-d>zz")
|
||||
vim.keymap.set("n", "<C-u>", "<C-u>zz")
|
||||
vim.keymap.set("n", "n", "nzzzv")
|
||||
vim.keymap.set("n", "N", "Nzzzv")
|
||||
--vim.keymap.set("n", "n", "nzzzv")
|
||||
--vim.keymap.set("n", "N", "Nzzzv")
|
||||
|
||||
-- greatest remap ever
|
||||
vim.keymap.set("x", "<leader>p", [["_dP]])
|
||||
@ -25,13 +29,15 @@ vim.keymap.set("n", "<leader>Y", [["+Y]])
|
||||
vim.keymap.set("i", "<C-c>", "<Esc>")
|
||||
|
||||
vim.keymap.set("n", "Q", "<nop>")
|
||||
vim.keymap.set("n", "<leader>tn", "<cmd>!tmux new tmux-sessionizer<CR>")
|
||||
vim.keymap.set("n", "<leader>F", vim.lsp.buf.format)
|
||||
--vim.keymap.set("n", "<leader>tn", "<cmd>!tmux new tmux-sessionizer<CR>")
|
||||
|
||||
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
|
||||
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
|
||||
vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
|
||||
vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
|
||||
--vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
|
||||
--vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
|
||||
--vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
|
||||
--vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
|
||||
|
||||
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
|
||||
vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
|
||||
|
||||
vim.keymap.set("t", "<esc>", "<C-\\><C-n>")
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
local actions = require('telescope.actions')
|
||||
require('telescope').setup {
|
||||
defaults = {
|
||||
-- Default configuration for telescope goes here:
|
||||
-- config_key = value,
|
||||
mappings = {
|
||||
i = {
|
||||
["<C-j>"] = "which_key",
|
||||
["<C-k>"] = "which_key",
|
||||
["<C-j>"] = actions.move_selection_next,
|
||||
["<C-k>"] = actions.move_selection_previous,
|
||||
},
|
||||
n = {
|
||||
["<C-j>"] = actions.move_selection_next,
|
||||
["<C-k>"] = actions.move_selection_previous,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,3 @@
|
||||
set -g prefix C-space
|
||||
unbind C-b
|
||||
|
||||
set -g default-terminal "xterm-256color"
|
||||
set -ga terminal-overrides ",*256col*:Tc"
|
||||
|
||||
@ -9,20 +6,16 @@ set -g "window-style" "bg=default"
|
||||
set -g "window-active-style" "bg=default"
|
||||
|
||||
setw -g mouse
|
||||
unbind C-b
|
||||
set -g prefix C-space
|
||||
|
||||
# reload config file (change file location to your the tmux.conf you want to use)
|
||||
bind r source-file ~/.config/tmux/.tmux.conf
|
||||
|
||||
#add vim binds with mod
|
||||
bind -n M-h select-pane -L
|
||||
bind -n M-j select-pane -D
|
||||
bind -n M-k select-pane -U
|
||||
bind -n M-l select-pane -R
|
||||
|
||||
bind -n M-H resize-pane -L 5
|
||||
bind -n M-J resize-pane -D 5
|
||||
bind -n M-K resize-pane -U 5
|
||||
bind -n M-L resize-pane -R 5
|
||||
bind C-H resize-pane -L 5
|
||||
bind C-J resize-pane -D 5
|
||||
bind C-K resize-pane -U 5
|
||||
bind C-L resize-pane -R 5
|
||||
|
||||
|
||||
set -s escape-time 0
|
||||
@ -34,15 +27,24 @@ bind k select-pane -U
|
||||
bind l select-pane -R
|
||||
|
||||
# set the pane border colors
|
||||
set -g pane-border-style 'fg=colour235,bg=colour238'
|
||||
set -g pane-active-border-style 'fg=colour51,bg=colour236'
|
||||
set -g pane-border-style 'fg=colour235,bg=default'
|
||||
set -g pane-active-border-style 'fg=colour51,bg=default'
|
||||
|
||||
bind b set status
|
||||
set -g status-style fg=white,bg=default
|
||||
set -g status-interval 15
|
||||
set -g status-justify left
|
||||
set -g status-keys vi
|
||||
set -g status-left "[#S] "
|
||||
set -g status-left-length 10
|
||||
set -g status-left-style default
|
||||
set -g status-position bottom
|
||||
set -g status-right-length 40
|
||||
set -g status-right-style default
|
||||
|
||||
set -g window-style bg=default
|
||||
set -g window-active-style bg=default
|
||||
|
||||
bind | split-window -h
|
||||
bind - split-window -v
|
||||
|
||||
bind _ split-window -v
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user