From fdd9133fb1333a0b193a66d104e4776d4e2e7654 Mon Sep 17 00:00:00 2001 From: Adam Jeniski Date: Tue, 7 Mar 2023 11:37:16 -0500 Subject: [PATCH] doomify? --- .config/nvim/after/plugin/hop.lua | 1 + .config/nvim/after/plugin/lsp.lua | 2 +- .config/nvim/after/plugin/telescope.lua | 14 +++--- .config/nvim/lua/ajet/remap.lua | 6 ++- .config/skhd/skhdrc | 65 +------------------------ 5 files changed, 15 insertions(+), 73 deletions(-) diff --git a/.config/nvim/after/plugin/hop.lua b/.config/nvim/after/plugin/hop.lua index 359c48e..b7f2792 100644 --- a/.config/nvim/after/plugin/hop.lua +++ b/.config/nvim/after/plugin/hop.lua @@ -1,3 +1,4 @@ +vim.keymap.set("n", "s", vim.cmd.HopChar2) vim.keymap.set("n", "gw", vim.cmd.HopWord) vim.keymap.set("n", "gl", vim.cmd.HopLine) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index a3c3418..876e7ad 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -14,7 +14,7 @@ lsp.on_attach(function(client, bufnr) vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) - vim.keymap.set("n", "fs", vim.lsp.buf.workspace_symbol, opts) + --vim.keymap.set("n", "fs", vim.lsp.buf.workspace_symbol, opts) vim.keymap.set("n", "vd", vim.diagnostic.open_float, opts) vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index dc18cdb..381caae 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -1,11 +1,11 @@ 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', '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, {}) +vim.keymap.set('n', '', builtin.find_files, {}) +vim.keymap.set('n', 'bi', builtin.buffers, {}) +vim.keymap.set('n', '/', builtin.live_grep, {}) +--vim.keymap.set('n', 'fs', builtin.lsp_document_symbols, {}) +--vim.keymap.set('n', 'fw', builtin.lsp_workspace_symbols, {}) +vim.keymap.set('n', 'hm', builtin.marks, {}) +vim.keymap.set('n', 'hk', builtin.keymaps, {}) vim.keymap.set('n', 'ps', function() builtin.grep_string({ srearch = vim.fn.input("Grep > ") }) end) diff --git a/.config/nvim/lua/ajet/remap.lua b/.config/nvim/lua/ajet/remap.lua index b2213d5..8efaa7d 100644 --- a/.config/nvim/lua/ajet/remap.lua +++ b/.config/nvim/lua/ajet/remap.lua @@ -5,7 +5,7 @@ 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("n", "fs", vim.cmd.w) vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") @@ -15,6 +15,10 @@ vim.keymap.set("n", "", "zz") --vim.keymap.set("n", "n", "nzzzv") --vim.keymap.set("n", "N", "Nzzzv") +vim.keymap.set("n", "w", "") +vim.keymap.set("n", "bd", ":bd") +vim.keymap.set("n", "bn", ":bn") + vim.keymap.set("n", "{", ":bp", {noremap = true}) vim.keymap.set("n", "}", ":bn", {noremap = true}) diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc index 68103b6..197bcc1 100644 --- a/.config/skhd/skhdrc +++ b/.config/skhd/skhdrc @@ -1,70 +1,7 @@ # Services -hyper - z : brew services restart yabai hyper - x : brew services restart skhd -hyper - c : killall limelight &> /dev/null; \ - ~/.config/limelight/limelight/bin/limelight -c ~/.config/limelight/limelightrc &> /dev/null & # Applications meh - space : open -n -a 'kitty' meh - z : open -n -a 'firefox' -meh - c : emacs& - -# Moving focus -hyper - k : yabai -m window --focus north || yabai -m display --focus north -hyper - h : yabai -m window --focus west || yabai -m display --focus west -hyper - j : yabai -m window --focus south || yabai -m display --focus south -hyper - l : yabai -m window --focus east || yabai -m display --focus east - -# Focus next monitor -hyper - p : yabai -m display --focus next || yabai -m display --focus first - -# Moving windows -meh - k : yabai -m window --warp north || $(yabai -m window --display north; yabai -m display --focus north) -meh - h : yabai -m window --warp west || $(yabai -m window --display west; yabai -m display --focus west) -meh - j : yabai -m window --warp south || $(yabai -m window --display south; yabai -m display --focus south) -meh - l : yabai -m window --warp east || $(yabai -m window --display east; yabai -m display --focus east) - -# Resize windows -hyper - i : \ - yabai -m window --resize top:0:-20 ; \ - yabai -m window --resize bottom:0:-20 - -hyper - y : \ - yabai -m window --resize left:-20:0 ; \ - yabai -m window --resize right:-20:0 - -hyper - u : \ - yabai -m window --resize bottom:0:20 ; \ - yabai -m window --resize top:0:20 - -hyper - o : \ - yabai -m window --resize right:20:0 ; \ - yabai -m window --resize left:20:0 - -# Rotate windows -hyper - r : yabai -m space --rotate 270 - -# Balance size of windows -hyper - b : yabai -m space --balance - -# float / unfloat window and center on screen -hyper - t : yabai -m window --toggle float;\ - yabai -m window --grid 4:4:1:1:2:2 - -# toggle window zoom -hyper - f : yabai -m window --toggle zoom-fullscreen - -# Enable / Disable gaps in current workspace -hyper - v : yabai -m space --toggle padding; yabai -m space --toggle gap - -# setup binds to spaces -meh - q : yabai -m window --space 1 -meh - w : yabai -m window --space 2 -meh - e : yabai -m window --space 3 -meh - r : yabai -m window --space 4 -meh - t : yabai -m window --space 5 -meh - y : yabai -m window --space 6 -meh - u : yabai -m window --space 7 -meh - i : yabai -m window --space 8 -meh - o : yabai -m window --space 9 -meh - p : yabai -m window --space 10 +meh - c : emacsclient -c -a emacs