mirror of
https://github.com/mikkelsvartveit/dotfiles.git
synced 2025-12-22 19:22:38 +00:00
Update configs
This commit is contained in:
parent
b37a005bc4
commit
dddaebadf0
2 changed files with 13 additions and 30 deletions
|
|
@ -1,7 +1,6 @@
|
||||||
# Disable greeting
|
# Disable greeting
|
||||||
set fish_greeting
|
set fish_greeting
|
||||||
|
|
||||||
alias fixmouse="killall LogiMgrDaemon"
|
|
||||||
alias icloud="cd ~/Library/Mobile\ Documents/com~apple~CloudDocs"
|
alias icloud="cd ~/Library/Mobile\ Documents/com~apple~CloudDocs"
|
||||||
alias pi="ssh pi@pi.misva.me -p 1733"
|
alias pi="ssh pi@pi.misva.me -p 1733"
|
||||||
alias gcp="ssh mikkelsvartveit@gcp.misva.me"
|
alias gcp="ssh mikkelsvartveit@gcp.misva.me"
|
||||||
|
|
@ -11,7 +10,6 @@ alias cloud-sync="rsync -auzP --exclude=.DS_Store '/Volumes/Samsung T7/misvaClou
|
||||||
alias zshrc="nvim ~/.zshrc"
|
alias zshrc="nvim ~/.zshrc"
|
||||||
alias fishconfig="cd ~/.config/fish && nvim config.fish && cd -"
|
alias fishconfig="cd ~/.config/fish && nvim config.fish && cd -"
|
||||||
alias nvimconfig="cd ~/.config/nvim && nvim && cd -"
|
alias nvimconfig="cd ~/.config/nvim && nvim && cd -"
|
||||||
alias ai="sgpt -se"
|
|
||||||
|
|
||||||
abbr x86 "arch -x86_64"
|
abbr x86 "arch -x86_64"
|
||||||
abbr v "nvim"
|
abbr v "nvim"
|
||||||
|
|
@ -35,7 +33,6 @@ abbr gli "nvim (git rev-parse --show-toplevel)/.git/info/exclude"
|
||||||
abbr cloud-push "rsync -auzP --exclude=.DS_Store '/Volumes/Samsung T7/misvaCloud/' ubuntu@cloud.misva.me:~/misvaCloud/"
|
abbr cloud-push "rsync -auzP --exclude=.DS_Store '/Volumes/Samsung T7/misvaCloud/' ubuntu@cloud.misva.me:~/misvaCloud/"
|
||||||
abbr cloud-pull "rsync -auzP --exclude=.DS_Store ubuntu@cloud.misva.me:~/misvaCloud/ '/Volumes/Samsung T7/misvaCloud/'"
|
abbr cloud-pull "rsync -auzP --exclude=.DS_Store ubuntu@cloud.misva.me:~/misvaCloud/ '/Volumes/Samsung T7/misvaCloud/'"
|
||||||
abbr cloud-purge "rsync -auzP --exclude=.DS_Store '/Volumes/Samsung T7/misvaCloud/' ubuntu@cloud.misva.me:~/misvaCloud/ --delete --dry-run"
|
abbr cloud-purge "rsync -auzP --exclude=.DS_Store '/Volumes/Samsung T7/misvaCloud/' ubuntu@cloud.misva.me:~/misvaCloud/ --delete --dry-run"
|
||||||
abbr 164 "ssh cs164-aiu@eda-3.eecs.berkeley.edu"
|
|
||||||
abbr caf "caffeinate -d"
|
abbr caf "caffeinate -d"
|
||||||
|
|
||||||
function ghid
|
function ghid
|
||||||
|
|
@ -60,21 +57,18 @@ end
|
||||||
# Start Docker Desktop and wait to ensure the daemon is ready
|
# Start Docker Desktop and wait to ensure the daemon is ready
|
||||||
function ds
|
function ds
|
||||||
echo "Launching Docker Daemon..."
|
echo "Launching Docker Daemon..."
|
||||||
open -a "Docker"
|
open --hide -a "Orbstack"
|
||||||
sleep 15
|
sleep 5
|
||||||
echo "Docker daemon started."
|
echo "Docker daemon started."
|
||||||
end
|
end
|
||||||
|
|
||||||
function dq
|
function dq
|
||||||
osascript -e 'quit app "Docker Desktop"'
|
osascript -e 'quit app "OrbStack"'
|
||||||
end
|
end
|
||||||
|
|
||||||
# Enable autojump
|
# Enable autojump
|
||||||
[ -f /opt/homebrew/share/autojump/autojump.fish ]; and source /opt/homebrew/share/autojump/autojump.fish
|
[ -f /opt/homebrew/share/autojump/autojump.fish ]; and source /opt/homebrew/share/autojump/autojump.fish
|
||||||
|
|
||||||
# opam (OCaml package manager) configuration
|
|
||||||
source /Users/mikkelsvartveit/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
|
|
||||||
|
|
||||||
# Update PATH
|
# Update PATH
|
||||||
fish_add_path "$HOME/.local/bin" # Lingua Franca
|
fish_add_path "$HOME/.local/bin" # Lingua Franca
|
||||||
fish_add_path "$HOME/.bun/bin" # Bun
|
fish_add_path "$HOME/.bun/bin" # Bun
|
||||||
|
|
@ -96,3 +90,7 @@ pyenv init - | source
|
||||||
# bun
|
# bun
|
||||||
set --export BUN_INSTALL "$HOME/.bun"
|
set --export BUN_INSTALL "$HOME/.bun"
|
||||||
set --export PATH $BUN_INSTALL/bin $PATH
|
set --export PATH $BUN_INSTALL/bin $PATH
|
||||||
|
|
||||||
|
# Added by OrbStack: command-line tools and integration
|
||||||
|
# This won't be added again if you remove it.
|
||||||
|
source ~/.orbstack/shell/init2.fish 2>/dev/null || :
|
||||||
|
|
|
||||||
|
|
@ -40,14 +40,12 @@ nnoremap <leader>: <cmd>call VSCodeNotify('workbench.action.showCommands')<cr>
|
||||||
nnoremap <leader>c <cmd>call VSCodeNotify('workbench.action.showCommands')<cr>
|
nnoremap <leader>c <cmd>call VSCodeNotify('workbench.action.showCommands')<cr>
|
||||||
nnoremap <leader>d <cmd>call VSCodeNotify('workbench.view.scm')<cr>
|
nnoremap <leader>d <cmd>call VSCodeNotify('workbench.view.scm')<cr>
|
||||||
nnoremap <leader>n <cmd>call VSCodeNotify('workbench.action.toggleSidebarVisibility')<cr>
|
nnoremap <leader>n <cmd>call VSCodeNotify('workbench.action.toggleSidebarVisibility')<cr>
|
||||||
|
nnoremap <leader>rn <cmd>call VSCodeNotify('editor.action.rename')<cr>
|
||||||
" Disable arrow keys in normal mode - enforce hjkl instead
|
xnoremap gc <Cmd>call VSCodeNotify('editor.action.commentLine')<CR>
|
||||||
nnoremap <Left> :echoe "Use h"<CR>
|
nnoremap gc <Cmd>call VSCodeNotify('editor.action.commentLine')<CR>
|
||||||
nnoremap <Right> :echoe "Use l"<CR>
|
nnoremap gcc <Cmd>call VSCodeNotify('editor.action.commentLine')<CR>
|
||||||
nnoremap <Up> :echoe "Use k"<CR>
|
xnoremap gb <Cmd>call VSCodeNotify('editor.action.blockComment')<CR>
|
||||||
nnoremap <Down> :echoe "Use j"<CR>
|
nnoremap gb <Cmd>call VSCodeNotify('editor.action.blockComment')<CR>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
" PLUGINS - installation and configuration
|
" PLUGINS - installation and configuration
|
||||||
|
|
||||||
|
|
@ -66,21 +64,8 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
|
||||||
" Fetch plugins with Plug
|
" Fetch plugins with Plug
|
||||||
call plug#begin()
|
call plug#begin()
|
||||||
|
|
||||||
" Add two-character motions with s and S
|
|
||||||
Plug 'ggandor/leap.nvim'
|
|
||||||
Plug 'tpope/vim-repeat'
|
|
||||||
|
|
||||||
" Easy commenting/uncommenting
|
|
||||||
Plug 'numToStr/Comment.nvim'
|
|
||||||
|
|
||||||
" Easy handling of surroundings (tags, brackets etc.)
|
" Easy handling of surroundings (tags, brackets etc.)
|
||||||
Plug 'tpope/vim-surround'
|
Plug 'tpope/vim-surround'
|
||||||
|
|
||||||
" End of plugin fetching
|
" End of plugin fetching
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
" Configure leap
|
|
||||||
lua require('leap').add_default_mappings()
|
|
||||||
|
|
||||||
" Configure Comment.nvim
|
|
||||||
lua require('Comment').setup()
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue