noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-07-06 10:50:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nixos-flashdrive' into experimental

Browse Source
This commit is contained in:
Noah Masur
2022-01-25 10:49:23 -05:00
parent df4ca6e4c4 e0c405f8e8
commit 2177397947
13 changed files with 1647 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
nvim.configlink/init.lua
View File

@ -40,6 +40,7 @@ require("packer").startup(function(use)
use({
"morhetz/gruvbox",
config = function()
vim.g.gruvbox_italic = 1
vim.cmd([[colorscheme gruvbox]])
end,
})
@ -137,10 +138,10 @@ require("packer").startup(function(use)
require("lspconfig").rust_analyzer.setup({ capabilities = capabilities })
require("lspconfig").tflint.setup({ capabilities = capabilities })
require("lspconfig").terraformls.setup({ capabilities = capabilities })
require("lspconfig").pyright.setup({
cmd = { "poetry", "run", "pyright-langserver", "--stdio" },
capabilities = capabilities,
})
-- require("lspconfig").pyright.setup({
-- cmd = { "poetry", "run", "pyright-langserver", "--stdio" },
-- capabilities = capabilities,
-- })
end,
})
@ -159,12 +160,12 @@ require("packer").startup(function(use)
require("null-ls").setup({
sources = {
require("null-ls").builtins.formatting.stylua,
require("null-ls").builtins.formatting.black.with({
command = "poetry",
args = { "run", "black", "--quiet", "--fast", "-" },
}),
-- require("null-ls").builtins.formatting.black.with({
-- command = "poetry",
-- args = { "run", "black", "--quiet", "--fast", "-" },
-- }),
require("null-ls").builtins.formatting.fish_indent,
-- require("null-ls").builtins.formatting.nixfmt,
require("null-ls").builtins.formatting.nixfmt,
require("null-ls").builtins.formatting.rustfmt,
require("null-ls").builtins.diagnostics.shellcheck,
require("null-ls").builtins.formatting.shfmt.with({
@ -338,7 +339,7 @@ require("packer").startup(function(use)
fzy_native = {},
tmux = {},
zoxide = {},
neoclip = {},
--neoclip = {},
project = {
base_dirs = { "~/dev/work" },
},
@ -378,26 +379,26 @@ require("packer").startup(function(use)
})
-- 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,
})
-- 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({
@ -573,16 +574,16 @@ choose_project = function()
require("telescope").extensions.project.project(opts)
end
clipboard_history = function()
local opts = require("telescope.themes").get_cursor({
layout_config = {
cursor = {
width = 150,
},
},
})
require("telescope").extensions.neoclip.neoclip(opts)
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()
local opts = require("telescope.themes").get_ivy({
@ -691,7 +692,7 @@ key("", "<Leader>t#", ":Tabularize /#<CR>")
key("", "<Leader>tl", ":Tabularize /---<CR>")
-- Vimrc editing
key("n", "<Leader>fv", ":edit $MYVIMRC<CR>")
key("n", "<Leader>fv", ":edit $DOTS/nvim.configlink/init.lua<CR>")
key("n", "<Leader>rr", ":luafile $MYVIMRC<CR>")
key("n", "<Leader>rp", ":luafile $MYVIMRC<CR>:PackerInstall<CR>:")
key("n", "<Leader>rc", ":luafile $MYVIMRC<CR>:PackerCompile<CR>")