Added some new plugins and changed terminal font

6 files changed, 51 insertions, 13 deletions

diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 803021f..ee67cb9 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -106,7 +106,7 @@ font:
     #   - (macOS) Menlo
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
-    family: comic mono
+    family: Monaspace Xenon
     # The `style` can be specified to pick a specific face.
     style: Bold
 
@@ -116,8 +116,7 @@ font:
     #
     # If the bold family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: comic mono
-
+    family: Monaspace Xenon
     # The `style` can be specified to pick a specific face.
     style: Bold
 
@@ -127,7 +126,7 @@ font:
     #
     # If the italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: comic mono
+    family: Monaspace Xenon
 
     # The `style` can be specified to pick a specific face.
     style: Italic
@@ -138,7 +137,7 @@ font:
     #
     # If the bold italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: monospace
+    family: Monaspace Xenon
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
@@ -170,7 +169,7 @@ font:
 colors:
   # Default colors
   primary:
-    background: '#000000'
+    background: '#0A0E14'
     foreground: '#B3B1AD'
 
   # Normal colors
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 9c1dc1d..d727f6e 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -11,6 +11,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "competitest.nvim": { "branch": "master", "commit": "9aaf2827b130d64da5de291d74235c77b950c44c" },
   "conform.nvim": { "branch": "master", "commit": "f7766d2fbe23f0f22a3db1513beba7d03a8dc261" },
+  "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" },
   "flutter-tools.nvim": { "branch": "main", "commit": "7350750d46fbeb4d2bb4878157b658d435935299" },
   "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
@@ -22,12 +23,11 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" },
   "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
   "material.nvim": { "branch": "main", "commit": "5485e2e91b4117d9a4977c4afb6d70504559e1ac" },
-  "mini.ai": { "branch": "main", "commit": "fc9ce93eb8d58ce1a39101928fb5ea8f8b97844c" },
   "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" },
   "mini.comment": { "branch": "main", "commit": "e4320af992cd053a7da2f33d9f63a86c2ab6ce59" },
   "mini.indentscope": { "branch": "main", "commit": "cbc07203ca8faae952ca373c1f6cc5881ce97af0" },
+  "mini.move": { "branch": "main", "commit": "b3bca8e493f8d1da343ff1be06c21a47e2fde1c0" },
   "mini.pairs": { "branch": "main", "commit": "6f6bd7ed5757b40bc29c73dac0d743e4e6978124" },
-  "mini.starter": { "branch": "main", "commit": "c74bdde61385360b02ca9fd7731ebce8903d78d7" },
   "mini.surround": { "branch": "main", "commit": "862cfaef72d789d320625ec34e2488a5cc8fd423" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "1236db954ce502eb5b340bcdb69aa057cc372e8d" },
   "neoconf.nvim": { "branch": "main", "commit": "00dcf2b81c45de1768b4171faa16729f0888cfb8" },
@@ -44,6 +44,7 @@
   "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" },
   "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" },
+  "oil.nvim": { "branch": "master", "commit": "82834573bbca27c240f30087ff642b807ed1872a" },
   "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "rose-pine": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" },
diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua
index 9478c98..9833f1e 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/config/keymaps.lua
@@ -16,8 +16,8 @@ local function map(mode, lhs, rhs, opts)
   end
 end
 
-map("v", "<S-j>", ":m '>+1<CR>gv=gv", { desc = "Move down" })
-map("v", "<S-k>", ":m '<-2<CR>gv=gv", { desc = "Move up" })
+-- map("v", "<S-j>", ":m '>+1<CR>gv=gv", { desc = "Move down" })
+-- map("v", "<S-k>", ":m '<-2<CR>gv=gv", { desc = "Move up" })
 
 map("n", "<leader>t", ":lua require('dbgstmt').select()<CR>", { desc = "Move up" })
 
@@ -31,7 +31,9 @@ vim.cmd([[
     cnoreabbrev q1 q!
     cnoreabbrev Qa! qa!
     cnoreabbrev Qall! qall!
+    cnoreabbrev WW w
     cnoreabbrev Wa wa
+    cnoreabbrev WA wa
     cnoreabbrev Wq wq
     cnoreabbrev wQ wq
     cnoreabbrev WQ wq
@@ -53,6 +55,9 @@ map("n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<CR>", { desc = "code
 map("n", "<leader>y", "<cmd>Telescop flutter commands<CR>", { desc = "Flutter commands", remap = true })
 map("n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", { desc = "Line diagnostics", remap = true })
 
+-- oil.nvim
+map("n", "<leader>o", "<cmd>Oil<CR>", { desc = "Open Oil.nvim", remap = true })
+
 -- Better navigation
 map("n", "<C-d>", "<C-d>zz", { desc = "better half page down scroll", remap = true })
 map("n", "<C-u>", "<C-u>zz", { desc = "better half page up scroll", remap = true })
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index d1b395f..b5f2ed5 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -5,7 +5,7 @@
 vim.opt.ch = 0
 vim.opt.list = false
 vim.opt.confirm = false
-vim.o.guifont = "Comic mono:h14" -- text below applies for VimScript
+vim.o.guifont = "Monaspace xenon:h12:bold" -- text below applies for VimScript
 
 -- Helper function for transparency formatting
 local alpha = function()
diff --git a/nvim/.config/nvim/lua/plugins/example.lua b/nvim/.config/nvim/lua/plugins/example.lua
index dd80f50..ba0b0b5 100644
--- a/nvim/.config/nvim/lua/plugins/example.lua
+++ b/nvim/.config/nvim/lua/plugins/example.lua
@@ -30,6 +30,14 @@ return {
   },
 
   {
+    'stevearc/oil.nvim',
+    opts = {},
+    lazy = false,
+    -- Optional dependencies
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+  },
+
+  {
     'akinsho/flutter-tools.nvim',
     lazy = false,
     dependencies = {
@@ -295,7 +303,7 @@ return {
   },
 
   -- use mini.starter instead of alpha
-  { import = "lazyvim.plugins.extras.ui.mini-starter" },
+  -- { import = "lazyvim.plugins.extras.ui.mini-starter" },
 
   -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
   { import = "lazyvim.plugins.extras.lang.json" },
@@ -366,6 +374,31 @@ return {
   },
 
   {
+    "echasnovski/mini.move",
+    opts = {
+      mappings = {
+        -- Move visual selection in Visual mode. Defaults are Alt (Meta) + hjkl.
+        left = '<S-h>',
+        right = '<S-l>',
+        down = '<S-j>',
+        up = '<S-k>',
+
+        -- Move current line in Normal mode
+        line_left = '<M-h>',
+        line_right = '<M-l>',
+        line_down = '<M-j>',
+        line_up = '<M-k>',
+      },
+
+      -- Options which control moving behavior
+      options = {
+        -- Automatically reindent selection during linewise vertical move
+        reindent_linewise = true,
+      },
+    },
+  },
+
+  {
     "echasnovski/mini.surround",
     opts = {
       mappings = {
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 81b5682..36e0181 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,4 +1,4 @@
-export CPLUS_INCLUDE_PATH="$HOME/programming/cppDev/imgui/imgui/backends:$HOME/programming/cppDev/imgui-sfml:$HOME/programming/cppDev/imgui/imgui/:$HOME/programming/problem_solving/"
+export CPLUS_INCLUDE_PATH="$HOME/programming/cppDev/imgui/imgui/backends:$HOME/programming/cppDev/imgui-sfml:$HOME/programming/cppDev/imgui/imgui/:$HOME/programming/problem_solving/algo/"
 export ZSH="/home/$USER/.oh-my-zsh"
 export ANDROID_HOME=$HOME/Android/Sdk
 export PATH="$PATH:/usr/bin/docker:/usr/local/arm-cross-compiler/install/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin:/home/omar/Android/Sdk"