diff --git a/dev-env b/dev-env index 340545d..c828094 100755 --- a/dev-env +++ b/dev-env @@ -52,12 +52,23 @@ update_files() { popd &>/dev/null } +copy() { + log "removing: $2" + if [[ $dry_run == "0" ]]; then + rm $2 + fi + log "copying: $1 to $2" + if [[ $dry_run == "0" ]]; then + cp $1 $2 + fi +} + update_files $DEV_ENV/env/.config $XDG_CONFIG_HOME update_files $DEV_ENV/env/.local $HOME/.local # # copy $DEV_ENV/tmux-sessionizer/tmux-sessionizer $HOME/.local/scripts/tmux-sessionizer -# copy $DEV_ENV/env/.zsh_profile $HOME/.zsh_profile -# copy $DEV_ENV/env/.zshrc $HOME/.zshrc +copy $DEV_ENV/env/.zshenv $HOME/.zshenv + # copy $DEV_ENV/env/.xprofile $HOME/.xprofile # copy $DEV_ENV/env/.tmux-sessionizer $HOME/.tmux-sessionizer # copy $DEV_ENV/dev-env $HOME/.local/scripts/dev-env diff --git a/clipse/config.json b/env/.config/clipse/config.json similarity index 100% rename from clipse/config.json rename to env/.config/clipse/config.json diff --git a/clipse/custom_theme.json b/env/.config/clipse/custom_theme.json similarity index 100% rename from clipse/custom_theme.json rename to env/.config/clipse/custom_theme.json diff --git a/espanso/config/default.yml b/env/.config/espanso/config/default.yml similarity index 100% rename from espanso/config/default.yml rename to env/.config/espanso/config/default.yml diff --git a/espanso/config/xcode.yml b/env/.config/espanso/config/xcode.yml similarity index 100% rename from espanso/config/xcode.yml rename to env/.config/espanso/config/xcode.yml diff --git a/espanso/match/_xcode_snippets.yml b/env/.config/espanso/match/_xcode_snippets.yml similarity index 100% rename from espanso/match/_xcode_snippets.yml rename to env/.config/espanso/match/_xcode_snippets.yml diff --git a/espanso/match/base.yml b/env/.config/espanso/match/base.yml similarity index 100% rename from espanso/match/base.yml rename to env/.config/espanso/match/base.yml diff --git a/espanso/match/date.yml b/env/.config/espanso/match/date.yml similarity index 100% rename from espanso/match/date.yml rename to env/.config/espanso/match/date.yml diff --git a/espanso/match/email.yml b/env/.config/espanso/match/email.yml similarity index 100% rename from espanso/match/email.yml rename to env/.config/espanso/match/email.yml diff --git a/espanso/match/git.yml b/env/.config/espanso/match/git.yml similarity index 100% rename from espanso/match/git.yml rename to env/.config/espanso/match/git.yml diff --git a/espanso/match/housecallpro.yml b/env/.config/espanso/match/housecallpro.yml similarity index 100% rename from espanso/match/housecallpro.yml rename to env/.config/espanso/match/housecallpro.yml diff --git a/espanso/match/links.yml b/env/.config/espanso/match/links.yml similarity index 100% rename from espanso/match/links.yml rename to env/.config/espanso/match/links.yml diff --git a/espanso/match/packages/actually-all-emojis-spaces/README.md b/env/.config/espanso/match/packages/actually-all-emojis-spaces/README.md similarity index 100% rename from espanso/match/packages/actually-all-emojis-spaces/README.md rename to env/.config/espanso/match/packages/actually-all-emojis-spaces/README.md diff --git a/espanso/match/packages/actually-all-emojis-spaces/_manifest.yml b/env/.config/espanso/match/packages/actually-all-emojis-spaces/_manifest.yml similarity index 100% rename from espanso/match/packages/actually-all-emojis-spaces/_manifest.yml rename to env/.config/espanso/match/packages/actually-all-emojis-spaces/_manifest.yml diff --git a/espanso/match/packages/actually-all-emojis-spaces/_pkgsource.yml b/env/.config/espanso/match/packages/actually-all-emojis-spaces/_pkgsource.yml similarity index 100% rename from espanso/match/packages/actually-all-emojis-spaces/_pkgsource.yml rename to env/.config/espanso/match/packages/actually-all-emojis-spaces/_pkgsource.yml diff --git a/espanso/match/packages/actually-all-emojis-spaces/package.yml b/env/.config/espanso/match/packages/actually-all-emojis-spaces/package.yml similarity index 100% rename from espanso/match/packages/actually-all-emojis-spaces/package.yml rename to env/.config/espanso/match/packages/actually-all-emojis-spaces/package.yml diff --git a/espanso/match/symbols.yml b/env/.config/espanso/match/symbols.yml similarity index 100% rename from espanso/match/symbols.yml rename to env/.config/espanso/match/symbols.yml diff --git a/eza/theme.yml b/env/.config/eza/theme.yml similarity index 100% rename from eza/theme.yml rename to env/.config/eza/theme.yml diff --git a/ghostty/config b/env/.config/ghostty/config similarity index 100% rename from ghostty/config rename to env/.config/ghostty/config diff --git a/git/config b/env/.config/git/config similarity index 100% rename from git/config rename to env/.config/git/config diff --git a/git/gitignore b/env/.config/git/gitignore similarity index 100% rename from git/gitignore rename to env/.config/git/gitignore diff --git a/npm/npmrc b/env/.config/npm/npmrc similarity index 100% rename from npm/npmrc rename to env/.config/npm/npmrc diff --git a/nvim/lazynvim/.gitignore b/env/.config/nvim/.gitignore similarity index 100% rename from nvim/lazynvim/.gitignore rename to env/.config/nvim/.gitignore diff --git a/nvim/lazynvim/.neoconf.json b/env/.config/nvim/.neoconf.json similarity index 100% rename from nvim/lazynvim/.neoconf.json rename to env/.config/nvim/.neoconf.json diff --git a/nvim/lazynvim/LICENSE b/env/.config/nvim/LICENSE similarity index 100% rename from nvim/lazynvim/LICENSE rename to env/.config/nvim/LICENSE diff --git a/nvim/lazynvim/README.md b/env/.config/nvim/README.md similarity index 100% rename from nvim/lazynvim/README.md rename to env/.config/nvim/README.md diff --git a/nvim/lazynvim/after/ftplugin/markdown.lua b/env/.config/nvim/after/ftplugin/markdown.lua similarity index 100% rename from nvim/lazynvim/after/ftplugin/markdown.lua rename to env/.config/nvim/after/ftplugin/markdown.lua diff --git a/nvim/lazynvim/after/ftplugin/swift.lua b/env/.config/nvim/after/ftplugin/swift.lua similarity index 100% rename from nvim/lazynvim/after/ftplugin/swift.lua rename to env/.config/nvim/after/ftplugin/swift.lua diff --git a/nvim/lazynvim/init.lua b/env/.config/nvim/init.lua similarity index 100% rename from nvim/lazynvim/init.lua rename to env/.config/nvim/init.lua diff --git a/nvim/lazynvim/lazyvim.json b/env/.config/nvim/lazyvim.json similarity index 100% rename from nvim/lazynvim/lazyvim.json rename to env/.config/nvim/lazyvim.json diff --git a/nvim/lazynvim/lua/config/autocmds.lua b/env/.config/nvim/lua/config/autocmds.lua similarity index 100% rename from nvim/lazynvim/lua/config/autocmds.lua rename to env/.config/nvim/lua/config/autocmds.lua diff --git a/nvim/lazynvim/lua/config/keymaps.lua b/env/.config/nvim/lua/config/keymaps.lua similarity index 100% rename from nvim/lazynvim/lua/config/keymaps.lua rename to env/.config/nvim/lua/config/keymaps.lua diff --git a/nvim/lazynvim/lua/config/lazy.lua b/env/.config/nvim/lua/config/lazy.lua similarity index 100% rename from nvim/lazynvim/lua/config/lazy.lua rename to env/.config/nvim/lua/config/lazy.lua diff --git a/nvim/lazynvim/lua/config/options.lua b/env/.config/nvim/lua/config/options.lua similarity index 100% rename from nvim/lazynvim/lua/config/options.lua rename to env/.config/nvim/lua/config/options.lua diff --git a/nvim/lazynvim/lua/plugins/cmp.lua b/env/.config/nvim/lua/plugins/cmp.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/cmp.lua rename to env/.config/nvim/lua/plugins/cmp.lua diff --git a/nvim/lazynvim/lua/plugins/colorscheme.lua b/env/.config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/colorscheme.lua rename to env/.config/nvim/lua/plugins/colorscheme.lua diff --git a/nvim/lazynvim/lua/plugins/disabled.lua b/env/.config/nvim/lua/plugins/disabled.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/disabled.lua rename to env/.config/nvim/lua/plugins/disabled.lua diff --git a/nvim/lazynvim/lua/plugins/fidget.lua b/env/.config/nvim/lua/plugins/fidget.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/fidget.lua rename to env/.config/nvim/lua/plugins/fidget.lua diff --git a/nvim/lazynvim/lua/plugins/formatter.lua b/env/.config/nvim/lua/plugins/formatter.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/formatter.lua rename to env/.config/nvim/lua/plugins/formatter.lua diff --git a/nvim/lazynvim/lua/plugins/harpoon.lua b/env/.config/nvim/lua/plugins/harpoon.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/harpoon.lua rename to env/.config/nvim/lua/plugins/harpoon.lua diff --git a/nvim/lazynvim/lua/plugins/init.lua b/env/.config/nvim/lua/plugins/init.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/init.lua rename to env/.config/nvim/lua/plugins/init.lua diff --git a/nvim/lazynvim/lua/plugins/lint.lua b/env/.config/nvim/lua/plugins/lint.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/lint.lua rename to env/.config/nvim/lua/plugins/lint.lua diff --git a/nvim/lazynvim/lua/plugins/lsp.lua b/env/.config/nvim/lua/plugins/lsp.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/lsp.lua rename to env/.config/nvim/lua/plugins/lsp.lua diff --git a/nvim/lazynvim/lua/plugins/luasnip.lua b/env/.config/nvim/lua/plugins/luasnip.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/luasnip.lua rename to env/.config/nvim/lua/plugins/luasnip.lua diff --git a/nvim/lazynvim/lua/plugins/oil.lua b/env/.config/nvim/lua/plugins/oil.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/oil.lua rename to env/.config/nvim/lua/plugins/oil.lua diff --git a/nvim/lazynvim/lua/plugins/snacks.lua b/env/.config/nvim/lua/plugins/snacks.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/snacks.lua rename to env/.config/nvim/lua/plugins/snacks.lua diff --git a/nvim/lazynvim/lua/plugins/telescope.lua b/env/.config/nvim/lua/plugins/telescope.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/telescope.lua rename to env/.config/nvim/lua/plugins/telescope.lua diff --git a/nvim/lazynvim/lua/plugins/todo-comment.lua b/env/.config/nvim/lua/plugins/todo-comment.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/todo-comment.lua rename to env/.config/nvim/lua/plugins/todo-comment.lua diff --git a/nvim/lazynvim/lua/plugins/typst-preview.lua b/env/.config/nvim/lua/plugins/typst-preview.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/typst-preview.lua rename to env/.config/nvim/lua/plugins/typst-preview.lua diff --git a/nvim/lazynvim/lua/plugins/xcodebuild.lua b/env/.config/nvim/lua/plugins/xcodebuild.lua similarity index 100% rename from nvim/lazynvim/lua/plugins/xcodebuild.lua rename to env/.config/nvim/lua/plugins/xcodebuild.lua diff --git a/nvim/lazynvim/snippets/init.lua b/env/.config/nvim/snippets/init.lua similarity index 100% rename from nvim/lazynvim/snippets/init.lua rename to env/.config/nvim/snippets/init.lua diff --git a/nvim/lazynvim/snippets/lua.lua b/env/.config/nvim/snippets/lua.lua similarity index 100% rename from nvim/lazynvim/snippets/lua.lua rename to env/.config/nvim/snippets/lua.lua diff --git a/nvim/lazynvim/snippets/swift.lua b/env/.config/nvim/snippets/swift.lua similarity index 100% rename from nvim/lazynvim/snippets/swift.lua rename to env/.config/nvim/snippets/swift.lua diff --git a/nvim/lazynvim/spell/en.utf-8.add b/env/.config/nvim/spell/en.utf-8.add similarity index 100% rename from nvim/lazynvim/spell/en.utf-8.add rename to env/.config/nvim/spell/en.utf-8.add diff --git a/nvim/lazynvim/spell/en.utf-8.add.spl b/env/.config/nvim/spell/en.utf-8.add.spl similarity index 100% rename from nvim/lazynvim/spell/en.utf-8.add.spl rename to env/.config/nvim/spell/en.utf-8.add.spl diff --git a/nvim/lazynvim/stylua.toml b/env/.config/nvim/stylua.toml similarity index 100% rename from nvim/lazynvim/stylua.toml rename to env/.config/nvim/stylua.toml diff --git a/starship/starship.toml b/env/.config/starship/starship.toml similarity index 100% rename from starship/starship.toml rename to env/.config/starship/starship.toml diff --git a/tmux/tmux.conf b/env/.config/tmux/tmux.conf similarity index 100% rename from tmux/tmux.conf rename to env/.config/tmux/tmux.conf diff --git a/tree-sitter/config.json b/env/.config/tree-sitter/config.json similarity index 100% rename from tree-sitter/config.json rename to env/.config/tree-sitter/config.json diff --git a/walker/config.toml b/env/.config/walker/config.toml similarity index 100% rename from walker/config.toml rename to env/.config/walker/config.toml diff --git a/waybar/config.jsonc b/env/.config/waybar/config.jsonc similarity index 100% rename from waybar/config.jsonc rename to env/.config/waybar/config.jsonc diff --git a/waybar/style.css b/env/.config/waybar/style.css similarity index 100% rename from waybar/style.css rename to env/.config/waybar/style.css diff --git a/yazi/theme.toml b/env/.config/yazi/theme.toml similarity index 100% rename from yazi/theme.toml rename to env/.config/yazi/theme.toml diff --git a/yazi/theme.toml-1748966637471042 b/env/.config/yazi/theme.toml-1748966637471042 similarity index 100% rename from yazi/theme.toml-1748966637471042 rename to env/.config/yazi/theme.toml-1748966637471042 diff --git a/yazi/yazi.toml b/env/.config/yazi/yazi.toml similarity index 100% rename from yazi/yazi.toml rename to env/.config/yazi/yazi.toml diff --git a/yazi/yazi.toml-1748966636821415 b/env/.config/yazi/yazi.toml-1748966636821415 similarity index 100% rename from yazi/yazi.toml-1748966636821415 rename to env/.config/yazi/yazi.toml-1748966636821415 diff --git a/zsh/config/.zshrc b/env/.config/zsh/.zshrc similarity index 100% rename from zsh/config/.zshrc rename to env/.config/zsh/.zshrc diff --git a/zsh/config/functions/brew-update b/env/.config/zsh/functions/brew-update similarity index 100% rename from zsh/config/functions/brew-update rename to env/.config/zsh/functions/brew-update diff --git a/zsh/config/functions/cdots b/env/.config/zsh/functions/cdots similarity index 100% rename from zsh/config/functions/cdots rename to env/.config/zsh/functions/cdots diff --git a/zsh/config/functions/chmox b/env/.config/zsh/functions/chmox similarity index 100% rename from zsh/config/functions/chmox rename to env/.config/zsh/functions/chmox diff --git a/zsh/config/functions/clean-screenshots b/env/.config/zsh/functions/clean-screenshots similarity index 100% rename from zsh/config/functions/clean-screenshots rename to env/.config/zsh/functions/clean-screenshots diff --git a/zsh/config/functions/desktop b/env/.config/zsh/functions/desktop similarity index 100% rename from zsh/config/functions/desktop rename to env/.config/zsh/functions/desktop diff --git a/zsh/config/functions/dmg b/env/.config/zsh/functions/dmg similarity index 100% rename from zsh/config/functions/dmg rename to env/.config/zsh/functions/dmg diff --git a/zsh/config/functions/dp b/env/.config/zsh/functions/dp similarity index 100% rename from zsh/config/functions/dp rename to env/.config/zsh/functions/dp diff --git a/zsh/config/functions/edit-ssh-config b/env/.config/zsh/functions/edit-ssh-config similarity index 100% rename from zsh/config/functions/edit-ssh-config rename to env/.config/zsh/functions/edit-ssh-config diff --git a/zsh/config/functions/find-latest b/env/.config/zsh/functions/find-latest similarity index 100% rename from zsh/config/functions/find-latest rename to env/.config/zsh/functions/find-latest diff --git a/zsh/config/functions/gl b/env/.config/zsh/functions/gl similarity index 100% rename from zsh/config/functions/gl rename to env/.config/zsh/functions/gl diff --git a/zsh/config/functions/gma b/env/.config/zsh/functions/gma similarity index 100% rename from zsh/config/functions/gma rename to env/.config/zsh/functions/gma diff --git a/zsh/config/functions/gpgreset b/env/.config/zsh/functions/gpgreset similarity index 100% rename from zsh/config/functions/gpgreset rename to env/.config/zsh/functions/gpgreset diff --git a/zsh/config/functions/mkcd b/env/.config/zsh/functions/mkcd similarity index 100% rename from zsh/config/functions/mkcd rename to env/.config/zsh/functions/mkcd diff --git a/zsh/config/functions/n b/env/.config/zsh/functions/n similarity index 100% rename from zsh/config/functions/n rename to env/.config/zsh/functions/n diff --git a/zsh/config/functions/new-proposal b/env/.config/zsh/functions/new-proposal similarity index 100% rename from zsh/config/functions/new-proposal rename to env/.config/zsh/functions/new-proposal diff --git a/zsh/config/functions/shortdate b/env/.config/zsh/functions/shortdate similarity index 100% rename from zsh/config/functions/shortdate rename to env/.config/zsh/functions/shortdate diff --git a/zsh/config/functions/tns b/env/.config/zsh/functions/tns similarity index 100% rename from zsh/config/functions/tns rename to env/.config/zsh/functions/tns diff --git a/zsh/config/functions/update-dots b/env/.config/zsh/functions/update-dots similarity index 100% rename from zsh/config/functions/update-dots rename to env/.config/zsh/functions/update-dots diff --git a/zsh/config/functions/vic b/env/.config/zsh/functions/vic similarity index 100% rename from zsh/config/functions/vic rename to env/.config/zsh/functions/vic diff --git a/zsh/config/zsh-functions b/env/.config/zsh/zsh-functions similarity index 100% rename from zsh/config/zsh-functions rename to env/.config/zsh/zsh-functions diff --git a/zsh/config/.zshenv b/env/.zshenv similarity index 100% rename from zsh/config/.zshenv rename to env/.zshenv diff --git a/go b/go deleted file mode 100644 index 8d1c8b6..0000000 --- a/go +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gopass/config b/gopass/config deleted file mode 100644 index 304d1f0..0000000 --- a/gopass/config +++ /dev/null @@ -1,13 +0,0 @@ -[mounts] - path = /home/michael/.local/share/gopass/passwordstore -[recipients] - hash = 6a408ace969698b274c7c7580f7b0187e8aab4018ae06c5de895d69ae99b8b44 -[mounts "servers"] -[recipients "homelab"] - hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0 -[mounts "homelab"] -[recipients "new-test"] - hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3 -[mounts "new-test"] -[recipients "servers"] - hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0 diff --git a/gpg-tui/gpg-tui.toml b/gpg-tui/gpg-tui.toml deleted file mode 100644 index 91f2f73..0000000 --- a/gpg-tui/gpg-tui.toml +++ /dev/null @@ -1,32 +0,0 @@ -[general] - splash = false - tick_rate = 250 - color = "gray" - style = "colored" - file_explorer = "xplr" - detail_level = "minimum" - # log_file = "test" - # key_bindings = [ - # { keys = [ "?" ], command = ":help" }, - # { keys = [ "o" ], command = ":options" }, - # { keys = [ "n" ], command = ":normal" }, - # { keys = [ "v" ], command = ":visual" }, - # { keys = [ "c" ], command = ":copy" }, - # { keys = [ "p", "C-v" ], command = ":paste" }, - # { keys = [ "x" ], command = ":export" }, - # { keys = [ "s" ], command = ":set prompt :sign" }, - # { keys = [ "e" ], command = ":set prompt :edit" }, - # { keys = [ "i" ], command = ":set prompt :import"}, - # { keys = [ "f" ], command = ":set prompt :receive" }, - # { keys = [ "u" ], command = ":set prompt :send" }, - # { keys = [ "g" ], command = ":generate" }, - # { keys = [ "d", "backspace" ], command = ":delete" }, - # { keys = [ "C-r" ], command = ":refresh" }, - # ] - -[gpg] - armor = false - homedir = "~/.gnupg" - outdir = "~/.gnupg/out" - # outfile = "{type}_{query}.{ext}" - # default_key = "0xA1B2C3XY" diff --git a/kitty/kitty.conf b/kitty/kitty.conf deleted file mode 100644 index d7adb14..0000000 --- a/kitty/kitty.conf +++ /dev/null @@ -1,96 +0,0 @@ -# vim:ft=kitty -# _ _ _ ___ ___ _ _ ____ ____ _ _ ____ -# |_/ | | | \_/ | | | |\ | |___ -# | \_ | | | | .|___ |__| | \| | -# - -## name: Catppuccin Kitty Mocha -## author: Catppuccin Org -## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf -## blurb: Soothing pastel theme for the high-spirited! - -# The basic colors -foreground #cdd6f4 -background #1e1e2e -selection_foreground #1e1e2e -selection_background #f5e0dc - -# Cursor colors -cursor #f5e0dc -cursor_text_color #1e1e2e - -# URL underline color when hovering with mouse -url_color #f5e0dc - -# Kitty window border colors -active_border_color #b4befe -inactive_border_color #6c7086 -bell_border_color #f9e2af - -# OS Window titlebar colors -wayland_titlebar_color system -macos_titlebar_color system - -# Tab bar colors -active_tab_foreground #11111b -active_tab_background #cba6f7 -inactive_tab_foreground #cdd6f4 -inactive_tab_background #181825 -tab_bar_background #11111b - -# Colors for marks (marked text in the terminal) -mark1_foreground #1e1e2e -mark1_background #b4befe -mark2_foreground #1e1e2e -mark2_background #cba6f7 -mark3_foreground #1e1e2e -mark3_background #74c7ec - -# The 16 terminal colors - -# black -color0 #45475a -color8 #585b70 - -# red -color1 #f38ba8 -color9 #f38ba8 - -# green -color2 #a6e3a1 -color10 #a6e3a1 - -# yellow -color3 #f9e2af -color11 #f9e2af - -# blue -color4 #89b4fa -color12 #89b4fa - -# magenta -color5 #f5c2e7 -color13 #f5c2e7 - -# cyan -color6 #94e2d5 -color14 #94e2d5 - -# white -color7 #bac2de -color15 #a6adc8 - -font_family Droid Sans Mono for Powerline Regular - -font_size 13.0 -symbol_map U+E0A0-U+E0A3,U+E0C0-U+E0C7 1 -narrow_symbols U+E0A0-U+E0A3,U+E0C0-U+E0C7 1 - -macos_titlebar_color system - -background_opacity 0.9 - -#hide_window_decorations titlebar-only -hide_window_decorations no -confirm_os_window_close 0 diff --git a/nvim/m-housh/after/ftplugin/markdown.lua b/nvim/m-housh/after/ftplugin/markdown.lua deleted file mode 100644 index 92290ab..0000000 --- a/nvim/m-housh/after/ftplugin/markdown.lua +++ /dev/null @@ -1,20 +0,0 @@ --- Markdown specific key maps. --- -local todos = require("todo-comments") -local keywords = { "WARN", "WARNING", "IMPORTANT" } - --- Show all the warnings in the quick fix list. -vim.keymap.set( - "n", - "tw", - "Trouble todo toggle filter = {tag = {WARN, IMPORTANT}}", - { desc = "[T]odo [W]arnings" } -) - -vim.keymap.set("n", "]w", function() - todos.jump_next({ keywords = keywords }) -end, { desc = "Next [W]arning" }) - -vim.keymap.set("n", "[w", function() - todos.jump_prev({ keywords = keywords }) -end, { desc = "Previous [W]arning" }) diff --git a/nvim/m-housh/after/ftplugin/swift.lua b/nvim/m-housh/after/ftplugin/swift.lua deleted file mode 100644 index ebe4aff..0000000 --- a/nvim/m-housh/after/ftplugin/swift.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt.tabstop = 2 -vim.opt.shiftwidth = 2 diff --git a/nvim/m-housh/init.lua b/nvim/m-housh/init.lua deleted file mode 100755 index 102fd84..0000000 --- a/nvim/m-housh/init.lua +++ /dev/null @@ -1,22 +0,0 @@ --- Leader needs to be set before loading plugins -vim.g.mapleader = " " -vim.g.maplocalleader = " " - --- NOTE: Keep settings at the top, otherwise some options don't work well. --- mainly have had trouble with not using the settings in an `.editorconfig` --- file for projects. - --- Common settings -require("config.settings") - --- Auto commands -require("config.autocmd") - --- Plugins -require("config.lazy") - --- Key maps -require("config.keymaps") - --- Theme (must stay after plugins are loaded) -require("config.theme") diff --git a/nvim/m-housh/lua/config/autocmd.lua b/nvim/m-housh/lua/config/autocmd.lua deleted file mode 100755 index f5bd829..0000000 --- a/nvim/m-housh/lua/config/autocmd.lua +++ /dev/null @@ -1,58 +0,0 @@ -local defaultGroupOptions = { clear = true } -local markdownGroup = vim.api.nvim_create_augroup("MyMarkdownGroup", defaultGroupOptions) -local spellGroup = vim.api.nvim_create_augroup("SpellGroup", defaultGroupOptions) -local createCmd = vim.api.nvim_create_autocmd - --- Spell check -createCmd("BufEnter", { - pattern = { "*.md", "*.markdown", "*.txt", "*.tex" }, - group = spellGroup, - callback = function(_) - vim.cmd.setlocal("textwidth=80") - vim.cmd.setlocal("spell spelllang=en_us") - end, -}) - --- Markdown -createCmd("BufWritePost", { - pattern = { "*.md", "*.markdown" }, - group = markdownGroup, - callback = function(_) - local cursor = vim.fn.getpos(".") - vim.cmd("FormatWrite") - vim.fn.setpos(".", cursor) - end, -}) - --- Go -createCmd("BufWritePre", { - pattern = "*.go", - callback = function() - require("go.format").goimport() - end, - group = vim.api.nvim_create_augroup("GoFormat", defaultGroupOptions), -}) - --- Leaf -createCmd({ "BufRead", "BufNewFile" }, { - pattern = "*.leaf", - callback = function() - vim.opt.filetype = "html" - end, -}) - -vim.api.nvim_exec2( - [[ - autocmd BufNewFile,BufRead /private/**/gopass** setlocal noswapfile nobackup noundofile shada="" - ]], - {} -) - --- Highlight when yanking. -createCmd("TextYankPost", { - desc = "Highlight when yanking text.", - group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }), - callback = function() - vim.highlight.on_yank() - end, -}) diff --git a/nvim/m-housh/lua/config/keymaps.lua b/nvim/m-housh/lua/config/keymaps.lua deleted file mode 100755 index a486023..0000000 --- a/nvim/m-housh/lua/config/keymaps.lua +++ /dev/null @@ -1,52 +0,0 @@ -vim.g.mapleader = " " -vim.g.maplocalleader = " " - -local keymap = vim.keymap.set -local default_options = { noremap = true, silent = true } -local wk = require("which-key") - -local wk_add = function(mode, keymaps) - wk.add(keymaps, { mode = mode, silent = true }) -end - --------------------------------------------------------------------------------- --- Insert Mode --------------------------------------------------------------------------------- --- easier escape key mapping -keymap("i", "jk", "", default_options) -wk_add("i", { - { "", ":writea", desc = "[S]ave" }, -}) - --------------------------------------------------------------------------------- --- Normal Mode --------------------------------------------------------------------------------- -wk_add("n", { - { "", ":vertical resize +1", desc = "Resize Pane Left" }, - { "", ":vertical resize -1", desc = "Resize Pane Right" }, - { "", "resize -1", desc = "Resize Pane Up" }, - { "", "resize +1", desc = "Resize Pane Down" }, - - { "n", ":noh", desc = "[N]o highlighting" }, - { "s", ":set spell!", desc = "[S]pell check toggle" }, - { "", ":write", desc = "[S]ave" }, - - { "J", ":move .+1==", desc = "Move line down" }, - { "K", ":move .-2==", desc = "Move line up" }, - - { "z", ":ZenMode", desc = "[Z]en Mode" }, -}) - --------------------------------------------------------------------------------- --- Visual Mode --------------------------------------------------------------------------------- - -vim.keymap.set("v", "K", ":move '<-2gv=gv", { desc = "Move selected block up.", silent = true, noremap = true }) -vim.keymap.set("v", "J", ":move '>+1gv=gv", { desc = "Move selected block up.", silent = true, noremap = true }) - --- Toggle term key maps, that get attached when terminal is opened. -function _G.set_terminal_keymaps() - local opts = { buffer = 0 } - keymap("t", "", [[]], opts) -end -vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()") diff --git a/nvim/m-housh/lua/config/lazy.lua b/nvim/m-housh/lua/config/lazy.lua deleted file mode 100755 index d5b201d..0000000 --- a/nvim/m-housh/lua/config/lazy.lua +++ /dev/null @@ -1,83 +0,0 @@ --- Bootstrap Lazy. -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup({ - dev = { - path = "~/LocalProjects/plugins", - fallback = true, - }, - -- Import all the plugin configs in the 'plugin' directory - { import = "plugins" }, - -- Plugins that don't have a configuration file. - { - "folke/zen-mode.nvim", - opts = {}, - }, - { - "christoomey/vim-tmux-navigator", - lazy = false, - }, - { "NoahTheDuke/vim-just", ft = { "just" } }, - { - "chipsenkbeil/distant.nvim", - version = "v0.*", - event = "VeryLazy", - }, - { - "echasnovski/mini.ai", - version = "*", - config = function() - require("mini.ai").setup({}) - end, - }, - { - "vhyrro/luarocks.nvim", - enabled = true, - priority = 1001, -- this plugin needs to run before anything else - opts = { - rocks = { "magick" }, - }, - }, - { - "folke/lazydev.nvim", - ft = "lua", -- only load on lua files - opts = { - library = { - -- See the configuration section for more details - -- Load luvit types when the `vim.uv` word is found - { path = "${3rd}/luv/library", words = { "vim%.uv" } }, - }, - }, - }, - { - "MeanderingProgrammer/render-markdown.nvim", - -- dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite - dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons" }, -- if you use standalone mini plugins - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons - opts = {}, - }, -}, { - checker = { - enabled = true, - notify = false, - }, - change_detection = { - notify = false, - }, - rocks = { - hererocks = true, -- recommended if you do not have global installation of Lua 5.1. - }, -}) - -vim.keymap.set("n", "ll", "Lazy", { desc = "Open [L]azy" }) diff --git a/nvim/m-housh/lua/config/settings.lua b/nvim/m-housh/lua/config/settings.lua deleted file mode 100755 index 96ec45b..0000000 --- a/nvim/m-housh/lua/config/settings.lua +++ /dev/null @@ -1,66 +0,0 @@ -local o = vim.opt -local wo = vim.wo -local fn = vim.fn - -vim.cmd.set("inccommand=split") -o.filetype = "on" -o.updatetime = 500 -- faster completion -o.timeoutlen = 800 -- time to wait for a mapped sequence to complete (in milliseconds) -o.ttimeoutlen = 300 -- Time in milliseconds to wait for a key code sequence to complete -o.backup = false -- creates a backup file -o.swapfile = false -- enable/disable swap file creation -o.dir = fn.stdpath("data") .. "/swp" -- swap file directory -o.undofile = false -- enable/disable undo file creation -o.undodir = fn.stdpath("data") .. "/undodir" -- set undo directory -o.history = 500 -- Use the 'history' option to set the number of lines from command mode that are remembered. -o.hidden = true -- required to keep multiple buffers and open multiple buffers -o.clipboard = "unnamedplus" -- allows neovim to access the system clipboard -o.fileencoding = "utf-8" -- the encoding written to a file -o.conceallevel = 0 -- so that `` is visible in markdown files -o.number = true -- set numbered lines -o.relativenumber = true -- set relative numbered lines -o.cmdheight = 1 -- space for displaying messages/commands -o.showmode = false -- we don't need to see things like -- INSERT -- anymore -o.showtabline = 2 -- always show tabs -o.laststatus = 2 -- The value of this option influences when the last window will have a status line (2 always) -o.smartcase = true -- smart case -o.smartindent = true -- make indenting smarter again -o.splitbelow = true -- force all horizontal splits to go below current window -o.splitright = true -- force all vertical splits to go to the right of current window -o.autoindent = true -- turn on auto indent. -o.expandtab = true -- convert tabs to spaces -o.smarttab = true -- turn on smart tab -o.shiftwidth = 2 -- the number of spaces inserted for each indentation -o.tabstop = 2 -- how many columns a tab counts for -o.termguicolors = true -- set term gui colors (most terminals support this) -o.cursorline = true -- highlight the current line -o.scrolloff = 20 -- Minimal number of screen lines to keep above and below the cursor -o.sidescrolloff = 5 -- The minimal number of columns to scroll horizontally -o.hlsearch = false -- highlight all matches on previous search pattern -o.ignorecase = true -- ignore case in search patterns -o.foldenable = false -- disable folding; enable with zi -o.foldmethod = "expr" -o.foldexpr = "nvim_treesitter#foldexpr()" --- o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<" -o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<,space:␣" -o.shortmess = o.shortmess + "c" -- prevent "pattern not found" messages -wo.colorcolumn = "99999" -o.wildmode = "full" -o.lazyredraw = false -- do not redraw screen while running macros -o.grepprg = "rg --hidden --vimgrep --smart-case --" -o.completeopt = { "menu", "menuone", "noselect", "noinsert" } -- A comma separated list of options for Insert mode completion -o.wildignorecase = true -- When set case is ignored when completing file names and directories -o.wildignore = [[ -.git,.hg,.svn -*.aux,*.out,*.toc -*.o,*.obj,*.exe,*.dll,*.manifest,*.rbc,*.class -*.ai,*.bmp,*.gif,*.ico,*.jpg,*.jpeg,*.png,*.psd,*.webp -*.avi,*.divx,*.mp4,*.webm,*.mov,*.m2ts,*.mkv,*.vob,*.mpg,*.mpeg -*.mp3,*.oga,*.ogg,*.wav,*.flac -*.eot,*.otf,*.ttf,*.woff -*.doc,*.pdf,*.cbr,*.cbz -*.zip,*.tar.gz,*.tar.bz2,*.rar,*.tar.xz,*.kgb -*.swp,.lock,.DS_Store,._* -*/tmp/*,*.so,*.swp,*.zip,**/node_modules/**,**/target/**,**.terraform/**" -]] -o.viminfo = "" -- disable viminfo from copying information from current session, for security. diff --git a/nvim/m-housh/lua/config/theme.lua b/nvim/m-housh/lua/config/theme.lua deleted file mode 100755 index 79a299d..0000000 --- a/nvim/m-housh/lua/config/theme.lua +++ /dev/null @@ -1,4 +0,0 @@ --- Nightfox ---require('nightfox').load('terrafox') -vim.cmd.colorscheme "catppuccin" - diff --git a/nvim/m-housh/lua/plugins/blink.lua b/nvim/m-housh/lua/plugins/blink.lua deleted file mode 100644 index 69de619..0000000 --- a/nvim/m-housh/lua/plugins/blink.lua +++ /dev/null @@ -1,61 +0,0 @@ --- https://cmp.saghen.dev/ -return { - { - "saghen/blink.cmp", - enabled = false, - dependencies = { - -- "rafamadriz/friendly-snippets", - { "L3MON4D3/LuaSnip", version = "v2.*" }, - }, - version = "v0.*", - opts = { - signature = { enabled = true }, - sources = { - default = { "lsp", "path", "snippets", "buffer", "luasnip" }, - providers = { - lsp = { - name = "lsp", - enabled = true, - module = "blink.cmp.sources.lsp", - score_offset = 1000, -- higher = higher priority - }, - luasnip = { - name = "luasnip", - enabled = true, - module = "blink.cmp.sources.luasnip", - score_offset = 950, - }, - snippets = { - name = "snippets", - enabled = true, - module = "blink.cmp.sources.snippets", - score_offset = 900, - }, - }, - }, - snippets = { - expand = function(snippet) - require("luasnip").lsp_expand(snippet) - end, - active = function(filter) - if filter and filter.direction then - return require("luasnip").jumpable(filter.direction) - end - return require("luasnip").in_snippet() - end, - jump = function(direction) - require("luasnip").jump(direction) - end, - }, - }, - opts_extend = { "sources.default" }, - keymap = { - preset = "default", - - [""] = {}, - [""] = {}, - [""] = { "snippet_backward", "fallback" }, - [""] = { "snippet_forward", "fallback" }, - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/cmp.lua b/nvim/m-housh/lua/plugins/cmp.lua deleted file mode 100755 index e3a3e6b..0000000 --- a/nvim/m-housh/lua/plugins/cmp.lua +++ /dev/null @@ -1,95 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - enabled = true, - event = "VeryLazy", - dependencies = { - "MeanderingProgrammer/render-markdown.nvim", - "folke/lazydev.nvim", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", -- source for text in buffer - "hrsh7th/cmp-path", -- source for file system paths - "L3MON4D3/LuaSnip", -- snippet engine - "saadparwaiz1/cmp_luasnip", -- for autocompletion - "rafamadriz/friendly-snippets", -- useful snippets - "onsails/lspkind.nvim", -- vs-code like pictograms - }, - config = function() - local cmp = require("cmp") - local luasnip = require("luasnip") - local lspkind = require("lspkind") - - -- TODO: This is implemented in LuaSnip config, does it need to be here? - - -- loads vscode style snippets from installed plugins (e.g. friendly-snippets) - require("luasnip.loaders.from_vscode").lazy_load() - - cmp.setup({ - completion = { - completeopt = "menu,menuone,preview", - }, - snippet = { -- configure how nvim-cmp interacts with snippet engine - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_prev_item(), -- previous suggestion - [""] = cmp.mapping.select_next_item(), -- next suggestion - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }), -- select completion, this makes it so it doesn't auto complete when suggesting. - [""] = cmp.mapping.abort(), -- close completion window - [""] = cmp.mapping({ - i = function(fallback) - if cmp.visible() then - if luasnip.expandable() then - luasnip.expand() - else - cmp.mapping.confirm({ select = false }) - fallback() - end - else - fallback() - end - end, - s = cmp.mapping.confirm({ select = true }), - c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), - }), - -- TODO: - -- The next two mappings are also implemented in the LuaSnip configuration, - -- as and do they actually need to be here?? - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(1) then - luasnip.jump(1) - else - fallback() - end - end, { "i", "s" }), - }), - -- sources for autocompletion - sources = cmp.config.sources({ - { name = "lazydev", group_index = 0 }, - { name = "nvim_lsp" }, - { name = "luasnip" }, -- snippets - { name = "render-markdown" }, -- markdown - { name = "buffer" }, -- text within current buffer - { name = "path" }, -- file system paths - }), - -- configure lspkind for vs-code like pictograms in completion menu - formatting = { - format = lspkind.cmp_format({ - maxwidth = 50, - ellipsis_char = "...", - }), - }, - }) - end, -} diff --git a/nvim/m-housh/lua/plugins/comment.lua b/nvim/m-housh/lua/plugins/comment.lua deleted file mode 100755 index 9564a85..0000000 --- a/nvim/m-housh/lua/plugins/comment.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - 'numToStr/Comment.nvim', - event = { 'BufReadPre', 'BufNewFile' }, - opts = { - -- add any options here - }, -} diff --git a/nvim/m-housh/lua/plugins/fidget.lua b/nvim/m-housh/lua/plugins/fidget.lua deleted file mode 100644 index a9b709a..0000000 --- a/nvim/m-housh/lua/plugins/fidget.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "j-hui/fidget.nvim", - event = "VeryLazy", - opts = { - notification = { - window = { - normal_hl = "String", -- Base highlight group in the notification window - winblend = 0, -- Background color opacity in the notification window - border = "rounded", -- Border around the notification window - zindex = 45, -- Stacking priority of the notification window - max_width = 0, -- Maximum width of the notification window - max_height = 0, -- Maximum height of the notification window - x_padding = 1, -- Padding from right edge of window boundary - y_padding = 1, -- Padding from bottom edge of window boundary - align = "bottom", -- How to align the notification window - relative = "editor", -- What the notification window position is relative to - }, - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/flash.lua b/nvim/m-housh/lua/plugins/flash.lua deleted file mode 100644 index 31f43b1..0000000 --- a/nvim/m-housh/lua/plugins/flash.lua +++ /dev/null @@ -1,56 +0,0 @@ -return { - "folke/flash.nvim", - event = "VeryLazy", - opts = { - search = { - mode = "normal", - }, - modes = { - char = { - enabled = false, - }, - }, - }, - keys = { - { - "s", - mode = { "n", "x", "o" }, - function() - require("flash").jump() - end, - desc = "Flash", - }, - { - "S", - mode = { "n", "x", "o" }, - function() - require("flash").treesitter() - end, - desc = "Flash Treesitter", - }, - { - "r", - mode = "o", - function() - require("flash").remote() - end, - desc = "Remote Flash", - }, - { - "R", - mode = { "o", "x" }, - function() - require("flash").treesitter_search() - end, - desc = "Treesitter Search", - }, - { - "", - mode = { "c" }, - function() - require("flash").toggle() - end, - desc = "Toggle Flash Search", - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/formatter.lua b/nvim/m-housh/lua/plugins/formatter.lua deleted file mode 100755 index 95adf71..0000000 --- a/nvim/m-housh/lua/plugins/formatter.lua +++ /dev/null @@ -1,74 +0,0 @@ -return { - "mhartington/formatter.nvim", - event = { "BufReadPre", "BufNewFile" }, - keys = { - { - "f", - ":Format", - desc = "[F]ormat", - }, - { - "F", - ":FormatWrite", - desc = "[F]ormat write", - }, - }, - config = function(_, opts) - local util = require("formatter.util") - require("formatter").setup({ - filetype = { - lua = { - require("formatter.filetypes.lua").stylua, - function() - return { - exe = "stylua", - args = { - "--search-parent-directories", - "--stdin-filepath", - util.escape_path(util.get_current_buffer_file_path()), - "--", - "-", - }, - stdin = true, - } - end, - }, - markdown = function() - return { - exe = "prettier", - args = { - "--stdin-filepath", - util.escape_path(util.get_current_buffer_file_path()), - "--print-width", - "100", - "--prose-wrap", - "always", - "--parser", - "markdown", - }, - stdin = true, - try_node_modules = true, - } - end, - swift = function() - return { - exe = "swiftformat", - } - end, - ["*"] = { - -- formatter for any / all file types. - require("formatter.filetypes.any").remove_trailing_whitespace, - }, - }, - }) - - local augroup = vim.api.nvim_create_augroup - local autocmd = vim.api.nvim_create_autocmd - - augroup("__formatter__", { clear = true }) - autocmd("BufWritePost", { - group = "__formatter__", - command = ":FormatWrite", - }) - end, -} diff --git a/nvim/m-housh/lua/plugins/ghostty.lua b/nvim/m-housh/lua/plugins/ghostty.lua deleted file mode 100644 index a6e82d6..0000000 --- a/nvim/m-housh/lua/plugins/ghostty.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "ghostty", - dir = vim.env.GHOSTTY_PATH .. "/Contents/Resources/vim/vimfiles/", - lazy = false, -} diff --git a/nvim/m-housh/lua/plugins/go.lua b/nvim/m-housh/lua/plugins/go.lua deleted file mode 100755 index 6b7dabe..0000000 --- a/nvim/m-housh/lua/plugins/go.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "ray-x/go.nvim", - enabled = false, - lazy = true, - dependencies = { -- optional packages - "ray-x/guihua.lua", - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - 'mfussenegger/nvim-dap', - 'rcarriga/nvim-dap-ui', - 'theHamsta/nvim-dap-virtual-text', - }, - config = function() - require("go").setup() - end, - --event = {'BufReadPre', 'BufNewFile'}, - ft = {"go", 'gomod'}, - build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries -} diff --git a/nvim/m-housh/lua/plugins/harpoon.lua b/nvim/m-housh/lua/plugins/harpoon.lua deleted file mode 100644 index e2e8f14..0000000 --- a/nvim/m-housh/lua/plugins/harpoon.lua +++ /dev/null @@ -1,86 +0,0 @@ -return { - "ThePrimeagen/harpoon", - branch = "harpoon2", - event = "VeryLazy", - dependencies = { - "nvim-lua/plenary.nvim", - }, - config = function() - local harpoon = require("harpoon") - harpoon:setup({ - settings = { - save_on_toggle = true, - sync_on_ui_close = true, - key = function() - return vim.loop.cwd() - end, - }, - }) - - local conf = require("telescope.config").values - local function toggle_telescope(harpoon_files) - local file_paths = {} - for _, item in ipairs(harpoon_files.items) do - table.insert(file_paths, item.value) - end - - require("telescope.pickers") - .new({}, { - prompt_title = "Harpoon", - finder = require("telescope.finders").new_table({ - results = file_paths, - }), - previewer = conf.file_previewer({}), - sorter = conf.generic_sorter({}), - }) - :find() - end - - -- Keymaps - vim.keymap.set("n", "", function() - toggle_telescope(harpoon:list()) - end, { desc = "Open Harpoon window" }) - - vim.keymap.set("n", "a", function() - harpoon:list():add() - end, { desc = "[A]dd to harpoon list." }) - vim.keymap.set("n", "", function() - harpoon.ui:toggle_quick_menu(harpoon:list()) - end, { desc = "Toggle quick menu." }) - - -- Buffer key maps. Currently keeping all buffer movements - -- isolated to top left row of keys on keyboard and all begin - -- with the key. - - -- Select buffer numbers. - vim.keymap.set("n", "", function() - harpoon:list():select(1) - end, { desc = "Select first harpoon buffer." }) - vim.keymap.set("n", "", function() - harpoon:list():select(2) - end, { desc = "Select second harpoon buffer." }) - vim.keymap.set("n", "", function() - harpoon:list():select(3) - end, { desc = "Select third harpoon buffer." }) - vim.keymap.set("n", "", function() - harpoon:list():select(4) - end, { desc = "Select fourth harpoon buffer." }) - - -- Toggle previous and next buffers. - vim.keymap.set("n", "", function() - harpoon:list():prev() - end, { desc = "[P]revious harpoon buffer." }) - vim.keymap.set("n", "", function() - harpoon:list():next() - end, { desc = "[N]ext harpoon buffer." }) - - -- Extensions - harpoon:extend({ - UI_CREATE = function(cx) - vim.keymap.set("n", "", function() - harpoon.ui:select_menu_item({ vsplit = true }) - end, { buffer = cx.buffer, desc = "Open in [V]split" }) - end, - }) - end, -} diff --git a/nvim/m-housh/lua/plugins/image.lua b/nvim/m-housh/lua/plugins/image.lua deleted file mode 100644 index 4ab4c97..0000000 --- a/nvim/m-housh/lua/plugins/image.lua +++ /dev/null @@ -1,45 +0,0 @@ -return { - "3rd/image.nvim", - event = "VeryLazy", - dependencies = { - { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { "markdown" }, - highlight = { enable = true }, - }) - end, - }, - }, - opts = { - backend = "kitty", - --backend = "ueberzug", - integrations = { - markdown = { - enabled = true, - clear_in_insert_mode = false, - download_remote_images = true, - only_render_image_at_cursor = true, - floating_windows = true, - filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here - }, - neorg = { - enabled = true, - clear_in_insert_mode = false, - download_remote_images = true, - only_render_image_at_cursor = false, - filetypes = { "norg" }, - }, - }, - max_width = nil, - max_height = nil, - max_width_window_percentage = nil, - max_height_window_percentage = 50, - editor_only_render_when_focused = true, -- auto show/hide images when the editor gains/looses focus - tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off) - kitty_method = "normal", - hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened - }, -} diff --git a/nvim/m-housh/lua/plugins/init.lua b/nvim/m-housh/lua/plugins/init.lua deleted file mode 100755 index da94064..0000000 --- a/nvim/m-housh/lua/plugins/init.lua +++ /dev/null @@ -1,2 +0,0 @@ --- This file contains plugin's that don't require much configuration. -return {} diff --git a/nvim/m-housh/lua/plugins/lazygit.lua b/nvim/m-housh/lua/plugins/lazygit.lua deleted file mode 100755 index cc1473e..0000000 --- a/nvim/m-housh/lua/plugins/lazygit.lua +++ /dev/null @@ -1,11 +0,0 @@ -return {} --- return { --- "kdheepak/lazygit.nvim", --- dependencies = { --- "nvim-telescope/telescope.nvim", --- "nvim-lua/plenary.nvim" --- }, --- config = function() --- require("telescope").load_extension("lazygit") --- end, --- } diff --git a/nvim/m-housh/lua/plugins/lsp.lua b/nvim/m-housh/lua/plugins/lsp.lua deleted file mode 100755 index acfc413..0000000 --- a/nvim/m-housh/lua/plugins/lsp.lua +++ /dev/null @@ -1,120 +0,0 @@ -return { - { - "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - -- "saghen/blink.cmp", - { "antosha417/nvim-lsp-file-operations", config = true }, - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - { - "folke/lazydev.nvim", - ft = "lua", - opts = { - library = { - { path = "${3rd}/luv/library", words = { "vim%.uv" } }, - }, - }, - }, - }, - config = function() - require("mason").setup() - require("mason-lspconfig").setup({ - ensure_installed = { - "bashls", - "clangd", - "dockerls", - "gopls", - "jinja_lsp", - "jqls", - "jsonls", - "ltex", - "lua_ls", - "marksman", - "tinymist", - "yamlls", - }, - automatic_installation = true, - }) - local lspconfig = require("lspconfig") - local cmp_nvim_lsp = require("cmp_nvim_lsp") - local capabilities = cmp_nvim_lsp.default_capabilities() - -- local capabilities = require("blink.cmp").get_lsp_capabilities() - local opts = { noremap = true, silent = true } - local on_attach = function(_, bufnr) - opts.buffer = bufnr - - opts.desc = "Show line diagnostics" - vim.keymap.set("n", "d", vim.diagnostic.open_float, opts) - - opts.desc = "Show diagnostics in Telescope" - vim.keymap.set("n", "d", "Telescope diagnostics bufnr=0", opts) - - opts.desc = "Show documentation for what is under cursor" - vim.keymap.set("n", "", vim.lsp.buf.hover, opts) - - opts.desc = "[G]oto [D]efinition" - vim.keymap.set("n", "gd", "Telescope lsp_definitions trim_text=true", opts) - - opts.desc = "[G]oto [D]eclaration" - vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) - - opts.desc = "[G]oto [R]eferences" - vim.keymap.set("n", "gr", "Telescope lsp_references", opts) - - opts.desc = "LSP [C]ode [A]ction" - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, opts) - - --opts.desc = "[R]e-[N]ame" - --vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) - - opts.desc = "[R]eload or start LSP" - vim.keymap.set({ "n", "x" }, "rl", ":LspRestart | :LspStart", opts) - - opts.desc = "Goto previous diagnostic" - vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) - - opts.desc = "Goto next diagnostic" - vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) - end - - -- The language servers to setup. - local lsp_servers = { - "bashls", - "clangd", - "dockerls", - "gopls", - "jsonls", - "lua_ls", - "marksman", - "sourcekit", - "tinymist", - "yamlls", - } - - for _, lsp in ipairs(lsp_servers) do - lspconfig[lsp].setup({ - capabilities = capabilities, - on_attach = on_attach, - on_init = function(client) - -- HACK: to fix some issues with LSP - -- more details: https://github.com/neovim/neovim/issues/19237#issuecomment-2237037154 - client.offset_encoding = "utf-8" - end, - cmd = lsp == "sourcekit" and { vim.trim(vim.fn.system("xcrun -f sourcekit-lsp")) } or nil, - }) - end - - -- nice icons - local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " } - for type, icon in pairs(signs) do - local hl = "DiagnosticSign" .. type - vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) - end - - -- For some reason I was having trouble getting this to work inside the on-attach, so it's here. - vim.keymap.set("n", "rn", vim.lsp.buf.rename, { desc = "[R]e-[N]ame" }) - end, - }, -} diff --git a/nvim/m-housh/lua/plugins/lualine.lua b/nvim/m-housh/lua/plugins/lualine.lua deleted file mode 100755 index b8ba1c3..0000000 --- a/nvim/m-housh/lua/plugins/lualine.lua +++ /dev/null @@ -1,69 +0,0 @@ -local function xcodebuild_device() - if vim.g.xcodebuild_platform == "macOS" then - return " macOS" - end - - if vim.g.xcodebuild_os then - return " " .. vim.g.xcodebuild_device_name .. " (" .. vim.g.xcodebuild_os .. ")" - end - - return " " .. vim.g.xcodebuild_device_name -end - -return { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - options = { - globalstatus = true, - theme = "auto", - symbols = { - alternate_file = "#", - directory = "", - readonly = "", - unnamed = "[No Name]", - newfile = "[New]", - }, - disabled_buftypes = { "quickfix", "prompt" }, - component_separators = "", - section_separators = { left = "", right = "" }, - }, - sections = { - lualine_a = { - -- { "mode" }, - { "filename" }, - }, - lualine_b = { - { "diagnostics" }, - { "diff" }, - { - "searchcount", - maxcount = 999, - timeout = 500, - }, - }, - lualine_c = {}, - lualine_x = { - { "' ' .. vim.g.xcodebuild_last_status", color = { fg = "#a6e3a1" } }, - -- { "'󰙨 ' .. vim.g.xcodebuild_test_plan", color = { fg = "#a6e3a1", bg = "#161622" } }, - { xcodebuild_device, color = { fg = "#f9e2af", bg = "#161622" } }, - }, - lualine_y = { - { "branch" }, - }, - lualine_z = { - { "location" }, - }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = {}, - lualine_y = {}, - lualine_z = {}, - }, - extensions = { "nvim-dap-ui", "quickfix", "trouble", "nvim-tree", "lazy", "mason" }, - - }, -} diff --git a/nvim/m-housh/lua/plugins/luasnip.lua b/nvim/m-housh/lua/plugins/luasnip.lua deleted file mode 100644 index 3e59490..0000000 --- a/nvim/m-housh/lua/plugins/luasnip.lua +++ /dev/null @@ -1,55 +0,0 @@ -return { - "L3MON4D3/LuaSnip", - version = "v2.*", - event = "VeryLazy", - keys = { - { - "", - mode = { "i", "s" }, - function() - local ls = require("luasnip") - if ls.expand_or_jumpable() then - ls.expand_or_jump() - end - end, - }, - { - "", - mode = { "i", "s" }, - function() - local ls = require("luasnip") - if ls.jumpable(-1) then - ls.jump(-1) - end - end, - }, - { - "", - mode = { "i", "s" }, - function() - local ls = require("luasnip") - if ls.choice_active() then - ls.change_choice(1) - end - end, - }, - }, - config = function() - local ls = require("luasnip") - ls.setup({ - history = true, - enable_autosnippets = false, - updatevents = "TextChanged,TextChangedI", - extra_opts = { - [require("luasnip.util.types").choiceNode] = { - active = { - virt_text = { { "choiceNode", "Comment" } }, - }, - }, - }, - }) - - require("luasnip.loaders.from_vscode").lazy_load() - require("luasnip.loaders.from_lua").lazy_load({ paths = vim.fn.stdpath("config") .. "/snippets" }) - end, -} diff --git a/nvim/m-housh/lua/plugins/markdown-preview.lua b/nvim/m-housh/lua/plugins/markdown-preview.lua deleted file mode 100644 index 6166bd5..0000000 --- a/nvim/m-housh/lua/plugins/markdown-preview.lua +++ /dev/null @@ -1,24 +0,0 @@ --- This needs some work, as it's not working. May need to install a different browser?? -return { - "iamcco/markdown-preview.nvim", - enabled = false, - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - ft = { "markdown" }, - config = function() - return { - mkdp_browser = "Vivaldi", - } - end, - keys = { - { - "mp", - ft = "markdown", - "MarkdownPreviewToggle", - desc = "Markdown Preview", - }, - }, - build = "cd app && yarn install", - init = function() - vim.g.mkdp_filetypes = { "markdown" } - end, -} diff --git a/nvim/m-housh/lua/plugins/noice.lua b/nvim/m-housh/lua/plugins/noice.lua deleted file mode 100755 index 98ad41f..0000000 --- a/nvim/m-housh/lua/plugins/noice.lua +++ /dev/null @@ -1,46 +0,0 @@ -return { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { - -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries - "MunifTanjim/nui.nvim", - -- OPTIONAL: - -- `nvim-notify` is only needed, if you want to use the notification view. - -- If not available, we use `mini` as the fallback - "rcarriga/nvim-notify", - }, - opts = { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, - }, - -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help - }, - signature = { enabled = false }, - }, - routes = { - { -- enables messages for showing macro recording. - view = "notify", - filter = { event = "msg_showmode" }, - }, - { -- Hide the written messages. - view = "notify", - filter = { - event = "msg_show", - kind = "", - find = "written", - }, - opts = { skip = true }, - }, - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/nvim-dap.lua b/nvim/m-housh/lua/plugins/nvim-dap.lua deleted file mode 100644 index 20ee777..0000000 --- a/nvim/m-housh/lua/plugins/nvim-dap.lua +++ /dev/null @@ -1,71 +0,0 @@ -local function setupListeners() - local dap = require("dap") - local areSet = false - - dap.listeners.after["event_initialized"]["me"] = function() - if not areSet then - areSet = true - vim.keymap.set("n", "dc", dap.continue, { desc = "Continue", noremap = true }) - vim.keymap.set("n", "dC", dap.run_to_cursor, { desc = "Run To Cursor" }) - vim.keymap.set("n", "ds", dap.step_over, { desc = "Step Over" }) - vim.keymap.set("n", "di", dap.step_into, { desc = "Step Into" }) - vim.keymap.set("n", "do", dap.step_out, { desc = "Step Out" }) - vim.keymap.set({ "n", "v" }, "dh", require("dap.ui.widgets").hover, { desc = "Hover" }) - vim.keymap.set({ "n", "v" }, "de", require("dapui").eval, { desc = "Eval" }) - end - end - - dap.listeners.after["event_terminated"]["me"] = function() - if areSet then - areSet = false - vim.keymap.del("n", "dc") - vim.keymap.del("n", "dC") - vim.keymap.del("n", "ds") - vim.keymap.del("n", "di") - vim.keymap.del("n", "do") - vim.keymap.del({ "n", "v" }, "dh") - vim.keymap.del({ "n", "v" }, "de") - end - end -end - -return { - "mfussenegger/nvim-dap", - --event = "VeryLazy", - dependencies = { - "wojciech-kulik/xcodebuild.nvim", - }, - config = function() - local xcodebuild = require("xcodebuild.integrations.dap") - - -- TODO: make sure to set path to your codelldb - local codelldbPath = os.getenv("HOME") .. "/tools/codelldb-aarch64-darwin/extension/adapter/codelldb" - xcodebuild.setup(codelldbPath) - - local define = vim.fn.sign_define - define("DapBreakpoint", { text = "", texthl = "DiagnosticError", linehl = "", numhl = "" }) - define("DapBreakpointRejected", { text = "", texthl = "DiagnosticError", linehl = "", numhl = "" }) - define("DapStopped", { text = "", texthl = "DiagnosticOk", linehl = "", numhl = "" }) - define("DapLogPoint", { text = "", texthl = "DiagnosticInfo", linehl = "", numhl = "" }) - define("DapLogPoint", { text = "", texthl = "DiagnosticInfo", linehl = "", numhl = "" }) - - setupListeners() - - --when breakpoint is hit, it sets the focus to the buffer with the breakpoint - require("dap").defaults.fallback.switchbuf = "usetab,uselast" - - --stylua: ignore start - vim.keymap.set("n", "dd", xcodebuild.build_and_debug, { desc = "Build & Debug" }) - vim.keymap.set("n", "dr", xcodebuild.debug_without_build, { desc = "Debug Without Building" }) - vim.keymap.set("n", "dt", xcodebuild.debug_tests, { desc = "Debug Tests" }) - vim.keymap.set("n", "dT", xcodebuild.debug_class_tests, { desc = "Debug Class Tests" }) - vim.keymap.set("n", "b", xcodebuild.toggle_breakpoint, { desc = "Toggle Breakpoint" }) - vim.keymap.set("n", "B", xcodebuild.toggle_message_breakpoint, { desc = "Toggle Message Breakpoint" }) - --stylua: ignore end - - vim.keymap.set("n", "dx", function() - xcodebuild.terminate_session() - require("dap").listeners.after["event_terminated"]["me"]() - end, { desc = "Terminate debugger" }) - end, -} diff --git a/nvim/m-housh/lua/plugins/nvim-dapui.lua b/nvim/m-housh/lua/plugins/nvim-dapui.lua deleted file mode 100644 index dd905be..0000000 --- a/nvim/m-housh/lua/plugins/nvim-dapui.lua +++ /dev/null @@ -1,87 +0,0 @@ -return { - "rcarriga/nvim-dap-ui", - dependencies = { - "mfussenegger/nvim-dap", - "nvim-neotest/nvim-nio", - }, - lazy = true, - config = function() - require("dapui").setup({ - controls = { - element = "repl", - enabled = true, - icons = { - disconnect = "", - run_last = "", - terminate = "⏹︎", - pause = "⏸︎", - play = "", - step_into = "󰆹", - step_out = "󰆸", - step_over = "", - step_back = "", - }, - }, - floating = { - border = "single", - mappings = { - close = { "q", "" }, - }, - }, - icons = { - collapsed = "", - expanded = "", - current_frame = "", - }, - layouts = { - { - elements = { - { id = "stacks", size = 0.25 }, - { id = "scopes", size = 0.25 }, - { id = "breakpoints", size = 0.25 }, - { id = "watches", size = 0.25 }, - }, - position = "left", - size = 40, - }, - { - elements = { - { id = "repl", size = 0.4 }, - { id = "console", size = 0.6 }, - }, - position = "bottom", - size = 10, - }, - }, - }) - - local dap, dapui = require("dap"), require("dapui") - local group = vim.api.nvim_create_augroup("dapui_config", { clear = true }) - - -- hide ~ in DAPUI - vim.api.nvim_create_autocmd("BufWinEnter", { - group = group, - pattern = "DAP*", - callback = function() - vim.wo.fillchars = "eob: " - end, - }) - vim.api.nvim_create_autocmd("BufWinEnter", { - group = group, - pattern = "\\[dap\\-repl\\]", - callback = function() - vim.wo.fillchars = "eob: " - end, - }) - - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() - end - end, -} diff --git a/nvim/m-housh/lua/plugins/nvim-lint.lua b/nvim/m-housh/lua/plugins/nvim-lint.lua deleted file mode 100644 index 83867aa..0000000 --- a/nvim/m-housh/lua/plugins/nvim-lint.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - "mfussenegger/nvim-lint", - event = { "BufReadPre", "BufNewFile" }, - config = function() - local lint = require("lint") - - lint.linters_by_ft = { - swift = { "swiftlint" }, - } - - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - - vim.api.nvim_create_autocmd({ "BufWritePost", "BufReadPost", "InsertLeave", "TextChanged" }, { - group = lint_augroup, - callback = function() - require("lint").try_lint() - end, - }) - - vim.keymap.set("n", "ml", function() - require("lint").try_lint() - end, { desc = "[L]int file" }) - end, -} diff --git a/nvim/m-housh/lua/plugins/oil.lua b/nvim/m-housh/lua/plugins/oil.lua deleted file mode 100644 index b1c134f..0000000 --- a/nvim/m-housh/lua/plugins/oil.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - "stevearc/oil.nvim", - event = "VeryLazy", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - opts = { - columns = { "icon" }, - keymaps = { - [""] = false, - [""] = "actions.select_split", - [""] = { - "actions.select", - opts = { vertical = true }, - desc = "Open the entry in a vertical split", - }, - }, - view_options = { - is_hidden_file = function(name, _) -- second arg is bufnr, but not currently used. - -- Don't show .DS_Store in output. - local is_ds_store = name ~= ".DS_Store" - return not is_ds_store - end, - }, - }, - keys = { - -- Show the parent directory in current window. - { "-", "Oil", desc = "Open directory." }, - -- Open parent directory in floating window. - { - "-", - function() - require("oil").toggle_float() - end, - desc = "Open directory in float.", - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/presenting.lua b/nvim/m-housh/lua/plugins/presenting.lua deleted file mode 100644 index c7cb6c8..0000000 --- a/nvim/m-housh/lua/plugins/presenting.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "sotte/presenting.nvim", - opts = { - -- fill in your options here - -- see :help Presenting.config - }, - cmd = { "Presenting" }, -} diff --git a/nvim/m-housh/lua/plugins/swift.lua b/nvim/m-housh/lua/plugins/swift.lua deleted file mode 100755 index 0080124..0000000 --- a/nvim/m-housh/lua/plugins/swift.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "m-housh/swift.nvim", - dependencies = { - "akinsho/toggleterm.nvim", - }, - ft = { "swift" }, - config = function() - require("swift").setup() - local default_options = { noremap = true, silent = true } - local actions = require("swift.actions") - vim.opt.tabstop = 2 - vim.opt.shiftwidth = 2 - vim.keymap.set("n", "", actions.build, default_options) - vim.keymap.set("n", "", actions.test, default_options) - end, -} diff --git a/nvim/m-housh/lua/plugins/telescope.lua b/nvim/m-housh/lua/plugins/telescope.lua deleted file mode 100755 index 560c506..0000000 --- a/nvim/m-housh/lua/plugins/telescope.lua +++ /dev/null @@ -1,102 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - branch = "0.1.x", - dependencies = { - "nvim-lua/plenary.nvim", - }, - lazy = true, - config = function() - local actions = require("telescope.actions") - local builtin = require("telescope.builtin") - - require("telescope").setup({ - ensure_installed = { - "swift", - }, - defaults = { - file_ignore_patterns = { "node_modules", "%.jpg", "%.png", ".swiftpm" }, - vimgrep_arguments = { - "rg", - "--follow", - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - "--smart-case", - }, - mappings = { - i = { - -- Close on first esc instead of going to normal mode - [""] = actions.close, - [""] = actions.send_selected_to_qflist, - [""] = actions.send_to_qflist, - [""] = actions.toggle_selection + actions.move_selection_next, - [""] = actions.toggle_selection + actions.move_selection_previous, - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - }, - n = { - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - [""] = actions.toggle_selection + actions.move_selection_next, - [""] = actions.toggle_selection + actions.move_selection_previous, - [""] = actions.send_selected_to_qflist, - [""] = actions.send_to_qflist, - }, - }, - prompt_prefix = " ", - selection_caret = " ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "descending", - layout_strategy = "flex", - layout_config = { - width = 0.75, - prompt_position = "bottom", - preview_cutoff = 120, - horizontal = { mirror = false }, - vertical = { mirror = true }, - }, - file_sorter = require("telescope.sorters").get_fuzzy_file, - generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - -- path_display = true, -- strange behaviour not showing the files in result window - winblend = 0, - border = {}, - borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - color_devicons = true, - use_less = true, - set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, - file_previewer = require("telescope.previewers").vim_buffer_cat.new, - grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, - qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, - - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker, - }, - }) - - local map = function(keys, action, desc) - local opts = { silent = true, noremap = true, desc = desc } - vim.keymap.set("n", keys, action, opts) - end - - local find_files = function(dir) - return function() - builtin.find_files({ cwd = dir, hidden = true, no_ignore = true }) - end - end - - vim.keymap.set("n", "", builtin.jumplist, { silent = true, noremap = true, desc = "Open [J]ump List." }) - map("ff", builtin.find_files, "[F]ind [F]iles") - map("fg", builtin.live_grep, "[F]ind [G]rep") - map("fb", builtin.buffers, "[F]ind [B]uffers") - map("fh", builtin.help_tags, "[F]ind [H]elp") - map("fd", find_files("$DOTFILES"), "[F]ind [D]otfiles") - map("fn", find_files("$DOTFILES/nvim/m-housh"), "[F]ind [N]vim file") - map("fs", find_files("$DOTFILES/scripts/scripts"), "[F]ind [S]cript") - map("fz", find_files("$DOTFILES/zsh/config"), "[F]ind [Z]sh config file") - map("gf", builtin.git_files, "Find [G]it [F]iles") - end, -} diff --git a/nvim/m-housh/lua/plugins/theme.lua b/nvim/m-housh/lua/plugins/theme.lua deleted file mode 100755 index 9849e1f..0000000 --- a/nvim/m-housh/lua/plugins/theme.lua +++ /dev/null @@ -1,38 +0,0 @@ --- return { --- 'EdenEast/nightfox.nvim', --- lazy = false, -- make sure we load this during startup --- priority = 1000, -- make sure to load this before all other plugins. --- opts = { --- --fox = "terafox", -- change the colorscheme to use terafox --- styles = { --- comments = "italic", -- change style of comments to be italic --- keywords = "bold", -- change style of keywords to be bold --- functions = "italic,bold" -- styles can be a comma separated list --- }, --- inverse = { --- match_paren = true, -- inverse the highlighting of match_parens --- }, --- colors = { --- red = "#FF0000", -- Override the red color for MAX POWER --- --bg_alt = "#000000", --- }, --- hlgroups = { --- TSPunctDelimiter = { fg = "${red}" }, -- Override a highlight group with the color red --- LspCodeLens = { bg = "#000000", style = "italic" }, --- } --- }, --- } -return { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = { - color_overrides = { - all = { - text = "#ffffff", - strings = "#ffffff" - } - } - } -} - diff --git a/nvim/m-housh/lua/plugins/todo-comments.lua b/nvim/m-housh/lua/plugins/todo-comments.lua deleted file mode 100644 index 09e35a5..0000000 --- a/nvim/m-housh/lua/plugins/todo-comments.lua +++ /dev/null @@ -1,49 +0,0 @@ -return { - "folke/todo-comments.nvim", - event = "VeryLazy", - dependencies = { - "nvim-lua/plenary.nvim", - "folke/trouble.nvim", - }, - opts = { - keywords = { - -- Adds the important keyword, I primarily use this in markdown - -- documents to be able to jump and color appropriately. - FIX = { alt = { "IMPORTANT" } }, - - -- Adds mark keyword, used in swift. - NOTE = { alt = { "MARK" } }, - }, - }, - keys = { - { - "tq", - "Trouble todo toggle", - desc = "Todo quick fix list.", - }, - { - "t", - "TodoTelescope", - desc = "Todo telescope list.", - }, - { - "tl", - "TodoLocList", - desc = "Todo location list.", - }, - { - "]t", - function() - require("todo-comments").jump_next() - end, - desc = "Next todo.", - }, - { - "[t", - function() - require("todo-comments").jump_prev() - end, - desc = "Previous todo.", - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/toggleterm.lua b/nvim/m-housh/lua/plugins/toggleterm.lua deleted file mode 100755 index 6352495..0000000 --- a/nvim/m-housh/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - 'akinsho/toggleterm.nvim', - enable = true, - lazy = true, - opts = { - size = 20, - open_mapping = [[]], - hide_numbers = true, - shade_terminals = true, - shading_factor = 2, - start_in_insert = true, - insert_mappings = true, - persist_size = true, - direction = "float", - close_on_exit = true, - shell = vim.o.shell, - float_opts = { - border = "curved", - winblend = 0, - highlights = { - border = "Normal", - background = "Normal", - }, - }, - } - } diff --git a/nvim/m-housh/lua/plugins/treesitter.lua b/nvim/m-housh/lua/plugins/treesitter.lua deleted file mode 100755 index 66d9471..0000000 --- a/nvim/m-housh/lua/plugins/treesitter.lua +++ /dev/null @@ -1,76 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - "nvim-treesitter/nvim-treesitter-textobjects", - }, - build = ":TSUpdate", - event = { "BufReadPre", "BufNewFile" }, - opts = { - ensure_installed = { - "bash", - "cmake", - "dockerfile", - "go", - "hcl", - "html", - "java", - "javascript", - "json", - "latex", - "ledger", - "llvm", - "lua", - "make", - "markdown", - "python", - "swift", - "toml", - "xml", - "yaml", - }, -- one of "all", "maintained" (parsers with maintainers), or a list of languages - ignore_install = {}, -- List of parsers to ignore installing - highlight = { - enable = true, -- false will disable the whole extension - disable = {}, -- list of language that will be disabled - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - scope_incremental = "", - node_incremental = "", - node_decremental = "", - }, - }, - indent = { enable = true }, - autopairs = { { enable = true } }, - textobjects = { - select = { - enable = true, - -- Automatically jump forward to textobj, similar to targets.vim - lookahead = true, - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner", - ["al"] = "@loop.outer", - ["il"] = "@loop.inner", - ["ib"] = "@block.inner", - ["ab"] = "@block.outer", - ["ir"] = "@parameter.inner", - ["ar"] = "@parameter.outer", - ["a="] = "@assignment.outer", - ["i="] = "@assignment.inner", - }, - }, - }, - rainbow = { - enable = true, - extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean - max_file_lines = 2000, -- Do not enable for files with more than specified lines - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/trouble.lua b/nvim/m-housh/lua/plugins/trouble.lua deleted file mode 100644 index b55d730..0000000 --- a/nvim/m-housh/lua/plugins/trouble.lua +++ /dev/null @@ -1,46 +0,0 @@ -return { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - event = { "BufReadPre", "BufNewFile" }, - keys = { - { "d", "Trouble diagnostics toggle", { desc = "Trouble [D]iagnostics" } }, - { "dq", "Trouble quickfix toggle", { desc = "Trouble [Q]uikfix." } }, - { "dl", "Trouble loclist toggle", { desc = "Trouble [L]ocation list" } }, - }, - - opts = {}, - config = function() - require("trouble").setup({ - auto_open = false, - auto_close = false, - auto_preview = true, - auto_jump = false, - mode = "quickfix", - severity = vim.diagnostic.severity.ERROR, - cycle_results = false, - }) - vim.api.nvim_create_autocmd("User", { - pattern = { "XcodebuildBuildFinished", "XcodebuildTestsFinished" }, - callback = function(event) - if event.data.cancelled then - return - end - - if event.data.success then - require("trouble").close() - elseif not event.data.failedCount or event.data.failedCount > 0 then - if next(vim.fn.getqflist()) then - require("trouble").open("quickfix") - else - require("trouble").close() - end - - require("trouble").refresh() - end - end, - }) - -- Jump to diagnostic issues across the whole project. - vim.keymap.set("n", "", "silent cc | silent cnzz", { desc = "Jump to next issue" }) - vim.keymap.set("n", "", "silent cc | silent cpzz", { desc = "Jump to previous issue" }) - end, -} diff --git a/nvim/m-housh/lua/plugins/which-key.lua b/nvim/m-housh/lua/plugins/which-key.lua deleted file mode 100755 index ce7a4b6..0000000 --- a/nvim/m-housh/lua/plugins/which-key.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - opts = { - preset = "helix", - }, - keys = { - { - "?", - function() - require("which-key").show({ global = false }) - end, - desc = "Buffer Local Keymaps (which-key)", - }, - }, -} diff --git a/nvim/m-housh/lua/plugins/wrapping.lua b/nvim/m-housh/lua/plugins/wrapping.lua deleted file mode 100755 index a24fc01..0000000 --- a/nvim/m-housh/lua/plugins/wrapping.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "andrewferrier/wrapping.nvim", - event = { 'BufReadPre', 'BufNewFile' }, - opts = { - auto_set_mode_filetype_allowlist = { - "asciidoc", - "gitcommit", - "latex", - "markdown", - "tex", - "text" - }, - softener = { - markdown = 1.3 - }, - }, - } diff --git a/nvim/m-housh/lua/plugins/xcodebuild.lua b/nvim/m-housh/lua/plugins/xcodebuild.lua deleted file mode 100644 index caf5ec4..0000000 --- a/nvim/m-housh/lua/plugins/xcodebuild.lua +++ /dev/null @@ -1,82 +0,0 @@ -local progress_handle - -return { - "wojciech-kulik/xcodebuild.nvim", - --event = "VeryLazy", - ft = "swift", - --branch = "fix/issue-249", - dependencies = { - "nvim-telescope/telescope.nvim", - "MunifTanjim/nui.nvim", - }, - config = function() - require("xcodebuild").setup({ - show_build_progress_bar = false, - logs = { - auto_open_on_success_tests = false, - auto_open_on_failed_tests = false, - auto_open_on_success_build = false, - auto_open_on_failed_build = false, - auto_focus = false, - auto_close_on_app_launch = true, - only_summary = true, - notify = function(message, severity) - local fidget = require("fidget") - if progress_handle then - progress_handle.message = message - if not message:find("Loading") then - progress_handle:finish() - progress_handle = nil - if vim.trim(message) ~= "" then - fidget.notify(message, severity) - end - end - else - fidget.notify(message, severity) - end - end, - notify_progress = function(message) - local progress = require("fidget.progress") - - if progress_handle then - progress_handle.title = "" - progress_handle.message = message - else - progress_handle = progress.handle.create({ - message = message, - lsp_client = { name = "xcodebuild.nvim" }, - }) - end - end, - }, - code_coverage = { - enabled = true, - }, - }) - - -- stylua: ignore start - vim.keymap.set("n", "X", "XcodebuildPicker", { desc = "Show Xcodebuild Actions" }) - vim.keymap.set("n", "xf", "XcodebuildProjectManager", { desc = "Show Project Manager Actions" }) - - vim.keymap.set("n", "xb", "XcodebuildBuild", { desc = "Build Project" }) - vim.keymap.set("n", "xB", "XcodebuildBuildForTesting", { desc = "Build For Testing" }) - vim.keymap.set("n", "xr", "XcodebuildBuildRun", { desc = "Build & Run Project" }) - - vim.keymap.set("n", "xt", "XcodebuildTest", { desc = "Run Tests" }) - vim.keymap.set("v", "xt", "XcodebuildTestSelected", { desc = "Run Selected Tests" }) - vim.keymap.set("n", "xT", "XcodebuildTestClass", { desc = "Run This Test Class" }) - - vim.keymap.set("n", "xl", "XcodebuildToggleLogs", { desc = "Toggle Xcodebuild Logs" }) - vim.keymap.set("n", "xc", "XcodebuildToggleCodeCoverage", { desc = "Toggle Code Coverage" }) - vim.keymap.set("n", "xC", "XcodebuildShowCodeCoverageReport", { desc = "Show Code Coverage Report" }) - vim.keymap.set("n", "xe", "XcodebuildTestExplorerToggle", { desc = "Toggle Test Explorer" }) - vim.keymap.set("n", "xs", "XcodebuildFailingSnapshots", { desc = "Show Failing Snapshots" }) - - vim.keymap.set("n", "xd", "XcodebuildSelectDevice", { desc = "Select Device" }) - vim.keymap.set("n", "xp", "XcodebuildSelectTestPlan", { desc = "Select Test Plan" }) - vim.keymap.set("n", "xq", "Telescope quickfix", { desc = "Show QuickFix List" }) - - vim.keymap.set("n", "xx", "XcodebuildQuickfixLine", { desc = "Quickfix Line" }) - vim.keymap.set("n", "xa", "XcodebuildCodeActions", { desc = "Show Code Actions" }) - end, -} diff --git a/nvim/m-housh/snippets/init.lua b/nvim/m-housh/snippets/init.lua deleted file mode 100644 index 9028086..0000000 --- a/nvim/m-housh/snippets/init.lua +++ /dev/null @@ -1,17 +0,0 @@ --- Setup snippets here. -local ls = require("luasnip") -local s = ls.snippet -local sn = ls.snippet_node -local ms = ls.multi_snippet -local i = ls.insert_node -local f = ls.function_node -local c = ls.choice_node -local t = ls.text_node - -ls.add_snippets("lua", { - s("hello", { - t('print("hello '), - i(1), - t(' world")'), - }), -}) diff --git a/nvim/m-housh/snippets/lua.lua b/nvim/m-housh/snippets/lua.lua deleted file mode 100644 index 518c789..0000000 --- a/nvim/m-housh/snippets/lua.lua +++ /dev/null @@ -1,41 +0,0 @@ --- Setup snippets here. -local ls = require("luasnip") -local s = ls.snippet -local sn = ls.snippet_node -local ms = ls.multi_snippet -local i = ls.insert_node -local f = ls.function_node -local c = ls.choice_node -local t = ls.text_node - -ls.add_snippets("lua", { - -- Setup a new snippet file. - s("sf", { - t({ - "-- Setup snippets.", - 'local ls = require("luasnip")', - "local s = ls.snippet", - "local sn = ls.snippet_node", - "local ms = ls.multi_snippet", - "local i = ls.insert_node", - "local f = ls.function_node", - "local c = ls.choice_node", - "local t = ls.text_node", - "-- Add snippets", - }), - t('ls.add_snippets("'), - i(1, ""), - t({ - '", {', - "\t-- Define snippets here.", - "})", - }), - }), - s("c", { - c(1, { - t("1st"), - t("2nd"), - }), - }), -}) - diff --git a/nvim/m-housh/snippets/swift.lua b/nvim/m-housh/snippets/swift.lua deleted file mode 100644 index 1d8255f..0000000 --- a/nvim/m-housh/snippets/swift.lua +++ /dev/null @@ -1,141 +0,0 @@ --- Setup snippets. -local ls = require("luasnip") -local s = ls.snippet -local sn = ls.snippet_node -local ms = ls.multi_snippet -local i = ls.insert_node -local f = ls.function_node -local c = ls.choice_node -local t = ls.text_node -local fmt = require("luasnip.extras.fmt").fmt -local rep = require("luasnip.extras").rep --- Add snippets -ls.add_snippets("swift", { - - -- Logging - s( - { trig = "logg", desc = "Log a message" }, - fmt('logger.{}("{}")', { - i(1), - i(2), - }) - ), - - -- Add a dependency snippet. - s({ trig = "@dep", desc = "Add a dependency." }, fmt("@Dependency(\\.{}) var {}", { i(1), rep(1) })), - - -- Add a dependency client. - s( - { - trig = "@dc", - desc = "Add a dependency client.", - }, - fmt( - [[ - public extension DependencyValues {{ - var {}: {} {{ - get {{ self[{}.self] }} - set {{ self[{}.self] = newValue }} - }} - }} - - @DependencyClient - public struct {} {{ - - // Insert interface here. - {} - }} - - extension {}: TestDependencyKey {{ - public static let testValue: {} = Self() - }} - - ]], - { - i(1, ""), - i(2, ""), - rep(2), - rep(2), - rep(2), - i(0), - rep(2), - rep(2), - } - ) - ), - - s( - { trig = "str", desc = "Add a struct" }, - fmt( - [[ - struct {}: {} {{ - {} - }} - ]], - { i(1, ""), i(2, ""), i(0) } - ) - ), - - -- Decorate a type or function with an @_spi(...) - s({ trig = "@_s", desc = "Add spi modifier." }, fmt("@_spi({})", { i(1, "name") })), - - -- Add an @_spi(...) import ... - s( - { trig = "@_si", desc = "Import with spi." }, - fmt( - [[ - @_spi({}) import {} - {} - ]], - { i(1, "name"), i(2, "module"), i(0) } - ) - ), - - -- Document a function - -- TODO: add dynamic number of prameters. - s( - { trig = "docf", desc = "Document a function." }, - fmt( - [[ - /// {} - /// - /// - Parameters: - /// - {}: {} - ]], - { i(1, "A short description."), i(2, ""), i(3, "Describe the parameter.") } - ) - ), - - -- Add a parameter to a documentation string. - s( - { trig = "param", desc = "Add a parameter to documentation" }, - fmt( - [[ - /// - {}: {} - ]], - { i(1, ""), i(2, "") } - ) - ), - - -- Add a withDependencies - s( - { trig = "wd", desc = "withDependencies" }, - fmt( - [[ - withDependencies {{ - $0.{} = {} - }} operation: {{ - @Dependency(\.{}) var {} - {} - }} - ]], - { - i(1, ""), - i(2, ""), - rep(1), - rep(1), - i(0), - } - ) - ), -}) diff --git a/nvim/m-housh/spell/en.utf-8.add b/nvim/m-housh/spell/en.utf-8.add deleted file mode 100755 index 096d029..0000000 --- a/nvim/m-housh/spell/en.utf-8.add +++ /dev/null @@ -1,16 +0,0 @@ -MeasureQuick -Housh -sealtite -Subcool -OEM -NEC -AHJ -CFM -Hydronic -subpar -quo -IAQ -wc -HVAC -dehumidification -ansible diff --git a/nvim/m-housh/spell/en.utf-8.add.spl b/nvim/m-housh/spell/en.utf-8.add.spl deleted file mode 100755 index c805b67..0000000 Binary files a/nvim/m-housh/spell/en.utf-8.add.spl and /dev/null differ diff --git a/runs/dev b/runs/dev index 5309793..6c14229 100755 --- a/runs/dev +++ b/runs/dev @@ -32,8 +32,9 @@ yay -S --noconfirm --needed \ pcsc-tools \ starship \ swaync \ - tree-sitter-cli \ + tldr \ tmux \ + tree-sitter-cli \ wl-clipboard \ yubikey-manger \ zoxide \ diff --git a/runs/nautilus b/runs/nautilus new file mode 100755 index 0000000..a12ef89 --- /dev/null +++ b/runs/nautilus @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +yay ${1:-"-S --noconfirm"} nautilus diff --git a/runs/yazi b/runs/yazi new file mode 100755 index 0000000..c27bf17 --- /dev/null +++ b/runs/yazi @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +yay ${1:-"-S --noconfirm"} yazi diff --git a/scripts/enable-services.sh b/scripts/enable-services.sh index c060c20..ec16a27 100755 --- a/scripts/enable-services.sh +++ b/scripts/enable-services.sh @@ -7,3 +7,4 @@ sudo setcap "cap_dac_override+p" $(which espanso) systemctl --user enable --now logout-task.service systemctl --user enable --now batter-monitor.timer +sudo sysetmctl enable --now pscsd.service diff --git a/ssh/config b/ssh/config deleted file mode 100644 index e08cbba..0000000 --- a/ssh/config +++ /dev/null @@ -1,66 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -36386431326264346262396233353265336630626364653932343439343531663635366436656637 -3633613465313232613061653031353332353763626233370a373034393230393733343231313734 -34616431343331653763653362306631393036393165336363326463633338386230653133313061 -3238393235386461390a376237663766323437353633303138626631656163353665656534363066 -63303864393437343539346532373366353335303436643465393138363332366335636232663334 -38333262613162663261663039653330643036343666636261626166346139346532346163633563 -64653639343634343535323532646430636563623435363065386561643434333630356133636435 -63343135393130356362643561626434636562313562386630363636653161343663343031343330 -65636339356639383062356333323232633333636434643138663136366632313431366132373264 -65373237623066643336386232616565366634643865643238383632653735616134303466346463 -62663064666364636566643963653836663737393537326462343639303736643536313335653238 -38306230363262323634353563616662333336636563636233393864633136363730393136636664 -34653862633639353631323239343463303331656636623537356635316434323932373831346431 -32333338393763383237373062383138366332363439336466663636386631636361356333353333 -36656133343637336131396564343032373930353962373331333231616537326262313039643862 -63343638656636373239393564333365636636346565376631303431616530343639653835653766 -32656433376235646661393463383564626362373364306539373062383264653130323139386332 -62373634633635653833653835613037663234313134616565666663303263623930306232313436 -36646534306635626166333933636538383766633730626236363737333463643564616437386138 -35663738326161643863383135643565326336653131636539303632393237336462383434303137 -61653230643861333834376135323864323834323938343964653433336265353134396133653165 -30646139626138643565356166316566306634663265386535623665633333653930643338336232 -32383932363332396438653435636365343564366464613065326633393136393030323338633632 -61636264383135363435383239653466633339313863626665326566356634313635643462396163 -66383738306132656163643438613665663833353638326532346439336465353365613338313934 -61386335313338383130376431323734383731623038616161386363373334333232626337333939 -38363265383538633135643535373731346261343165306665333234613133343763623261653634 -39643565376264373431323337363166393362336630323038626139343930383034376262613432 -33643733333531363136363631323933616433666336653335373365343333333438333063633935 -65643562303634386365336436653630636662343865376433393735323631616363383566616231 -36333935316139653864323333333665326163356538363564633532393839346138646666353534 -61626131313336643365323030343933613566303036373039373461323633313235386263383662 -62333063343462383338656264663364323039356161366165306631663334373438653433373030 -64353361653032626163376135313264323861636636656539363533626437383939383963383639 -36653637663135313132323536633864633561626436393336333963376439363131363766613863 -37373462366538363536623465346265663731663739613766623665376361316630663630366337 -31316236373561643536646533373238623763633630343663643461373366623835356234643030 -61356331383838316564636530656634353264663031393539386532623239336565656564346261 -31646463383431666462643366653535393736313462323437376262326464323537616663663433 -30323233613937353738666432356663326232383632333366646330323431616436393361323536 -36663063386634383966363632656364323035613231303362383339646237396438633037366539 -65383165333238633337313339663231623164656435623966336236666365653361393934353938 -65353438386139346364336263316666343632353736356230663830363062316336396136393065 -64306336643939343631386231343436353131393463636564636361323332666666613863323232 -31356132363631373363656361326230666564366130393063333862616334653932373266306538 -65616630373738333837623934653763336230323263616666616338373530663862313136613231 -66363439376231336532373736613638333632306337346161623430656130636362656235613637 -33376338663765396235653138626638663763303433623764363633323263623431386262663334 -65393934316236343434336334373639396437656265653736636135306464663631373461326636 -63316435623762623463383563363331396262383236396433666562336332633963663630616236 -65303362346162373233663065646137353135643336313239643662613537346263653839666564 -63623833346463313965636135373538323362356634363632366361393536363766653032633661 -62656164393331623662646230343030633162613235666232613164643837616264656239383062 -61336532383035363932363730623239353063373264386564656265323736363737396431346330 -30376631636437303765623063303566313038653239343264313837383136303033343834306461 -31366564333635386634653834663866643861396664303132313435333135623361396232643164 -31663137656461623765313961313830373438363738306232313263386363616336623763663736 -33646639343239353331616564653130303338373536663464363832376362366361663438366138 -65633738363662373266326638616366326463313837333733346462333235356235306166663262 -62333735323563613963336335613462646664663561393436643530356339323737343265323637 -66663136393033356661613065363030653535393966326637626637316261356135353631653562 -65626233316534646137333936346134303761323034303736366633613066353333656165326662 -63363766613963346633613861333266353663333665373362643638326263633236396338373961 -66636361363633623238663565376637373433363966616237393936336534656161333065666461 -36333834653465636666316639333733656463363437646439376634386463643134 diff --git a/tmux/tmux-powerline/config.sh b/tmux/tmux-powerline/config.sh deleted file mode 100644 index eb3f25a..0000000 --- a/tmux/tmux-powerline/config.sh +++ /dev/null @@ -1,201 +0,0 @@ -# Default configuration file for tmux-powerline. -# Modeline { -# vi: foldmarker={,} foldmethod=marker foldlevel=0 tabstop=4 filetype=sh -# } - -# General { - # Show which segment fails and its exit code. - export TMUX_POWERLINE_DEBUG_MODE_ENABLED="false" - # Use patched font symbols. - export TMUX_POWERLINE_PATCHED_FONT_IN_USE="true" - - # The theme to use. - export TMUX_POWERLINE_THEME="mhoush" - # Overlay directory to look for themes. There you can put your own themes outside the repo. Fallback will still be the "themes" directory in the repo. - export TMUX_POWERLINE_DIR_USER_THEMES="${XDG_CONFIG_HOME:-$HOME/.config}/tmux-powerline/themes" - # Overlay directory to look for segments. There you can put your own segments outside the repo. Fallback will still be the "segments" directory in the repo. - export TMUX_POWERLINE_DIR_USER_SEGMENTS="${XDG_CONFIG_HOME:-$HOME/.config}/tmux-powerline/segments" - - # The initial visibility of the status bar. Can be {"on, off"}. - export TMUX_POWERLINE_STATUS_VISIBILITY="on" - # The status bar refresh interval in seconds. - # Note that events that force-refresh the status bar (such as window renaming) will ignore this. - export TMUX_POWERLINE_STATUS_INTERVAL="1" - # The location of the window list. Can be {"absolute-centre, centre, left, right"}. - # Note that "absolute-centre" is only supported on `tmux -V` >= 3.2. - export TMUX_POWERLINE_STATUS_JUSTIFICATION="centre" - - # The maximum length of the left status bar. - export TMUX_POWERLINE_STATUS_LEFT_LENGTH="60" - # The maximum length of the right status bar. - export TMUX_POWERLINE_STATUS_RIGHT_LENGTH="90" - - # Uncomment these if you want to enable tmux bindings for muting (hiding) one of the status bars. - # E.g. this example binding would mute the left status bar when pressing followed by Ctrl-[ - #export TMUX_POWERLINE_MUTE_LEFT_KEYBINDING="C-[" - #export TMUX_POWERLINE_MUTE_RIGHT_KEYBINDING="C-]" -# } - -# battery.sh { - # How to display battery remaining. Can be {percentage, cute}. - export TMUX_POWERLINE_SEG_BATTERY_TYPE="percentage" - # How may hearts to show if cute indicators are used. - export TMUX_POWERLINE_SEG_BATTERY_NUM_HEARTS="5" -# } - -# date.sh { - # date(1) format for the date. If you don't, for some reason, like ISO 8601 format you might want to have "%D" or "%m/%d/%Y". - export TMUX_POWERLINE_SEG_DATE_FORMAT="%F" -# } - -# disk_usage.sh { - # Filesystem to retrieve disk space information. Any from the filesystems available (run "df | awk '{print }'" to check them). - export TMUX_POWERLINE_SEG_DISK_USAGE_FILESYSTEM="/" -# } - -# earthquake.sh { - # The data provider to use. Currently only "goo" is supported. - export TMUX_POWERLINE_SEG_EARTHQUAKE_DATA_PROVIDER="goo" - # How often to update the earthquake data in seconds. - # Note: This is not an early warning detector, use this - # to be informed about recent earthquake magnitudes in your - # area. If this is too often, goo may decide to ban you form - # their server - export TMUX_POWERLINE_SEG_EARTHQUAKE_UPDATE_PERIOD="600" - # Only display information when earthquakes are within this many minutes - export TMUX_POWERLINE_SEG_EARTHQUAKE_ALERT_TIME_WINDOW="60" - # Display time with this format - export TMUX_POWERLINE_SEG_EARTHQUAKE_TIME_FORMAT='(%H:%M)' - # Display only if magnitude is greater or equal to this number - export TMUX_POWERLINE_SEG_EARTHQUAKE_MIN_MAGNITUDE="3" -# } - -# hostname.sh { - # Use short or long format for the hostname. Can be {"short, long"}. - export TMUX_POWERLINE_SEG_HOSTNAME_FORMAT="short" -# } - -# macos_notification_count.sh { - # App ids to query in notification center, separated by space - # To get the app id that is associated with a specific app run: - # sqlite3 -list "/var/folders/f1/rvv29ht91w15bk13tdcd339m0000gn/0//com.apple.notificationcenter/db/db" 'select * from app_info' - # The first column contains the app ids - # "5" is the app id of Messages.app - # Only "banner" notifications are supported (see settings in the notification center) - export TMUX_POWERLINE_SEG_MACOS_NOTIFICATION_COUNT_APPIDS="5" - # Notification symbol - export TMUX_POWERLINE_SEG_MACOS_NOTIFICATION_COUNT_CHAR="💬" -# } - -# mailcount.sh { - # Mailbox type to use. Can be any of {apple_mail, gmail, maildir, mbox, mailcheck} - export TMUX_POWERLINE_SEG_MAILCOUNT_MAILBOX_TYPE="" - - ## Gmail - # Enter your Gmail username here WITH OUT @gmail.com.( OR @domain) - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_USERNAME="" - # Google password. Recomenned to use application specific password (https://accounts.google.com/b/0/IssuedAuthSubTokens) Leave this empty to get password from OS X keychain. - # For OSX users : MAKE SURE that you add a key to the keychain in the format as follows - # Keychain Item name : http:// - # Account name : @ - # Password : Your password ( Once again, try to use 2 step-verification and application-specific password) - # See http://support.google.com/accounts/bin/answer.py?hl=en&answer=185833 for more info. - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_PASSWORD="" - # Domain name that will complete your email. For normal GMail users it probably is "gmail.com but can be "foo.tld" for Google Apps users. - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_SERVER="gmail.com" - # How often in minutes to check for new mails. - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_INTERVAL="5" - - ## Maildir - # Path to the maildir to check. - export TMUX_POWERLINE_SEG_MAILCOUNT_MAILDIR_INBOX="/Users/michael/.mail/inbox/new" - - ## mbox - # Path to the mbox to check. - export TMUX_POWERLINE_SEG_MAILCOUNT_MBOX_INBOX="" - - ## mailcheck - # Optional path to mailcheckrc - export TMUX_POWERLINE_SEG_MAILCOUNT_MAILCHECKRC="/Users/michael/.mailcheckrc" -# } - -# now_playing.sh { - # Music player to use. Can be any of {audacious, banshee, cmus, itunes, lastfm, mocp, mpd, mpd_simple, pithos, playerctl, rdio, rhythmbox, spotify, spotify_wine, file}. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MUSIC_PLAYER="spotify" - # File to be read in case the song is being read from a file - export TMUX_POWERLINE_SEG_NOW_PLAYING_FILE_NAME="" - # Maximum output length. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MAX_LEN="40" - # How to handle too long strings. Can be {trim, roll}. - export TMUX_POWERLINE_SEG_NOW_PLAYING_TRIM_METHOD="trim" - # Charcters per second to roll if rolling trim method is used. - export TMUX_POWERLINE_SEG_NOW_PLAYING_ROLL_SPEED="2" - - # Hostname for MPD server in the format "[password@]host" - export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_HOST="localhost" - # Port the MPD server is running on. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_PORT="6600" - # Song display format for mpd_simple. See mpc(1) for delimiters. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_SIMPLE_FORMAT="%artist% - %title%" - # Song display format for playerctl. see "Format Strings" in playerctl(1). - export TMUX_POWERLINE_SEG_NOW_PLAYING_PLAYERCTL_FORMAT="{{ artist }} - {{ title }}" - # Song display format for rhythmbox. see "FORMATS" in rhythmbox-client(1). - export TMUX_POWERLINE_SEG_NOW_PLAYING_RHYTHMBOX_FORMAT="%aa - %tt" - - # Last.fm - # Set up steps for Last.fm - # 1. Make sure jq(1) is installed on the system. - # 2. Create a new API application at https://www.last.fm/api/account/create (name it tmux-powerline) and copy the API key and insert it below in the setting TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_API_KEY - # 3. Make sure the API can access your recently played song by going to you user privacy settings https://www.last.fm/settings/privacy and make sure "Hide recent listening information" is UNCHECKED. - # Username for Last.fm if that music player is used. - export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_USERNAME="" - # API Key for the API. - export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_API_KEY="" - # How often in seconds to update the data from last.fm. - export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_UPDATE_PERIOD="30" - # Fancy char to display before now playing track - export TMUX_POWERLINE_SEG_NOW_PLAYING_NOTE_CHAR="♫" -# } - -# pwd.sh { - # Maximum length of output. - export TMUX_POWERLINE_SEG_PWD_MAX_LEN="40" -# } - -# time.sh { - # date(1) format for the time. Americans might want to have "%I:%M %p". - export TMUX_POWERLINE_SEG_TIME_FORMAT="%I:%M %p" -# } - -# tmux_session_info.sh { - # Session info format to feed into the command: tmux display-message -p - # For example, if FORMAT is '[ #S ]', the command is: tmux display-message -p '[ #S ]' - export TMUX_POWERLINE_SEG_TMUX_SESSION_INFO_FORMAT="#S:#I.#P" -# } - -# utc_time.sh { - # date(1) format for the UTC time. - export TMUX_POWERLINE_SEG_UTC_TIME_FORMAT="%H:%M %Z" -# } - -# vcs_branch.sh { - # Max length of the branch name. - export TMUX_POWERLINE_SEG_VCS_BRANCH_MAX_LEN="24" -# } - -# weather.sh { - # The data provider to use. Currently only "yahoo" is supported. - export TMUX_POWERLINE_SEG_WEATHER_DATA_PROVIDER="yrno" - # What unit to use. Can be any of {c,f,k}. - export TMUX_POWERLINE_SEG_WEATHER_UNIT="c" - # How often to update the weather in seconds. - export TMUX_POWERLINE_SEG_WEATHER_UPDATE_PERIOD="600" - # Name of GNU grep binary if in PATH, or path to it. - export TMUX_POWERLINE_SEG_WEATHER_GREP="grep" - # Location of the JSON parser, jq - export TMUX_POWERLINE_SEG_WEATHER_JSON="jq" - # Your location - # Latitude and Longtitude for use with yr.no - TMUX_POWERLINE_SEG_WEATHER_LAT="" - TMUX_POWERLINE_SEG_WEATHER_LON="" -# } diff --git a/tmux/tmux-powerline/themes/mhoush.sh b/tmux/tmux-powerline/themes/mhoush.sh deleted file mode 100644 index 135be17..0000000 --- a/tmux/tmux-powerline/themes/mhoush.sh +++ /dev/null @@ -1,113 +0,0 @@ -# Default Theme - -if patched_font_in_use; then - TMUX_POWERLINE_SEPARATOR_LEFT_BOLD="" - TMUX_POWERLINE_SEPARATOR_LEFT_THIN="" - TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD="" - TMUX_POWERLINE_SEPARATOR_RIGHT_THIN="" -else - TMUX_POWERLINE_SEPARATOR_LEFT_BOLD="◀" - TMUX_POWERLINE_SEPARATOR_LEFT_THIN="❮" - TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD="▶" - TMUX_POWERLINE_SEPARATOR_RIGHT_THIN="❯" -fi - -TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR:-'235'} -TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR:-'255'} - -TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD} -TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_LEFT_BOLD} - -# See man tmux.conf for additional formatting options for the status line. -# The `format regular` and `format inverse` functions are provided as conveniences - -if [ -z $TMUX_POWERLINE_WINDOW_STATUS_CURRENT ]; then - TMUX_POWERLINE_WINDOW_STATUS_CURRENT=( - "#[$(format inverse)]" \ - "$TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR" \ - " #I#F " \ - "$TMUX_POWERLINE_SEPARATOR_RIGHT_THIN" \ - " #W " \ - "#[$(format regular)]" \ - "$TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR" - ) -fi - -if [ -z $TMUX_POWERLINE_WINDOW_STATUS_STYLE ]; then - TMUX_POWERLINE_WINDOW_STATUS_STYLE=( - "$(format regular)" - ) -fi - -if [ -z $TMUX_POWERLINE_WINDOW_STATUS_FORMAT ]; then - TMUX_POWERLINE_WINDOW_STATUS_FORMAT=( - "#[$(format regular)]" \ - " #I#{?window_flags,#F, } " \ - "$TMUX_POWERLINE_SEPARATOR_RIGHT_THIN" \ - " #W " - ) -fi - -# Format: segment_name background_color foreground_color [non_default_separator] [separator_background_color] [separator_foreground_color] [spacing_disable] [separator_disable] -# -# * background_color and foreground_color. Formats: -# * Named colors (chech man page of tmux for complete list) e.g. black, red, green, yellow, blue, magenta, cyan, white -# * a hexadecimal RGB string e.g. #ffffff -# * 'default' for the defalt tmux color. -# * non_default_separator - specify an alternative character for this segment's separator -# * separator_background_color - specify a unique background color for the separator -# * separator_foreground_color - specify a unique foreground color for the separator -# * spacing_disable - remove space on left, right or both sides of the segment: -# * "left_disable" - disable space on the left -# * "right_disable" - disable space on the right -# * "both_disable" - disable spaces on both sides -# * - any other character/string produces no change to default behavior (eg "none", "X", etc.) -# -# * separator_disable - disables drawing a separator on this segment, very useful for segments -# with dynamic background colours (eg tmux_mem_cpu_load): -# * "separator_disable" - disables the separator -# * - any other character/string produces no change to default behavior -# -# Example segment with separator disabled and right space character disabled: -# "hostname 33 0 {TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD} 33 0 right_disable separator_disable" -# -# Note that although redundant the non_default_separator, separator_background_color and -# separator_foreground_color options must still be specified so that appropriate index -# of options to support the spacing_disable and separator_disable features can be used - -if [ -z $TMUX_POWERLINE_LEFT_STATUS_SEGMENTS ]; then - TMUX_POWERLINE_LEFT_STATUS_SEGMENTS=( - "tmux_session_info 148 234" \ - "hostname 33 0" \ - #"ifstat 30 255" \ - #"ifstat_sys 30 255" \ - #"lan_ip 24 255 ${TMUX_POWERLINE_SEPARATOR_RIGHT_THIN}" \ - #"wan_ip 24 255" \ - "vcs_branch 29 88" \ - "pwd 89 211" \ - #"vcs_compare 60 255" \ - "vcs_staged 64 255" \ - "vcs_modified 9 255" \ - #"vcs_others 245 0" \ - ) -fi - -if [ -z $TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS ]; then - TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS=( - #"earthquake 3 0" \ - "macos_notification_count 29 255" \ - #"mailcount 9 255" \ - "now_playing 234 37" \ - #"cpu 240 136" \ - #"load 237 167" \ - #"tmux_mem_cpu_load 234 136" \ - "battery 137 127" \ - #"weather 37 255" \ - #"rainbarf 0 ${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR}" \ - #"xkb_layout 125 117" \ - "date_day 235 136" \ - "date 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \ - "time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \ - #"utc_time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \ - ) -fi diff --git a/vim/vimrc b/vim/vimrc deleted file mode 100644 index fc8ca0c..0000000 --- a/vim/vimrc +++ /dev/null @@ -1,99 +0,0 @@ - -" ----------------------- settings ---------------------------------- -set autoindent -set autowrite " automatically write files when changing -set background=dark -set backspace=indent,eol,start -set belloff=all -set colorcolumn=80 -set expandtab " replace tabs with spaces automatically -set exrc -set foldmethod=manual -set hidden -set history=100 " command history -set icon -set incsearch -set nobackup -set nocompatible -set nofixendofline -set nohlsearch -set noswapfile -"set nowrap -set number -set relativenumber -set ruler " turns on col and row in lower right -" used with `set ruler` -set ruf=%30(%=%#LineNr#%.50F\ [%{strlen(&ft)?&ft:'none'}]\ %l:%c\ %p%%%) -set scrolloff=8 -set shiftwidth=2 -set showmode " show command and insert mode -set signcolumn=no -set smartindent -set smarttab -set softtabstop=2 -set tabstop=2 -set termguicolors -set textwidth=72 " Used with line wrapping -set ttyfast " faster scrolling -set undodir=~/.vim/undodir -set undofile -set viminfo='20,<1000,s1000 " prevents truncated yanks, deletes, etc. -set wildmenu -set wrap - -syntax enable -filetype plugin on " sense the filesystem -let mapleader = " " - -" ----------------------- plugins ---------------------------------- - -" Install vim-plug if not found -if empty(glob('~/.vim/autoload/plug.vim')) - silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs - \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -endif - -" Run PlugInstall if there are missing plugins -autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) - \| PlugInstall --sync | source $MYVIMRC -\| endif - -call plug#begin('~/.vim/plugged') - Plug 'junegunn/fzf' - Plug 'vim-pandoc/vim-pandoc' - Plug 'rwxrob/vim-pandoc-syntax-simple' - Plug 'morhetz/gruvbox' -call plug#end() - -colorscheme gruvbox -" highlight Normal guibg=none - -" ----------------------- utilities ---------------------------------- - -" fuzzy finder -let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } } - -" opens fuzzy finder under the current directory -nmap ff :call fzf#run(fzf#wrap({ 'source': 'find "$PWD" -type f' })) -" opens fuzzy finder for files under a git version control -nmap fg :call fzf#run(fzf#wrap({ 'source': 'git ls-files' })) - - -fun! TrimWhiteSpace() - let l:save = winsaveview() - keeppatterns %s/\s\+$//e - call winrestview(l:save) -endfun - -augroup MICHAEL - autocmd! - autocmd BufWritePre * :call TrimWhiteSpace() - autocmd Filetype yaml setlocal ts=2 sts=2 sw=2 expandtab - autocmd Filetype markdown setlocal tw=79 fo+=t - autocmd Filetype pandoc setlocal tw=79 fo+=t - " format json when writing a buffer. - autocmd BufWritePre *.json :silent %!jq -augroup END - - - diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua deleted file mode 100644 index 2a1a797..0000000 --- a/wezterm/wezterm.lua +++ /dev/null @@ -1,47 +0,0 @@ -local wezterm = require("wezterm") -local config = {} - -if wezterm.config_builder then - config = wezterm.config_builder() -end - ---config.color_scheme = 'rose-pine' - ---config.color_scheme = 'terafox' --- config.colors = { --- background = "#131111" --- } - -config.color_scheme = "Catppuccin Mocha" - --- Font -config.font = wezterm.font_with_fallback({ - "JetBrains Mono", - "Inconsolata Nerd Font Mono", -}) -config.font_size = 16.0 - --- Window -config.adjust_window_size_when_changing_font_size = false -config.enable_scroll_bar = false -config.initial_cols = 150 -config.initial_rows = 80 -config.window_padding = { - left = 10, - right = 5, - top = 0, - bottom = 0, -} -config.window_close_confirmation = "NeverPrompt" ---config.window_decorations = 'TITLE' --- Set higher fps -config.max_fps = 120 - --- Tab Bar -config.show_tabs_in_tab_bar = true -config.show_new_tab_button_in_tab_bar = false -config.use_fancy_tab_bar = true -config.tab_bar_at_bottom = true -config.hide_tab_bar_if_only_one_tab = true - -return config diff --git a/zsh/.zshenv b/zsh/.zshenv deleted file mode 100755 index d81324a..0000000 --- a/zsh/.zshenv +++ /dev/null @@ -1,8 +0,0 @@ -# This needs placed in the ~/.zshenv -# -# This sources general default environment variables from `ZDOTDIR`, local overrides may be stored -# in `$XDG_DATA_HOME/zsh/env.zsh`. The `ZDOTDIR/.zshrc-local` is a legacy file location that I used, -# but should be removed when all my machines are updated to use the local overrides file. - -export ZDOTDIR="$HOME/.config/zsh" -[ -f "$ZDOTDIR/.zshenv" ] && source "$ZDOTDIR/.zshenv" diff --git a/zsh/config/zsh-aliases b/zsh/config/zsh-aliases deleted file mode 100644 index d9d097a..0000000 --- a/zsh/config/zsh-aliases +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/zsh -# configure aliases -# _ _ -# ( ) (_ ) _ -# ____ ___ | |__ ______ _ _ | | (_) _ _ ___ __ ___ -# (_ ,)/',__)| _ `\(______) /'_` ) | | | | /'_` )/',__) /'__`\/',__) -# /'/_ \__, \| | | | ( (_| | | | | |( (_| |\__, \( ___/\__, \ -# (____)(____/(_) (_) `\__,_)(___)(_)`\__,_)(____/`\____)(____/ - - -# clear the terminal -alias cl() { - if [[ "$TMUX_PANE" ]]; then - tmux send-keys -R\; clear-history - else - clear - fi -} - -# move into the ~/.dotfiles directory -alias cdots() { cd "${HOME}/.dotfiles" } - -# move into zsh config files -alias zdots="vi ${ZDOTDIR}" - -# open dotfiles in nvim editor -#alias dots="vi $DOTFILES" - -# print the banner -#alias banner() { clear && cat < "$ZDOTDIR/banner" } - -# create a directory and move into it. -#alias mkcd() { mkdir $1 && cd $1 } - -# list files and directories, including hidden files -#alias l() { ls -lah --color "$@" } - -# editor -alias vim() { nvim "$@" } -alias vi() { nvim "$@" } - -# git -alias g() { git "$@" } -alias ga() { git add . } -alias gcb() { git checkout -b "$@" } -alias gco() { git checkout "$@" } -alias gl() { git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit } -alias gma() { git add . && git commit -m "$1" } -alias gp() { git push } -alias gs() { git status } - -# move back to old cwd -alias bk="cd $OLDPWD" - -# My mac-mini specific aliases -# if [ $(hostname -s) = "Michaels-Mac-mini" ]; then -# alias projects() { cd "/Volumes/M1 Mac-Mini External Drive/Projects" } -# fi - -# change file to be executable -#alias chmox() { chmod +x "$@" } - -# tmux -#alias ta() { tmux -f ~/.config/tmux/tmux.config attach "$@" } -