Skip to content

Commit

Permalink
Update stylua settings
Browse files Browse the repository at this point in the history
  • Loading branch information
jsstevenson committed Aug 7, 2022
1 parent fbda874 commit 08ee07d
Show file tree
Hide file tree
Showing 10 changed files with 467 additions and 464 deletions.
363 changes: 182 additions & 181 deletions nvim/lua/lsp.lua

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions nvim/lua/mappings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ mapx.vnoremap("<C-_>", "gc", "silent")
-- telescope
local telescope = require("telescope.builtin")
mapx.nnoremap("ff", function()
telescope.find_files()
telescope.find_files()
end, "silent")
mapx.nnoremap("fg", function()
telescope.live_grep()
telescope.live_grep()
end, "silent")
mapx.nnoremap("gr", function()
telescope.lsp_references()
telescope.lsp_references()
end, "silent")

-- misc
Expand Down
26 changes: 13 additions & 13 deletions nvim/lua/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ local cmd = vim.cmd
local scopes = { o = vim.o, b = vim.bo, w = vim.wo }

local function opt(scope, key, value)
scopes[scope][key] = value
if scope ~= "o" then
scopes["o"][key] = value
end
scopes[scope][key] = value
if scope ~= "o" then
scopes["o"][key] = value
end
end

opt("o", "termguicolors", true)
Expand Down Expand Up @@ -33,16 +33,16 @@ opt("o", "inccommand", "nosplit")

-- disable unused stuff
local disabled_built_ins = {
"netrwFileHandlers",
"gzip",
"zip",
"zipPlugin",
"tar",
"tarPlugin",
"spellfile_plugin",
"tutor",
"netrwFileHandlers",
"gzip",
"zip",
"zipPlugin",
"tar",
"tarPlugin",
"spellfile_plugin",
"tutor",
}

for _, plugin in pairs(disabled_built_ins) do
vim.g["loaded_" .. plugin] = 1
vim.g["loaded_" .. plugin] = 1
end
290 changes: 145 additions & 145 deletions nvim/lua/packer_plugins.lua
Original file line number Diff line number Diff line change
@@ -1,156 +1,156 @@
return require("packer").startup({
function(use)
use("wbthomason/packer.nvim")
function(use)
use("wbthomason/packer.nvim")

-- appearance
use({
"jsstevenson/tokyonight.nvim",
branch = "new-colors",
})
use({
"hoob3rt/lualine.nvim",
config = function()
require("plugins.status_line")
end,
})
use({
"akinsho/nvim-bufferline.lua",
config = function()
require("bufferline").setup({})
end,
})
use("voldikss/vim-floaterm")
use({
"mechatroner/rainbow_csv",
ft = { "csv", "tsv" },
})
use({
"rrethy/vim-hexokinase",
run = "cd ~/.local/share/nvim/site/pack/packer/start/vim-hexokinase && make hexokinase",
})
-- appearance
use({
"jsstevenson/tokyonight.nvim",
branch = "new-colors",
})
use({
"hoob3rt/lualine.nvim",
config = function()
require("plugins.status_line")
end,
})
use({
"akinsho/nvim-bufferline.lua",
config = function()
require("bufferline").setup({})
end,
})
use("voldikss/vim-floaterm")
use({
"mechatroner/rainbow_csv",
ft = { "csv", "tsv" },
})
use({
"rrethy/vim-hexokinase",
run = "cd ~/.local/share/nvim/site/pack/packer/start/vim-hexokinase && make hexokinase",
})

-- general
use({
"b0o/mapx.nvim",
config = function()
require("mapx").setup({})
end,
})
-- general
use({
"b0o/mapx.nvim",
config = function()
require("mapx").setup({})
end,
})

-- telescope
use({
"nvim-telescope/telescope.nvim",
requires = {
{ "nvim-lua/plenary.nvim" },
{
"nvim-telescope/telescope-fzf-native.nvim",
run = "make",
},
},
config = function()
require("plugins.telescope")
end,
})
-- telescope
use({
"nvim-telescope/telescope.nvim",
requires = {
{ "nvim-lua/plenary.nvim" },
{
"nvim-telescope/telescope-fzf-native.nvim",
run = "make",
},
},
config = function()
require("plugins.telescope")
end,
})

-- text objects & formatting
-- use 'wellle/targets.vim'
-- use 'michaeljsmith/vim-indent-object'
use({
"Vimjas/vim-python-pep8-indent",
ft = { "python" },
})
-- try https://github.com/junegunn/vim-easy-align as well?
use({
"godlygeek/tabular",
ft = { "tex", "markdown" },
})
use({
"numToStr/Comment.nvim",
config = function()
require("Comment").setup()
end,
})
use("tpope/vim-surround")
use("jiangmiao/auto-pairs")
use({
"jpalardy/vim-slime",
-- ft = {'python', 'racket', 'javascript', 'javascriptreact'},
config = function()
require("plugins.slime")
end,
})
-- text objects & formatting
-- use 'wellle/targets.vim'
-- use 'michaeljsmith/vim-indent-object'
use({
"Vimjas/vim-python-pep8-indent",
ft = { "python" },
})
-- try https://github.com/junegunn/vim-easy-align as well?
use({
"godlygeek/tabular",
ft = { "tex", "markdown" },
})
use({
"numToStr/Comment.nvim",
config = function()
require("Comment").setup()
end,
})
use("tpope/vim-surround")
use("jiangmiao/auto-pairs")
use({
"jpalardy/vim-slime",
-- ft = {'python', 'racket', 'javascript', 'javascriptreact'},
config = function()
require("plugins.slime")
end,
})

-- treesitter stuff
use({
"nvim-treesitter/nvim-treesitter",
})
use({
"RRethy/nvim-treesitter-endwise",
})
use({
"windwp/nvim-ts-autotag",
})
use({
"nvim-treesitter/playground",
})
-- treesitter stuff
use({
"nvim-treesitter/nvim-treesitter",
})
use({
"RRethy/nvim-treesitter-endwise",
})
use({
"windwp/nvim-ts-autotag",
})
use({
"nvim-treesitter/playground",
})

-- LSP things
use({
"neovim/nvim-lspconfig",
requires = {
{ "hrsh7th/cmp-nvim-lsp" },
{ "hrsh7th/cmp-buffer" },
{ "hrsh7th/nvim-cmp" },
{ "hrsh7th/vim-vsnip" },
{ "hrsh7th/vim-vsnip-integ" },
{ "williamboman/mason.nvim" },
{ "williamboman/mason-lspconfig.nvim" },
},
})
-- LSP things
use({
"neovim/nvim-lspconfig",
requires = {
{ "hrsh7th/cmp-nvim-lsp" },
{ "hrsh7th/cmp-buffer" },
{ "hrsh7th/nvim-cmp" },
{ "hrsh7th/vim-vsnip" },
{ "hrsh7th/vim-vsnip-integ" },
{ "williamboman/mason.nvim" },
{ "williamboman/mason-lspconfig.nvim" },
},
})

-- git
use("itchyny/vim-gitbranch") -- until I feel better about vim-fugitive
use({
"rhysd/conflict-marker.vim",
config = function()
require("plugins.conflict_marker")
end,
})
use({
"lewis6991/gitsigns.nvim",
config = function()
require("gitsigns").setup()
end,
})
-- git
use("itchyny/vim-gitbranch") -- until I feel better about vim-fugitive
use({
"rhysd/conflict-marker.vim",
config = function()
require("plugins.conflict_marker")
end,
})
use({
"lewis6991/gitsigns.nvim",
config = function()
require("gitsigns").setup()
end,
})

-- language-specific
use({
"nicwest/vim-http",
ft = { "http" },
})
use({
"wlangstroth/vim-racket",
ft = { "racket" },
})
use({
"rust-lang/rust.vim",
ft = { "rust" },
})
use({
"lervag/vimtex",
ft = { "tex" },
})
use({
"NTBBloodbath/rest.nvim",
requires = { "nvim-lua/plenary.nvim" },
config = function()
require("plugins.nvim-rest")
end,
})
end,
config = {
display = {
open_fn = require("packer.util").float,
},
-- language-specific
use({
"nicwest/vim-http",
ft = { "http" },
})
use({
"wlangstroth/vim-racket",
ft = { "racket" },
})
use({
"rust-lang/rust.vim",
ft = { "rust" },
})
use({
"lervag/vimtex",
ft = { "tex" },
})
use({
"NTBBloodbath/rest.nvim",
requires = { "nvim-lua/plenary.nvim" },
config = function()
require("plugins.nvim-rest")
end,
})
end,
config = {
display = {
open_fn = require("packer.util").float,
},
},
})
Loading

0 comments on commit 08ee07d

Please sign in to comment.