diff --git a/.config/nvim/.options/obsidian.all.lua b/.config/nvim/.options/obsidian.all.lua index f0cbf04..4f4e723 100644 --- a/.config/nvim/.options/obsidian.all.lua +++ b/.config/nvim/.options/obsidian.all.lua @@ -1,6 +1,6 @@ return { "epwalsh/obsidian.nvim", - version = "*", -- recommended, use latest release instead of latest commit + version = "*", -- recommended, use latest release instead of latest commit lazy = true, ft = "markdown", dependencies = { @@ -19,4 +19,4 @@ return { -- see below for full list of options 👇 }, -} \ No newline at end of file +} diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2514f9e..eded2d3 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,2 +1,8 @@ -- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") +if (vim.g.vscode) then + print("VSCode detected, skipping lazy loading") + require("vscode.code") +else + require("config.lazy") + -- require("config.lazy") +end diff --git a/.config/nvim/lua/plugins/just.lua b/.config/nvim/lua/plugins/just.lua new file mode 100644 index 0000000..41ae68a --- /dev/null +++ b/.config/nvim/lua/plugins/just.lua @@ -0,0 +1,4 @@ +return { + "NoahTheDuke/vim-just", + ft = { "just" }, +} diff --git a/.config/nvim/lua/vscode/keymaps.lua b/.config/nvim/lua/vscode/keymaps.lua new file mode 100644 index 0000000..6ac6d89 --- /dev/null +++ b/.config/nvim/lua/vscode/keymaps.lua @@ -0,0 +1,40 @@ +local keymap = vim.keymap.set + +vim.g.mapleader = " " + +vim.keymap.set({ "n", "v", "", "s", "x" }, "e", "k", { desc = "move cursor ⇧" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "n", "j", { desc = "move cursor ⇩" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "h", "h", { desc = "move cursor ⇦" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "i", "l", { desc = "move cursor ⇨" }) + +vim.keymap.set({ "n", "v", "", "s", "x" }, "N", "J", { desc = "Insert at the line start" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "E", "K", { desc = "Insert at the line start" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "I", "L", { desc = "Insert at the line start" }) + +vim.keymap.set({ "n", "v", "", "s", "x" }, "l", "i", { desc = "Insert mode" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "L", "I", { desc = "Insert at the line start" }) + +vim.keymap.set({ "n", "v", "", "s", "x" }, "k", "n", { desc = "Insert at the line start" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "K", "N", { desc = "Insert at the line start" }) + +vim.keymap.set({ "n", "v", "", "s", "x" }, "j", "e", { desc = "Insert at the line start" }) +vim.keymap.set({ "n", "v", "", "s", "x" }, "J", "E", { desc = "Insert at the line start" }) + +vim.opt.clipboard = "unnamedplus" +vim.opt.expandtab = true +vim.opt.tabstop = 5 +vim.opt.shiftwidth = 4 +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.wrap = true +vim.opt.scrolloff = 3 +vim.opt.hlsearch = true +vim.opt.incsearch = true +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.number = true +vim.opt.relativenumber = true + +-- VSCode commands +keymap({ "n", "v" }, "pp", "lua require('vscode').action('workbench.view.extension.project-manager')") +keymap({ "n", "v" }, "pP", "lua require('vscode').action('projectManager.listProjects')") diff --git a/.config/vim/vimrc b/.config/vim/vimrc index f0c8c7e..330e59b 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -31,7 +31,7 @@ set wrap set scrolloff=3 set hlsearch set incsearch -est ignorecase +set ignorecase set smartcase " XDG Directory Specifications @@ -49,4 +49,4 @@ set backupdir=$XDG_STATE_HOME/vim/backup set directory=$XDG_STATE_HOME/vim/swap set undodir=$XDG_STATE_HOME/vim/undo set viewdir=$XDG_STATE_HOME/vim/view -set shada+=n$XDG_STATE_HOME/vim/shada +" set shada+=n$XDG_STATE_HOME/vim/shada diff --git a/.gitignore b/.gitignore index 7aadea2..a2950d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store *private* .private.env.* .config/nvim/tt.* @@ -19,4 +20,7 @@ test.* *.tgz # WindowsTerminal.json PowerToys/ -xdg-ninja/ \ No newline at end of file +xdg-ninja/ +.DS_Store +vscode/ +.vscode/ \ No newline at end of file diff --git a/wsl/.zshrc b/wsl/.zshrc index 04bbafe..1a1a679 100644 --- a/wsl/.zshrc +++ b/wsl/.zshrc @@ -70,4 +70,11 @@ fi # vcpkg -export VCPKG_ROOT=~/vcpkg \ No newline at end of file +export VCPKG_ROOT=~/vcpkg + +# Package Manager + +alias pac="sudo pacman" +alias paci="sudo pacman -S" +alias pacr="sudo pacman -R" +alias pacu="sudo pacman -Ss" \ No newline at end of file