thomasabishop/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: nvim tweaks

Browse source
This commit is contained in:
thomasabishop 2024-11-17 15:09:38 +00:00
parent 192e7d3c23
commit 04827b7e18
15 changed files with 113 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
kitty/kitty.conf
View file

@ -1,30 +1,30 @@
include ./theme.conf
#font_family PragmataPro Mono Liga
#bold_font PragmataPro Mono Liga Bold
#italic_font PragmataPro Mono Liga Italic
#bold_italic_font PragmataPro Mono Liga Bold Italic
font_family PragmataPro Mono Liga
bold_font PragmataPro Mono Liga Bold
italic_font PragmataPro Mono Liga Italic
bold_italic_font PragmataPro Mono Liga Bold Italic
# font_family Liberation Mono
# bold_font Liberation Mono Bold
# italic_font Liberation Mono Italic
# bold_italic_font Liberation Mono Bold
font_family TerminusTTF
bold_font TerminusTTF-Bold
italic_font TerminusTTF-Italic
bold_italic_font TerminusTTF-Bold-Italic
# font_family TerminusTTF
# bold_font TerminusTTF-Bold
# italic_font TerminusTTF-Italic
# bold_italic_font TerminusTTF-Bold-Italic
font_size 12
clipboard_control write-clipboard write-primary read-clipboard-ask read-primary-ask
window_padding_width 5
window_padding_width 3
remember_window_size no
copy_on_select yes
background_opacity 1
background_opacity 0.95
bell_path /home/thomas/dotfiles/gruvbox-95/sounds/st-terminal-beep.wav
# startup_session launch.conf
confirm_os_window_close 0
# hide_window_decorations no

5
kitty/launch.conf Normal file
View file

@ -0,0 +1,5 @@
new_tab Base
launch zellij attach base
# new_tab Project
# launch zellij attach project

2
nvim/init.lua
View file

@ -1,4 +1,4 @@
require("config.colourscheme")
require("config.options")
require("config.lazy")
require("config.keybindings")
require("config.lazy")

25
nvim/lazy-lock.json
View file

@ -3,42 +3,43 @@
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "278376b953bcab65e2ab9508b5575d1f9a2cbac1" },
"conform.nvim": { "branch": "master", "commit": "023f795dbcf32d4351b6a9ed2e613d471b5bb812" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"git-blame.nvim": { "branch": "master", "commit": "2883a7460f611c2705b23f12d58d398d5ce6ec00" },
"gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
"gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
"gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" },
"gv.vim": { "branch": "master", "commit": "b6bb6664e2c95aa584059f195eb3a9f3cb133994" },
"image.nvim": { "branch": "master", "commit": "88e9693e188b8464b1c426aebb4389fd9db2fcbf" },
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"image.nvim": { "branch": "master", "commit": "7f61c1940a8b072ca47a28928d2375dc1e11f464" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" },
"lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
"lspsaga.nvim": { "branch": "main", "commit": "d027f8b9c7c55e26cf4030c8657a2fc8222ed762" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "cab00668464d2914d0752b86168b4a431cc93eb2" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "28b205ebe73a18f401e040585106f9bafd8ff21f" },
"nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" },
"nvim-lspconfig": { "branch": "master", "commit": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0" },
"nvim-treesitter": { "branch": "master", "commit": "20e10ca6914f65cf1410232433fb58de70ab6b39" },
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "f22496dfdd46da4d571f5254c72eff65ff5a1c27" },
"rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
"vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
"vim-css-color": { "branch": "master", "commit": "950e80352b325ff26d3b0faf95b29e301c200f7d" },
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
"vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" },
"vim-wakatime": { "branch": "master", "commit": "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1" },
"vim-wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" },
"zk-nvim": { "branch": "main", "commit": "aa9b346f2b0ab0c822bef917ee7f607d5c99f7bc" }
}

7
nvim/lua/config/colourscheme.lua
View file

@ -1,5 +1,8 @@
vim.g.gruvbox_material_background = "medium"
vim.g.gruvbox_material_enable_bold = 1
local global = vim.g
global.gruvbox_material_background = "medium"
global.gruvbox_material_enable_bold = 0
global.gruvbox_material_enable_italic = 1
local function update_highlight_group(group, tbl)
local old_hl = vim.api.nvim_get_hl_by_name(group, true)

40
nvim/lua/config/lazy.lua
View file

@ -1,17 +1,17 @@
-- Bootstrap lazy.nvim
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
os.exit(1)
end
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
os.exit(1)
end
end
vim.opt.rtp:prepend(lazypath)
@ -21,13 +21,13 @@ vim.opt.rtp:prepend(lazypath)
-- Setup lazy.nvim
require("lazy").setup({
spec = {
-- import your plugins
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "gruvbox" } },
-- automatically check for plugin updates
checker = { enabled = true },
spec = {
-- import your plugins
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "gruvbox" } },
-- automatically check for plugin updates
checker = { enabled = false },
})

3
nvim/lua/config/options.lua
View file

@ -2,6 +2,7 @@ local global = vim.g
local opt = vim.opt
local diagnostic = vim.diagnostic
vim.api.nvim_set_hl(0, "@keyword.function.python", { italic = true })
global.mapleader = ";"
global.maplocalleader = "\\"
global.lazyvim_picker = "telescope"
@ -32,7 +33,7 @@ opt.formatoptions = "cro"
opt.backspace = "indent,eol,start"
opt.conceallevel = 0
opt.spelllang = "en_gb"
vim.opt.spell = true
vim.opt.spell = false
diagnostic.config({
virtual_text = false,

2
nvim/lua/plugins/gruvbox-material.lua
View file

@ -3,6 +3,6 @@ return {
lazy = false,
priority = 1000,
config = function()
vim.cmd([[ colorscheme gruvbox-material]])
vim.cmd.colorscheme("gruvbox-material")
end,
}

72
nvim/lua/plugins/mason.lua
View file

@ -1,39 +1,39 @@
return {
"williamboman/mason.nvim",
dependencies = {
"williamboman/mason-lspconfig.nvim",
"WhoIsSethDaniel/mason-tool-installer.nvim",
},
config = function()
require("mason").setup()
require("mason-lspconfig").setup({
automatic_installation = true,
ensure_installed = {
"ts_ls",
"bashls",
"cssls",
"eslint",
"html",
"jsonls",
"pyright",
"lua_ls",
"jsonls",
"yamlls",
"marksman"
},
})
"williamboman/mason.nvim",
dependencies = {
"williamboman/mason-lspconfig.nvim",
"WhoIsSethDaniel/mason-tool-installer.nvim",
},
config = function()
require("mason").setup()
require("mason-lspconfig").setup({
automatic_installation = true,
ensure_installed = {
"ts_ls",
"bashls",
"cssls",
"eslint",
"html",
"jsonls",
"pyright",
"lua_ls",
"jsonls",
"yamlls",
"marksman",
},
})
require("mason-tool-installer").setup({
ensure_installed = {
"prettier",
"stylua",
"isort",
"black",
"pylint",
"eslint_d",
"marksman",
"shfmt"
},
})
end,
require("mason-tool-installer").setup({
ensure_installed = {
"prettier",
"stylua",
"isort",
"black",
"pylint",
"eslint_d",
"marksman",
"shfmt",
},
})
end,
}

1
nvim/lua/plugins/treesitter.lua
View file

@ -33,6 +33,7 @@ return {
"gitignore",
"c",
"python",
"hcl",
},
incremental_selection = {
enable = true,

2
nvim/spell/en.utf-8.add Normal file
View file

@ -0,0 +1,2 @@
off
toglle

BIN
nvim/spell/en.utf-8.add.spl Normal file
View file

Binary file not shown.

8
tmux/tmux.conf
View file

@ -1,5 +1,11 @@
set -g default-terminal "screen-256color"
#set -g default-terminal "tmux-256color"
#set -g default-terminal "screen-256color"
set -g default-terminal "xterm-256color"
set -ga terminal-overrides ",*256col*:Tc"
# set-option -g default-terminal screen-256color
# set -g terminal-overrides ",alacritty:Tc"
set-option -g status-position top

5
zsh/thomas.zsh-theme
View file

@ -1,6 +1,9 @@
# -*- sh -*- vim:set ft=sh ai et sw=4 sts=4:
# It might be bash like, but I can't have my co-workers knowing I use zsh
PROMPT='%{$fg_bold[green]%}%n@%m %{$fg_bold[magenta]%}(%2~)$(git_prompt_info)%{$reset_color%}%(.) '
# PROMPT='%{$fg_bold[green]%}%n@%m %{$fg_bold[magenta]%}(%2~)$(git_prompt_info)%{$reset_color%}%(.) '
#PROMPT='%{$fg_bold[green]%}%n@%m %{$fg_bold[magenta]%}(%2~)$(git_prompt_info)%{$reset_color%}%(.) '
PROMPT='%{$fg_bold[green]%}%{$fg_bold[magenta]%}(%2~)$(git_prompt_info)%{$reset_color%}%(.) '
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%} "
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

6
zsh/zshrc
View file

@ -5,7 +5,7 @@ alias vim="nvim"
alias cat="bat"
alias grep="rg"
alias tw="timew"
alias z="cd /home/thomas/repos/eolas"
alias z="cd /home/thomas/repos/eolas/zk"
alias zn="/home/thomas/repos/eolas/scripts/new_zk_note.sh"
alias dot="cd /home/thomas/dotfiles"
alias ddb="aws dynamodb"
@ -43,6 +43,4 @@ export NVM_DIR="$HOME/.nvm"
export PATH="$HOME/.local/bin:$PATH"
# export OPENAI_API_KEY=${OPENAI_API_KEY}
export PATH=$PATH:/home/thomas/.spicetify
#