diff --git a/dot_config/lvim/config.lua b/dot_config/lvim/config.lua index f0b8669..fca1f69 100644 --- a/dot_config/lvim/config.lua +++ b/dot_config/lvim/config.lua @@ -6,6 +6,7 @@ vim.opt.pumheight = 20 vim.opt.clipboard = "" vim.opt.cmdheight = 1 vim.opt.lazyredraw = true +vim.opt.showtabline = 0 vim.opt.completeopt = [[menuone,noinsert,noselect]] lvim.log.level = "warn" @@ -37,8 +38,6 @@ lvim.keys.normal_mode[""] = "j" lvim.keys.normal_mode[""] = "k" lvim.keys.normal_mode[""] = "l" lvim.keys.normal_mode[""] = "h" -lvim.keys.normal_mode[""] = ":BufferLineCycleNext" -lvim.keys.normal_mode[""] = ":BufferLineCyclePrev" -- telescope local buffer_mappings = { @@ -66,6 +65,7 @@ lvim.keys.normal_mode["ra"] = ":lua require('user.haskell').run_haskell( lvim.builtin.which_key.mappings["s"] = nil lvim.builtin.which_key.mappings["f"] = { name = "Find", + b = { "Telescope buffers", "Open Buffers" }, f = { "Telescope find_files", "Find File" }, h = { "Telescope help_tags", "Find Help" }, H = { "Telescope highlights", "Find Highlights" }, @@ -200,6 +200,7 @@ lvim.builtin.project.active = true lvim.builtin.alpha.active = true lvim.builtin.alpha.mode = "dashboard" lvim.builtin.notify.active = false +lvim.builtin.bufferline.active = false lvim.builtin.breadcrumbs.active = false lvim.builtin.terminal.active = false lvim.builtin.indentlines.active = false @@ -209,60 +210,60 @@ lvim.builtin.treesitter.highlight.enable = true lvim.builtin.nvimtree.setup.view.side = "left" lvim.builtin.nvimtree.setup.renderer.icons.show.git = true -lvim.builtin.bufferline.highlights = { - background = { - italic = false, - }, - buffer_selected = { - italic = false, - bold = true, - }, - diagnostic_selected = { - italic = false - }, - hint_selected = { - italic = false - }, - hint_diagnostic_selected = { - italic = false - }, - info_selected = { - italic = false - }, - info_diagnostic_selected = { - italic = false - }, - warning_selected = { - italic = false - }, - warning_diagnostic_selected = { - italic = false - }, - error_selected = { - italic = false - }, - error_diagnostic_selected = { - italic = false - }, - duplicate_selected = { - italic = false - }, - duplicate_visible = { - italic = false - }, - duplicate = { - italic = false - }, - pick_selected = { - italic = false - }, - pick_visible = { - italic = false - }, - pick = { - italic = false - }, -} +-- lvim.builtin.bufferline.highlights = { +-- background = { +-- italic = false, +-- }, +-- buffer_selected = { +-- italic = false, +-- bold = true, +-- }, +-- diagnostic_selected = { +-- italic = false +-- }, +-- hint_selected = { +-- italic = false +-- }, +-- hint_diagnostic_selected = { +-- italic = false +-- }, +-- info_selected = { +-- italic = false +-- }, +-- info_diagnostic_selected = { +-- italic = false +-- }, +-- warning_selected = { +-- italic = false +-- }, +-- warning_diagnostic_selected = { +-- italic = false +-- }, +-- error_selected = { +-- italic = false +-- }, +-- error_diagnostic_selected = { +-- italic = false +-- }, +-- duplicate_selected = { +-- italic = false +-- }, +-- duplicate_visible = { +-- italic = false +-- }, +-- duplicate = { +-- italic = false +-- }, +-- pick_selected = { +-- italic = false +-- }, +-- pick_visible = { +-- italic = false +-- }, +-- pick = { +-- italic = false +-- }, +-- } -- if you don't want all the parsers change this to a table of the ones you want lvim.builtin.treesitter.ensure_installed = { @@ -403,6 +404,7 @@ lvim.plugins = { }, integrations = { ts_rainbow = true, + bufferline = true, native_lsp = { virtual_text = { errors = {}, @@ -446,6 +448,8 @@ lvim.plugins = { TSStringEscape = { style = {} }, ["@namespace"] = { style = {} }, ["@parameter"] = { style = {} }, + ["@text.uri"] = { style = {} }, + ["@text.literal"] = { style = {} }, FloatBorder = { fg = "#cdd6f4", bg = "#181825" } }, diff --git a/dot_zshrc b/dot_zshrc index 81ff6f3..e4ce1f0 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -72,10 +72,7 @@ alias l='ls -CF' alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' -eval "$(oh-my-posh --init --shell zsh --config ~/.config/M365Princess.omp.json)" - . "$HOME/.cargo/env" -. "$HOME/.config/wezterm/wezterm.sh" export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm @@ -86,9 +83,8 @@ if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$PATH" fi -eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - export PATH="$PATH:$HOME/.local/bin" +export PATH="$PATH:$HOME/.local/share/scripts" export PATH="$PATH:/usr/bin/go/bin" export PATH="$PATH:/usr/local/go/bin" export M2_HOME="$HOME/.local/bin/apache-maven-3.8.6/bin" @@ -99,7 +95,14 @@ export EDITOR="lvim" [ -f "/home/sgoudham/.ghcup/env" ] && source "/home/sgoudham/.ghcup/env" # ghcup-env +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" + eval "$(zoxide init zsh)" +eval "$(oh-my-posh --init --shell zsh --config ~/.config/M365Princess.omp.json)" + #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! export SDKMAN_DIR="$HOME/.sdkman" [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" + +. "$HOME/.config/wezterm/wezterm.sh" +