Skip to content

Commit

Permalink
Make nvim config play a bit better with firenvim
Browse files Browse the repository at this point in the history
  • Loading branch information
nvonbulow committed Dec 30, 2023
1 parent 0b0c8fa commit 86cc470
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
4 changes: 4 additions & 0 deletions home/dot_config/nvim/exact_lua/config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ vim.o.completeopt = 'menuone,noselect'

-- NOTE: You should make sure your terminal supports this
vim.o.termguicolors = true

-- Set the font in gvim mode
vim.o.guifont = 'SpaceMono Nerd Font:h14'

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ return {
{
'akinsho/bufferline.nvim',
event = 'VeryLazy',
cond = not vim.g.started_by_firenvim,
keys = {
{ '<leader>bp', '<cmd>BufferLineTogglePin<cr>', desc = 'Toggle pin' },
{ '<leader>bP', '<Cmd>BufferLineGroupClose ungrouped<CR>', desc = 'Delete non-pinned buffers' },
Expand Down
2 changes: 2 additions & 0 deletions home/dot_config/nvim/exact_lua/config/plugins/noice.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ return {
{
'folke/noice.nvim',
event = 'VeryLazy',
-- This plugin doesn't seem to play well with firenvim
cond = not vim.g.started_by_firenvim,
opts = {
lsp = {
override = {
Expand Down
30 changes: 17 additions & 13 deletions home/dot_config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
local wezterm = require("wezterm")

local config = {}
local function get_config()
local config = {}
if wezterm.config_builder then
config = wezterm.config_builder()
end
-- font settings
config.font = wezterm.font("SpaceMono Nerd Font")
config.font_size = 13.5
-- disable ligatures ->
config.harfbuzz_features = { "calt=0", "clig=0", "liga=0" }

if wezterm.config_builder then
config = wezterm.config_builder()
end
config.term = "wezterm"

-- font settings
config.font = wezterm.font("SpaceMono Nerd Font")
config.font_size = 14.0
-- disable ligatures ->
config.harfbuzz_features = { "calt=0", "clig=0", "liga=0" }
-- set theme
config.color_scheme = "Catppuccin Mocha"

config.term = "wezterm"
config.hide_tab_bar_if_only_one_tab = true

-- set theme
config.color_scheme = "Catppuccin Mocha"
return config
end

return config
return get_config()

0 comments on commit 86cc470

Please sign in to comment.