[MINOR] Some small updates to dotfiles , getting ready for arch-config
This commit is contained in:
parent
11a280281c
commit
4eb3a06af1
11 changed files with 65 additions and 30 deletions
1
.config/nvim/ftplugin/haskell.lua
Normal file
1
.config/nvim/ftplugin/haskell.lua
Normal file
|
@ -0,0 +1 @@
|
|||
vim.opt_local.formatprg = "floskell --style chris-done"
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "5d57303efde86fcb0959c52b1a6d40f923940f34" },
|
||||
"LuaSnip": { "branch": "master", "commit": "3181cef8a5c6a71f263a28e61651233d7a7afeb2" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "028a87933d99f8bb88f2f70a4def3ff9574f3594" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
|
||||
|
@ -10,24 +10,27 @@
|
|||
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "046e4d3491baf664e0eef5231d28beb49333578b" },
|
||||
"impatient.nvim": { "branch": "main", "commit": "c90e273f7b8c50a02f956c24ce4804a47f18162e" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "666ed7bf73eb5895253c1155bd29270b066cbdac" },
|
||||
"leap.nvim": { "branch": "main", "commit": "a968ab4250840dc879e805f918b4f3b892310a12" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "15fe46a728b7473d4cae368838bbc1c79c3a3f48" },
|
||||
"leap.nvim": { "branch": "main", "commit": "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "43c7f402cb9822b61b5dc05bf0b385928df256a6" },
|
||||
"mason.nvim": { "branch": "main", "commit": "5ab101aa11849c2424d5b87726105daae8cb49e8" },
|
||||
"null-ls.nvim": { "branch": "main", "commit": "915558963709ea17c5aa246ca1c9786bfee6ddb4" },
|
||||
"nvim": { "branch": "main", "commit": "ecfa842c38b937596c81fa8df2123de69b980081" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "f00eb3b766c370cb34fdabc29c760338ba9e4c6c" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "c29f9a9f9b01528ca6a44cd14814f5af20778f7a" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e7303a1632c004ebd2dcd0be1aaa4354586c030b" },
|
||||
"null-ls.nvim": { "branch": "main", "commit": "2ff0a4ed1985d04bae3f21915ee0b1be3932c164" },
|
||||
"nvim": { "branch": "main", "commit": "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "ed88435764d8b00442e66d39ec3d9c360e560783" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "51d220e0bd8922caabcb3e5de936fc599a1bd210" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "1d3203b4c39ea5ec63cf1271d9e3b14a91706897" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "d508f9aceb8f1e3138aaea60ca5610a24d6561b6" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "cacee4828152dd3a83736169ae61bbcd29a3d213" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "3548363849878ef895ce54edda02421279b419d8" },
|
||||
"onedark.vim": { "branch": "main", "commit": "b6b5ffe31a195a3077338d7a506b905e4a51590f" },
|
||||
"orgmode": { "branch": "master", "commit": "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826" },
|
||||
"startup.nvim": { "branch": "master", "commit": "b060480d2e647534faf70fa1263fe7623b77b0ce" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" },
|
||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||
"vimtex": { "branch": "master", "commit": "bd0173e7d3c0097c5b855265ce83f5863f073c85" }
|
||||
"vimtex": { "branch": "master", "commit": "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd" },
|
||||
"zen-mode.nvim": { "branch": "main", "commit": "2c8f9f3758a4c430ff867e547741424ac16208bb" }
|
||||
}
|
|
@ -27,3 +27,6 @@ vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
|
|||
--Undo dir
|
||||
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||
vim.opt.undofile = true
|
||||
--Org mode hide links
|
||||
vim.opt.conceallevel = 2
|
||||
vim.opt.concealcursor = 'nc'
|
||||
|
|
|
@ -67,7 +67,6 @@ require("bufferline").setup({
|
|||
sort_by = 'insert_after_current',
|
||||
custom_filter = function(buf_number, buf_numbers)
|
||||
-- filter out filetypes you don't want to see
|
||||
print(vim.bo[buf_number].filetype)
|
||||
if vim.bo[buf_number].filetype ~= "" then
|
||||
return true
|
||||
end
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
--local colorscheme = "onedark"
|
||||
|
||||
require("catppuccin").setup({
|
||||
|
@ -9,8 +8,27 @@ require("catppuccin").setup({
|
|||
},
|
||||
integrations = {
|
||||
cmp = true,
|
||||
nvimtree = true,
|
||||
treesitter = true,
|
||||
treesitter_context = true,
|
||||
fidget = true,
|
||||
telescope = true,
|
||||
leap = true,
|
||||
mason = true,
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
virtual_text = {
|
||||
errors = { "italic" },
|
||||
hints = { "italic" },
|
||||
warnings = { "italic" },
|
||||
information = { "italic" },
|
||||
},
|
||||
underlines = {
|
||||
errors = { "underline" },
|
||||
hints = { "underline" },
|
||||
warnings = { "underline" },
|
||||
information = { "underline" },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
|
@ -19,5 +37,5 @@ local colorscheme = "catppuccin"
|
|||
|
||||
local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
|
||||
if not status_ok then
|
||||
return
|
||||
return
|
||||
end
|
||||
|
|
|
@ -135,7 +135,6 @@ cmp.setup {
|
|||
local col = context.cursor.col
|
||||
local char_before_cursor = string.sub(line, col - 1, col - 1)
|
||||
|
||||
|
||||
if char_before_cursor == "." then
|
||||
if kind == 2 or kind == 5 then
|
||||
return true
|
||||
|
@ -159,6 +158,9 @@ cmp.setup {
|
|||
{
|
||||
--This sources will only show up if there aren't any sources from the other list
|
||||
{ name = "buffer", keyword_length = 5 },
|
||||
},
|
||||
{
|
||||
{ name = "orgmode" }
|
||||
}
|
||||
),
|
||||
confirm_opts = {
|
||||
|
|
|
@ -9,7 +9,7 @@ lazy.setup({
|
|||
{ 'catppuccin/nvim',
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
config = function ()
|
||||
config = function()
|
||||
require('plugins.catppuccin')
|
||||
end
|
||||
},
|
||||
|
@ -21,6 +21,14 @@ lazy.setup({
|
|||
end
|
||||
},
|
||||
|
||||
{ 'folke/zen-mode.nvim',
|
||||
config = function()
|
||||
require("zen-mode").setup {
|
||||
vim.keymap.set('n', '<leader>z', '<Cmd> ZenMode <CR>',{noremap=true,silent=true})
|
||||
}
|
||||
end
|
||||
},
|
||||
|
||||
--Change add and remove surroundings from words
|
||||
'tpope/vim-surround',
|
||||
|
||||
|
@ -63,7 +71,11 @@ lazy.setup({
|
|||
--LSP Status
|
||||
{ 'j-hui/fidget.nvim',
|
||||
config = function()
|
||||
require('fidget').setup {}
|
||||
require('fidget').setup {
|
||||
window = {
|
||||
blend = 0,
|
||||
}
|
||||
}
|
||||
end
|
||||
},
|
||||
|
||||
|
@ -115,12 +127,6 @@ lazy.setup({
|
|||
require("plugins.bufferline")
|
||||
end
|
||||
},
|
||||
--{ 'romgrk/barbar.nvim',
|
||||
-- dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
-- config = function()
|
||||
-- require 'plugins.barbar'
|
||||
-- end
|
||||
--},
|
||||
|
||||
--does so much
|
||||
{
|
||||
|
@ -139,4 +145,5 @@ lazy.setup({
|
|||
end,
|
||||
},
|
||||
|
||||
|
||||
})
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require('lualine').setup {
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'auto',
|
||||
theme = 'catppuccin',
|
||||
component_separators = { left = '', right = ''},
|
||||
section_separators = { left = '', right = ''},
|
||||
disabled_filetypes = {
|
||||
|
|
|
@ -8,14 +8,13 @@ if not present then
|
|||
end
|
||||
|
||||
local options = {
|
||||
ensure_installed = { "lua", "haskell", "rust", "markdown", "markdown_inline" },
|
||||
ensure_installed = { "c", "lua", "haskell", "rust", "markdown", "markdown_inline" , "org"},
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
use_languagetree = true,
|
||||
additional_vim_regex_highlighting = { "markdown" },
|
||||
additional_vim_regex_highlighting = { "markdown" , "org"},
|
||||
},
|
||||
|
||||
indent = {
|
||||
enable = true,
|
||||
},
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
launch rofi
|
||||
|
||||
> , ("M-p", spawn "rofi -show drun")
|
||||
> , ("M-s", spawn "selected=$(ls ~/.config/rofi/scripts/|rofi -dmenu -p \"Run: \") && bash ~/.config/rofi/scripts/$selected")
|
||||
> , ("M-s", spawn "selected=$(ls ~/scripts/|rofi -dmenu -p \"Run: \") && bash ~/.config/rofi/scripts/$selected")
|
||||
|
||||
launch web browser
|
||||
|
||||
|
|
3
scripts/projects
Normal file
3
scripts/projects
Normal file
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash
|
||||
selected=$(ls ~/projects/ | rofi -dmenu -p "Open: ")
|
||||
alacritty -e fish -c "cd ~/projects/$selected && nvim . && fish"
|
Loading…
Reference in a new issue