@@ -70,6 +70,9 @@ vim.opt.listchars = { tab = '| ', trail = '·', nbsp = '␣' }
7070-- Preview substitutions live, as you type!
7171vim .opt .inccommand = ' split'
7272
73+ -- Disable wrap
74+ vim .opt .wrap = false
75+
7376-- Show which line your cursor is on
7477vim .opt .cursorline = true
7578
@@ -80,13 +83,14 @@ vim.opt.scrolloff = 10
8083vim .opt .conceallevel = 2
8184
8285-- Set TAB details -> to 2 spaces
83- -- NOTE: differnt types of code have tab spacing set in
86+ -- NOTE: different types of code have tab spacing set in
8487-- the language syntax file. If it's standard I won't get up
8588-- in arms about it...
86- -- vim.opt.tabstop = 2
87- -- vim.opt.shiftwidth = 2
88- -- vim.opt.expandtab = true
89- -- vim.bo.softtabstop = 2
89+ -- or will I?
90+ vim .opt .tabstop = 2
91+ vim .opt .shiftwidth = 2
92+ vim .opt .expandtab = true
93+ vim .bo .softtabstop = 2
9094
9195-- [[ Basic Keymaps ]]
9296-- See `:help vim.keymap.set()`
@@ -253,7 +257,7 @@ require('lazy').setup({
253257 { ' nvim-telescope/telescope-ui-select.nvim' },
254258
255259 -- Useful for getting pretty icons, but requires a Nerd Font.
256- { ' nvim-tree/nvim-web-devicons' , enabled = vim .g .have_nerd_font },
260+ -- { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
257261 },
258262 config = function ()
259263 -- Telescope is a fuzzy finder that comes with a lot of different things that
@@ -335,7 +339,6 @@ require('lazy').setup({
335339 end , { desc = ' [S]earch [N]eovim files' })
336340 end ,
337341 },
338-
339342 { -- LSP Configuration & Plugins
340343 ' neovim/nvim-lspconfig' ,
341344 dependencies = {
@@ -465,7 +468,7 @@ require('lazy').setup({
465468
466469 -- See full Code Diagnostic Text
467470 -- Useful for if they float off screen
468- vim .keymap .set (' n' , ' <leader>dd ' , ' <cmd>lua vim.diagnostic.open_float() <CR>' , { desc = ' Focuses Code Diagnostics' })
471+ vim .keymap .set (' n' , ' <leader>gh ' , ' <cmd>lua vim.diagnostic.open_float() <CR>' , { desc = ' Focuses Code Diagnostics' })
469472
470473 -- LSP servers and clients are able to communicate to each other what features they support.
471474 -- By default, Neovim doesn't support everything that is in the LSP specification.
@@ -555,46 +558,6 @@ require('lazy').setup({
555558 end ,
556559 },
557560
558- { -- Autoformat
559- ' stevearc/conform.nvim' ,
560- event = { ' BufWritePre' },
561- cmd = { ' ConformInfo' },
562- keys = {
563- {
564- ' <leader>f' ,
565- function ()
566- require (' conform' ).format { async = true , lsp_fallback = true }
567- end ,
568- mode = ' ' ,
569- desc = ' [F]ormat buffer' ,
570- },
571- },
572- opts = {
573- notify_on_error = false ,
574- format_on_save = function (bufnr )
575- -- Disable "format_on_save lsp_fallback" for languages that don't
576- -- have a well standardized coding style. You can add additional
577- -- languages here or re-enable it for the disabled ones.
578- local disable_filetypes = { c = true , cpp = true }
579- return {
580- timeout_ms = 500 ,
581- lsp_fallback = not disable_filetypes [vim .bo [bufnr ].filetype ],
582- }
583- end ,
584- stop_after_first = true ,
585- formatters_by_ft = {
586- lua = { ' stylua' },
587- -- Conform can also run multiple formatters sequentially
588- -- python = { "isort", "black" },
589- --
590- -- You can use a sub-list to tell conform to run *until* a formatter
591- -- is found.
592- javascript = { ' prettierd' },
593- typescript = { ' prettierd' },
594- },
595- },
596- },
597-
598561 { -- Autocompletion
599562 ' hrsh7th/nvim-cmp' ,
600563 event = ' InsertEnter' ,
@@ -710,6 +673,7 @@ require('lazy').setup({
710673 }
711674 end ,
712675 },
676+ -- DAP = debug adapter protocol
713677 -- { --nvim-dap--
714678 -- 'mfussenegger/nvim-dap',
715679 -- config = function()
@@ -943,26 +907,6 @@ require('lazy').setup({
943907 -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
944908 end ,
945909 },
946- {
947- ' nvim-tree/nvim-tree.lua' ,
948- config = function ()
949- require (' nvim-tree' ).setup {
950- sort = {
951- sorter = ' case_sensitive' ,
952- },
953- view = {
954- width = 30 ,
955- },
956- renderer = {
957- group_empty = true ,
958- },
959- filters = {
960- dotfiles = true ,
961- },
962- }
963- vim .keymap .set (' n' , ' <leader>0' , ' :NvimTreeToggle<CR>' , { silent = true })
964- end ,
965- },
966910 {
967911 ' tiagovla/scope.nvim' ,
968912 },
@@ -993,7 +937,17 @@ require('lazy').setup({
993937 }
994938 end ,
995939
996- vim .keymap .set (' n' , ' <space>fb' , ' <cmd>Telescope file_browser<CR>' , { noremap = true }),
940+ -- Telescope keymaps
941+ vim .keymap .set (' n' , ' <space>ob' , ' <cmd>Telescope file_browser<CR>' ,
942+ {
943+ desc = " [O]pen File [B]rowser" ,
944+ noremap = true
945+ }),
946+ vim .keymap .set (' n' , ' <space>ol' , ' <cmd>Telescope file_browser path=%:p:h<CR>' ,
947+ {
948+ desc = " [O]pen [L]ocal File Browser" ,
949+ noremap = true
950+ }),
997951 },
998952 -- PLUGIN: auto-close
999953 -- Handles auto closing brackets when the opening one is typed
@@ -1007,35 +961,6 @@ require('lazy').setup({
1007961 }
1008962 end ,
1009963 },
1010- -- PLUGIN: obsidian
1011- {
1012- ' epwalsh/obsidian.nvim' ,
1013- version = ' *' ,
1014- lazy = true ,
1015- ft = ' markdown' ,
1016- -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
1017- -- event = {
1018- -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
1019- -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md"
1020- -- -- refer to `:h file-pattern` for more examples
1021- -- "BufReadPre path/to/my-vault/*.md",
1022- -- "BufNewFile path/to/my-vault/*.md",
1023- -- },
1024- dependencies = {
1025- -- Required.
1026- ' nvim-lua/plenary.nvim' ,
1027-
1028- -- see below for full list of optional dependencies 👇
1029- },
1030- opts = {
1031- workspaces = {
1032- {
1033- name = ' personal' ,
1034- path = ' ~/Documents/alecaerdron' ,
1035- },
1036- },
1037- },
1038- },
1039964 {
1040965 ' rmagatti/auto-session' ,
1041966 lazy = false ,
@@ -1055,12 +980,7 @@ require('lazy').setup({
1055980 -- Here are some example plugins that I've included in the Kickstart repository.
1056981 -- Uncomment any of the lines below to enable them (you will need to restart nvim).
1057982 --
1058- -- require 'kickstart.plugins.debug',
1059- -- require 'kickstart.plugins.indent_line',
1060- -- require 'kickstart.plugins.lint',
1061- -- require 'kickstart.plugins.autopairs',
1062- -- require 'kickstart.plugins.neo-tree',
1063- require ' kickstart.plugins.gitsigns' , -- adds gitsigns recommend keymaps
983+ require ' plugins.gitsigns' , -- adds gitsigns recommend keymaps
1064984 --
1065985 -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
1066986 -- This is the easiest way to modularize your config.
0 commit comments