From bcc05e8c2624852afbd496b78f68c83fe52b5119 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 19 Sep 2021 12:51:14 -0400 Subject: [PATCH 1/7] Initial commit with yadm --- .Brewfile | 191 ++++++++++++++ .config/yadm/bootstrap | 25 ++ .gitconfig | 11 + .gitmodules | 3 + .gnupg/gpg-agent.conf##os.Darwin | 3 + .local/share/yadm/archive | Bin 0 -> 3577 bytes .ssh/id_rsa.pub | 1 + .ssh/id_rsa_tedkulp_old.pub | 1 + .tmux | 1 + .tmux.conf.local | 417 +++++++++++++++++++++++++++++++ .zshrc | 110 ++++++++ 11 files changed, 763 insertions(+) create mode 100644 .Brewfile create mode 100755 .config/yadm/bootstrap create mode 100644 .gitconfig create mode 100644 .gitmodules create mode 100644 .gnupg/gpg-agent.conf##os.Darwin create mode 100644 .local/share/yadm/archive create mode 100644 .ssh/id_rsa.pub create mode 100644 .ssh/id_rsa_tedkulp_old.pub create mode 160000 .tmux create mode 100644 .tmux.conf.local create mode 100644 .zshrc diff --git a/.Brewfile b/.Brewfile new file mode 100644 index 0000000..ffb287e --- /dev/null +++ b/.Brewfile @@ -0,0 +1,191 @@ +tap "boltops-tools/software" +tap "cutzenfriend/cmdg" +tap "hmarr/tap" +tap "homebrew/bundle" +tap "homebrew/cask" +tap "homebrew/cask-fonts" +tap "homebrew/cask-versions" +tap "homebrew/core" +tap "osx-cross/arm" +tap "osx-cross/avr" +tap "qmk/qmk" +tap "tsub/s3-edit" +tap "warrensbox/tap" +brew "ack" +brew "amazon-ecs-cli" +brew "antigen" +brew "gdbm" +brew "readline" +brew "xz" +brew "autojump" +brew "automake" +brew "autossh" +brew "libffi" +brew "glib" +brew "cairo" +brew "gobject-introspection" +brew "harfbuzz" +brew "pillow" +brew "aws-google-auth" +brew "awscli" +brew "bash" +brew "bat" +brew "bison" +brew "blueutil" +brew "consul" +brew "coreutils" +brew "ctop" +brew "erlang" +brew "elixir" +brew "emacs" +brew "exa" +brew "expect" +brew "ffmpeg" +brew "ffsend" +brew "findutils" +brew "fish" +brew "fpp" +brew "fzf" +brew "gdk-pixbuf" +brew "gh" +brew "git" +brew "git-extras" +brew "git-plus" +brew "pinentry" +brew "gnupg" +brew "go" +brew "pango" +brew "librsvg" +brew "graphviz" +brew "grep" +brew "grpc" +brew "handbrake" +brew "hasura-cli" +brew "helm" +brew "htop" +brew "hub" +brew "imagemagick" +brew "jq" +brew "kops" +brew "lazygit" +brew "libyaml" +brew "lynx" +brew "markdown" +brew "mas" +brew "mkvtoolnix" +brew "mongosh" +brew "mono" +brew "mosh" +brew "most" +brew "mysql" +brew "mysql@5.7" +brew "n", args: ["HEAD"] +brew "neovim" +brew "nmap" +brew "nnn" +brew "openjdk" +brew "pandoc" +brew "pinentry-mac" +brew "ruby-build" +brew "rbenv" +brew "rclone" +brew "reattach-to-user-namespace" +brew "redis" +brew "ripgrep" +brew "speedtest-cli" +brew "starship" +brew "stow" +brew "teensy_loader_cli" +brew "terraform-ls" +brew "tfenv" +brew "the_platinum_searcher" +brew "the_silver_searcher" +brew "tldr" +brew "tmux" +brew "tmux-xpanes" +brew "tmuxinator" +brew "tmuxinator-completion", link: false +brew "tree" +brew "ttyrec" +brew "urlview" +brew "vault" +brew "vim" +brew "wallpaper" +brew "wget" +brew "yadm" +brew "youtube-dl" +brew "z" +brew "zsh" +brew "zsh-syntax-highlighting" +brew "qmk/qmk/qmk" +brew "tsub/s3-edit/s3-edit" +brew "warrensbox/tap/tfswitch" +cask "1password" +cask "1password-cli" +cask "adobe-creative-cloud" +cask "alfred" +cask "anki" +cask "arduino" +cask "aws-vault" +cask "bartender" +cask "bettertouchtool" +cask "boop" +cask "cyberduck" +cask "daisydisk" +cask "dash" +cask "discord" +cask "docker" +cask "dropbox" +cask "duplicati" +cask "firefox" +cask "fork" +cask "google-chrome" +cask "google-drive-file-stream" +cask "handbrake" +cask "hazel" +cask "imazing" +cask "insomnia" +cask "istat-menus" +cask "iterm2" +cask "keybase" +cask "keycastr" +cask "meld" +cask "microsoft-auto-update" +cask "microsoft-office" +cask "mongodb-compass" +cask "moom" +cask "nextcloud" +cask "ngrok" +cask "notion" +cask "obsidian" +cask "parsec" +cask "phantomjs" +cask "postman" +cask "robo-3t" +cask "secure-pipes" +cask "session-manager-plugin" +cask "simplenote" +cask "slack" +cask "sparkleshare" +cask "spotify" +cask "superduper" +cask "synergy" +cask "telegram" +cask "vagrant" +cask "virtualbox" +cask "virtualbox-extension-pack" +cask "visual-studio-code" +cask "vlc" +cask "whatsapp" +cask "zoomus" +mas "Compressor", id: 424390742 +mas "Craft", id: 1487937127 +mas "Drafts", id: 1435957248 +mas "EOBD-Facile", id: 976630793 +mas "Final Cut Pro", id: 424389933 +mas "Greenshot", id: 1103915944 +mas "Pixelmator", id: 407963104 +mas "Sequel Ace", id: 1518036000 +mas "Todoist", id: 585829637 +mas "WireGuard", id: 1451685025 +mas "Xcode", id: 497799835 diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap new file mode 100755 index 0000000..ca2fee7 --- /dev/null +++ b/.config/yadm/bootstrap @@ -0,0 +1,25 @@ +#!/bin/bash + +cd $HOME + +echo "Init submodules" +yadm submodule update --recursive --init + +if [ ! -f "$HOME/.tmux.conf" ]; then + ln -s -f .tmux/.tmux.conf +fi + +if [ "$system_type" = "Darwin" ]; then + + # install homebrew if it's missing + if ! command -v brew >/dev/null 2>&1; then + echo "Installing homebrew" + /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + fi + + if [ -f "$HOME/.Brewfile" ]; then + echo "Updating homebrew bundle" + brew bundle --global + fi +fi + diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..9c66cf1 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,11 @@ +[user] + name = Ted Kulp + email = ted@tedkulp.com + gmail = tedkulp@gmail.com + signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895 +[commit] + gpgsign = true +[credential] + helper = osxkeychain +[pull] + rebase = false diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b8301f7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".tmux"] + path = .tmux + url = https://github.com/gpakosz/.tmux.git diff --git a/.gnupg/gpg-agent.conf##os.Darwin b/.gnupg/gpg-agent.conf##os.Darwin new file mode 100644 index 0000000..da68606 --- /dev/null +++ b/.gnupg/gpg-agent.conf##os.Darwin @@ -0,0 +1,3 @@ +pinentry-program /usr/local/bin/pinentry-mac +default-cache-ttl 86400 +max-cache-ttl 86400 diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive new file mode 100644 index 0000000000000000000000000000000000000000..8752b80db4efce26c4aaf640a405ab97c144d8a1 GIT binary patch literal 3577 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 literal 0 HcmV?d00001 diff --git a/.ssh/id_rsa.pub b/.ssh/id_rsa.pub new file mode 100644 index 0000000..bc35a11 --- /dev/null +++ b/.ssh/id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7koPFNYbvg2ZHbCJaTmcxl32Ci/aJFLSTgoZ3rUCPa/AwhQVWM5IftbVLtGdBNnqxQ3uhXgyFyCsHSAz8ibxoWFcbh9xSIaikoJwxs1Uql128ffwCBtR20aBRc9VZ00wibnJt4nfWmaZbaENAFCdr0X2rR3/NjI/PBASVFw9ek9XjV9k4ElW+w7Z+zAy6E3z9UEX//lV8hGrDoadV0FdiJB201p1BOxz6fHarDbZrilxHAL+0+jWhxrGM5KYEFHJVen8Pm1vYrhZNb3tdGZv0Q+tuUzT7KvlxNge0/OjYqAG9bofc00F0FO2R6xx8TrAqhj8Ky8YkaDLxW8HTDIMEae95NZ+QrQLXi9qH4psFVHIr9vtByIkvfvoNGGARiP16VaclvAZh6Pmn0gf/w/xbKi6ADeHcqmGd2Z7s8rzKrPPVOBXgGYK0shpfkjypsTfEx4n5gRzzTHe8snwGyV5MnK3OGFCD56SrEBqLcwcyfJ0gt5T0kfB5v5VHeACT4kWpljm9z9oRHs4yLK0A4tHHUGrzTIRT++FvcqyUw4YWLRom/L6gZ9VD8QKSq1wJysjLpSkIPBKprs/JKl1cFCzYTcJ3cWFUWfkZhpVBY2GzL3b1U3Ixsp84QjYFnMUxKXa5CjOeslgPmAevXVAc4VmdtLTkDnITKEVNwSnXVnXGvQ== ted@tedkulp.com diff --git a/.ssh/id_rsa_tedkulp_old.pub b/.ssh/id_rsa_tedkulp_old.pub new file mode 100644 index 0000000..c7496d3 --- /dev/null +++ b/.ssh/id_rsa_tedkulp_old.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwJYt2IQ+tOno17PFwFLMsG3P7CCucbd9f1pgLMoeCZOkPZE+2fXcmbsSFNX7GlIFm7IGZcwbuuh+19J4dfnVH1YEWo/vvvu1BoLRbEYWjG5qbAsbWoMzjWj1yI1VWqTXUhX3EIkfK/PG90nppJfNbtzWxTV1vMzrLt5qNFhEgk0= tedkulp@hooper.intranet.notss.com diff --git a/.tmux b/.tmux new file mode 160000 index 0000000..a97e302 --- /dev/null +++ b/.tmux @@ -0,0 +1 @@ +Subproject commit a97e3021cca1f8220cdf906233e1aef0bda044f5 diff --git a/.tmux.conf.local b/.tmux.conf.local new file mode 100644 index 0000000..f1e122e --- /dev/null +++ b/.tmux.conf.local @@ -0,0 +1,417 @@ +# : << EOF +# https://github.com/gpakosz/.tmux +# (‑●‑●)> dual licensed under the WTFPL v2 license and the MIT license, +# without any warranty. +# Copyright 2012— Gregory Pakosz (@gpakosz). + + +# -- navigation ---------------------------------------------------------------- + +# if you're running tmux within iTerm2 +# - and tmux is 1.9 or 1.9a +# - and iTerm2 is configured to let option key act as +Esc +# - and iTerm2 is configured to send [1;9A -> [1;9D for option + arrow keys +# then uncomment the following line to make Meta + arrow keys mapping work +#set -ga terminal-overrides "*:kUP3=\e[1;9A,*:kDN3=\e[1;9B,*:kRIT3=\e[1;9C,*:kLFT3=\e[1;9D" + + +# -- windows & pane creation --------------------------------------------------- + +# new window retains current path, possible values are: +# - true +# - false (default) +tmux_conf_new_window_retain_current_path=false + +# new pane retains current path, possible values are: +# - true (default) +# - false +tmux_conf_new_pane_retain_current_path=true + +# new pane tries to reconnect ssh sessions (experimental), possible values are: +# - true +# - false (default) +tmux_conf_new_pane_reconnect_ssh=false + +# prompt for session name when creating a new session, possible values are: +# - true +# - false (default) +tmux_conf_new_session_prompt=false + + +# -- display ------------------------------------------------------------------- + +# RGB 24-bit colour support (tmux >= 2.2), possible values are: +# - true +# - false (default) +tmux_conf_24b_colour=true + +# default theme +tmux_conf_theme_colour_1="#080808" # dark gray +tmux_conf_theme_colour_2="#303030" # gray +tmux_conf_theme_colour_3="#8a8a8a" # light gray +tmux_conf_theme_colour_4="#00afff" # light blue +tmux_conf_theme_colour_5="#ffff00" # yellow +tmux_conf_theme_colour_6="#080808" # dark gray +tmux_conf_theme_colour_7="#e4e4e4" # white +tmux_conf_theme_colour_8="#080808" # dark gray +tmux_conf_theme_colour_9="#ffff00" # yellow +tmux_conf_theme_colour_10="#ff00af" # pink +tmux_conf_theme_colour_11="#5fff00" # green +tmux_conf_theme_colour_12="#8a8a8a" # light gray +tmux_conf_theme_colour_13="#e4e4e4" # white +tmux_conf_theme_colour_14="#080808" # dark gray +tmux_conf_theme_colour_15="#080808" # dark gray +tmux_conf_theme_colour_16="#d70000" # red +tmux_conf_theme_colour_17="#e4e4e4" # white + +# default theme (ansi) +#tmux_conf_theme_colour_1="colour0" +#tmux_conf_theme_colour_2="colour8" +#tmux_conf_theme_colour_3="colour8" +#tmux_conf_theme_colour_4="colour14" +#tmux_conf_theme_colour_5="colour11" +#tmux_conf_theme_colour_6="colour0" +#tmux_conf_theme_colour_7="colour15" +#tmux_conf_theme_colour_8="colour0" +#tmux_conf_theme_colour_9="colour11" +#tmux_conf_theme_colour_10="colour13" +#tmux_conf_theme_colour_11="colour10" +#tmux_conf_theme_colour_12="colour8" +#tmux_conf_theme_colour_13="colour15" +#tmux_conf_theme_colour_14="colour0" +#tmux_conf_theme_colour_15="colour0" +#tmux_conf_theme_colour_16="colour1" +#tmux_conf_theme_colour_17="colour15" + +# window style +tmux_conf_theme_window_fg="default" +tmux_conf_theme_window_bg="default" + +# highlight focused pane (tmux >= 2.1), possible values are: +# - true +# - false (default) +tmux_conf_theme_highlight_focused_pane=true + +# focused pane colours: +tmux_conf_theme_focused_pane_bg="$tmux_conf_theme_colour_1" + +# pane border style, possible values are: +# - thin (default) +# - fat +tmux_conf_theme_pane_border_style=thin + +# pane borders colours: +tmux_conf_theme_pane_border="$tmux_conf_theme_colour_2" +tmux_conf_theme_pane_active_border="$tmux_conf_theme_colour_4" + +# pane indicator colours (when you hit + q) +tmux_conf_theme_pane_indicator="$tmux_conf_theme_colour_4" +tmux_conf_theme_pane_active_indicator="$tmux_conf_theme_colour_4" + +# status line style +tmux_conf_theme_message_fg="$tmux_conf_theme_colour_1" +tmux_conf_theme_message_bg="$tmux_conf_theme_colour_5" +tmux_conf_theme_message_attr="bold" + +# status line command style ( : Escape) +tmux_conf_theme_message_command_fg="$tmux_conf_theme_colour_5" +tmux_conf_theme_message_command_bg="$tmux_conf_theme_colour_1" +tmux_conf_theme_message_command_attr="bold" + +# window modes style +tmux_conf_theme_mode_fg="$tmux_conf_theme_colour_1" +tmux_conf_theme_mode_bg="$tmux_conf_theme_colour_5" +tmux_conf_theme_mode_attr="bold" + +# status line style +tmux_conf_theme_status_fg="$tmux_conf_theme_colour_3" +tmux_conf_theme_status_bg="$tmux_conf_theme_colour_1" +tmux_conf_theme_status_attr="none" + +# terminal title +# - built-in variables are: +# - #{circled_window_index} +# - #{circled_session_name} +# - #{hostname} +# - #{hostname_ssh} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_terminal_title="#h ❐ #S ● #I #W" + +# window status style +# - built-in variables are: +# - #{circled_window_index} +# - #{circled_session_name} +# - #{hostname} +# - #{hostname_ssh} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_window_status_fg="$tmux_conf_theme_colour_3" +tmux_conf_theme_window_status_bg="$tmux_conf_theme_colour_1" +tmux_conf_theme_window_status_attr="none" +tmux_conf_theme_window_status_format="#I #W" +#tmux_conf_theme_window_status_format="#{circled_window_index} #W" +#tmux_conf_theme_window_status_format="#I #W#{?window_bell_flag,🔔,}#{?window_zoomed_flag,🔍,}" + +# window current status style +# - built-in variables are: +# - #{circled_window_index} +# - #{circled_session_name} +# - #{hostname} +# - #{hostname_ssh} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_window_status_current_fg="$tmux_conf_theme_colour_1" +tmux_conf_theme_window_status_current_bg="$tmux_conf_theme_colour_4" +tmux_conf_theme_window_status_current_attr="bold" +tmux_conf_theme_window_status_current_format="#I #W" +#tmux_conf_theme_window_status_current_format="#{circled_window_index} #W" +#tmux_conf_theme_window_status_current_format="#I #W#{?window_zoomed_flag,🔍,}" + +# window activity status style +tmux_conf_theme_window_status_activity_fg="default" +tmux_conf_theme_window_status_activity_bg="default" +tmux_conf_theme_window_status_activity_attr="underscore" + +# window bell status style +tmux_conf_theme_window_status_bell_fg="$tmux_conf_theme_colour_5" +tmux_conf_theme_window_status_bell_bg="default" +tmux_conf_theme_window_status_bell_attr="blink,bold" + +# window last status style +tmux_conf_theme_window_status_last_fg="$tmux_conf_theme_colour_4" +tmux_conf_theme_window_status_last_bg="$tmux_conf_theme_colour_2" +tmux_conf_theme_window_status_last_attr="none" + +# status left/right sections separators +#tmux_conf_theme_left_separator_main="" +#tmux_conf_theme_left_separator_sub="|" +#tmux_conf_theme_right_separator_main="" +#tmux_conf_theme_right_separator_sub="|" +tmux_conf_theme_left_separator_main="\uE0B0" # /!\ you don't need to install Powerline +tmux_conf_theme_left_separator_sub="\uE0B1" # you only need fonts patched with +tmux_conf_theme_right_separator_main="\uE0B2" # Powerline symbols or the standalone +tmux_conf_theme_right_separator_sub="\uE0B3" # PowerlineSymbols.otf font, see README.md + +# status left/right content: +# - separate main sections with "|" +# - separate subsections with "," +# - built-in variables are: +# - #{battery_bar} +# - #{battery_hbar} +# - #{battery_percentage} +# - #{battery_status} +# - #{battery_vbar} +# - #{circled_session_name} +# - #{hostname_ssh} +# - #{hostname} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{loadavg} +# - #{mouse} +# - #{pairing} +# - #{prefix} +# - #{root} +# - #{synchronized} +# - #{uptime_y} +# - #{uptime_d} (modulo 365 when #{uptime_y} is used) +# - #{uptime_h} +# - #{uptime_m} +# - #{uptime_s} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_status_left=" ❐ #S | ↑#{?uptime_y, #{uptime_y}y,}#{?uptime_d, #{uptime_d}d,}#{?uptime_h, #{uptime_h}h,}#{?uptime_m, #{uptime_m}m,} " +tmux_conf_theme_status_right=" #{prefix}#{mouse}#{pairing}#{synchronized}#{?battery_status,#{battery_status},}#{?battery_bar, #{battery_bar},}#{?battery_percentage, #{battery_percentage},} , %R , %d %b | #{username}#{root} | #{hostname} " + +# status left style +tmux_conf_theme_status_left_fg="$tmux_conf_theme_colour_6,$tmux_conf_theme_colour_7,$tmux_conf_theme_colour_8" +tmux_conf_theme_status_left_bg="$tmux_conf_theme_colour_9,$tmux_conf_theme_colour_10,$tmux_conf_theme_colour_11" +tmux_conf_theme_status_left_attr="bold,none,none" + +# status right style +tmux_conf_theme_status_right_fg="$tmux_conf_theme_colour_12,$tmux_conf_theme_colour_13,$tmux_conf_theme_colour_14" +tmux_conf_theme_status_right_bg="$tmux_conf_theme_colour_15,$tmux_conf_theme_colour_16,$tmux_conf_theme_colour_17" +tmux_conf_theme_status_right_attr="none,none,bold" + +# pairing indicator +tmux_conf_theme_pairing="⚇" # U+2687 +tmux_conf_theme_pairing_fg="none" +tmux_conf_theme_pairing_bg="none" +tmux_conf_theme_pairing_attr="none" + +# prefix indicator +tmux_conf_theme_prefix="⌨" # U+2328 +tmux_conf_theme_prefix_fg="none" +tmux_conf_theme_prefix_bg="none" +tmux_conf_theme_prefix_attr="none" + +# mouse indicator +tmux_conf_theme_mouse="↗" # U+2197 +tmux_conf_theme_mouse_fg="none" +tmux_conf_theme_mouse_bg="none" +tmux_conf_theme_mouse_attr="none" + +# root indicator +tmux_conf_theme_root="!" +tmux_conf_theme_root_fg="none" +tmux_conf_theme_root_bg="none" +tmux_conf_theme_root_attr="bold,blink" + +# synchronized indicator +tmux_conf_theme_synchronized="⚏" # U+268F +tmux_conf_theme_synchronized_fg="red" +tmux_conf_theme_synchronized_bg="none" +tmux_conf_theme_synchronized_attr="none" + +# battery bar symbols +#tmux_conf_battery_bar_symbol_full="◼" +#tmux_conf_battery_bar_symbol_empty="◻" +tmux_conf_battery_bar_symbol_full="♥" +tmux_conf_battery_bar_symbol_empty="·" + +# battery bar length (in number of symbols), possible values are: +# - auto +# - a number, e.g. 5 +tmux_conf_battery_bar_length="auto" + +# battery bar palette, possible values are: +# - gradient (default) +# - heat +# - "colour_full_fg,colour_empty_fg,colour_bg" +tmux_conf_battery_bar_palette="gradient" +#tmux_conf_battery_bar_palette="#d70000,#e4e4e4,#000000" # red, white, black + +# battery hbar palette, possible values are: +# - gradient (default) +# - heat +# - "colour_low,colour_half,colour_full" +tmux_conf_battery_hbar_palette="gradient" +#tmux_conf_battery_hbar_palette="#d70000,#ff5f00,#5fff00" # red, orange, green + +# battery vbar palette, possible values are: +# - gradient (default) +# - heat +# - "colour_low,colour_half,colour_full" +tmux_conf_battery_vbar_palette="gradient" +#tmux_conf_battery_vbar_palette="#d70000,#ff5f00,#5fff00" # red, orange, green + +# symbols used to indicate whether battery is charging or discharging +#tmux_conf_battery_status_charging="↑" # U+2191 +#tmux_conf_battery_status_discharging="↓" # U+2193 +tmux_conf_battery_status_charging="🔌" # U+1F50C +tmux_conf_battery_status_discharging="🔋" # U+1F50B + +# clock style (when you hit + t) +# you may want to use %I:%M %p in place of %R in tmux_conf_theme_status_right +tmux_conf_theme_clock_colour="$tmux_conf_theme_colour_4" +tmux_conf_theme_clock_style="24" + + +# -- clipboard ----------------------------------------------------------------- + +# in copy mode, copying selection also copies to the OS clipboard +# - true +# - false (default) +# on macOS, this requires installing reattach-to-user-namespace, see README.md +# on Linux, this requires xsel or xclip +tmux_conf_copy_to_os_clipboard=true + + +# -- user customizations ------------------------------------------------------- +# this is the place to override or undo settings + +# increase history size +set -g history-limit 10000 + +# start with mouse mode enabled +# set -g mouse on + +# force Vi mode +# really you should export VISUAL or EDITOR environment variable, see manual +set -g status-keys vi +set -g mode-keys vi + +# replace C-b by C-a instead of using both prefixes +set -gu prefix2 +unbind C-a +unbind C-b +set -g prefix C-a +bind C-a send-prefix + +# move status line to top +#set -g status-position top + +# -- tpm ----------------------------------------------------------------------- + +# while I don't use tpm myself, many people requested official support so here +# is a seamless integration that automatically installs plugins in parallel + +# whenever a plugin introduces a variable to be used in 'status-left' or +# 'status-right', you can use it in 'tmux_conf_theme_status_left' and +# 'tmux_conf_theme_status_right' variables. + +# by default, launching tmux will update tpm and all plugins +# - true (default) +# - false +tmux_conf_update_plugins_on_launch=true + +# by default, reloading the configuration will update tpm and all plugins +# - true (default) +# - false +tmux_conf_update_plugins_on_reload=true + +# /!\ do not add set -g @plugin 'tmux-plugins/tpm' +# /!\ do not add run '~/.tmux/plugins/tpm/tpm' + +# to enable a plugin, use the 'set -g @plugin' syntax: +# visit https://github.com/tmux-plugins for available plugins +#set -g @plugin 'tmux-plugins/tmux-copycat' +set -g @plugin 'tmux-plugins/tmux-cpu' +#set -g @plugin 'tmux-plugins/tmux-resurrect' +#set -g @plugin 'tmux-plugins/tmux-continuum' +set -g @plugin 'tmux-plugins/tmux-urlview' +#set -g @continuum-restore 'on' + + +# -- custom variables ---------------------------------------------------------- + +# to define a custom #{foo} variable, define a POSIX shell function between the +# '# EOF' and the '# "$@"' lines. Please note that the opening brace { character +# must be on the same line as the function name otherwise the parse won't detect +# it. +# +# then, use #{foo} in e.g. the 'tmux_conf_theme_status_left' or the +# 'tmux_conf_theme_status_right' variables. + +# # /!\ do not remove the following line +# EOF +# +# weather() { +# curl -m 1 wttr.in?format=3 2>/dev/null +# sleep 900 # sleep for 15 minutes, throttle network requests whatever the value of status-interval +# } +# +# online() { +# ping -c 1 1.1.1.1 >/dev/null 2>&1 && printf '✔' || printf '✘' +# } +# +# "$@" +# # /!\ do not remove the previous line +bind-key e set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}" + +bind -T root F12 \ + set prefix None \;\ + set key-table off \;\ + if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\ + refresh-client -S \;\ + +bind -T off F12 \ + set -u prefix \;\ + set -u key-table \;\ + refresh-client -S diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..c525782 --- /dev/null +++ b/.zshrc @@ -0,0 +1,110 @@ +ZSH_DISABLE_COMPFIX=true +setopt HIST_IGNORE_SPACE +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +# ZSH_THEME="robbyrussell" +ZSH_THEME="cobalt2" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to automatically update without prompting. +# DISABLE_UPDATE_PROMPT="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +if [ -d "$HOME/.oh-my-zsh" ]; then + ZSH_CUSTOM=$HOME/.config/zsh +fi + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(vi-mode git autojump fzf aws vscode zsh-syntax-highlighting sudo dash zsh-z) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# tabtab source for packages +# uninstall by removing these lines +# [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true + +source <("/usr/local/bin/starship" init zsh --print-full-init) From b670d0bb696f8c22268399a90073b8db229a50bc Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 19 Sep 2021 13:50:06 -0400 Subject: [PATCH 2/7] More stuff --- .config/lvim/config.lua | 177 ++++++++++++++ .config/lvim/ignore | 0 .config/lvim/plugin/packer_compiled.lua | 296 ++++++++++++++++++++++++ .config/zsh/brew.zsh##os.Darwin | 1 + .config/zsh/docker.zsh | 7 + .config/zsh/ecs.zsh | 30 +++ .config/zsh/git.zsh | 19 ++ .config/zsh/mosh.zsh | 3 + .config/zsh/ssh.zsh | 3 + .config/zsh/tmux.zsh | 1 + .config/zsh/vim.zsh | 10 + .config/zsh/vscode.zsh##os.Darwin | 1 + .local/share/yadm/archive | Bin 3577 -> 5458 bytes README.md | 11 + 14 files changed, 559 insertions(+) create mode 100644 .config/lvim/config.lua create mode 100644 .config/lvim/ignore create mode 100644 .config/lvim/plugin/packer_compiled.lua create mode 100644 .config/zsh/brew.zsh##os.Darwin create mode 100644 .config/zsh/docker.zsh create mode 100644 .config/zsh/ecs.zsh create mode 100644 .config/zsh/git.zsh create mode 100644 .config/zsh/mosh.zsh create mode 100644 .config/zsh/ssh.zsh create mode 100644 .config/zsh/tmux.zsh create mode 100644 .config/zsh/vim.zsh create mode 100644 .config/zsh/vscode.zsh##os.Darwin create mode 100644 README.md diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua new file mode 100644 index 0000000..524e24d --- /dev/null +++ b/.config/lvim/config.lua @@ -0,0 +1,177 @@ +--[[ +lvim is the global options object + +Linters should be +filled in as strings with either +a global executable or a path to +an executable +]] +-- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT + +-- general +lvim.log.level = "warn" +lvim.format_on_save = true +lvim.colorscheme = "onedarker" + +-- keymappings [view all the defaults by pressing Lk] +lvim.leader = "space" +-- add your own keymapping +lvim.keys.normal_mode[""] = ":w" + +-- unmap a default keymapping +-- lvim.keys.normal_mode[""] = "" +-- edit a default keymapping +-- lvim.keys.normal_mode[""] = ":q" + +-- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode. +-- lvim.builtin.telescope.on_config_done = function() +-- local actions = require "telescope.actions" +-- -- for input mode +-- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_next +-- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next +-- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_previous +-- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_prev +-- -- for normal mode +-- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_next +-- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_previous +-- end + +-- Use which-key to add extra bindings with the leader-key prefix +-- lvim.builtin.which_key.mappings["P"] = { "Telescope projects", "Projects" } +-- lvim.builtin.which_key.mappings["t"] = { +-- name = "+Trouble", +-- r = { "Trouble lsp_references", "References" }, +-- f = { "Trouble lsp_definitions", "Definitions" }, +-- d = { "Trouble lsp_document_diagnostics", "Diagnostics" }, +-- q = { "Trouble quickfix", "QuickFix" }, +-- l = { "Trouble loclist", "LocationList" }, +-- w = { "Trouble lsp_workspace_diagnostics", "Diagnostics" }, +-- } + +-- TODO: User Config for predefined plugins +-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile +lvim.builtin.dashboard.active = true +lvim.builtin.terminal.active = true +lvim.builtin.lualine.active = true +lvim.builtin.dap.active = true +-- lvim.builtin.bufferline = true +lvim.builtin.nvimtree.side = "left" +lvim.builtin.nvimtree.show_icons.git = 1 + +-- if you don't want all the parsers change this to a table of the ones you want +lvim.builtin.treesitter.ensure_installed = "maintained" +lvim.builtin.treesitter.ignore_install = { "haskell" } +lvim.builtin.treesitter.highlight.enabled = true + +-- generic LSP settings +-- you can set a custom on_attach function that will be used for all the language servers +-- See +-- lvim.lsp.on_attach_callback = function(client, bufnr) +-- local function buf_set_option(...) +-- vim.api.nvim_buf_set_option(bufnr, ...) +-- end +-- --Enable completion triggered by +-- buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") +-- end +-- you can overwrite the null_ls setup table (useful for setting the root_dir function) +-- lvim.lsp.null_ls.setup = { +-- root_dir = require("lspconfig").util.root_pattern("Makefile", ".git", "node_modules"), +-- } +-- or if you need something more advanced +-- lvim.lsp.null_ls.setup.root_dir = function(fname) +-- if vim.bo.filetype == "javascript" then +-- return require("lspconfig/util").root_pattern("Makefile", ".git", "node_modules")(fname) +-- or require("lspconfig/util").path.dirname(fname) +-- elseif vim.bo.filetype == "php" then +-- return require("lspconfig/util").root_pattern("Makefile", ".git", "composer.json")(fname) or vim.fn.getcwd() +-- else +-- return require("lspconfig/util").root_pattern("Makefile", ".git")(fname) or require("lspconfig/util").path.dirname(fname) +-- end +-- end + +-- set a formatter if you want to override the default lsp one (if it exists) +-- lvim.lang.python.formatters = { +-- { +-- exe = "black", +-- } +-- } +-- set an additional linter +-- lvim.lang.python.linters = { +-- { +-- exe = "flake8", +-- } +-- } + +vim.cmd("set timeoutlen=500") + +-- Additional Plugins +lvim.plugins = { + { + "p00f/nvim-ts-rainbow", + }, + { "tpope/vim-repeat" }, + { + "tpope/vim-surround", + keys = {"c", "d", "y"} + }, + { + "metakirby5/codi.vim", + cmd = "Codi", + }, + { + "monaqa/dial.nvim", + event = "BufRead", + config = function() + local dial = require "dial" + vim.cmd [[ + nmap (dial-increment) + nmap (dial-decrement) + vmap (dial-increment) + vmap (dial-decrement) + vmap g (dial-increment-additional) + vmap g (dial-decrement-additional) + ]] + + dial.augends["custom#boolean"] = dial.common.enum_cyclic { + name = "boolean", + strlist = { "true", "false" }, + } + table.insert(dial.config.searchlist.normal, "custom#boolean") + + -- For Languages which prefer True/False, e.g. python. + dial.augends["custom#Boolean"] = dial.common.enum_cyclic { + name = "Boolean", + strlist = { "True", "False" }, + } + table.insert(dial.config.searchlist.normal, "custom#Boolean") + end, + }, + { + "phaazon/hop.nvim", + event = "BufRead", + config = function() + require("hop").setup() + vim.api.nvim_set_keymap("n", "s", ":HopChar2", { silent = true }) + vim.api.nvim_set_keymap("n", "S", ":HopWord", { silent = true }) + end, + }, +} + +-- Autocommands (https://neovim.io/doc/user/autocmd.html) +-- lvim.autocommands.custom_groups = { +-- { "BufWinEnter", "*.lua", "setlocal ts=8 sw=8" }, +-- } + +-- Typescript/javascript +lvim.lang.typescript.formatters = { { exe = "eslint"}, { exe = "prettier" } } +lvim.lang.typescriptreact.formatters = lvim.lang.typescript.formatters +lvim.lang.typescript.linters = { { exe = "eslint" } } +lvim.lang.typescriptreact.linters = lvim.lang.typescript.linters +lvim.lang.javascript.formatters = { { exe = "eslint"}, { exe = "prettier" } } +lvim.lang.javascriptreact.formatters = lvim.lang.javascript.formatters +lvim.lang.javascript.linters = { { exe = "eslint" } } +lvim.lang.javascriptreact.linters = lvim.lang.javascript.linters + +-- JSON +lvim.lang.json.formatters = { { exe = "prettier" } } + diff --git a/.config/lvim/ignore b/.config/lvim/ignore new file mode 100644 index 0000000..e69de29 diff --git a/.config/lvim/plugin/packer_compiled.lua b/.config/lvim/plugin/packer_compiled.lua new file mode 100644 index 0000000..6db5540 --- /dev/null +++ b/.config/lvim/plugin/packer_compiled.lua @@ -0,0 +1,296 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + + local time + local profile_info + local should_profile = false + if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end + else + time = function(chunk, start) end + end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + + _G._packer = _G._packer or {} + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s)) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + ["DAPInstall.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/DAPInstall.nvim" + }, + ["FixCursorHold.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/FixCursorHold.nvim" + }, + ["barbar.nvim"] = { + config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.bufferline\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/barbar.nvim" + }, + ["codi.vim"] = { + commands = { "Codi" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/codi.vim" + }, + ["dashboard-nvim"] = { + config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.dashboard\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/dashboard-nvim" + }, + ["dial.nvim"] = { + config = { "\27LJ\2\n\4\0\0\6\0\20\0&6\0\0\0'\2\1\0B\0\2\0026\1\2\0009\1\3\1'\3\4\0B\1\2\0019\1\5\0009\2\a\0009\2\b\0025\4\t\0005\5\n\0=\5\v\4B\2\2\2=\2\6\0016\1\f\0009\1\r\0019\3\14\0009\3\15\0039\3\16\3'\4\6\0B\1\3\0019\1\5\0009\2\a\0009\2\b\0025\4\18\0005\5\19\0=\5\v\4B\2\2\2=\2\17\0016\1\f\0009\1\r\0019\3\14\0009\3\15\0039\3\16\3'\4\17\0B\1\3\1K\0\1\0\1\3\0\0\tTrue\nFalse\1\0\1\tname\fBoolean\19custom#Boolean\vnormal\15searchlist\vconfig\vinsert\ntable\fstrlist\1\3\0\0\ttrue\nfalse\1\0\1\tname\fboolean\16enum_cyclic\vcommon\19custom#boolean\faugends\2 nmap (dial-increment)\n nmap (dial-decrement)\n vmap (dial-increment)\n vmap (dial-decrement)\n vmap g (dial-increment-additional)\n vmap g (dial-decrement-additional)\n \bcmd\bvim\tdial\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/dial.nvim" + }, + ["friendly-snippets"] = { + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/friendly-snippets" + }, + ["gitsigns.nvim"] = { + config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.gitsigns\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/gitsigns.nvim" + }, + ["hop.nvim"] = { + config = { "\27LJ\2\n\1\0\0\6\0\r\0\0226\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\3\0009\0\4\0009\0\5\0'\2\6\0'\3\a\0'\4\b\0005\5\t\0B\0\5\0016\0\3\0009\0\4\0009\0\5\0'\2\6\0'\3\n\0'\4\v\0005\5\f\0B\0\5\1K\0\1\0\1\0\1\vsilent\2\17:HopWord\6S\1\0\1\vsilent\2\18:HopChar2\6s\6n\20nvim_set_keymap\bapi\bvim\nsetup\bhop\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/hop.nvim" + }, + ["lualine.nvim"] = { + config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0" }, + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/lualine.nvim" + }, + ["nlsp-settings.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nlsp-settings.nvim" + }, + ["null-ls.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/null-ls.nvim" + }, + ["nvim-autopairs"] = { + config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.autopairs\frequire\0" }, + load_after = { + ["nvim-compe"] = true + }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-autopairs" + }, + ["nvim-comment"] = { + config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.comment\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-comment" + }, + ["nvim-compe"] = { + after = { "nvim-autopairs" }, + after_files = { "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-compe/after/plugin/compe.vim" }, + config = { "\27LJ\2\n8\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\15core.compe\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-compe" + }, + ["nvim-dap"] = { + config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0" }, + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-dap" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-lspconfig" + }, + ["nvim-lspinstall"] = { + config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\1K\0\1\0\nsetup\20core.lspinstall\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lspinstall" + }, + ["nvim-toggleterm.lua"] = { + config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.terminal\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-toggleterm.lua" + }, + ["nvim-tree.lua"] = { + config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0" }, + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-tree.lua" + }, + ["nvim-treesitter"] = { + config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0" }, + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-treesitter" + }, + ["nvim-ts-rainbow"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-ts-rainbow" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/plenary.nvim" + }, + ["popup.nvim"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/popup.nvim" + }, + ["project.nvim"] = { + config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0" }, + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/project.nvim" + }, + ["telescope.nvim"] = { + config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0" }, + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/telescope.nvim" + }, + ["vim-repeat"] = { + loaded = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/vim-repeat" + }, + ["vim-surround"] = { + keys = { { "", "c" }, { "", "d" }, { "", "y" } }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-surround" + }, + ["vim-vsnip"] = { + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-vsnip" + }, + ["which-key.nvim"] = { + config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.which-key\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/which-key.nvim" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) +-- Config for: project.nvim +time([[Config for project.nvim]], true) +try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0", "config", "project.nvim") +time([[Config for project.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) +-- Config for: nvim-dap +time([[Config for nvim-dap]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0", "config", "nvim-dap") +time([[Config for nvim-dap]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) + +-- Command lazy-loads +time([[Defining lazy-load commands]], true) +pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Codi lua require("packer.load")({'codi.vim'}, { cmd = "Codi", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) +time([[Defining lazy-load commands]], false) + +-- Keymap lazy-loads +time([[Defining lazy-load keymaps]], true) +vim.cmd [[noremap y lua require("packer.load")({'vim-surround'}, { keys = "y", prefix = "" }, _G.packer_plugins)]] +vim.cmd [[noremap c lua require("packer.load")({'vim-surround'}, { keys = "c", prefix = "" }, _G.packer_plugins)]] +vim.cmd [[noremap d lua require("packer.load")({'vim-surround'}, { keys = "d", prefix = "" }, _G.packer_plugins)]] +time([[Defining lazy-load keymaps]], false) + +vim.cmd [[augroup packer_load_aucmds]] +vim.cmd [[au!]] + -- Event lazy-loads +time([[Defining lazy-load event autocommands]], true) +vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'nvim-compe', 'vim-vsnip'}, { event = "InsertEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufWinEnter * ++once lua require("packer.load")({'nvim-toggleterm.lua', 'which-key.nvim', 'barbar.nvim', 'dashboard-nvim'}, { event = "BufWinEnter *" }, _G.packer_plugins)]] +vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'friendly-snippets'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] +vim.cmd [[au VimEnter * ++once lua require("packer.load")({'nvim-lspinstall'}, { event = "VimEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufRead * ++once lua require("packer.load")({'gitsigns.nvim', 'hop.nvim', 'nvim-comment', 'dial.nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] +time([[Defining lazy-load event autocommands]], false) +vim.cmd("augroup END") +if should_profile then save_profiles() end + +end) + +if not no_errors then + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end diff --git a/.config/zsh/brew.zsh##os.Darwin b/.config/zsh/brew.zsh##os.Darwin new file mode 100644 index 0000000..7d1b20d --- /dev/null +++ b/.config/zsh/brew.zsh##os.Darwin @@ -0,0 +1 @@ +export PATH="/usr/local/sbin:$PATH" diff --git a/.config/zsh/docker.zsh b/.config/zsh/docker.zsh new file mode 100644 index 0000000..c36fcde --- /dev/null +++ b/.config/zsh/docker.zsh @@ -0,0 +1,7 @@ +alias dcrun="docker compose " +alias dclogs="docker compose logs " + +function dcrestart () { + docker compose rm -sf "$@" + docker compose up -d "$@" +} diff --git a/.config/zsh/ecs.zsh b/.config/zsh/ecs.zsh new file mode 100644 index 0000000..1b0096c --- /dev/null +++ b/.config/zsh/ecs.zsh @@ -0,0 +1,30 @@ +ecsInstances() { + cluster=$1 + profile=${2:-default} + aws ecs list-container-instances --cluster $cluster --profile $profile | jq -r '.containerInstanceArns | join(" ")' +} + +ecsInstanceInfo() { + cluster=$1 + profile=${2:-default} + instances=(`ecsInstances $cluster $profile`) + aws ecs describe-container-instances --cluster $cluster --profile $profile --container-instances $instances[@] +} + +ecsInstanceIds() { + cluster=$1 + profile=${2:-default} + ecsInstanceInfo $cluster $profile | jq -r '.containerInstances[].ec2InstanceId' +} + +xecsSsh() { + cluster=$1 + profile=${2:-default} + user=${3:-"ec2-user"} + # KEYS=(`find ~/.ssh/*$profile*.pem | xargs -I {} echo "-i {}" | xargs`) + KEYS=(`find ~/.ssh/$profile.pem | xargs -I {} echo "-i {}" | xargs`) + echo $KEYS + CMD="xpanes -tsc \"SSM_PROFILE=$profile autossh -M 0 ${KEYS[@]} -o ServerAliveInterval=60 -o StrictHostKeyChecking=no $user@{}\" $(ecsInstanceIds $cluster $profile | xargs)" + eval $CMD +} + diff --git a/.config/zsh/git.zsh b/.config/zsh/git.zsh new file mode 100644 index 0000000..18edd06 --- /dev/null +++ b/.config/zsh/git.zsh @@ -0,0 +1,19 @@ +alias ghm='git push heroku master' +alias gpp='git pull origin "(git_current_branch)" && git push origin "(git_current_branch)"' + +function grcl () { + local branch="${1:-master}" + + echo git checkout $branch + echo git pull + echo git remote prune origin + echo git branch -avv | grep "gone]" | awk '{ print $1 }' | xargs git branch -d; +} + +alias gie='git init && git commit --allow-empty -m "Initial commit"' + +# alias __git-checkout_main=_git_checkout +# compdef _git grcl=git-checkout + +alias grc="git branch --merged | grep -v '\*' | grep -v master | grep -v stage | xargs -n 1 git branch -d" +alias grcr="git fetch --all -p && git branch -r --merged | grep -v '\*' | grep origin | grep -v master | grep -v stage | sed 's/origin\//:/' | xargs -n 1 echo git push origin" diff --git a/.config/zsh/mosh.zsh b/.config/zsh/mosh.zsh new file mode 100644 index 0000000..60384fb --- /dev/null +++ b/.config/zsh/mosh.zsh @@ -0,0 +1,3 @@ +function mosht () { + mosh $1 -- sh -c "tmux attach || tmux" +} diff --git a/.config/zsh/ssh.zsh b/.config/zsh/ssh.zsh new file mode 100644 index 0000000..d16a71b --- /dev/null +++ b/.config/zsh/ssh.zsh @@ -0,0 +1,3 @@ +function ssht () { + ssh $1 -t "tmux attach -d || tmux" +} diff --git a/.config/zsh/tmux.zsh b/.config/zsh/tmux.zsh new file mode 100644 index 0000000..3699d61 --- /dev/null +++ b/.config/zsh/tmux.zsh @@ -0,0 +1 @@ +alias xssh="xpanes --ssh" diff --git a/.config/zsh/vim.zsh b/.config/zsh/vim.zsh new file mode 100644 index 0000000..9461841 --- /dev/null +++ b/.config/zsh/vim.zsh @@ -0,0 +1,10 @@ +## nvim +#export PYTHON_HOST_PROG="/usr/bin/python2" +#export PYTHON3_HOST_PROG="/usr/local/bin/python3" +alias vim="nvim" +alias vi="nvim" + +## Lunarvim +alias vim="lvim" +alias vi="lvim" +export PATH=~/.local/bin:$PATH diff --git a/.config/zsh/vscode.zsh##os.Darwin b/.config/zsh/vscode.zsh##os.Darwin new file mode 100644 index 0000000..31fa0b9 --- /dev/null +++ b/.config/zsh/vscode.zsh##os.Darwin @@ -0,0 +1 @@ +alias fixvscode="sudo codesign --remove-signature /Applications/Visual\ Studio\ Code.app/Contents/Frameworks/Code\ Helper\ \(Renderer\).app/" diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive index 8752b80db4efce26c4aaf640a405ab97c144d8a1..d79a518908b2d0619058f7816f795abbbedda0bf 100644 GIT binary patch literal 5458 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 diff --git a/README.md b/README.md new file mode 100644 index 0000000..7e7d364 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# Ted's dotfiles + +I'm just getting started with this, so it's in a very, very alpha state. +It uses [yadm](https://yadm.io/docs/install), so install that first. + +## Directions + +* Install yadm +* yadm clone https://github.com/tedkulp/dotfiles + * Make sure to run bootstrap when it asks +* More stuff to come From 88956e46aac304274b9105cd23f146638797aac6 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 19 Sep 2021 20:17:22 -0400 Subject: [PATCH 3/7] Changes --- .Brewfile | 2 +- .config/lvim/config.lua | 131 ++++++++++++++++-------- .config/lvim/plugin/packer_compiled.lua | 76 +++++++++----- .config/zsh/powerline.zsh | 23 +++++ .zshrc | 2 +- 5 files changed, 162 insertions(+), 72 deletions(-) create mode 100644 .config/zsh/powerline.zsh diff --git a/.Brewfile b/.Brewfile index ffb287e..46ad313 100644 --- a/.Brewfile +++ b/.Brewfile @@ -86,6 +86,7 @@ brew "nnn" brew "openjdk" brew "pandoc" brew "pinentry-mac" +brew "powerline-go" brew "ruby-build" brew "rbenv" brew "rclone" @@ -93,7 +94,6 @@ brew "reattach-to-user-namespace" brew "redis" brew "ripgrep" brew "speedtest-cli" -brew "starship" brew "stow" brew "teensy_loader_cli" brew "terraform-ls" diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua index 524e24d..9b9dbec 100644 --- a/.config/lvim/config.lua +++ b/.config/lvim/config.lua @@ -106,55 +106,98 @@ vim.cmd("set timeoutlen=500") -- Additional Plugins lvim.plugins = { - { - "p00f/nvim-ts-rainbow", - }, - { "tpope/vim-repeat" }, - { - "tpope/vim-surround", - keys = {"c", "d", "y"} - }, - { - "metakirby5/codi.vim", - cmd = "Codi", - }, - { - "monaqa/dial.nvim", - event = "BufRead", - config = function() - local dial = require "dial" - vim.cmd [[ + { + "tpope/vim-surround", + keys = { "c", "d", "y" }, + }, + { + "ethanholz/nvim-lastplace", + event = "BufRead", + config = function() + require("nvim-lastplace").setup({ + lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, + lastplace_ignore_filetype = { + "gitcommit", + "gitrebase", + "svn", + "hgcommit", + }, + lastplace_open_folds = true, + }) + end, + }, + { + "lukas-reineke/indent-blankline.nvim", + event = "BufRead", + setup = function() + vim.g.indentLine_enabled = 1 + vim.g.indent_blankline_char = "▏" + vim.g.indent_blankline_filetype_exclude = { "help", "terminal", "dashboard" } + vim.g.indent_blankline_buftype_exclude = { "terminal" } + vim.g.indent_blankline_show_trailing_blankline_indent = false + vim.g.indent_blankline_show_first_indent_level = false + end, + }, + { + "ggandor/lightspeed.nvim", + event = "BufRead", + }, + { + "nacro90/numb.nvim", + event = "BufRead", + config = function() + require("numb").setup({ + show_numbers = true, -- Enable 'number' for the window while peeking + show_cursorline = true, -- Enable 'cursorline' for the window while peeking + }) + end, + }, + { + "windwp/nvim-spectre", + event = "BufRead", + config = function() + require("spectre").setup() + end, + }, + { + "andymass/vim-matchup", + event = "CursorMoved", + config = function() + vim.g.matchup_matchparen_offscreen = { method = "popup" } + end, + }, + { + "p00f/nvim-ts-rainbow", + }, + { "tpope/vim-repeat" }, + { + "monaqa/dial.nvim", + event = "BufRead", + config = function() + local dial = require("dial") + vim.cmd([[ nmap (dial-increment) nmap (dial-decrement) vmap (dial-increment) vmap (dial-decrement) vmap g (dial-increment-additional) vmap g (dial-decrement-additional) - ]] + ]]) - dial.augends["custom#boolean"] = dial.common.enum_cyclic { - name = "boolean", - strlist = { "true", "false" }, - } - table.insert(dial.config.searchlist.normal, "custom#boolean") + dial.augends["custom#boolean"] = dial.common.enum_cyclic({ + name = "boolean", + strlist = { "true", "false" }, + }) + table.insert(dial.config.searchlist.normal, "custom#boolean") - -- For Languages which prefer True/False, e.g. python. - dial.augends["custom#Boolean"] = dial.common.enum_cyclic { - name = "Boolean", - strlist = { "True", "False" }, - } - table.insert(dial.config.searchlist.normal, "custom#Boolean") - end, - }, - { - "phaazon/hop.nvim", - event = "BufRead", - config = function() - require("hop").setup() - vim.api.nvim_set_keymap("n", "s", ":HopChar2", { silent = true }) - vim.api.nvim_set_keymap("n", "S", ":HopWord", { silent = true }) - end, - }, + -- For Languages which prefer True/False, e.g. python. + dial.augends["custom#Boolean"] = dial.common.enum_cyclic({ + name = "Boolean", + strlist = { "True", "False" }, + }) + table.insert(dial.config.searchlist.normal, "custom#Boolean") + end, + }, } -- Autocommands (https://neovim.io/doc/user/autocmd.html) @@ -163,11 +206,11 @@ lvim.plugins = { -- } -- Typescript/javascript -lvim.lang.typescript.formatters = { { exe = "eslint"}, { exe = "prettier" } } +lvim.lang.typescript.formatters = { { exe = "eslint" }, { exe = "prettier" } } lvim.lang.typescriptreact.formatters = lvim.lang.typescript.formatters lvim.lang.typescript.linters = { { exe = "eslint" } } lvim.lang.typescriptreact.linters = lvim.lang.typescript.linters -lvim.lang.javascript.formatters = { { exe = "eslint"}, { exe = "prettier" } } +lvim.lang.javascript.formatters = { { exe = "eslint" }, { exe = "prettier" } } lvim.lang.javascriptreact.formatters = lvim.lang.javascript.formatters lvim.lang.javascript.linters = { { exe = "eslint" } } lvim.lang.javascriptreact.linters = lvim.lang.javascript.linters @@ -175,3 +218,5 @@ lvim.lang.javascriptreact.linters = lvim.lang.javascript.linters -- JSON lvim.lang.json.formatters = { { exe = "prettier" } } +-- Lua +lvim.lang.lua.formatters = { { exe = "stylua" } } diff --git a/.config/lvim/plugin/packer_compiled.lua b/.config/lvim/plugin/packer_compiled.lua index 6db5540..e8edeaf 100644 --- a/.config/lvim/plugin/packer_compiled.lua +++ b/.config/lvim/plugin/packer_compiled.lua @@ -83,12 +83,6 @@ _G.packer_plugins = { needs_bufread = false, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/barbar.nvim" }, - ["codi.vim"] = { - commands = { "Codi" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/codi.vim" - }, ["dashboard-nvim"] = { config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.dashboard\frequire\0" }, loaded = false, @@ -112,11 +106,15 @@ _G.packer_plugins = { needs_bufread = false, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/gitsigns.nvim" }, - ["hop.nvim"] = { - config = { "\27LJ\2\n\1\0\0\6\0\r\0\0226\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\3\0009\0\4\0009\0\5\0'\2\6\0'\3\a\0'\4\b\0005\5\t\0B\0\5\0016\0\3\0009\0\4\0009\0\5\0'\2\6\0'\3\n\0'\4\v\0005\5\f\0B\0\5\1K\0\1\0\1\0\1\vsilent\2\17:HopWord\6S\1\0\1\vsilent\2\18:HopChar2\6s\6n\20nvim_set_keymap\bapi\bvim\nsetup\bhop\frequire\0" }, + ["indent-blankline.nvim"] = { loaded = false, needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/hop.nvim" + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/indent-blankline.nvim" + }, + ["lightspeed.nvim"] = { + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/lightspeed.nvim" }, ["lualine.nvim"] = { config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0" }, @@ -131,6 +129,12 @@ _G.packer_plugins = { loaded = true, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/null-ls.nvim" }, + ["numb.nvim"] = { + config = { "\27LJ\2\nX\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\20show_cursorline\2\17show_numbers\2\nsetup\tnumb\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/numb.nvim" + }, ["nvim-autopairs"] = { config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.autopairs\frequire\0" }, load_after = { @@ -159,6 +163,12 @@ _G.packer_plugins = { loaded = true, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-dap" }, + ["nvim-lastplace"] = { + config = { "\27LJ\2\n\1\0\0\4\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\6\0=\3\a\2B\0\2\1K\0\1\0\30lastplace_ignore_filetype\1\5\0\0\14gitcommit\14gitrebase\bsvn\rhgcommit\29lastplace_ignore_buftype\1\0\1\25lastplace_open_folds\2\1\4\0\0\rquickfix\vnofile\thelp\nsetup\19nvim-lastplace\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lastplace" + }, ["nvim-lspconfig"] = { loaded = true, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-lspconfig" @@ -169,6 +179,12 @@ _G.packer_plugins = { needs_bufread = false, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lspinstall" }, + ["nvim-spectre"] = { + config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fspectre\frequire\0" }, + loaded = false, + needs_bufread = false, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-spectre" + }, ["nvim-toggleterm.lua"] = { config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.terminal\frequire\0" }, loaded = false, @@ -215,6 +231,13 @@ _G.packer_plugins = { loaded = true, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/telescope.nvim" }, + ["vim-matchup"] = { + after_files = { "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-matchup/after/plugin/matchit.vim" }, + config = { "\27LJ\2\nN\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\0\1\vmethod\npopup!matchup_matchparen_offscreen\6g\bvim\0" }, + loaded = false, + needs_bufread = true, + path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-matchup" + }, ["vim-repeat"] = { loaded = true, path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/vim-repeat" @@ -239,6 +262,18 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) +-- Setup for: indent-blankline.nvim +time([[Setup for indent-blankline.nvim]], true) +try_loadstring("\27LJ\2\n\2\0\0\2\0\v\0\0256\0\0\0009\0\1\0)\1\1\0=\1\2\0006\0\0\0009\0\1\0'\1\4\0=\1\3\0006\0\0\0009\0\1\0005\1\6\0=\1\5\0006\0\0\0009\0\1\0005\1\b\0=\1\a\0006\0\0\0009\0\1\0+\1\1\0=\1\t\0006\0\0\0009\0\1\0+\1\1\0=\1\n\0K\0\1\0-indent_blankline_show_first_indent_level4indent_blankline_show_trailing_blankline_indent\1\2\0\0\rterminal%indent_blankline_buftype_exclude\1\4\0\0\thelp\rterminal\14dashboard&indent_blankline_filetype_exclude\b▏\26indent_blankline_char\23indentLine_enabled\6g\bvim\0", "setup", "indent-blankline.nvim") +time([[Setup for indent-blankline.nvim]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0", "config", "lualine.nvim") @@ -247,10 +282,6 @@ time([[Config for lualine.nvim]], false) time([[Config for project.nvim]], true) try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0", "config", "project.nvim") time([[Config for project.nvim]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) -- Config for: nvim-dap time([[Config for nvim-dap]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0", "config", "nvim-dap") @@ -259,32 +290,23 @@ time([[Config for nvim-dap]], false) time([[Config for nvim-treesitter]], true) try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0", "config", "nvim-treesitter") time([[Config for nvim-treesitter]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) - --- Command lazy-loads -time([[Defining lazy-load commands]], true) -pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Codi lua require("packer.load")({'codi.vim'}, { cmd = "Codi", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -time([[Defining lazy-load commands]], false) - -- Keymap lazy-loads time([[Defining lazy-load keymaps]], true) +vim.cmd [[noremap d lua require("packer.load")({'vim-surround'}, { keys = "d", prefix = "" }, _G.packer_plugins)]] vim.cmd [[noremap y lua require("packer.load")({'vim-surround'}, { keys = "y", prefix = "" }, _G.packer_plugins)]] vim.cmd [[noremap c lua require("packer.load")({'vim-surround'}, { keys = "c", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap d lua require("packer.load")({'vim-surround'}, { keys = "d", prefix = "" }, _G.packer_plugins)]] time([[Defining lazy-load keymaps]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Event lazy-loads time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'nvim-compe', 'vim-vsnip'}, { event = "InsertEnter *" }, _G.packer_plugins)]] -vim.cmd [[au BufWinEnter * ++once lua require("packer.load")({'nvim-toggleterm.lua', 'which-key.nvim', 'barbar.nvim', 'dashboard-nvim'}, { event = "BufWinEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufWinEnter * ++once lua require("packer.load")({'which-key.nvim', 'nvim-toggleterm.lua', 'dashboard-nvim', 'barbar.nvim'}, { event = "BufWinEnter *" }, _G.packer_plugins)]] +vim.cmd [[au CursorMoved * ++once lua require("packer.load")({'vim-matchup'}, { event = "CursorMoved *" }, _G.packer_plugins)]] +vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'vim-vsnip', 'nvim-compe'}, { event = "InsertEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufRead * ++once lua require("packer.load")({'gitsigns.nvim', 'indent-blankline.nvim', 'lightspeed.nvim', 'numb.nvim', 'nvim-spectre', 'nvim-comment', 'nvim-lastplace', 'dial.nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'friendly-snippets'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] vim.cmd [[au VimEnter * ++once lua require("packer.load")({'nvim-lspinstall'}, { event = "VimEnter *" }, _G.packer_plugins)]] -vim.cmd [[au BufRead * ++once lua require("packer.load")({'gitsigns.nvim', 'hop.nvim', 'nvim-comment', 'dial.nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] time([[Defining lazy-load event autocommands]], false) vim.cmd("augroup END") if should_profile then save_profiles() end diff --git a/.config/zsh/powerline.zsh b/.config/zsh/powerline.zsh new file mode 100644 index 0000000..941ac17 --- /dev/null +++ b/.config/zsh/powerline.zsh @@ -0,0 +1,23 @@ +function powerline_precmd() { + PS1="$($GOPATH/bin/powerline-go -error $? -jobs ${${(%):%j}:-0})" + + # Uncomment the following line to automatically clear errors after showing + # them once. This not only clears the error for powerline-go, but also for + # everything else you run in that shell. Don't enable this if you're not + # sure this is what you want. + + #set "?" +} + +function install_powerline_precmd() { + for s in "${precmd_functions[@]}"; do + if [ "$s" = "powerline_precmd" ]; then + return + fi + done + precmd_functions+=(powerline_precmd) +} + +if [ "$TERM" != "linux" ] && [ -f "$GOPATH/bin/powerline-go" ]; then + install_powerline_precmd +fi diff --git a/.zshrc b/.zshrc index c525782..4629b5a 100644 --- a/.zshrc +++ b/.zshrc @@ -107,4 +107,4 @@ source $ZSH/oh-my-zsh.sh # uninstall by removing these lines # [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true -source <("/usr/local/bin/starship" init zsh --print-full-init) +# source <("/usr/local/bin/starship" init zsh --print-full-init) From aa265b2156119aef81ae3a34de4a0676b689ba2b Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 20 Sep 2021 07:51:24 -0400 Subject: [PATCH 4/7] Add most of the linux stuff in --- .config/lvim/config.lua | 145 ++--------- .config/lvim/plugin/packer_compiled.lua | 318 ------------------------ .config/yadm/bootstrap | 93 ++++++- .config/zsh/autojump.zsh | 2 + .config/zsh/fzf.zsh | 13 + .config/zsh/go.zsh | 2 + .config/zsh/nvm.zsh | 2 + .config/zsh/rust.zsh | 1 + .config/zsh/vim.zsh | 4 +- .zshrc | 8 +- 10 files changed, 135 insertions(+), 453 deletions(-) delete mode 100644 .config/lvim/plugin/packer_compiled.lua create mode 100644 .config/zsh/autojump.zsh create mode 100644 .config/zsh/fzf.zsh create mode 100644 .config/zsh/go.zsh create mode 100644 .config/zsh/nvm.zsh create mode 100644 .config/zsh/rust.zsh diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua index 9b9dbec..f064f30 100644 --- a/.config/lvim/config.lua +++ b/.config/lvim/config.lua @@ -1,23 +1,14 @@ ---[[ -lvim is the global options object - -Linters should be -filled in as strings with either -a global executable or a path to -an executable -]] -- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT -- general -lvim.log.level = "warn" lvim.format_on_save = true +lvim.lint_on_save = true lvim.colorscheme = "onedarker" -- keymappings [view all the defaults by pressing Lk] lvim.leader = "space" -- add your own keymapping lvim.keys.normal_mode[""] = ":w" - -- unmap a default keymapping -- lvim.keys.normal_mode[""] = "" -- edit a default keymapping @@ -28,8 +19,8 @@ lvim.keys.normal_mode[""] = ":w" -- local actions = require "telescope.actions" -- -- for input mode -- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next -- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_previous +-- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next -- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_prev -- -- for normal mode -- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_next @@ -42,24 +33,21 @@ lvim.keys.normal_mode[""] = ":w" -- name = "+Trouble", -- r = { "Trouble lsp_references", "References" }, -- f = { "Trouble lsp_definitions", "Definitions" }, --- d = { "Trouble lsp_document_diagnostics", "Diagnostics" }, +-- d = { "Trouble lsp_document_diagnostics", "Diagnosticss" }, -- q = { "Trouble quickfix", "QuickFix" }, -- l = { "Trouble loclist", "LocationList" }, --- w = { "Trouble lsp_workspace_diagnostics", "Diagnostics" }, +-- w = { "Trouble lsp_workspace_diagnostics", "Diagnosticss" }, -- } -- TODO: User Config for predefined plugins -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile lvim.builtin.dashboard.active = true lvim.builtin.terminal.active = true -lvim.builtin.lualine.active = true -lvim.builtin.dap.active = true --- lvim.builtin.bufferline = true lvim.builtin.nvimtree.side = "left" -lvim.builtin.nvimtree.show_icons.git = 1 +lvim.builtin.nvimtree.show_icons.git = 0 -- if you don't want all the parsers change this to a table of the ones you want -lvim.builtin.treesitter.ensure_installed = "maintained" +lvim.builtin.treesitter.ensure_installed = {} lvim.builtin.treesitter.ignore_install = { "haskell" } lvim.builtin.treesitter.highlight.enabled = true @@ -93,130 +81,27 @@ lvim.builtin.treesitter.highlight.enabled = true -- lvim.lang.python.formatters = { -- { -- exe = "black", +-- args = {} -- } -- } -- set an additional linter -- lvim.lang.python.linters = { -- { -- exe = "flake8", +-- args = {} -- } -- } -vim.cmd("set timeoutlen=500") - -- Additional Plugins -lvim.plugins = { - { - "tpope/vim-surround", - keys = { "c", "d", "y" }, - }, - { - "ethanholz/nvim-lastplace", - event = "BufRead", - config = function() - require("nvim-lastplace").setup({ - lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, - lastplace_ignore_filetype = { - "gitcommit", - "gitrebase", - "svn", - "hgcommit", - }, - lastplace_open_folds = true, - }) - end, - }, - { - "lukas-reineke/indent-blankline.nvim", - event = "BufRead", - setup = function() - vim.g.indentLine_enabled = 1 - vim.g.indent_blankline_char = "▏" - vim.g.indent_blankline_filetype_exclude = { "help", "terminal", "dashboard" } - vim.g.indent_blankline_buftype_exclude = { "terminal" } - vim.g.indent_blankline_show_trailing_blankline_indent = false - vim.g.indent_blankline_show_first_indent_level = false - end, - }, - { - "ggandor/lightspeed.nvim", - event = "BufRead", - }, - { - "nacro90/numb.nvim", - event = "BufRead", - config = function() - require("numb").setup({ - show_numbers = true, -- Enable 'number' for the window while peeking - show_cursorline = true, -- Enable 'cursorline' for the window while peeking - }) - end, - }, - { - "windwp/nvim-spectre", - event = "BufRead", - config = function() - require("spectre").setup() - end, - }, - { - "andymass/vim-matchup", - event = "CursorMoved", - config = function() - vim.g.matchup_matchparen_offscreen = { method = "popup" } - end, - }, - { - "p00f/nvim-ts-rainbow", - }, - { "tpope/vim-repeat" }, - { - "monaqa/dial.nvim", - event = "BufRead", - config = function() - local dial = require("dial") - vim.cmd([[ - nmap (dial-increment) - nmap (dial-decrement) - vmap (dial-increment) - vmap (dial-decrement) - vmap g (dial-increment-additional) - vmap g (dial-decrement-additional) - ]]) - - dial.augends["custom#boolean"] = dial.common.enum_cyclic({ - name = "boolean", - strlist = { "true", "false" }, - }) - table.insert(dial.config.searchlist.normal, "custom#boolean") - - -- For Languages which prefer True/False, e.g. python. - dial.augends["custom#Boolean"] = dial.common.enum_cyclic({ - name = "Boolean", - strlist = { "True", "False" }, - }) - table.insert(dial.config.searchlist.normal, "custom#Boolean") - end, - }, -} +-- lvim.plugins = { +-- {"folke/tokyonight.nvim"}, { +-- "ray-x/lsp_signature.nvim", +-- config = function() require"lsp_signature".on_attach() end, +-- event = "InsertEnter" +-- } +-- } -- Autocommands (https://neovim.io/doc/user/autocmd.html) -- lvim.autocommands.custom_groups = { -- { "BufWinEnter", "*.lua", "setlocal ts=8 sw=8" }, -- } - --- Typescript/javascript -lvim.lang.typescript.formatters = { { exe = "eslint" }, { exe = "prettier" } } -lvim.lang.typescriptreact.formatters = lvim.lang.typescript.formatters -lvim.lang.typescript.linters = { { exe = "eslint" } } -lvim.lang.typescriptreact.linters = lvim.lang.typescript.linters -lvim.lang.javascript.formatters = { { exe = "eslint" }, { exe = "prettier" } } -lvim.lang.javascriptreact.formatters = lvim.lang.javascript.formatters -lvim.lang.javascript.linters = { { exe = "eslint" } } -lvim.lang.javascriptreact.linters = lvim.lang.javascript.linters - --- JSON -lvim.lang.json.formatters = { { exe = "prettier" } } - --- Lua -lvim.lang.lua.formatters = { { exe = "stylua" } } diff --git a/.config/lvim/plugin/packer_compiled.lua b/.config/lvim/plugin/packer_compiled.lua deleted file mode 100644 index e8edeaf..0000000 --- a/.config/lvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,318 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - - local time - local profile_info - local should_profile = false - if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end - else - time = function(chunk, start) end - end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - - _G._packer = _G._packer or {} - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s)) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["DAPInstall.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/DAPInstall.nvim" - }, - ["FixCursorHold.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/FixCursorHold.nvim" - }, - ["barbar.nvim"] = { - config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.bufferline\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/barbar.nvim" - }, - ["dashboard-nvim"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.dashboard\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/dashboard-nvim" - }, - ["dial.nvim"] = { - config = { "\27LJ\2\n\4\0\0\6\0\20\0&6\0\0\0'\2\1\0B\0\2\0026\1\2\0009\1\3\1'\3\4\0B\1\2\0019\1\5\0009\2\a\0009\2\b\0025\4\t\0005\5\n\0=\5\v\4B\2\2\2=\2\6\0016\1\f\0009\1\r\0019\3\14\0009\3\15\0039\3\16\3'\4\6\0B\1\3\0019\1\5\0009\2\a\0009\2\b\0025\4\18\0005\5\19\0=\5\v\4B\2\2\2=\2\17\0016\1\f\0009\1\r\0019\3\14\0009\3\15\0039\3\16\3'\4\17\0B\1\3\1K\0\1\0\1\3\0\0\tTrue\nFalse\1\0\1\tname\fBoolean\19custom#Boolean\vnormal\15searchlist\vconfig\vinsert\ntable\fstrlist\1\3\0\0\ttrue\nfalse\1\0\1\tname\fboolean\16enum_cyclic\vcommon\19custom#boolean\faugends\2 nmap (dial-increment)\n nmap (dial-decrement)\n vmap (dial-increment)\n vmap (dial-decrement)\n vmap g (dial-increment-additional)\n vmap g (dial-decrement-additional)\n \bcmd\bvim\tdial\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/dial.nvim" - }, - ["friendly-snippets"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/friendly-snippets" - }, - ["gitsigns.nvim"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.gitsigns\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/gitsigns.nvim" - }, - ["indent-blankline.nvim"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/indent-blankline.nvim" - }, - ["lightspeed.nvim"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/lightspeed.nvim" - }, - ["lualine.nvim"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/lualine.nvim" - }, - ["nlsp-settings.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nlsp-settings.nvim" - }, - ["null-ls.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/null-ls.nvim" - }, - ["numb.nvim"] = { - config = { "\27LJ\2\nX\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\20show_cursorline\2\17show_numbers\2\nsetup\tnumb\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/numb.nvim" - }, - ["nvim-autopairs"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.autopairs\frequire\0" }, - load_after = { - ["nvim-compe"] = true - }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-autopairs" - }, - ["nvim-comment"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.comment\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-comment" - }, - ["nvim-compe"] = { - after = { "nvim-autopairs" }, - after_files = { "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-compe/after/plugin/compe.vim" }, - config = { "\27LJ\2\n8\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\15core.compe\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-compe" - }, - ["nvim-dap"] = { - config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-dap" - }, - ["nvim-lastplace"] = { - config = { "\27LJ\2\n\1\0\0\4\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\6\0=\3\a\2B\0\2\1K\0\1\0\30lastplace_ignore_filetype\1\5\0\0\14gitcommit\14gitrebase\bsvn\rhgcommit\29lastplace_ignore_buftype\1\0\1\25lastplace_open_folds\2\1\4\0\0\rquickfix\vnofile\thelp\nsetup\19nvim-lastplace\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lastplace" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-lspconfig" - }, - ["nvim-lspinstall"] = { - config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\1K\0\1\0\nsetup\20core.lspinstall\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lspinstall" - }, - ["nvim-spectre"] = { - config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fspectre\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-spectre" - }, - ["nvim-toggleterm.lua"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.terminal\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-toggleterm.lua" - }, - ["nvim-tree.lua"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-tree.lua" - }, - ["nvim-treesitter"] = { - config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-treesitter" - }, - ["nvim-ts-rainbow"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-ts-rainbow" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/plenary.nvim" - }, - ["popup.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/popup.nvim" - }, - ["project.nvim"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/project.nvim" - }, - ["telescope.nvim"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/telescope.nvim" - }, - ["vim-matchup"] = { - after_files = { "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-matchup/after/plugin/matchit.vim" }, - config = { "\27LJ\2\nN\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\0\1\vmethod\npopup!matchup_matchparen_offscreen\6g\bvim\0" }, - loaded = false, - needs_bufread = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-matchup" - }, - ["vim-repeat"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/vim-repeat" - }, - ["vim-surround"] = { - keys = { { "", "c" }, { "", "d" }, { "", "y" } }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-surround" - }, - ["vim-vsnip"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-vsnip" - }, - ["which-key.nvim"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.which-key\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/which-key.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Setup for: indent-blankline.nvim -time([[Setup for indent-blankline.nvim]], true) -try_loadstring("\27LJ\2\n\2\0\0\2\0\v\0\0256\0\0\0009\0\1\0)\1\1\0=\1\2\0006\0\0\0009\0\1\0'\1\4\0=\1\3\0006\0\0\0009\0\1\0005\1\6\0=\1\5\0006\0\0\0009\0\1\0005\1\b\0=\1\a\0006\0\0\0009\0\1\0+\1\1\0=\1\t\0006\0\0\0009\0\1\0+\1\1\0=\1\n\0K\0\1\0-indent_blankline_show_first_indent_level4indent_blankline_show_trailing_blankline_indent\1\2\0\0\rterminal%indent_blankline_buftype_exclude\1\4\0\0\thelp\rterminal\14dashboard&indent_blankline_filetype_exclude\b▏\26indent_blankline_char\23indentLine_enabled\6g\bvim\0", "setup", "indent-blankline.nvim") -time([[Setup for indent-blankline.nvim]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) --- Config for: lualine.nvim -time([[Config for lualine.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0", "config", "lualine.nvim") -time([[Config for lualine.nvim]], false) --- Config for: project.nvim -time([[Config for project.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0", "config", "project.nvim") -time([[Config for project.nvim]], false) --- Config for: nvim-dap -time([[Config for nvim-dap]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0", "config", "nvim-dap") -time([[Config for nvim-dap]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Keymap lazy-loads -time([[Defining lazy-load keymaps]], true) -vim.cmd [[noremap d lua require("packer.load")({'vim-surround'}, { keys = "d", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap y lua require("packer.load")({'vim-surround'}, { keys = "y", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap c lua require("packer.load")({'vim-surround'}, { keys = "c", prefix = "" }, _G.packer_plugins)]] -time([[Defining lazy-load keymaps]], false) - -vim.cmd [[augroup packer_load_aucmds]] -vim.cmd [[au!]] - -- Event lazy-loads -time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au BufWinEnter * ++once lua require("packer.load")({'which-key.nvim', 'nvim-toggleterm.lua', 'dashboard-nvim', 'barbar.nvim'}, { event = "BufWinEnter *" }, _G.packer_plugins)]] -vim.cmd [[au CursorMoved * ++once lua require("packer.load")({'vim-matchup'}, { event = "CursorMoved *" }, _G.packer_plugins)]] -vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'vim-vsnip', 'nvim-compe'}, { event = "InsertEnter *" }, _G.packer_plugins)]] -vim.cmd [[au BufRead * ++once lua require("packer.load")({'gitsigns.nvim', 'indent-blankline.nvim', 'lightspeed.nvim', 'numb.nvim', 'nvim-spectre', 'nvim-comment', 'nvim-lastplace', 'dial.nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] -vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'friendly-snippets'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] -vim.cmd [[au VimEnter * ++once lua require("packer.load")({'nvim-lspinstall'}, { event = "VimEnter *" }, _G.packer_plugins)]] -time([[Defining lazy-load event autocommands]], false) -vim.cmd("augroup END") -if should_profile then save_profiles() end - -end) - -if not no_errors then - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index ca2fee7..7df3037 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -2,24 +2,115 @@ cd $HOME +# What are we packing? +system_type=$(uname -s) + +# Install submodules echo "Init submodules" yadm submodule update --recursive --init +# Link in our tmux config if [ ! -f "$HOME/.tmux.conf" ]; then ln -s -f .tmux/.tmux.conf fi +# Create $GOHOME if necessary +if [ ! -d "$HOME/go" ]; then + mkdir $HOME/go +fi + +# Update our origin URL to the git version now that we have +# our ssh config stuff downloaded +echo "Updating the yadm repo origin URL" +yadm remote set-url origin "git@github.com:tedkulp/dotfiles.git" + +# Mac Specifics if [ "$system_type" = "Darwin" ]; then - # install homebrew if it's missing + # Install Homebrew if it's missing if ! command -v brew >/dev/null 2>&1; then echo "Installing homebrew" /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" fi + # Install all the stuff in Brewfile (get comfortable... have some coffee or adult beverage) if [ -f "$HOME/.Brewfile" ]; then echo "Updating homebrew bundle" brew bundle --global fi fi +# Linux Specifics +if [ "$system_type" = "Linux" ]; then + + # Install apt stuff + sudo apt update -y + sudo apt upgrade -y + sudo apt install -y zsh software-properties-common python-dev python3-dev python3-pip + + # Install node if necessary + if ! command -v node >/dev/null 2>&1; then + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash + export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + nvm install node + fi + + # Install rust and cargo in necessary + if ! command -v cargo >/dev/null 2>&1; then + curl https://sh.rustup.rs -sSf > rustup-init.sh + chmod 755 rustup-init.sh + ./rustup-init.sh -y + rm rustup-init.sh + fi + + # Install neovim if necessary + if ! command -v nvim >/dev/null 2>&1; then + sudo add-apt-repository ppa:neovim-ppa/unstable -y + sudo apt-get update -y + sudo apt-get install neovim -y + fi + + # Install lunarvim + if ! command -v lvim >/dev/null 2>&1; then + bash <(curl -s https://raw.githubusercontent.com/lunarvim/lunarvim/master/utils/installer/install.sh) + lvim +PackerSync + fi + + # Install fzf if necessary + if ! command -v fzf >/dev/null 2>&1; then + git clone --depth 1 https://github.com/junegunn/fzf.git $HOME/.fzf + $HOME/.fzf/install --bin --no-key-bindings --no-completion --no-update-rc + fi + + # Install go if necessary + if ! command -v go >/dev/null 2>&1; then + curl -sLk https://git.io/gobrew | sh - + export PATH="$HOME/.gobrew/current/bin:$HOME/.gobrew/bin:$PATH" + export GOPATH="$HOME/.gobrew/current/go" + gobrew use 1.17 + fi + + # Install powerline-go if necessary + if ! command -v powerline-go >/dev/null 2>&1; then + go install github.com/justjanne/powerline-go@latest + fi + + # Install autojump if necessary + if ! command -v autojump >/dev/null 2>&1; then + git clone git://github.com/wting/autojump.git + cd $HOME/autojump + ./install.py + cd $HOME + fi +fi + +# Oh My ZSH +if [ ! -d "$HOME/.oh-my-zsh" ]; then + echo "Installing oh-my-zsh. Install zsh as default, but then exit out to continue." + sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" +fi + +# Wrapping up +echo "Don't forget to run yadm decrypt!" +exit 0 diff --git a/.config/zsh/autojump.zsh b/.config/zsh/autojump.zsh new file mode 100644 index 0000000..174656f --- /dev/null +++ b/.config/zsh/autojump.zsh @@ -0,0 +1,2 @@ +[[ -s /home/ted/.autojump/etc/profile.d/autojump.sh ]] && source /home/ted/.autojump/etc/profile.d/autojump.sh +autoload -U compinit && compinit -u diff --git a/.config/zsh/fzf.zsh b/.config/zsh/fzf.zsh new file mode 100644 index 0000000..4a4328f --- /dev/null +++ b/.config/zsh/fzf.zsh @@ -0,0 +1,13 @@ +# Setup fzf +# --------- +if [[ ! "$PATH" == *$HOME/.fzf/bin* ]]; then + export PATH="${PATH:+${PATH}:}$HOME/.fzf/bin" +fi + +# Auto-completion +# --------------- +[[ $- == *i* ]] && source "$HOME/.fzf/shell/completion.zsh" 2> /dev/null + +# Key bindings +# ------------ +source "$HOME/.fzf/shell/key-bindings.zsh" diff --git a/.config/zsh/go.zsh b/.config/zsh/go.zsh new file mode 100644 index 0000000..8343c4d --- /dev/null +++ b/.config/zsh/go.zsh @@ -0,0 +1,2 @@ +export PATH="$HOME/.gobrew/current/bin:$HOME/.gobrew/bin:$PATH" +export GOPATH="$HOME/.gobrew/current/go" diff --git a/.config/zsh/nvm.zsh b/.config/zsh/nvm.zsh new file mode 100644 index 0000000..a7042dd --- /dev/null +++ b/.config/zsh/nvm.zsh @@ -0,0 +1,2 @@ +export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/.config/zsh/rust.zsh b/.config/zsh/rust.zsh new file mode 100644 index 0000000..486777e --- /dev/null +++ b/.config/zsh/rust.zsh @@ -0,0 +1 @@ +. $HOME/.cargo/env diff --git a/.config/zsh/vim.zsh b/.config/zsh/vim.zsh index 9461841..bf23f72 100644 --- a/.config/zsh/vim.zsh +++ b/.config/zsh/vim.zsh @@ -5,6 +5,6 @@ alias vim="nvim" alias vi="nvim" ## Lunarvim -alias vim="lvim" -alias vi="lvim" +# alias vim="lvim" +# alias vi="lvim" export PATH=~/.local/bin:$PATH diff --git a/.zshrc b/.zshrc index 4629b5a..905374f 100644 --- a/.zshrc +++ b/.zshrc @@ -10,8 +10,8 @@ export ZSH="$HOME/.oh-my-zsh" # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -# ZSH_THEME="robbyrussell" -ZSH_THEME="cobalt2" +ZSH_THEME="robbyrussell" +# ZSH_THEME="cobalt2" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -108,3 +108,7 @@ source $ZSH/oh-my-zsh.sh # [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true # source <("/usr/local/bin/starship" init zsh --print-full-init) + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion From 1ff1b38ea0264930aca2f85d8c7b057d8686214b Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 20 Sep 2021 08:44:22 -0400 Subject: [PATCH 5/7] Some fixes --- .config/yadm/bootstrap | 2 ++ .config/zsh/vim.zsh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index 7df3037..b55b13e 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -73,6 +73,7 @@ if [ "$system_type" = "Linux" ]; then # Install lunarvim if ! command -v lvim >/dev/null 2>&1; then + . $HOME/.cargo/env bash <(curl -s https://raw.githubusercontent.com/lunarvim/lunarvim/master/utils/installer/install.sh) lvim +PackerSync fi @@ -109,6 +110,7 @@ fi if [ ! -d "$HOME/.oh-my-zsh" ]; then echo "Installing oh-my-zsh. Install zsh as default, but then exit out to continue." sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + yadm checkout $HOME/.zshrc # We want our version fi # Wrapping up diff --git a/.config/zsh/vim.zsh b/.config/zsh/vim.zsh index bf23f72..9461841 100644 --- a/.config/zsh/vim.zsh +++ b/.config/zsh/vim.zsh @@ -5,6 +5,6 @@ alias vim="nvim" alias vi="nvim" ## Lunarvim -# alias vim="lvim" -# alias vi="lvim" +alias vim="lvim" +alias vi="lvim" export PATH=~/.local/bin:$PATH From 0887e65681e801a5c994d66b42fbd5b617c83800 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 20 Sep 2021 09:30:40 -0400 Subject: [PATCH 6/7] Fixes --- .config/yadm/bootstrap | 11 +++-------- .zshrc | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index b55b13e..fd2e4c6 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -96,14 +96,6 @@ if [ "$system_type" = "Linux" ]; then if ! command -v powerline-go >/dev/null 2>&1; then go install github.com/justjanne/powerline-go@latest fi - - # Install autojump if necessary - if ! command -v autojump >/dev/null 2>&1; then - git clone git://github.com/wting/autojump.git - cd $HOME/autojump - ./install.py - cd $HOME - fi fi # Oh My ZSH @@ -111,6 +103,9 @@ if [ ! -d "$HOME/.oh-my-zsh" ]; then echo "Installing oh-my-zsh. Install zsh as default, but then exit out to continue." sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" yadm checkout $HOME/.zshrc # We want our version + . $HOME/.zshrc + git clone https://github.com/agkozak/zsh-z $HOME/.config/zsh/plugins/zsh-z + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/plugins/zsh-syntax-highlighting fi # Wrapping up diff --git a/.zshrc b/.zshrc index 905374f..a4811d4 100644 --- a/.zshrc +++ b/.zshrc @@ -73,7 +73,7 @@ fi # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(vi-mode git autojump fzf aws vscode zsh-syntax-highlighting sudo dash zsh-z) +plugins=(vi-mode git fzf aws vscode sudo dash zsh-z zsh-syntax-highlighting) source $ZSH/oh-my-zsh.sh From 6371a6b4d12ef24b8458a0746a6e8fafa819c49f Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 20 Sep 2021 10:08:53 -0400 Subject: [PATCH 7/7] More fixes --- .config/yadm/bootstrap | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index fd2e4c6..563b0a6 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -46,7 +46,7 @@ if [ "$system_type" = "Linux" ]; then # Install apt stuff sudo apt update -y sudo apt upgrade -y - sudo apt install -y zsh software-properties-common python-dev python3-dev python3-pip + sudo apt install -y zsh software-properties-common python-dev python3-dev python3-pip urlview # Install node if necessary if ! command -v node >/dev/null 2>&1; then @@ -75,7 +75,7 @@ if [ "$system_type" = "Linux" ]; then if ! command -v lvim >/dev/null 2>&1; then . $HOME/.cargo/env bash <(curl -s https://raw.githubusercontent.com/lunarvim/lunarvim/master/utils/installer/install.sh) - lvim +PackerSync + $HOME/.local/bin/lvim +PackerSync fi # Install fzf if necessary @@ -102,10 +102,9 @@ fi if [ ! -d "$HOME/.oh-my-zsh" ]; then echo "Installing oh-my-zsh. Install zsh as default, but then exit out to continue." sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" - yadm checkout $HOME/.zshrc # We want our version - . $HOME/.zshrc git clone https://github.com/agkozak/zsh-z $HOME/.config/zsh/plugins/zsh-z git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/plugins/zsh-syntax-highlighting + yadm checkout $HOME/.zshrc # We want our version fi # Wrapping up