From 16e0018eb05026bf7f5c2abf551502cab689a86a Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Wed, 27 Mar 2024 07:22:37 +0100 Subject: [PATCH 1/2] Change Macos config path for lazygit --- dot_config/kitty/kitty.conf.tmpl | 4 ++-- dot_zshrc.tmpl | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dot_config/kitty/kitty.conf.tmpl b/dot_config/kitty/kitty.conf.tmpl index 563778e..a22aba4 100644 --- a/dot_config/kitty/kitty.conf.tmpl +++ b/dot_config/kitty/kitty.conf.tmpl @@ -1,6 +1,6 @@ font_family BrutalistMono Nerd Font -# bold_font auto -# italic_font auto +bold_font BrutalistMono Nerd Font Bold +italic_font BrutalistMono Nerd Font Italic # bold_italic_font auto font_size {{ .fontsize }} text_composition_strategy 1.0 diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index d9e50d8..522ee1e 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -64,6 +64,7 @@ alias bkp-list='doas restic -r /mnt/nfs/BSD/restic-repo snapshots' {{- else }} {{ if eq .chezmoi.os "darwin" }} source $HOME/perl5/perlbrew/etc/bashrc +export XDG_CONFIG_HOME="$HOME/.config" {{- if eq .chezmoi.arch "arm64" }} export PATH=/opt/homebrew/bin:$PATH {{- end }} From 6e08297438cf28a7041c80a8df075e3d85d04578 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Wed, 27 Mar 2024 22:34:10 +0100 Subject: [PATCH 2/2] Update colorscheme macos --- dot_config/nvim/lazyvim.json | 9 ----- .../nvim/lua/plugins/colorscheme.lua.tmpl | 34 +++++++++---------- 2 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 dot_config/nvim/lazyvim.json diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json deleted file mode 100644 index f4e2010..0000000 --- a/dot_config/nvim/lazyvim.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extras": [ - - ], - "news": { - "NEWS.md": "2123" - }, - "version": 3 -} \ No newline at end of file diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua.tmpl b/dot_config/nvim/lua/plugins/colorscheme.lua.tmpl index 2d15975..a4c08e4 100644 --- a/dot_config/nvim/lua/plugins/colorscheme.lua.tmpl +++ b/dot_config/nvim/lua/plugins/colorscheme.lua.tmpl @@ -4,6 +4,10 @@ return { "ellisonleao/gruvbox.nvim", opts = { contrast = "hard" }, }, + -- kanagawa + { + "rebelot/kanagawa.nvim", + }, {{- if eq .chezmoi.os "openbsd" }} { "gbprod/nord.nvim", @@ -21,28 +25,24 @@ return { vim.cmd([[colorscheme nord]]) end, }, - - { - "folke/tokyonight.nvim", - opts = {}, - }, - - { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, - - -- kanagawa - { - "rebelot/kanagawa.nvim", - }, {{- else }} - -- kanagawa { - "rebelot/kanagawa.nvim", - }, - + "gbprod/nord.nvim", + lazy = false, + priority = 1000, + opts = { + styles = { + comments = { italic = true }, + keywords = { bold = true }, + functions = { bold = true }, + variables = {}, + }, + }, + }, { "LazyVim/LazyVim", opts = { - colorscheme = "kanagawa", + colorscheme = "nord", }, }, {{- end }}