diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index c21d557..be146a2 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -10,7 +10,7 @@ dynamic_padding = true decorations = "Buttonless" [font] -normal.family = "GoMono Nerd Font Mono" +normal.family = "Comic Code" size = 12 # Subtle positional tuning diff --git a/kanata/.config/kanata/kanata.kbd b/kanata/.config/kanata/kanata.kbd index 8d3909c..43fa024 100644 --- a/kanata/.config/kanata/kanata.kbd +++ b/kanata/.config/kanata/kanata.kbd @@ -25,7 +25,7 @@ tab q w e r t y u i o p [ ] \ XX a s d f g h j k l ; ' ret lsft z x c v b n m , . / rsft - lctl lmet \ spc @dflt rmet rctl + lctl lmet lalt spc @dflt rmet rctl ) (deflayer symbols ;;{{{1 diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 0daa7e4..5f0ba80 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -303,6 +303,7 @@ do gcc={'*.c'}, ['g++']={'*.cpp'}, cargo={'Cargo.toml'}, + zig={'*.zig'} } ---@param dir string? @@ -402,7 +403,6 @@ require'lazy'.setup{ --{{{1 ---@module 'oil' ---@type oil.SetupOpts opts = {}, - dependencies = { { 'echasnovski/mini.icons', opts = {} } }, lazy = false, config = function () require('oil').setup({ @@ -574,12 +574,13 @@ require'lazy'.setup{ --{{{1 require'mini.align'.setup() end, }, - { 'miikanissi/modus-themes.nvim', --{{{2 + { 'sainnhe/everforest', --{{{2 lazy = false, priority = 1000, config = function() vim.o.termguicolors = true - vim.cmd.colorscheme('modus_vivendi') + vim.g.everforest_enable_italic = true + vim.cmd.colorscheme('everforest') end, }, { 'folke/lazydev.nvim', --{{{2 @@ -671,6 +672,18 @@ require'lazy'.setup{ --{{{1 } } + do -- turtle config + local turtle_server = vim.fn.exepath("turtle-language-server") + local node = vim.fn.exepath("node") + if turtle_server ~= "" and node ~= "" then + vim.lsp.config['turtle-language-server'] = { + cmd={ node, turtle_server, '--stdio' }, + filetypes = { 'turtle', 'ttl' }, + } + vim.lsp.enable('turtle-language-server') + end + end + vim.lsp.enable('gdscript') vim.lsp.config('hls', { filetypes = { 'haskell', 'lhaskell', 'cabal' }, @@ -851,7 +864,6 @@ require'lazy'.setup{ --{{{1 dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope-ui-select.nvim', - 'kyazdani42/nvim-web-devicons', }, config = function() local actions = require'telescope.actions'