From 2d07e77c777502b552baf3658f0c1f75f5a842a5 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Fri, 2 Aug 2024 22:39:35 -0700 Subject: [PATCH 01/10] Added bindings for search history --- config/plugins/telescope.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix index 1a0bca0..e30823d 100644 --- a/config/plugins/telescope.nix +++ b/config/plugins/telescope.nix @@ -9,6 +9,12 @@ }; }; }; + settings.defaults.mappings = { + "i" = { + "" = {__raw = "require('telescope.actions').cycle_history_next";}; + "" = {__raw = "require('telescope.actions').cycle_history_prev";}; + }; + }; }; keymaps = [ From 662e20f79722a33aafeaf8dbc3bcf609cb5f2e3f Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sat, 3 Aug 2024 13:57:30 -0700 Subject: [PATCH 02/10] Added lazygit integration --- config/default.nix | 1 + config/plugins/lazygit.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 config/plugins/lazygit.nix diff --git a/config/default.nix b/config/default.nix index 73d72d3..19dbfc4 100644 --- a/config/default.nix +++ b/config/default.nix @@ -4,6 +4,7 @@ imports = [ ./plugins/cmp.nix ./plugins/gitsigns.nix + ./plugins/lazygit.nix ./plugins/lsp.nix ./plugins/lualine.nix ./plugins/rhubarb.nix diff --git a/config/plugins/lazygit.nix b/config/plugins/lazygit.nix new file mode 100644 index 0000000..fd21df7 --- /dev/null +++ b/config/plugins/lazygit.nix @@ -0,0 +1,16 @@ +{ + plugins.lazygit = { + enable = true; + }; + + keymaps = [ + { + action = ":LazyGit"; + key = "lg"; + } + { + action = ":LazyGitFilter"; + key = "lc"; + } + ]; +} From 2c48963179d3406fabc99d6df0e63fdc8a1b7d36 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Tue, 6 Aug 2024 09:41:41 -0700 Subject: [PATCH 03/10] Added shortcut for listing buffers --- config/plugins/telescope.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix index e30823d..e5058cb 100644 --- a/config/plugins/telescope.nix +++ b/config/plugins/telescope.nix @@ -26,6 +26,10 @@ action = "Telescope live_grep"; key = "g"; } + { + action = "Telescope buffers"; + key = "u"; + } { action = "Telescope file_browser path=%:p:h select_buffer=true"; key = "b"; From 5b0724b2f9ac3ad19cdb7b0a40ffc80f5449094b Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Tue, 6 Aug 2024 09:47:25 -0700 Subject: [PATCH 04/10] Updated lockfile --- flake.lock | 98 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 6937d74..a6ff34d 100644 --- a/flake.lock +++ b/flake.lock @@ -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": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "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": 1722857853, + "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", "type": "github" }, "original": { @@ -153,11 +152,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { @@ -174,11 +173,11 @@ ] }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -189,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "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": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "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": 1722925425, + "narHash": "sha256-BXUYNBaG5KF+h8aU7p/4HUxGK1G42Ji/GK+KkC3bntU=", "owner": "nix-community", "repo": "nixvim", - "rev": "06a44e9e8814ab13ea013e222637a497a50e96e4", + "rev": "e48ce785d9e72c0106319d93e23c5579336ffe33", "type": "github" }, "original": { @@ -256,6 +256,28 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722772237, + "narHash": "sha256-3eCYmzeLngX8eutIsTZAG8DIvT/0DWQQxiszTQz8n0s=", + "owner": "NuschtOS", + "repo": "search", + "rev": "aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6", + "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": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { From c2019dad461435c6e4f3c518355d9bf244f45ab2 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sun, 11 Aug 2024 15:57:07 -0700 Subject: [PATCH 05/10] Switched to catppuccin theme --- config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default.nix b/config/default.nix index 19dbfc4..194c83b 100644 --- a/config/default.nix +++ b/config/default.nix @@ -12,9 +12,9 @@ ./plugins/vim-obsession.nix ]; - colorschemes.base16 = { + colorschemes.catppuccin = { enable = true; - colorscheme = "darktooth"; + settings.flavour = "mocha"; }; opts = { From 4ae16d3294e92c376df9cd1763e57de052a1896b Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sat, 17 Aug 2024 22:36:13 -0700 Subject: [PATCH 06/10] Increased completion keyword length Also made lsp the first item in sources. --- config/plugins/cmp.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/plugins/cmp.nix b/config/plugins/cmp.nix index 4e1ec14..6073086 100644 --- a/config/plugins/cmp.nix +++ b/config/plugins/cmp.nix @@ -2,6 +2,8 @@ plugins.cmp = { enable = true; settings = { + completion = {keyword_length = 2;}; + mapping = { "" = "cmp.mapping.select_next_item()"; "" = "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";} ]; }; From 4e0c1b07241e6d427b84b24e698eafbcec709601 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Fri, 30 Aug 2024 23:07:37 -0700 Subject: [PATCH 07/10] fix: unreadable TODO comments Moved away from the transparency plugin and instead used the colorscheme's `transparent_background` option. --- config/default.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/config/default.nix b/config/default.nix index 194c83b..5905320 100644 --- a/config/default.nix +++ b/config/default.nix @@ -15,6 +15,7 @@ colorschemes.catppuccin = { enable = true; settings.flavour = "mocha"; + settings.transparent_background = true; }; opts = { @@ -39,10 +40,6 @@ action = ":set rnu!"; key = "num"; } - { - action = ":TransparentToggle"; - key = "t"; - } ]; autoCmd = [ @@ -64,18 +61,5 @@ fugitive.enable = true; comment.enable = true; rustaceanvim.enable = true; - - /* - :TransparentEnable - :TransparentDisable - :TransparentToggle - */ - transparent = { - enable = true; - settings.exclude_groups = [ - "CursorLine" - "CursorLineNr" - ]; - }; }; } From 26baabd822fb0d6bcaf33b27b86973c8a9e68a71 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Fri, 30 Aug 2024 23:10:15 -0700 Subject: [PATCH 08/10] chore: updated lockfile --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index a6ff34d..f16ef05 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725024810, + "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1722857853, - "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722925425, - "narHash": "sha256-BXUYNBaG5KF+h8aU7p/4HUxGK1G42Ji/GK+KkC3bntU=", + "lastModified": 1725048799, + "narHash": "sha256-NaCb/odkjPjILD1XqXsr1Q7d0iIgf87m8ixGrowfC2A=", "owner": "nix-community", "repo": "nixvim", - "rev": "e48ce785d9e72c0106319d93e23c5579336ffe33", + "rev": "56208f9e3f46f034353636fa651df8663ec57fa3", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1722772237, - "narHash": "sha256-3eCYmzeLngX8eutIsTZAG8DIvT/0DWQQxiszTQz8n0s=", + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "owner": "NuschtOS", "repo": "search", - "rev": "aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "type": "github" }, "original": { From 89328000a329750ec72e2aea7c707856a8dea1bd Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sun, 1 Sep 2024 22:47:23 -0700 Subject: [PATCH 09/10] feat: configured elixir lsp --- config/plugins/lsp.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index d17d732..14cb91f 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -62,6 +62,9 @@ # c++ clangd.enable = true; + # elixir + elixirls.enable = true; + # nix nixd = { enable = true; From 68028745ba11a4ebef715c7bdbe246f72091cbee Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Sun, 1 Sep 2024 22:47:54 -0700 Subject: [PATCH 10/10] feat: enable additional treesitter plugins --- config/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/default.nix b/config/default.nix index 5905320..8c792a6 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}: { # Import all your configuration modules here # imports = [./bufferline.nix]; imports = [ @@ -56,7 +56,11 @@ ]; 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;