diff --git a/config/default.nix b/config/default.nix index 8c792a6..73d72d3 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,10 +1,9 @@ -{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 @@ -12,10 +11,9 @@ ./plugins/vim-obsession.nix ]; - colorschemes.catppuccin = { + colorschemes.base16 = { enable = true; - settings.flavour = "mocha"; - settings.transparent_background = true; + colorscheme = "darktooth"; }; opts = { @@ -40,6 +38,10 @@ action = ":set rnu!"; key = "num"; } + { + action = ":TransparentToggle"; + key = "t"; + } ]; autoCmd = [ @@ -56,14 +58,23 @@ ]; plugins = { - treesitter = { - enable = true; - settings.highlight.enable = true; - }; - treesitter-context.enable = true; + treesitter.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" + ]; + }; }; } diff --git a/config/plugins/cmp.nix b/config/plugins/cmp.nix index 6073086..4e1ec14 100644 --- a/config/plugins/cmp.nix +++ b/config/plugins/cmp.nix @@ -2,8 +2,6 @@ plugins.cmp = { enable = true; settings = { - completion = {keyword_length = 2;}; - mapping = { "" = "cmp.mapping.select_next_item()"; "" = "cmp.mapping.select_prev_item()"; @@ -22,11 +20,11 @@ ''; sources = [ - {name = "nvim_lsp";} {name = "buffer";} {name = "cmdline";} {name = "cmp-clippy";} {name = "luasnip";} + {name = "nvim_lsp";} {name = "path";} ]; }; diff --git a/config/plugins/lazygit.nix b/config/plugins/lazygit.nix deleted file mode 100644 index fd21df7..0000000 --- a/config/plugins/lazygit.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - plugins.lazygit = { - enable = true; - }; - - keymaps = [ - { - action = ":LazyGit"; - key = "lg"; - } - { - action = ":LazyGitFilter"; - key = "lc"; - } - ]; -} diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index 14cb91f..d17d732 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -62,9 +62,6 @@ # c++ clangd.enable = true; - # elixir - elixirls.enable = true; - # nix nixd = { enable = true; diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix index e5058cb..1a0bca0 100644 --- a/config/plugins/telescope.nix +++ b/config/plugins/telescope.nix @@ -9,12 +9,6 @@ }; }; }; - settings.defaults.mappings = { - "i" = { - "" = {__raw = "require('telescope.actions').cycle_history_next";}; - "" = {__raw = "require('telescope.actions').cycle_history_prev";}; - }; - }; }; keymaps = [ @@ -26,10 +20,6 @@ action = "Telescope live_grep"; key = "g"; } - { - action = "Telescope buffers"; - key = "u"; - } { action = "Telescope file_browser path=%:p:h select_buffer=true"; key = "b"; diff --git a/flake.lock b/flake.lock index f16ef05..6937d74 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,18 @@ "nodes": { "devshell": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -40,11 +41,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1725024810, - "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -61,11 +62,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -79,11 +80,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -109,11 +110,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -152,11 +153,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -173,11 +174,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1719845423, + "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "ec12b88104d6c117871fad55e931addac4626756", "type": "github" }, "original": { @@ -188,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -204,23 +205,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -239,15 +240,14 @@ "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725048799, - "narHash": "sha256-NaCb/odkjPjILD1XqXsr1Q7d0iIgf87m8ixGrowfC2A=", + "lastModified": 1720898451, + "narHash": "sha256-T7JAUYx7WZrEEItqRb9Bh6rj0Njffir4XHJUNwhQMiY=", "owner": "nix-community", "repo": "nixvim", - "rev": "56208f9e3f46f034353636fa651df8663ec57fa3", + "rev": "06a44e9e8814ab13ea013e222637a497a50e96e4", "type": "github" }, "original": { @@ -256,28 +256,6 @@ "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", @@ -308,11 +286,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", "type": "github" }, "original": {