Skip to content

Commit

Permalink
Merge pull request #57 from redyf/dev
Browse files Browse the repository at this point in the history
Cleaning config a little bit
  • Loading branch information
redyf authored Feb 10, 2024
2 parents dbd571e + 5a1fcef commit 2f310d5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 23 deletions.
25 changes: 10 additions & 15 deletions config/default.nix
Original file line number Diff line number Diff line change
@@ -1,37 +1,32 @@
{ inputs
, self
, pkgs
, ...
}: {
{
# Import all your configuration modules here
imports = [
./sets.nix
./keymaps.nix

./bufferlines/bufferline.nix

./colorschemes/base16.nix
# ./colorschemes/base16.nix
./colorschemes/catppuccin.nix
./colorschemes/rose-pine.nix
# ./colorschemes/rose-pine.nix

./completion/cmp.nix
./completion/copilot.nix
./completion/lspkind.nix

./dap/dap.nix

./filetrees/neo-tree.nix

# ./filetrees/neo-tree.nix
./git/gitsigns.nix
./git/lazygit.nix
./git/neogit.nix
# ./git/neogit.nix

./languages/nvim-jdtls.nix
./languages/nvim-lint.nix
./languages/typescript-tools-nvim.nix
./languages/treesitter/treesitter.nix
./languages/treesitter/treesitter-context.nix
./languages/treesitter/treesitter-textobjects.nix
# ./languages/treesitter/treesitter-textobjects.nix
./languages/treesitter/ts-autotag.nix
./languages/treesitter/ts-context-commentstring.nix

Expand All @@ -41,7 +36,7 @@
./lsp/lspsaga.nix
./lsp/trouble.nix

./none-ls/none-ls.nix
# ./none-ls/none-ls.nix

./snippets/luasnip.nix

Expand All @@ -58,15 +53,15 @@

./utils/better-escape.nix
./utils/discordrpc.nix
./utils/flash.nix
# ./utils/flash.nix
./utils/hardtime.nix
./utils/harpoon.nix
./utils/illuminate.nix
# ./utils/illuminate.nix
./utils/markdown-preview.nix
./utils/mini.nix
./utils/neodev.nix
./utils/neotest.nix
./utils/nvim-autopairs.nix
# ./utils/nvim-autopairs.nix
./utils/nvim-colorizer.nix
./utils/nvim-surround.nix
./utils/oil.nix
Expand Down
5 changes: 0 additions & 5 deletions config/lsp/conform.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{
plugins.conform-nvim = {
enable = true;
# As a shortcut, conform will optionally set up this format-on-save autocmd for you
# formatOnSave = {
# lspFallback = true;
# timeoutMs = 500;
# };
notifyOnError = true;
formattersByFt = {
html = [ [ "prettierd" "prettier" ] ];
Expand Down
1 change: 1 addition & 0 deletions config/lsp/lsp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
};
lsp = {
enable = true;
capabilities = "offsetEncoding = 'utf-16'";
servers = {
clangd = { enable = true; };
lua-ls = {
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2f310d5

Please sign in to comment.