diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/alacritty.toml | 5 | ||||
| -rw-r--r-- | config/nvim/init.vim | 1 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 37 | ||||
| -rw-r--r-- | config/sway/bindsym-media | 2 |
4 files changed, 22 insertions, 23 deletions
diff --git a/config/alacritty.toml b/config/alacritty.toml index f46434b..340f690 100644 --- a/config/alacritty.toml +++ b/config/alacritty.toml @@ -1,3 +1,4 @@ +[general] #import = ["~/.config/alacritty/themes/themes/alabaster.toml"] [colors.bright] @@ -39,10 +40,6 @@ background = "#2e3440" dim_foreground = "#a5abb6" foreground = "#d8dee9" -#[colors.search.footer_bar] -#background = "#434c5e" -#foreground = "#d8dee9" - [colors.search.matches] background = "#88c0d0" foreground = "CellBackground" diff --git a/config/nvim/init.vim b/config/nvim/init.vim index c269b77..5305848 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -27,6 +27,7 @@ set encoding=utf-8 set backspace=indent,eol,start set completeopt=menu,menuone,preview,noselect,noinsert +" colorscheme vim colorscheme nord let g:lightline = { \ 'colorscheme': 'nord', diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index d1a4c55..8c41208 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -52,7 +52,6 @@ require("packer").startup(function(use) end, }) -- Programming ------------------------------------------------------------- - use("neovim/nvim-lspconfig") use("p00f/clangd_extensions.nvim") use({ "mfussenegger/nvim-lint", @@ -107,15 +106,16 @@ require("packer").startup(function(use) config = function() require("conform").setup({ formatters_by_ft = { - c = { "clang-format", "trim_newlines", "twim_whitespace" }, - json = { "jq", "trim_newlines", "twim_whitespace" }, - lua = { "stylua", "trim_newlines", "twim_whitespace" }, - nix = { "alejandra", "trim_newlines", "twim_whitespace" }, - python = { "ruff_fix", "ruff_format", "trim_newlines", "twim_whitespace" }, - sh = { "shfmt", "trim_newlines", "twim_whitespace" }, - typst = { "typstfmt", "trim_newlines", "twim_whitespace" }, - yaml = { "yq", "trim_newlines", "twim_whitespace" }, - xml = { "xmllint", "trim_newlines", "twim_whitespace" }, + c = { "clang-format", "trim_newlines", "trim_whitespace" }, + json = { "jq", "trim_newlines", "trim_whitespace" }, + lua = { "stylua", "trim_newlines", "trim_whitespace" }, + nix = { "alejandra", "trim_newlines", "trim_whitespace" }, + python = { "ruff_fix", "ruff_format", "trim_newlines", "trim_whitespace" }, + sh = { "shfmt", "trim_newlines", "trim_whitespace" }, + typst = { "typstyle", "trim_newlines", "trim_whitespace" }, + rst = { "docstrfmt", "trim_newlines" }, + yaml = { "yq", "trim_newlines", "trim_whitespace" }, + xml = { "xmllint", "trim_newlines", "trim_whitespace" }, }, }) end, @@ -124,6 +124,14 @@ require("packer").startup(function(use) use("honza/vim-snippets") use("craigemery/vim-autotag") use("scrooloose/nerdcommenter") + -- LSP --------------------------------------------------------------------- + use("neovim/nvim-lspconfig") + vim.lsp.enable("bashls") + vim.lsp.enable("clangd") + vim.lsp.enable("nil_ls") + vim.lsp.enable("pylsp") + vim.lsp.enable("tinymist") + vim.lsp.enable("guile_ls") -- Additional integrations ------------------------------------------------- use({ "chomosuke/typst-preview.nvim", @@ -141,12 +149,5 @@ require("packer").startup(function(use) use("LnL7/vim-nix") use("kaarmu/typst.vim") use("aliou/bats.vim") - - -- LSP --------------------------------------------------------------------- - vim.lsp.enable("bashls") - vim.lsp.enable("clangd") - vim.lsp.enable("nil_ls") - vim.lsp.enable("pylsp") - vim.lsp.enable("tinymist") - vim.lsp.enable("guile_ls") + use("HiPhish/guile.vim") end) diff --git a/config/sway/bindsym-media b/config/sway/bindsym-media index b1159ef..28c4011 100644 --- a/config/sway/bindsym-media +++ b/config/sway/bindsym-media @@ -12,7 +12,7 @@ for_window [ title="Pulsemixer" ] move position center # Screen brightness controls -bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +10% +bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set 10%+ bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 10%- # Media player controls |