Merge fix

alacritty/.config/alacritty/alacritty.toml

@@ -60,7 +60,7 @@ style = "Block"
 TERM = "xterm-256color"
 
 [font]
-size = 10
+size = 9
 
 [font.bold]
 family = "Fira Code"

leftwm/.config/leftwm/config.ron

@@ -1,31 +1,22 @@
-//  _        ___                                      ___ _
-// | |      / __)_                                   / __|_)
-// | | ____| |__| |_ _ _ _ ____      ____ ___  ____ | |__ _  ____    ____ ___  ____
-// | |/ _  )  __)  _) | | |    \    / ___) _ \|  _ \|  __) |/ _  |  / ___) _ \|  _ \
-// | ( (/ /| |  | |_| | | | | | |  ( (__| |_| | | | | |  | ( ( | |_| |  | |_| | | | |
-// |_|\____)_|   \___)____|_|_|_|   \____)___/|_| |_|_|  |_|\_|| (_)_|   \___/|_| |_|
-// A WindowManager for Adventurers                         (____/
-// For info about configuration please visit https://github.com/leftwm/leftwm/wiki
-
 #![enable(implicit_some)]
 (
     modkey: "Mod4",
     mousekey: "Mod4",
     workspaces: [
-        (
+      (
-            output: "DP-4",
+        output: "DP-4",
-            y: 0,
+        y: 0,
-            x: 0,
+        x: 0,
-            height: 1080,
+        height: 1080,
-            width: 1920,
+        width: 1920,
-        ),
+      ),
-        (
+      (
-            output: "HDMI-0",
+        output: "HDMI-0",
-            y: 0,
+        y: 0,
-            x: 1920,
+        x: 1920,
-            height: 1080,
+        height: 1080,
-            width: 1920,
+        width: 1920,
-        )
+      )
     ],
     tags: [
         "1",
@@ -41,23 +32,14 @@
     max_window_width: None,
     layouts: [
         MainAndVertStack,
-        // MainAndHorizontalStack,
-        // MainAndDeck,
-        // GridHorizontal,
-        // EvenHorizontal,
-        // EvenVertical,
         Fibonacci,
-        // LeftMain,
-        // CenterMain,
-        // CenterMainBalanced,
-        // CenterMainFluid,
         Monocle,
         LeftWiderRightStack,
     ],
-    layout_mode: Tag,
+    layout_mode: Workspace,
     insert_behavior: Bottom,
     scratchpad: [
-        (name: "Qalc", value: "alacritty -e qalc -t", x: 760, y: 415, height: 250, width: 400),
+      (name: "Qalc", value: "alacritty -e qalc -t", x: 760, y: 415, height: 250, width: 400),
     ],
     window_rules: [],
     disable_current_tag_swap: true,
@@ -76,7 +58,6 @@
         (command: Execute, value: "playerctl play-pause", modifier: ["modkey"], key: "u"),
         (command: CloseWindow, value: "", modifier: ["modkey", "Shift"], key: "q"),
         (command: SoftReload, value: "", modifier: ["modkey", "Shift"], key: "x"),
-        // (command: Execute, value: "loginctl kill-session $XDG_SESSION_ID", modifier: ["modkey", "Shift"], key: "x"),
         (command: Execute, value: "betterlockscreen --lock", modifier: ["modkey", "Shift"], key: "l"),
         (command: Execute, value: "emacs", modifier: ["modkey", "Shift"], key: "e"),
         (command: Execute, value: "flameshot gui", modifier: ["modkey"], key: "Print"),
@@ -100,11 +81,11 @@
 
         (command: ToggleScratchPad, value: "Qalc", modifier: ["modkey"], key: "c"),
         (command: ToggleFloating, modifier: ["modkey"], key: "f"),
-	(command: ToggleFullScreen, modifier: ["modkey", "Shift"], key: "f"),
+        (command: ToggleFullScreen, modifier: ["modkey", "Shift"], key: "f"),
 
-	(command: SetLayout, value: "Monocle", modifier: ["modkey"], key: "m"),
+        (command: SetLayout, value: "Monocle", modifier: ["modkey"], key: "m"),
-	(command: SetLayout, value: "MainAndVertStack", modifier: ["modkey"], key: "t"),
+        (command: SetLayout, value: "MainAndVertStack", modifier: ["modkey"], key: "t"),
-	(command: SetLayout, value: "LeftWiderRightStack", modifier: ["modkey", "Shift"], key: "t"),
+        (command: SetLayout, value: "LeftWiderRightStack", modifier: ["modkey", "Shift"], key: "t"),
 
         (command: GotoTag, value: "1", modifier: ["modkey"], key: "1"),
         (command: GotoTag, value: "2", modifier: ["modkey"], key: "2"),
@@ -125,5 +106,4 @@
         (command: MoveToTag, value: "8", modifier: ["modkey", "Shift"], key: "8"),
         (command: MoveToTag, value: "9", modifier: ["modkey", "Shift"], key: "9"),
     ],
-    state_path: None,
 )

leftwm/.config/leftwm/config.ron.old

@@ -0,0 +1,111 @@
+#![enable(implicit_some)]
+(
+	modkey: "Mod4",
+	mousekey: "Mod4",
+	workspaces: [
+		(
+			output: "DP-4",
+			y: 0,
+			x: 0,
+			height: 1080,
+			width: 1920,
+		),
+		(
+			output: "HDMI-0",
+			y: 0,
+			x: 1920,
+			height: 1080,
+			width: 1920,
+		)
+	],
+	tags: [
+		"1",
+		"2",
+		"3",
+		"4",
+		"5",
+		"6",
+		"7",
+		"8",
+		"9",
+	],
+	max_window_width: None,
+	layouts: [
+		"MainAndVertStack",
+		"Fibonacci",
+		"Monocle",
+		"LeftWiderRightStack",
+	],
+	layout_mode: Tag,
+	insert_behavior: Bottom,
+	scratchpad: [
+		(name: "Qalc", value: "alacritty -e qalc -t", x: 760, y: 415, height: 250, width: 400),
+	],
+	window_rules: [],
+	disable_current_tag_swap: true,
+	disable_tile_drag: false,
+	disable_window_snap: true,
+	focus_behaviour: Sloppy,
+	focus_new_windows: true,
+	single_window_border: true,
+	sloppy_mouse_follows_focus: true,
+	auto_derive_workspaces: true,
+	keybind: [
+		(command: Execute, value: "rofi -show drun", modifier: ["modkey"], key: "d"),
+		(command: Execute, value: "rofi -show ssh", modifier: ["modkey"], key: "s"),
+		(command: Execute, value: "alacritty", modifier: ["modkey"], key: "Return"),
+		(command: Execute, value: "chromium", modifier: ["modkey"], key: "b"), // 
+		(command: Execute, value: "playerctl play-pause", modifier: ["modkey"], key: "u"),
+		(command: CloseWindow, value: "", modifier: ["modkey", "Shift"], key: "q"),
+		(command: SoftReload, value: "", modifier: ["modkey", "Shift"], key: "x"),
+		// (command: Execute, value: "loginctl kill-session $XDG_SESSION_ID", modifier: ["modkey", "Shift"], key: "x"),
+		(command: Execute, value: "betterlockscreen --lock", modifier: ["modkey", "Shift"], key: "l"),
+		(command: Execute, value: "emacs", modifier: ["modkey", "Shift"], key: "e"),
+		(command: Execute, value: "flameshot gui", modifier: ["modkey"], key: "Print"),
+		(command: MoveToLastWorkspace, value: "", modifier: ["modkey", "Shift"], key: "w"),
+		(command: SwapTags, value: "", modifier: ["modkey"], key: "w"),
+
+		(command: MoveWindowUp, value: "", modifier: ["modkey", "Shift"], key: "k"),
+		(command: MoveWindowDown, value: "", modifier: ["modkey", "Shift"], key: "j"),
+		(command: MoveWindowTop, value: "", modifier: ["modkey", "Shift"], key: "Return"),
+
+		(command: FocusWorkspaceNext, value: "", modifier: ["modkey"], key: "e"),
+		(command: FocusWorkspacePrevious, value: "", modifier: ["modkey"], key: "q"),
+		(command: FocusWindowUp, value: "", modifier: ["modkey"], key: "k"),
+		(command: FocusWindowDown, value: "", modifier: ["modkey"], key: "j"),
+
+		(command: IncreaseMainWidth, value: "2", modifier: ["modkey"], key: "l"),
+		(command: DecreaseMainWidth, value: "2", modifier: ["modkey"], key: "h"),
+
+		(command: NextLayout, value: "", modifier: ["modkey", "Control"], key: "k"),
+		(command: PreviousLayout, value: "", modifier: ["modkey", "Control"], key: "j"),
+
+		(command: ToggleScratchPad, value: "Qalc", modifier: ["modkey"], key: "c"),
+		(command: ToggleFloating, modifier: ["modkey"], key: "f"),
+	(command: ToggleFullScreen, modifier: ["modkey", "Shift"], key: "f"),
+
+	(command: SetLayout, value: "Monocle", modifier: ["modkey"], key: "m"),
+	(command: SetLayout, value: "MainAndVertStack", modifier: ["modkey"], key: "t"),
+	(command: SetLayout, value: "LeftWiderRightStack", modifier: ["modkey", "Shift"], key: "t"),
+
+		(command: GotoTag, value: "1", modifier: ["modkey"], key: "1"),
+		(command: GotoTag, value: "2", modifier: ["modkey"], key: "2"),
+		(command: GotoTag, value: "3", modifier: ["modkey"], key: "3"),
+		(command: GotoTag, value: "4", modifier: ["modkey"], key: "4"),
+		(command: GotoTag, value: "5", modifier: ["modkey"], key: "5"),
+		(command: GotoTag, value: "6", modifier: ["modkey"], key: "6"),
+		(command: GotoTag, value: "7", modifier: ["modkey"], key: "7"),
+		(command: GotoTag, value: "8", modifier: ["modkey"], key: "8"),
+		(command: GotoTag, value: "9", modifier: ["modkey"], key: "9"),
+		(command: MoveToTag, value: "1", modifier: ["modkey", "Shift"], key: "1"),
+		(command: MoveToTag, value: "2", modifier: ["modkey", "Shift"], key: "2"),
+		(command: MoveToTag, value: "3", modifier: ["modkey", "Shift"], key: "3"),
+		(command: MoveToTag, value: "4", modifier: ["modkey", "Shift"], key: "4"),
+		(command: MoveToTag, value: "5", modifier: ["modkey", "Shift"], key: "5"),
+		(command: MoveToTag, value: "6", modifier: ["modkey", "Shift"], key: "6"),
+		(command: MoveToTag, value: "7", modifier: ["modkey", "Shift"], key: "7"),
+		(command: MoveToTag, value: "8", modifier: ["modkey", "Shift"], key: "8"),
+		(command: MoveToTag, value: "9", modifier: ["modkey", "Shift"], key: "9"),
+	],
+	state_path: None,
+)

nvchad/.config/nvim/lua/custom/chadrc.lua

@@ -5,8 +5,8 @@ local M = {}
 local highlights = require "custom.highlights"
 
 M.ui = {
-  theme = "github_dark",
+  theme = "tomorrow_night",
-  theme_toggle = { "gruvchad", "github_dark" },
+  theme_toggle = { "tomorrow_night", "gruvbox_light" },
 
   hl_override = highlights.override,
   hl_add = highlights.add,

nvchad/.config/nvim/lua/custom/init.lua

@@ -5,3 +5,8 @@
 --   pattern = "*",
 --   command = "tabdo wincmd =",
 -- })
+vim.filetype.add({
+  extension = {
+    mdx = 'mdx'
+  }
+})

nvchad/.config/nvim/lua/custom/plugins.lua

@@ -47,18 +47,18 @@ local plugins = {
 		end,
 	},
 
-  {
+	{
-    "github/copilot.vim",
+		"github/copilot.vim",
-    lazy = false,
+		lazy = false,
-    config = function()
+		config = function()
-      -- Mapping tab is already used by NvChad
+			-- Mapping tab is already used by NvChad
-      vim.g.copilot_no_tab_map = true;
+			vim.g.copilot_no_tab_map = true
-      vim.g.copilot_assume_mapped = true;
+			vim.g.copilot_assume_mapped = true
-      vim.g.copilot_tab_fallback = "";
+			vim.g.copilot_tab_fallback = ""
-      -- The mapping is set to other key, see custom/lua/mappings
+			-- The mapping is set to other key, see custom/lua/mappings
-      -- or run <leader>ch to see copilot mapping section
+			-- or run <leader>ch to see copilot mapping section
-    end
+		end,
-  },
+	},
 
 	{
 		"nvim-treesitter/nvim-treesitter",
@@ -66,6 +66,13 @@ local plugins = {
 			"JoosepAlviste/nvim-ts-context-commentstring",
 		},
 		opts = overrides.treesitter,
+		config = function(_, opts)
+			dofile(vim.g.base46_cache .. "syntax")
+			require("nvim-treesitter.configs").setup(opts)
+
+			-- use markdown parser for mdx files
+			vim.treesitter.language.register("mdx", "markdown", "tsx")
+		end,
 	},
 
 	{

oh-my-zsh/.oh-my-zsh/aliases.sh

@@ -40,3 +40,7 @@ alias dev="cd $HOME/Projects/almtech/ingenuity/"
 alias dc="docker-compose"
 
 alias dots="cd $HOME/.dotfiles/"
+
+# Vim stuff 
+alias vi="nvim"
+alias vim="nvim"