chore(merge): Compile Updates for Submodule and Settings (#115)

## Summary: In a series of commits, the project has been updates to submodule configurations, window size adjustment, theme updating, and font settings. These changes optimize user interaction and visual appearance. ## Changed: - feat: Update the submodule: nvim-config (#114) - feat: Update the windowWize to normal from full (#113) - feat: Update the theme for the lazygit (#112) ## Updated: - refactor: Minor adjustment on font setting (#111) - refactor: Update the fonts within wezterm configs (#110)
tpatalas · Aug 16, 2023 · e04556f · e04556f
2 parents 2eb4db2 + 52ce207
commit e04556f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/lazygit/config.yml b/lazygit/config.yml
@@ -1,7 +1,7 @@
 # https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md
 # https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Command_Keybindings.md
 gui:
-  windowSize: "full" # one of 'normal' | 'half' | 'full' default is 'normal'
+  windowSize: "normal" # one of 'normal' | 'half' | 'full' default is 'normal'
   timeFormat: "02 Jan 06 15:04 MST" # https://pkg.go.dev/time#Time.Format
   branchColors:
     "master": "#1abc9c"
@@ -17,6 +17,9 @@ gui:
   showIcons: true
   showBranchCommitHash: true
   theme:
+    activeBorderColor:
+      - cyan
+      - bold
     selectedLineBgColor:
       - "#51566F" # set to `default` to have no background color
 git:

diff --git a/nvim/nvim-config b/nvim/nvim-config
diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua
@@ -39,9 +39,25 @@ return {
 	-- Font
 	-- More NerdFont: https://www.nerdfonts.com/font-downloads
 	font = wezterm.font_with_fallback({
-		{ family = "JetBrainsMonoNL Nerd Font", weight = "Medium", stretch = "ExtraExpanded" },
-		{ family = "Iosevka Nerd Font", harfbuzz_features = { "calt=0", "clig=0", "liga=0" }, weight = "DemiBold" },
-		{ family = "FiraCode Nerd Font", weight = "Regular" },
+		{
+			family = "JetBrainsMonoNL Nerd Font",
+			weight = "DemiBold",
+			italic = false,
+		},
+		{
+			family = "FiraCode Nerd Font",
+			harfbuzz_features = { "calt=0", "clig=0", "liga=0" },
+			weight = "Regular",
+			stretch = "Expanded",
+			italic = false,
+		},
+		{
+			family = "Iosevka Nerd Font",
+			harfbuzz_features = { "calt=0", "clig=0", "liga=0" },
+			weight = "DemiBold",
+			stretch = "Expanded",
+			italic = false,
+		},
 		"Symbols Nerd Font",
 	}),
 	font_shaper = "Harfbuzz",
@@ -50,20 +66,22 @@ return {
 	font_size = 14,
 	cell_width = 1.0,
 	line_height = 1.3,
+	-- freetype_load_target = "Normal",
+	freetype_load_flags = "NO_HINTING",
 	foreground_text_hsb = {
 		hue = 1.0,
 		saturation = 1.0,
 		brightness = 1.0,
 	},
 	window_background_opacity = 0.5,
 	macos_window_background_blur = 50,
-	underline_position = -6,
+	underline_position = -5,
 	underline_thickness = 1,
 	window_decorations = "INTEGRATED_BUTTONS",
 	window_padding = {
-		left = 1,
+		left = 0,
 		right = 0,
-		top = 3,
+		top = 2,
 		bottom = 0,
 	},
 	audible_bell = "Disabled",
@@ -83,7 +101,6 @@ return {
 	},
 	window_close_confirmation = "NeverPrompt",
 	use_resize_increments = false,
-	-- dpi = 144,
 	-- Tab_bar
 	enable_tab_bar = true,
 	use_fancy_tab_bar = true,
+24 −24		lazy-lock.json
+0 −10		lua/autocmd.lua
+4 −4		lua/keymaps.lua
+1 −1		lua/plugins/auto_session/init.lua
+1 −0		lua/plugins/autopairs/init.lua
+62 −25		lua/plugins/colorscheme/init.lua
+1 −0		lua/plugins/comment/init.lua
+14 −0		lua/plugins/flash/init.lua
+1 −0		lua/plugins/gitsigns/init.lua
+2 −0		lua/plugins/harpoon/init.lua
+3 −2		lua/plugins/init.lua
+10 −0		lua/plugins/lspconfig/servers.lua
+1 −1		lua/plugins/lualine/custom_components.lua
+31 −31		lua/plugins/lualine/custom_theme.lua
+9 −8		lua/plugins/lualine/init.lua
+0 −37		lua/plugins/neo_tree/configs.lua
+0 −22		lua/plugins/neo_tree/init.lua
+1 −0		lua/plugins/neotest/init.lua
+6 −2		lua/plugins/nvim_cmp/configs.lua
+5 −0		lua/plugins/nvim_surround/init.lua
+45 −0		lua/plugins/oil/init.lua
+2 −0		lua/plugins/telescope/keymaps.lua
+35 −8		lua/plugins/toggle_term/init.lua
+11 −0		lua/plugins/tw_values/init.lua
+1 −0		lua/plugins/typescript_tools/init.lua