Compare commits

..

10 commits

Author SHA1 Message Date
alejandro-angulo 68028745ba
feat: enable additional treesitter plugins 2024-09-01 22:53:16 -07:00
alejandro-angulo 89328000a3
feat: configured elixir lsp 2024-09-01 22:47:23 -07:00
alejandro-angulo 26baabd822
chore: updated lockfile 2024-08-30 23:10:15 -07:00
alejandro-angulo 4e0c1b0724
fix: unreadable TODO comments
Moved away from the transparency plugin and instead used the
colorscheme's `transparent_background` option.
2024-08-30 23:07:37 -07:00
alejandro-angulo 4ae16d3294
Increased completion keyword length
Also made lsp the first item in sources.
2024-08-17 22:36:13 -07:00
alejandro-angulo c2019dad46
Switched to catppuccin theme 2024-08-11 15:57:07 -07:00
alejandro-angulo 5b0724b2f9
Updated lockfile 2024-08-06 09:47:25 -07:00
alejandro-angulo 2c48963179
Added shortcut for listing buffers 2024-08-06 09:41:41 -07:00
alejandro-angulo 662e20f797
Added lazygit integration 2024-08-03 13:57:30 -07:00
alejandro-angulo 2d07e77c77
Added bindings for search history 2024-08-02 22:39:35 -07:00
6 changed files with 102 additions and 60 deletions

View file

@ -1,9 +1,10 @@
{
{pkgs, ...}: {
# Import all your configuration modules here
# imports = [./bufferline.nix];
imports = [
./plugins/cmp.nix
./plugins/gitsigns.nix
./plugins/lazygit.nix
./plugins/lsp.nix
./plugins/lualine.nix
./plugins/rhubarb.nix
@ -11,9 +12,10 @@
./plugins/vim-obsession.nix
];
colorschemes.base16 = {
colorschemes.catppuccin = {
enable = true;
colorscheme = "darktooth";
settings.flavour = "mocha";
settings.transparent_background = true;
};
opts = {
@ -38,10 +40,6 @@
action = "<cmd>:set rnu!<CR>";
key = "<leader>num";
}
{
action = "<cmd>:TransparentToggle<CR>";
key = "<leader>t";
}
];
autoCmd = [
@ -58,23 +56,14 @@
];
plugins = {
treesitter.enable = true;
treesitter = {
enable = true;
settings.highlight.enable = true;
};
treesitter-context.enable = true;
tmux-navigator.enable = true;
fugitive.enable = true;
comment.enable = true;
rustaceanvim.enable = true;
/*
:TransparentEnable
:TransparentDisable
:TransparentToggle
*/
transparent = {
enable = true;
settings.exclude_groups = [
"CursorLine"
"CursorLineNr"
];
};
};
}

View file

@ -2,6 +2,8 @@
plugins.cmp = {
enable = true;
settings = {
completion = {keyword_length = 2;};
mapping = {
"<C-n>" = "cmp.mapping.select_next_item()";
"<C-p>" = "cmp.mapping.select_prev_item()";
@ -20,11 +22,11 @@
'';
sources = [
{name = "nvim_lsp";}
{name = "buffer";}
{name = "cmdline";}
{name = "cmp-clippy";}
{name = "luasnip";}
{name = "nvim_lsp";}
{name = "path";}
];
};

View file

@ -0,0 +1,16 @@
{
plugins.lazygit = {
enable = true;
};
keymaps = [
{
action = "<cmd>:LazyGit<CR>";
key = "<leader>lg";
}
{
action = "<cmd>:LazyGitFilter<CR>";
key = "<leader>lc";
}
];
}

View file

@ -62,6 +62,9 @@
# c++
clangd.enable = true;
# elixir
elixirls.enable = true;
# nix
nixd = {
enable = true;

View file

@ -9,6 +9,12 @@
};
};
};
settings.defaults.mappings = {
"i" = {
"<C-n>" = {__raw = "require('telescope.actions').cycle_history_next";};
"<C-p>" = {__raw = "require('telescope.actions').cycle_history_prev";};
};
};
};
keymaps = [
@ -20,6 +26,10 @@
action = "<cmd>Telescope live_grep<CR>";
key = "<leader>g";
}
{
action = "<cmd>Telescope buffers<CR>";
key = "<leader>u";
}
{
action = "<cmd>Telescope file_browser path=%:p:h select_buffer=true<CR>";
key = "<leader>b";

View file

@ -2,18 +2,17 @@
"nodes": {
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
@ -41,11 +40,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"lastModified": 1725024810,
"narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"rev": "af510d4a62d071ea13925ce41c95e3dec816c01d",
"type": "github"
},
"original": {
@ -62,11 +61,11 @@
]
},
"locked": {
"lastModified": 1719877454,
"narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
@ -80,11 +79,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -110,11 +109,11 @@
]
},
"locked": {
"lastModified": 1719259945,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"lastModified": 1724857454,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"type": "github"
},
"original": {
@ -153,11 +152,11 @@
]
},
"locked": {
"lastModified": 1719827439,
"narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
@ -174,11 +173,11 @@
]
},
"locked": {
"lastModified": 1719845423,
"narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=",
"lastModified": 1724561770,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ec12b88104d6c117871fad55e931addac4626756",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
"type": "github"
},
"original": {
@ -189,11 +188,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1720768451,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
@ -205,23 +204,23 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1719876945,
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
"lastModified": 1722555339,
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1719848872,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
@ -240,14 +239,15 @@
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1720898451,
"narHash": "sha256-T7JAUYx7WZrEEItqRb9Bh6rj0Njffir4XHJUNwhQMiY=",
"lastModified": 1725048799,
"narHash": "sha256-NaCb/odkjPjILD1XqXsr1Q7d0iIgf87m8ixGrowfC2A=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "06a44e9e8814ab13ea013e222637a497a50e96e4",
"rev": "56208f9e3f46f034353636fa651df8663ec57fa3",
"type": "github"
},
"original": {
@ -256,6 +256,28 @@
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724584782,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
"owner": "NuschtOS",
"repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
@ -286,11 +308,11 @@
]
},
"locked": {
"lastModified": 1719887753,
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"lastModified": 1724833132,
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
"type": "github"
},
"original": {