merged
This commit is contained in:
@@ -2,5 +2,9 @@
|
||||
.config/btop
|
||||
.config/neofetch
|
||||
/.aider*
|
||||
<<<<<<< HEAD
|
||||
./home_config/nvim/lazy-lock.json
|
||||
home_config/nvim/lazy-lock.json
|
||||
=======
|
||||
__pycache__/
|
||||
>>>>>>> 00717500056db846954b09bcfac4ebb3f1aa84e6
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Place a copy of this config to ~/.aerospace.toml
|
||||
# Place a copy of this config to ~/.aerospace.toml
|
||||
# After that, you can edit ~/.aerospace.toml to your liking
|
||||
|
||||
# You can use it to add commands that run after login to macOS user session.
|
||||
@@ -57,12 +57,12 @@ automatically-unhide-macos-hidden-apps = false
|
||||
# See:
|
||||
# https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
|
||||
[gaps]
|
||||
inner.horizontal = 8
|
||||
inner.vertical = 8
|
||||
outer.left = 8
|
||||
outer.bottom = 8
|
||||
outer.top = 8
|
||||
outer.right = 8
|
||||
inner.horizontal = 2
|
||||
inner.vertical = 2
|
||||
outer.left = 2
|
||||
outer.bottom = 2
|
||||
outer.top = 2
|
||||
outer.right = 2
|
||||
|
||||
# 'main' binding mode declaration
|
||||
# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
|
||||
@@ -131,11 +131,9 @@ automatically-unhide-macos-hidden-apps = false
|
||||
alt-c = 'workspace C'
|
||||
alt-d = 'workspace D'
|
||||
alt-e = 'workspace E'
|
||||
alt-f = 'workspace F'
|
||||
alt-g = 'workspace G'
|
||||
alt-i = 'workspace I'
|
||||
alt-m = 'workspace M'
|
||||
alt-n = 'workspace N'
|
||||
alt-o = 'workspace O'
|
||||
alt-p = 'workspace P'
|
||||
alt-q = 'workspace Q'
|
||||
@@ -164,11 +162,9 @@ automatically-unhide-macos-hidden-apps = false
|
||||
alt-shift-c = 'move-node-to-workspace C'
|
||||
alt-shift-d = 'move-node-to-workspace D'
|
||||
alt-shift-e = 'move-node-to-workspace E'
|
||||
alt-shift-f = 'move-node-to-workspace F'
|
||||
alt-shift-g = 'move-node-to-workspace G'
|
||||
alt-shift-i = 'move-node-to-workspace I'
|
||||
alt-shift-m = 'move-node-to-workspace M'
|
||||
alt-shift-n = 'move-node-to-workspace N'
|
||||
alt-shift-o = 'move-node-to-workspace O'
|
||||
alt-shift-p = 'move-node-to-workspace P'
|
||||
alt-shift-q = 'move-node-to-workspace Q'
|
||||
|
||||
@@ -1,13 +1,22 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" },
|
||||
"blink.cmp": { "branch": "main", "commit": "4607923f60029f8cb28e6950a078f93fd33e1288" },
|
||||
=======
|
||||
"LazyVim": { "branch": "main", "commit": "ec5981dfb1222c3bf246d9bcaa713d5cfa486fbd" },
|
||||
"blink.cmp": { "branch": "main", "commit": "49f211fe5d729df53df4c042d7c3464cf47d199e" },
|
||||
>>>>>>> 00717500056db846954b09bcfac4ebb3f1aa84e6
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
|
||||
"conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
|
||||
<<<<<<< HEAD
|
||||
"grug-far.nvim": { "branch": "main", "commit": "2c7ef09353714bd4954f5459d9a7e2579a050dc7" },
|
||||
=======
|
||||
"grug-far.nvim": { "branch": "main", "commit": "5da116bc99a03e14be3b824e319f4e49c676af78" },
|
||||
>>>>>>> 00717500056db846954b09bcfac4ebb3f1aa84e6
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
|
||||
@@ -15,12 +24,21 @@
|
||||
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||
"mini.ai": { "branch": "main", "commit": "978ffc65c6b513fde9ef075326d34d89197f1ea5" },
|
||||
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
|
||||
<<<<<<< HEAD
|
||||
"mini.pairs": { "branch": "main", "commit": "cd9d95e33645781f86ca5ffe0a6885a22d59f127" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
||||
"nvim-lint": { "branch": "master", "commit": "936197073214c26a347fb933c9459c8766376b23" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "d26ce0126694283cf32bf1f4192ef37ef404c037" },
|
||||
=======
|
||||
"mini.pairs": { "branch": "main", "commit": "b90e36aa5ca5e0d825e77ad67aac22214a4d9096" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
||||
"nvim-lint": { "branch": "master", "commit": "93b8040115c9114dac1047311763bef275e752dc" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "401e50fae626c4707af12114b5ddb7bb9f4236a4" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "85168f15808d89b0222313652b9d2777eda3cb08" },
|
||||
>>>>>>> 00717500056db846954b09bcfac4ebb3f1aa84e6
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||
"persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
return {
|
||||
{ "mason-org/mason.nvim", version = "^1.0.0" },
|
||||
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@@ -148,7 +148,7 @@ keybinds clear-defaults=true {
|
||||
bind "Alt i" { MoveTab "left"; }
|
||||
bind "Alt n" { NewPane; }
|
||||
bind "Alt o" { MoveTab "right"; }
|
||||
bind "Ctrl q" { Quit; }
|
||||
bind "Alt Ctrl q" { Quit; }
|
||||
}
|
||||
shared_except "locked" "move" {
|
||||
bind "Ctrl h" { SwitchToMode "move"; }
|
||||
|
||||
+6
-3
@@ -34,6 +34,10 @@ zinit cdreplay -q
|
||||
bindkey -e
|
||||
bindkey '^p' history-search-backward
|
||||
bindkey '^n' history-search-forward
|
||||
bindkey '^[[A' history-beginning-search-backward
|
||||
bindkey '^[[B' history-beginning-search-forward
|
||||
bindkey '\e[A' history-beginning-search-backward
|
||||
bindkey '\e[B' history-beginning-search-forward
|
||||
|
||||
# History
|
||||
HISTSIZE=5000
|
||||
@@ -105,8 +109,7 @@ if [[ $(uname) == "Darwin" ]]; then
|
||||
source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
elif [[ $(uname) == "Linux" ]]; then
|
||||
source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
bindkey "${terminfo[kcuu1]}" history-search-backward
|
||||
bindkey "${terminfo[kcud1]}" history-search-forward
|
||||
fi
|
||||
|
||||
|
||||
bindkey '^[[B' history-search-forward
|
||||
bindkey '^[[A' history-search-backward
|
||||
|
||||
Executable
+35
@@ -0,0 +1,35 @@
|
||||
#!/bin/bash
|
||||
# filepath: /Users/vhpfi/dotfiles/lk-installers/macinstaller
|
||||
|
||||
# Check if Homebrew is installed
|
||||
if command -v brew >/dev/null 2>&1; then
|
||||
echo "Homebrew is already installed. Updating..."
|
||||
brew update
|
||||
else
|
||||
echo "Homebrew not found. Installing Homebrew..."
|
||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
|
||||
# Add Homebrew to PATH for the current session
|
||||
if [[ -f /opt/homebrew/bin/brew ]]; then
|
||||
# For Apple Silicon Macs
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
|
||||
echo "Homebrew has been installed and added to your PATH."
|
||||
elif [[ -f /usr/local/bin/brew ]]; then
|
||||
# For Intel Macs
|
||||
eval "$(/usr/local/bin/brew shellenv)"
|
||||
echo 'eval "$(/usr/local/bin/brew shellenv)"' >> ~/.zprofile
|
||||
echo "Homebrew has been installed and added to your PATH."
|
||||
else
|
||||
echo "Error: Couldn't find the Homebrew binary after installation."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Installing packages with Homebrew..."
|
||||
brew install neovim btop htop neofetch curl wget git zip unzip zsh tldr
|
||||
brew install zsh-autosuggestions zsh-syntax-highlighting
|
||||
brew install rustup-init
|
||||
rustup-init -y
|
||||
|
||||
echo "Installation complete!"
|
||||
Reference in New Issue
Block a user