From cb1ae322644224e47a6bbbad6a9be05b65d00695 Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <kontakt@webgefrickel.de>
Date: Wed, 14 Feb 2024 10:35:12 +0100
Subject: [PATCH] monaspace + neorg -> obsidian/md

---
 install/6_software.sh           |  2 +-
 nvim/init.lua                   |  6 ++----
 nvim/lua/plugins/neorg.lua      | 14 --------------
 nvim/lua/plugins/treesitter.lua |  1 -
 wezterm.lua                     | 31 +++++++++++++++++++++++++++----
 5 files changed, 30 insertions(+), 24 deletions(-)
 delete mode 100644 nvim/lua/plugins/neorg.lua

diff --git a/install/6_software.sh b/install/6_software.sh
index bd6ce2c7..833d07eb 100755
--- a/install/6_software.sh
+++ b/install/6_software.sh
@@ -4,7 +4,7 @@ brew tap homebrew/cask-fonts
 brew tap homebrew/cask-versions
 
 # font of choice
-brew install --cask font-fira-code-nerd-font
+brew install --cask font-monaspace-nerd-font
 
 # default software
 brew install --cask affinity-designer
diff --git a/nvim/init.lua b/nvim/init.lua
index 7f73b604..01b9429e 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -67,10 +67,8 @@ require('lazy').setup({
   { 'nvim-pack/nvim-spectre', dependencies = 'nvim-lua/plenary.nvim', config = true },
   { 'mfussenegger/nvim-lint', config = get_config('lint') },
   { 'stevearc/conform.nvim', event = 'BufWritePre', config = get_config('conform') },
-  { 'nvim-neorg/neorg',
-    build = ':Neorg sync-parsers',
-    dependencies = 'nvim-lua/plenary.nvim',
-    config = get_config('neorg'),
+  { 'epwalsh/obsidian.nvim', version = '*', lazy = true, ft = 'markdown',
+    dependencies = { 'nvim-lua/plenary.nvim' }, opts = { dir = '~/Notes' },
   },
   { 'zbirenbaum/copilot.lua', event = 'InsertEnter', config = get_config('copilot') },
   { 'zbirenbaum/copilot-cmp', config = true },
diff --git a/nvim/lua/plugins/neorg.lua b/nvim/lua/plugins/neorg.lua
deleted file mode 100644
index 6af61a3f..00000000
--- a/nvim/lua/plugins/neorg.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-require('neorg').setup({
-  load = {
-    ['core.concealer'] = {},
-    ['core.defaults'] = {},
-    ['core.dirman'] = {
-      config = {
-        default_workspace = 'notes',
-        workspaces = {
-          notes = '~/Notes',
-        },
-      },
-    },
-  },
-})
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index df6e39e4..f4a88b32 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -12,7 +12,6 @@ require('nvim-treesitter.configs').setup({
     'jsonc',
     'lua',
     'markdown',
-    'norg',
     'php',
     'python',
     'regex',
diff --git a/wezterm.lua b/wezterm.lua
index d7f8d123..866865d7 100644
--- a/wezterm.lua
+++ b/wezterm.lua
@@ -1,7 +1,7 @@
 local wezterm = require('wezterm')
-local mux = wezterm.mux
 local act = wezterm.action
 local config = wezterm.config_builder()
+local mux = wezterm.mux
 
 -- helper functions
 local function get_current_working_dir(tab)
@@ -55,9 +55,31 @@ end
 
 -- base config
 config.color_scheme = 'GruvboxDark'
-config.font = wezterm.font('FiraCode Nerd Font')
+config.font = wezterm.font('MonaspiceAr Nerd Font')
+
+config.font = wezterm.font({
+  family = 'MonaspiceAr Nerd Font',
+  weight = 'Regular',
+  harfbuzz_features = { 'calt', 'liga', 'dlig', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08' },
+})
+
+config.font_rules = {
+  { -- Italic (comments)
+    intensity = 'Normal',
+    italic = true,
+    font = wezterm.font({
+      family = "MonaspiceRn Nerd Font",
+      weight = "ExtraLight",
+      stretch = "Normal",
+      style = "Italic",
+      harfbuzz_features = { 'calt', 'liga', 'dlig', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08' },
+    })
+  },
+}
+
 config.default_prog = { '/opt/homebrew/bin/zsh' }
 config.font_size = 14.0
+config.line_height = 1.1
 config.initial_cols = 120
 config.initial_rows = 32
 config.inactive_pane_hsb = { saturation = 0.5, brightness = 0.9 }
@@ -65,6 +87,7 @@ config.leader = { key = 'a', mods = 'CTRL', timeout_milliseconds = 1000 }
 config.scrollback_lines = 5000
 config.send_composed_key_when_left_alt_is_pressed = true
 config.show_new_tab_button_in_tab_bar = false
+config.show_tab_index_in_tab_bar = true
 config.tab_bar_at_bottom = true
 config.use_dead_keys = false
 config.use_fancy_tab_bar = false
@@ -130,7 +153,7 @@ config.keys = {
       description = 'Rename current workspace',
       action = wezterm.action_callback(function(window, pane, line)
         if line then
-          wezterm.mux.rename_workspace(wezterm.mux.get_active_workspace(), line)
+          mux.rename_workspace(mux.get_active_workspace(), line)
         end
       end),
     },
@@ -170,7 +193,7 @@ wezterm.on('update-status', function(window)
   window:set_left_status(string.format('  %s  ', workspace))
 end)
 
--- always maximise and start default session with mutt, neorg and dotfiles
+-- always maximise and start default session with mutt, notes and dotfiles
 wezterm.on('gui-startup', function()
   local home_dir = wezterm.home_dir
   local tab, pane, window = mux.spawn_window({ cwd = home_dir })