daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Add vim-yoink and vim-cutlass

Browse source
This commit is contained in:
Daniel Kempkens 2021-12-07 21:59:18 +01:00
parent 13dd5b40cf
commit ed10d1e97d
6 changed files with 51 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/nvim/lua/nifoc/config/yoink.lua Normal file
View file

@ -0,0 +1,4 @@
vim.g.yoinkIncludeDeleteOperations = 1
vim.cmd('packadd! vim-cutlass')
vim.cmd('packadd! vim-yoink')

10
config/nvim/lua/nifoc/keymap.lua
View file

@ -128,9 +128,13 @@ function M.setup()
vim.api.nvim_set_keymap('i', '<S-Left>', '<C-o>^', {noremap = true}) vim.api.nvim_set_keymap('i', '<S-Left>', '<C-o>^', {noremap = true})
vim.api.nvim_set_keymap('i', '<S-Right>', '<C-o>$', {noremap = true}) vim.api.nvim_set_keymap('i', '<S-Right>', '<C-o>$', {noremap = true})
vim.api.nvim_set_keymap('v', 'p', '"_dP', {noremap = true}) -- vim-yoink
vim.api.nvim_set_keymap('n', 'd', '"_d', {noremap = true}) vim.api.nvim_set_keymap('n', 'p', '<Plug>(YoinkPaste_p)')
vim.api.nvim_set_keymap('v', 'd', '"_d', {noremap = true}) vim.api.nvim_set_keymap('n', 'P', '<Plug>(YoinkPaste_P)')
vim.api.nvim_set_keymap('n', 'gp', '<Plug>(YoinkPaste_gp)')
vim.api.nvim_set_keymap('n', 'gP', '<Plug>(YoinkPaste_gP)')
vim.api.nvim_set_keymap('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
vim.api.nvim_set_keymap('x', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
vim.api.nvim_set_keymap('n', '<C-t>', '<cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true}) vim.api.nvim_set_keymap('n', '<C-t>', '<cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})
vim.api.nvim_set_keymap('t', '<C-t>', '<C-\\><C-n><cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true}) vim.api.nvim_set_keymap('t', '<C-t>', '<C-\\><C-n><cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})

1
config/nvim/lua/nifoc/plugins.lua
View file

@ -27,6 +27,7 @@ require('nifoc.config.cursorline')
-- Keybindings -- Keybindings
require('nifoc.config.whichkey') require('nifoc.config.whichkey')
require('nifoc.config.yoink')
-- Syntax -- Syntax
require('nifoc.config.treesitter') require('nifoc.config.treesitter')

3
programs/nvim/default.nix
View file

@ -48,9 +48,10 @@ in
# Keybindings # Keybindings
which-key-nvim which-key-nvim
{ plugin = vim-yoink; optional = true; }
{ plugin = vim-cutlass; optional = true; }
# Themes # Themes
tokyonight-nvim
dracula-nvim dracula-nvim
# Syntax # Syntax

58
programs/nvim/plugins.nix
View file

@ -49,17 +49,29 @@
}; };
meta.homepage = "https://github.com/folke/which-key.nvim"; meta.homepage = "https://github.com/folke/which-key.nvim";
}; };
tokyonight-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-yoink = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "tokyonight.nvim"; pname = "vim-yoink";
version = "b3a829d"; version = "89ed693";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "folke"; owner = "svermeulen";
repo = "tokyonight.nvim"; repo = "vim-yoink";
rev = "b3a829d2ba6344b5364fda71b5b7501f707d1bdf"; rev = "89ed6934679fdbc3c20f552b50b1f869f624cd22";
sha256 = "n00mEFtTbN8XAmlOcjtToagaUqROJ8Id4E4kAPXpEVk="; sha256 = "ekGKOYzmdaMqAun/3fRGlhA7bLKuhzsXsEcFNukgFWU=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
meta.homepage = "https://github.com/folke/tokyonight.nvim"; meta.homepage = "https://github.com/svermeulen/vim-yoink";
};
vim-cutlass = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-cutlass";
version = "7afd649";
src = pkgs.fetchFromGitHub {
owner = "svermeulen";
repo = "vim-cutlass";
rev = "7afd649415541634c8ce317fafbc31cd19d57589";
sha256 = "j5W9q905ApDf3fvCIS4UwyHYnEZu5Ictn+6JkV/xjig=";
fetchSubmodules = false;
};
meta.homepage = "https://github.com/svermeulen/vim-cutlass";
}; };
dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "dracula.nvim"; pname = "dracula.nvim";
@ -123,12 +135,12 @@
}; };
plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "plenary.nvim"; pname = "plenary.nvim";
version = "c2bb2d8"; version = "e6267f7";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "c2bb2d8fd5b44bfc6aad3a5463c84576a98dd4a9"; rev = "e6267f79481064eee53950571f53cbaafb08417d";
sha256 = "ZcQEmGOMU5m17CERIBCqpRgQBHbEpP4h52l7gdCXmok="; sha256 = "c8su4sB4g+tFJjITzZ/Obu3qyTVTVl5UfGGINxk+7Ag=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
meta.homepage = "https://github.com/nvim-lua/plenary.nvim"; meta.homepage = "https://github.com/nvim-lua/plenary.nvim";
@ -196,12 +208,12 @@
}; };
lsp-trouble-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { lsp-trouble-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "lsp-trouble.nvim"; pname = "lsp-trouble.nvim";
version = "4a45782"; version = "7d9cfcc";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "lsp-trouble.nvim"; repo = "lsp-trouble.nvim";
rev = "4a45782db943f95500b61ffce187bf4cada954ae"; rev = "7d9cfccf9549a555bd45aebc38226daab373483c";
sha256 = "qkJkMPxmUVytymwgXI8BW3OPMZcGRT9pSA4LzXhOlZg="; sha256 = "cmOsQBloK116GYtXbKTQ08Zjc4reZE1ygHQS5IMUviw=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
meta.homepage = "https://github.com/folke/lsp-trouble.nvim"; meta.homepage = "https://github.com/folke/lsp-trouble.nvim";
@ -232,12 +244,12 @@
}; };
nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-cmp"; pname = "nvim-cmp";
version = "edc2a50"; version = "af07ff9";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-cmp"; repo = "nvim-cmp";
rev = "edc2a503ee33e2a62e94a2257e9e3bbd50fa6feb"; rev = "af07ff9b7973e95eff9e0275e13fe0350281208b";
sha256 = "5/ZvonFG65i+bBKAdlgD0+zI87BgIaEGFwocsPkbmS0="; sha256 = "8+cm+N6FYFOu/BBornCVf5cwUY2F4u6roUU8ECdkLSM=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-cmp"; meta.homepage = "https://github.com/hrsh7th/nvim-cmp";
@ -508,24 +520,24 @@
}; };
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "5eb87a0"; version = "6bad541";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "5eb87a0b05914d3763277ebe257bd5bafcdde8cd"; rev = "6bad541a403ceabf4ce777c5c9d2ec2ac99b0ed3";
sha256 = "jT01Opd/PEqXs80ZLCRqVcs0H28df+rNNp3n5wZ7lQk="; sha256 = "AeaF06XZOG4+LrO4TvpWKb3d45OQFrr0120LCWZIsQo=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
}; };
spellsitter-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { spellsitter-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "spellsitter.nvim"; pname = "spellsitter.nvim";
version = "3b378cf"; version = "d4c58c2";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "spellsitter.nvim"; repo = "spellsitter.nvim";
rev = "3b378cfb74dcdd159f52d6506401915f65c51fd5"; rev = "d4c58c2f8f199fcaff5465cd86d1ee85e10dad83";
sha256 = "oFx5/IU3T8iHQY6lFnMBynyU8btQgn9cXyOR53C5E0o="; sha256 = "hebxL4HzfsH1TZr3dBfdUdZm5NiWw02WaYIMlSdnX3I=";
fetchSubmodules = false; fetchSubmodules = false;
}; };
meta.homepage = "https://github.com/lewis6991/spellsitter.nvim"; meta.homepage = "https://github.com/lewis6991/spellsitter.nvim";

3
programs/nvim/plugins.txt
View file

@ -2,7 +2,8 @@ lewis6991/impatient.nvim
antoinemadec/FixCursorHold.nvim antoinemadec/FixCursorHold.nvim
delphinus/vim-auto-cursorline delphinus/vim-auto-cursorline
folke/which-key.nvim folke/which-key.nvim
folke/tokyonight.nvim svermeulen/vim-yoink
svermeulen/vim-cutlass
Mofiqul/dracula.nvim Mofiqul/dracula.nvim
nvim-treesitter/nvim-treesitter nvim-treesitter/nvim-treesitter
nvim-treesitter/playground nvim-treesitter/playground