move neovim init.lua to module

This commit is contained in:
Noah Masur 2022-05-07 16:54:47 -04:00
parent 046b24d3aa
commit ce52be726f
4 changed files with 6 additions and 59 deletions

View File

@ -52,7 +52,7 @@
./modules/applications/media.nix ./modules/applications/media.nix
./modules/applications/1password.nix ./modules/applications/1password.nix
./modules/applications/discord.nix ./modules/applications/discord.nix
./modules/editor/neovim.nix ./modules/editor/neovim
./modules/editor/notes.nix ./modules/editor/notes.nix
]; ];
}; };

View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { { config, pkgs, lib, ... }: {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
@ -8,7 +8,9 @@
]; ];
xdg.configFile = { xdg.configFile = {
"nvim/init.lua".source = ../../nvim.configlink/init.lua; "nvim/init.lua".text = lib.mkOrder 100 ''
${builtins.readFile ./init.lua}
'';
}; };
programs.git.extraConfig.core.editor = "nvim"; programs.git.extraConfig.core.editor = "nvim";

View File

@ -353,7 +353,7 @@ require("packer").startup(function(use)
zoxide = {}, zoxide = {},
--neoclip = {}, --neoclip = {},
project = { project = {
base_dirs = { "~/dev/work" }, base_dirs = { "~/dev" },
}, },
}, },
}) })
@ -390,43 +390,6 @@ require("packer").startup(function(use)
end, end,
}) })
-- Clipboard history
-- use({
-- "AckslD/nvim-neoclip.lua",
-- branch = "main",
-- requires = {
-- { "tami5/sqlite.lua", module = "sqlite" },
-- { "nvim-telescope/telescope.nvim" },
-- },
-- config = function()
-- require("neoclip").setup({
-- enable_persistant_history = true,
-- default_register = { "+", '"' },
-- keys = {
-- telescope = {
-- i = { paste = "<c-v>" },
-- },
-- },
-- })
-- require("telescope").load_extension("neoclip")
-- end,
-- })
-- Project bookmarks
use({
"ThePrimeagen/harpoon",
requires = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
},
})
-- TLDR Lookup
use({
"mrjones2014/tldr.nvim",
requires = { "nvim-telescope/telescope.nvim" },
})
-- ======================================================================= -- =======================================================================
-- Install on initial bootstrap -- Install on initial bootstrap
@ -591,17 +554,6 @@ choose_project = function()
require("telescope").extensions.project.project(opts) require("telescope").extensions.project.project(opts)
end end
-- clipboard_history = function()
-- local opts = require("telescope.themes").get_cursor({
-- layout_config = {
-- cursor = {
-- width = 150,
-- },
-- },
-- })
-- require("telescope").extensions.neoclip.neoclip(opts)
-- end
command_history = function() command_history = function()
local opts = require("telescope.themes").get_ivy({ local opts = require("telescope.themes").get_ivy({
layout_config = { layout_config = {
@ -672,13 +624,6 @@ key("n", "<Leader>gb", ":Telescope git_branches<CR>")
key("n", "<Leader>gs", ":Telescope git_status<CR>") key("n", "<Leader>gs", ":Telescope git_status<CR>")
key("n", "<C-p>", "<Cmd>lua choose_project()<CR>") key("n", "<C-p>", "<Cmd>lua choose_project()<CR>")
-- Harpoon
key("n", "<Leader>m", "<Cmd>lua require('harpoon.mark').add_file()<CR><Esc>")
key("n", "<Leader>`", "<Cmd>lua require('harpoon.ui').toggle_quick_menu()<CR><Esc>")
key("n", "<Leader>1", "<Cmd>lua require('harpoon.ui').nav_file(1)<CR><Esc>")
key("n", "<Leader>2", "<Cmd>lua require('harpoon.ui').nav_file(2)<CR><Esc>")
key("n", "<Leader>3", "<Cmd>lua require('harpoon.ui').nav_file(3)<CR><Esc>")
-- LSP -- LSP
key("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", { silent = true }) key("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", { silent = true })
key("n", "gT", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", { silent = true }) key("n", "gT", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", { silent = true })