diff --git a/.config/karabiner/assets/complex_modifications/ajet_config.json b/.config/karabiner/assets/complex_modifications/ajet_config.json index b51e568..9b3149e 100644 --- a/.config/karabiner/assets/complex_modifications/ajet_config.json +++ b/.config/karabiner/assets/complex_modifications/ajet_config.json @@ -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" + ] + } + ] + } + ] } ] } diff --git a/.config/nvim/after/plugin/colors.lua b/.config/nvim/after/plugin/colors.lua index 9e8643d..35043e0 100644 --- a/.config/nvim/after/plugin/colors.lua +++ b/.config/nvim/after/plugin/colors.lua @@ -1,5 +1,5 @@ function ColorMyPencils(color) - color = color or "nightfox" + color = color or "catppuccin" vim.cmd.colorscheme(color) end diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua index 3cd6974..60aa453 100644 --- a/.config/nvim/after/plugin/harpoon.lua +++ b/.config/nvim/after/plugin/harpoon.lua @@ -4,8 +4,7 @@ local ui = require("harpoon.ui") vim.keymap.set("n", "a", mark.add_file) vim.keymap.set("n", "", ui.toggle_quick_menu) -vim.keymap.set("n", "", function() ui.nav_file(1) end) +vim.keymap.set("n", "", function() ui.nav_file(1) end) vim.keymap.set("n", "", function() ui.nav_file(2) end) -vim.keymap.set("n", "", function() ui.nav_file(3) end) -vim.keymap.set("n", "", function() ui.nav_file(4) end) -vim.keymap.set("n", "", function() ui.nav_file(5) end) +vim.keymap.set("n", "", function() ui.nav_file(3) end) +vim.keymap.set("n", "", function() ui.nav_file(4) end) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 2052c82..9d7f7cb 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -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({ - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.select_next_item(cmp_select), - [''] = cmp.mapping.confirm({ select = true }), + [''] = cmp.mapping.select_prev_item(cmp_select), + [''] = cmp.mapping.select_next_item(cmp_select), + [''] = cmp.mapping.confirm({ select = true }), [""] = cmp.mapping.complete(), }) --- disable completion with tab --- this helps with copilot setup -cmp_mappings[''] = nil -cmp_mappings[''] = nil - lsp.setup_nvim_cmp({ - mapping = cmp_mappings + mapping = cmp_mappings, + sources = { + { + name = 'conjure' + } + } }) lsp.set_preferences({ diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index e050681..dc18cdb 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -2,7 +2,7 @@ local builtin = require('telescope.builtin') vim.keymap.set('n', 'ff', builtin.find_files, {}) vim.keymap.set('n', 'fb', builtin.buffers, {}) vim.keymap.set('n', 'fg', builtin.live_grep, {}) -vim.keymap.set('n', 'fd', builtin.lsp_document_symbols, {}) +vim.keymap.set('n', 'fs', builtin.lsp_document_symbols, {}) vim.keymap.set('n', 'fw', builtin.lsp_workspace_symbols, {}) vim.keymap.set('n', 'fm', builtin.marks, {}) vim.keymap.set('n', 'fk', builtin.keymaps, {}) diff --git a/.config/nvim/lua/ajet/init.lua b/.config/nvim/lua/ajet/init.lua index d5c6f76..eebc46d 100644 --- a/.config/nvim/lua/ajet/init.lua +++ b/.config/nvim/lua/ajet/init.lua @@ -2,3 +2,6 @@ require("ajet.packer") require("ajet.remap") require("ajet.set") require("ajet.treesitter") +require("ajet.rusttools") +require("ajet.telescope") + diff --git a/.config/nvim/lua/ajet/packer.lua b/.config/nvim/lua/ajet/packer.lua index aa29449..7f0c763 100644 --- a/.config/nvim/lua/ajet/packer.lua +++ b/.config/nvim/lua/ajet/packer.lua @@ -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) diff --git a/.config/nvim/lua/ajet/remap.lua b/.config/nvim/lua/ajet/remap.lua index 1464bd2..5204d9d 100644 --- a/.config/nvim/lua/ajet/remap.lua +++ b/.config/nvim/lua/ajet/remap.lua @@ -1,6 +1,10 @@ vim.g.mapleader = " " +vim.g.maplocalleader = " " vim.keymap.set("n", "pv", vim.cmd.Ex) +vim.keymap.set("n", "cc", vim.cmd.cclose) +vim.keymap.set("n", "co", vim.cmd.copen) + vim.keymap.set("n", "", vim.cmd.w) vim.keymap.set("v", "J", ":m '>+1gv=gv") @@ -9,8 +13,8 @@ vim.keymap.set("v", "K", ":m '<-2gv=gv") vim.keymap.set("n", "J", "mzJ`z") vim.keymap.set("n", "", "zz") vim.keymap.set("n", "", "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", "p", [["_dP]]) @@ -25,13 +29,15 @@ vim.keymap.set("n", "Y", [["+Y]]) vim.keymap.set("i", "", "") vim.keymap.set("n", "Q", "") -vim.keymap.set("n", "tn", "!tmux new tmux-sessionizer") vim.keymap.set("n", "F", vim.lsp.buf.format) +--vim.keymap.set("n", "tn", "!tmux new tmux-sessionizer") -vim.keymap.set("n", "", "cnextzz") -vim.keymap.set("n", "", "cprevzz") -vim.keymap.set("n", "k", "lnextzz") -vim.keymap.set("n", "j", "lprevzz") +--vim.keymap.set("n", "", "cnextzz") +--vim.keymap.set("n", "", "cprevzz") +--vim.keymap.set("n", "k", "lnextzz") +--vim.keymap.set("n", "j", "lprevzz") vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) + +vim.keymap.set("t", "", "") diff --git a/.config/nvim/lua/ajet/telescope.lua b/.config/nvim/lua/ajet/telescope.lua index 940512e..f373adb 100644 --- a/.config/nvim/lua/ajet/telescope.lua +++ b/.config/nvim/lua/ajet/telescope.lua @@ -1,11 +1,16 @@ +local actions = require('telescope.actions') require('telescope').setup { defaults = { -- Default configuration for telescope goes here: -- config_key = value, mappings = { i = { - [""] = "which_key", - [""] = "which_key", + [""] = actions.move_selection_next, + [""] = actions.move_selection_previous, + }, + n = { + [""] = actions.move_selection_next, + [""] = actions.move_selection_previous, } } } diff --git a/.config/tmux/.tmux.conf b/.config/tmux/.tmux.conf index 3709f8b..15717a7 100644 --- a/.config/tmux/.tmux.conf +++ b/.config/tmux/.tmux.conf @@ -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