commit f6881cea7a37b81b3e1bff27cf7e9af0205a6315 Author: Akemi Izuko Date: Tue Sep 6 23:34:19 2022 -0600 Init again The dotfiles are back diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6cc93d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,66 @@ +# Reference file for all alacritty options, found at; +# https://github.com/alacritty/alacritty/releases + +# Aerc +aerc/accounts.conf + +# Bin +bin/sway_tree + +# Mpv +mpv/watch_later + +# Other +other/com.warpd.launcher.plist + +# Qutebrowser +qutebrowser/* +qutebrowser/config.py +qutebrowser/gruvbox_qutebrowser.py + +# Skhd +skhd/com.skhd.launcher.plist + +# Sketchybar +sketchybar/com.sketchybar.launcher.plist + +# Sway +sway/toggle_mute_data +sway/*.avif +sway/*.jepg +sway/*.jpg +sway/*.mp3 +sway/*.png + +# Swaylock +swaylock/* +!swaylock/config + +# Tmux +tmux/plugins + +# Vifm +vifm/scripts/README +vifm/fzf-read/bookmarks +vifm/vifm-help.txt +vifm/vifminfo.json +vifm/*.jpg + +# Vim +vim/.vim/plugged +vim/.vim/autoload/plug.vim +vim/.vim/vim_notepad.md +vim/.vim/colors +vim/nvim/colors + +# Vimiv +vimiv/styles/default + +# Warpd +warpd/com.warpd.launcher.plist + +# Xremap +xremap/config.yml + +# Yabai +yabai/pinned_windows.json diff --git a/README.md b/README.md new file mode 100644 index 0000000..93a430e --- /dev/null +++ b/README.md @@ -0,0 +1,329 @@ +Hit the ground flying with dotfiles for Unix-like systems including MacOS. These +contain all sorts of goodies for bash, vim, shell scripts, unix notes, and much +more! + +# Installation + + $ git clone --depth=1 'ssh://git@github.com:22/Aizuko/configs.git' configs + $ cd configs && bash ./install.sh --help + +Use `./install.sh install` to symlink configs. Anything not linked will be +reported and can be viewed at any time with `./install.sh status`. After linking +files, proceed to the [post-installation](#Post-Installation) section + +Don't worry, the script won't overwrite anything and doesn't even touch anything +without an explicit `install` argument + +### Info + +Verified platforms: + + - **EndeavourOS 5.19.6** with Bash **5.1.16** + - **MacOS 10.15.{3,5}** with Bash **5.1.8** and **3.2.57** + - Almost certainly works on any Arch-based distro and likely most of Linux + +The mindset behind these: + + - If it can be done in a shell, it probably should be done in a shell + - The mouse is too far away + - As fast as possible + +Configs are kept as consistent as possible between Mac and Linux, without +sacrificing anything on either end. See the [keybinds for +reference](#Keybinding-methodology) + +Linux is configured to run Sway. It's extremely light and incredibly fast. +Although almost everything works on Wayland at this point, the Sway config can +be trivially ported to i3 running on Xorg. An Arch-based distro will make +installing the right packages easier, though is by no means required + +MacOS is configured to run Yabai with Skhd. This takes some tweaking. Check out +the [Post-installation section for MacOS](#MacOS) beforehand. These config files +were written on and font MacOS Catalina 10.15. Some things may not work in newer +versions, though most things should be fine + +The `./notes` directory contains various reference files. They can be accessed +quickly by running `notes` + +# Post Installation + +## Both + +Use `bash package_install.sh status` to see which packages are missing on your +system. `./package_install.sh install` will try to install additional packages. +This is very likely to work on MacOS and any `pacman`-using distro. If it's not +working, install them manually by looking through `./package_install.sh status` + +This script does not install many heavier packages, such as `gimp`, `sway`, and +`ffmpeg`. Check out `./notes/further_installation.md` for a list of these and +install them manually + +## Linux + +#### Fonts + +Many scripts assume you have access to [Meslo LGM +NerdFont](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Meslo/M). +These can be replaced easily with any other nerd font. Other fonts may lack +support for the right character set + + $ mv -i downloaded-fonts/* ~/.local/share/fonts + # mv -i downloaded-fonts/* /usr/local/share/fonts + +See the [ArchWiki](https://wiki.archlinux.org/title/fonts#Manual_installation) +for more information. TexLive downloads a lot of additional fonts by default too + +#### xRemap + +Remapping keys is done through `xremap`. Despite the name, it works flawlessly +on Wayland, at least in Sway + +Depending on your environment, you need to install a different binary, all of +which are available through `cargo`. For example `cargo install xremap +--features sway`. Check [here for more +options](https://github.com/k0kubun/xremap#installation). + +If you're using systemd, run the following: + +``` +# ln -s ~/.configs_pointer/xremap/config{_console,}.yml +# mkdir -p /etc/xremap +# ln -s {~/.configs_pointer,/etc}/xremap/config.yml +# cp ~/.configs_pointer/systemd/xremap.service /etc/systemd/system/xremap.service +# cp ~/.cargo/bin/xremap /usr/local/bin/xremap +# systemctl enable xremap.service +# systemctl start xremap.service +# switch_keyboards.sh pc +``` + +You can toggle between Mac-style keyboard and standard keyboard with +`switch_keyboards.sh` see the doc-comment `vi $(which switch_keyboards.sh)` for +more information + +`sway/config` acts as a hotkey daemon and `wtype` can synthesize input + +#### Sway + +To run sway, install the `sway` and `swaylock` packages. Both configs reference +`default_wallpaper.png` in their respective directories. Put your wallpaper +there or change the corresponding `config` file + +If sway is acting up, try setting/unsetting `WAYLAND_DISPLAY` and `SWAYSOCK`. +`swaymsg` also takes an `-s` option which can specify the socket manually + +Sway doesn't adjust the gamma on external displays. Compared to MacOS, +everything looks very washed-out and low contrast. Using `wl-sunset` with `-t +4000 -T 6500 -g 0.9` brings MacOS-like gamma curves + +For more information about sway, read the [i3 User's +Guide](https://i3wm.org/docs/userguide.html). Particularly chapters 3 and 4 are +very important for sway + +#### Multilingual input +IME-style inputs require a complicated setup on wayland. The method described +here unfortunately scales like Xwayland. That is to say it's very blurry on a +HiDPI display. Also, IMEs don't work in Alacritty yet. Consider [foot +terminal](https://codeberg.org/dnkl/foot) if this is important + +If you only need an IME in Chromium, [Google Input +Tools](https://chrome.google.com/webstore/detail/google-input-tools/mclkkofklkfljcocdinagocijmpgbhab) +is a pretty decent solution. It scales properly on wayland and doesn't require a +spotty setup. However, it doesn't work in the search bar and makes network calls +for kanji lookups, which can be really slow + +Otherwise you can use fcitx5. Choose a supported IME based on what language you +need [here](https://wiki.archlinux.org/title/Input_method). For the example +below we'll install Mozc + +```bash +please pacman -S fcitx5 fcitx5-configtool fcitx5-gtk fcitx5-qt fcitx5-mozc +please pacman -S gtk4 # For Chromium support +``` + +Next add these lines to `/etc/environment` +``` +GTK_IM_MODULE=fcitx +QT_IM_MODULE=fcitx +XMODIFIERS=@im=fcitx +MOZ_ENABLE_WAYLAND=1 +``` + +Currently, Chromium will only interface with fcitx5 when it's running on the +non-default gtk4. Add `--gtk-version=4` to `~/.config/chromium-flags.conf`. As +of writing, this breaks Chromium's built-in file manager, the one for picking +files. Use Firefox for a better fcitx5 experience + +Open fcitx5-configtool to set the required keyboards and change the global +hotkey. For Mozc, you'd move the Mozc keyboard to the left. Not the other +Japanese keyboards, those are not IME-based + +You may need to reboot wayland or possibly the entire system. Fcitx5 will now be +available will the following command. Consider adding the following to +`sway/config` if you want it on startup, or use `` to toggle in on/off + +```bash +fcitx5 -d --replace +``` + +#### AV1 media +AV1 is the hottest new codec on the block, providing compression levels better +than h265. I've seen it 200x smaller than png, with the same resolution and +color space + +To store images as avif, use `magick convert my_image_name.{png,avif}`. `viu` +has no support for avif. `imv` supports it out of the box. `vimiv` requires a qt +plugin for support: + +```bash +please pacman -S libavif +# Get the latest release from below, for example +# https://github.com/novomesk/qt-avif-image-plugin/releases/latest +curl -LO 'https://github.com/novomesk/qt-avif-image-plugin/archive/refs/tags/v0.5.0.tar.gz' +tar xf qt-avif-image-plugin-0.5.0.tar.gz +cd qt-avif-image-plugin-0.5.0 +./build_libqavif_dynamic.sh +please make install +``` + +#### Chromium +Chromium does not support screen sharing by default on wayland. To add support +go into `chrome://flags` and enable the "WebRTC PipeWire support" flag. Next +download the following a reboot to allow screen sharing + +``` +please pacman -S xdg-desktop-portal-wlr libpipewire02 +``` + +Consider disabling "Continue running background apps when Chromium is closed" in +settings + +Fix the default fonts in `chrome://settings/fonts`. These are the fallback fonts + +#### Firefox +Firefox will start on xorg by default, unless the `MOZ_ENABLE_WAYLAND=1` +environment variable is set. Incognito is enabled through the `--private-window` +flag + +Firefox uses `about:config` stored in +`~/.mozilla/firefox/.default-release/prefs.js`. These are the +equivalent of Chromium flags. For these configs, simply switch +`ui.key.menuAccessKeyFocuses` to false, to avoid conflicts with xremap + +#### Backlights +Laptops usually control the backlight via apci. One program to control this is +[light](https://github.com/haikarainen/light). By default light requires the use +of root privileges to modify devices. Use systemd rules and the video group to +allow unprivileged users to run it normally: + +```bash +curl -LO 'https://raw.githubusercontent.com/haikarainen/light/master/90-backlight.rules' +please mkdir -p /usr/lib/udev/rules.d +please cp 90-backlight.rules /usr/lib/udev/rules.d +# Add your user to the video group +please usermod -aG video emiliko +``` + +## MacOS + +Macs aren't even close to Linux in virtualisation capabilities, window managers, +and customizability in general. However, if you're unfortunate enough to find +yourself with a macbook, all is not lost. Here's a rough porting guide: + +| sWayland | MacOS | +| --------------------- | -------- | +| SwayWM | [Yabai](https://github.com/koekeishiya/yabai) | +| xRemap | [Karabiner-Elements](https://karabiner-elements.pqrs.org/) | +| ~/.config/sway/config | [skhd](https://github.com/koekeishiya/skhd) | +| swhkd | [skhd](https://github.com/koekeishiya/skhd) | +| wtype | [skhd](https://github.com/koekeishiya/skhd) | +| systemd | Launchd | +| Zathura | [Skim](https://skim-app.sourceforge.io/) | +| Fuzzel | [Choose](https://github.com/chipsenkbeil/choose) or Spotlight | +| udisksctl | `diskutil` +| ~/.local/share/fonts | FontBook | +| wl-clipboard | `pbcopy` `pbpaste` | +| sshd | System Preference -> Sharing -> Remote Login | +| Super/Ctrl | Command | +| Alt | Opt | +| $0 | +$1000 | + +For Xorg users, `yabai` is to `skhd` what `bspwm` is to `sxhkd`. Also `launchd` +is wayyy less capable than `systemd` and rarely gets used. The `launchd` script +in `./bin` wraps around all the commands you'll ever need + +To use open source apps, run `sudo spctl --master-disable`, then head to System +Preferences -> Security & Privacy -> General and select Anywhere at the bottom. +You can check it's working with `spctl --status` + +While you're here, you can go under Software Updates and uncheck everything + +#### Window managers + +MacOS only allows the default Quartz Compositor, a floating window manager with +too many animations and almost no keyboard controls. There are two open source +tiling window managers, which are just scripts overtop Quartz Compositor as +alternatives. [Amethyst](https://github.com/ianyh/Amethyst) and +[Yabai](https://github.com/koekeishiya/yabai) + +Amethyst provides basic tiling of windows and basic keyboard controls. Yabai is +effectively a port of bspwm to MacOS and has much more extensive configuration +than Amethyst, notably controlling workspaces. Unfortunately they don't hold a +candle to Linux managers. Both can be very laggy and Yabai specifically often +freezes up for a few seconds, though these are the only options. + +To use Yabai, boot into recovery mode, and disable SIP [as explained +here](https://github.com/koekeishiya/yabai/wiki/Disabling-System-Integrity-Protection). +Despite what apple says, this doesn't make the system immediately explode. +Actually there's no difference at all, except being able to use Yabai + +# Methodology +## Keybinding +Generally keybindings follow this scheme for `skhd`/`xremap`, bash, and vim's +insert mode. They roughly resemble Emac's default. Outliers are bolded. These +are written assuming Ctrl is mapped to CapsLock + +When possible selecting is preferred to actually deleting the text + +| Type | Start of line | Back word | Back character | Forward character | Forward word | End of line | +| ---- | ------------- | --------- | -------------- | ----------------- | ------------ | ----------- | +| Movement | `^a` | **`^b`** | **`^j`** | `^f` | **`^w`** | `^e` | +| Deletion | | **`^u`** | `^h` | `^d` | | `^k` | + +Window managers are bound to the Super/Command/Logo key. This conflicts with +MacOS's defaults at times + +## Light and Dark Mode + +### Graphical + +Light mode remains somewhat spotty and probably will indefinitely. On Wayland +there's [wluma](https://github.com/maximbaz/wluma) which is a port of MacOS's +[Lumen](https://github.com/anishathalye/lumen). Both can somewhat help alleviate +rapid changes in on-screen content brightness + +There's a UserStyle.css file, tested with +[Stylus](https://chrome.google.com/webstore/detail/stylus/clngdbkpkpeebahjckkjfobafhncgmne) +on Chromium which provides dark themes for many additional sites, such as the +ArchWiki + +### Text mode + +Alacritty, tmux, vim, vifm, vimiv are all synchronously colored through +`bin/colo.sh`. This script supports multiple color schemes and makes it easy to +add new ones. + +Vifm has a "light" and "dark" mode which plays better with generally "lighter" +and "darker" color schemes. This can be manually changed with `:Light` and +`:Dark` + +Vim similarly has shortcuts for the included color schemes. `:Dark[1-4]` and +`:Light[1-4]` change to some hand-picked good ones. Additionally `:Darkh` +changes to a higher-contrast version of the `:Dark` color scheme + +## Todo +The only one done configing is you, Ricky + + - Maildir with aerc + - [Himalaya](https://git.sr.ht/~soywod/himalaya-cli) instead of aerc? + - Setup irc client? + - Organize notes diff --git a/aerc/aerc.conf b/aerc/aerc.conf new file mode 100644 index 0000000..96ebade --- /dev/null +++ b/aerc/aerc.conf @@ -0,0 +1,331 @@ +# +# aerc main configuration + +[general] +default-save-path=/dev/shm +# +# If set to "gpg", aerc will use system gpg binary and keystore for all crypto +# operations. Otherwise, the internal openpgp implemenation will be used. +# +# Default: internal +pgp-provider=internal + +# By default, the file permissions of accounts.conf must be restrictive and +# only allow reading by the file owner (0600). Set this option to true to +# ignore this permission check. Use this with care as it may expose your +# credentials. +# +# Default: false +unsafe-accounts-conf=false + +[ui] +# +# Describes the format for each row in a mailbox view. This field is compatible +# with mutt's printf-like syntax. +# +# Default: %D %-17.17n %Z %s +index-format=%-20.20D %-17.17n %Z %s + +# +# See time.Time#Format at https://godoc.org/time#Time.Format +# +# Default: 2006-01-02 03:04 PM (ISO 8601 + 12 hour time) +timestamp-format=2006-01-02 03:04 PM + +# +# Index-only time format for messages that were received/sent today. +# If this is not specified, timestamp-format is used instead. +# +# Default: "03:04 PM" (12 hour time) +this-day-time-format=03:04 PM + +# +# Index-only time format for messages that were received/sent within the last +# 7 days. If this is not specified, timestamp-format is used instead. +# +# Default: "Monday 03:04 PM" (Week day + 12 hour time) +this-week-time-format=Monday 03:04 PM + +# +# Index-only time format for messages that were received/sent this year. +# If this is not specified, timestamp-format is used instead. +# +# Default: "January 02" (Month + month day) +this-year-time-format=January 02 + +# +# Width of the sidebar, including the border. +# +# Default: 20 +sidebar-width=20 + +# +# Message to display when viewing an empty folder. +# +# Default: (no messages) +empty-message=(no messages) + +# Message to display when no folders exists or are all filtered +# +# Default: (no folders) +empty-dirlist=(no folders) + +# Enable mouse events in the ui, e.g. clicking and scrolling with the mousewheel +# +# Default: false +mouse-enabled=false + +# +# Ring the bell when new messages are received +# +# Default: true +new-message-bell=true + +# Marker to show before a pinned tab's name. +# +# Default: ` +pinned-tab-marker='`' + +# Describes the format string to use for the directory list +# +# Default: %n %>r +dirlist-format=%n %>r + +# Delay after which the messages are actually listed when entering a directory. +# This avoids loading messages when skipping over folders and makes the UI more +# responsive. If you do not want that, set it to 0s. +# +# Default: 200ms +dirlist-delay=200ms + +# Display the directory list as a foldable tree that allows to collapse and +# expand the folders. +# +# Default: false +dirlist-tree=false + +# List of space-separated criteria to sort the messages by, see *sort* +# command in *aerc*(1) for reference. Prefixing a criterion with "-r " +# reverses that criterion. +# +# Example: "from -r date" +# +# Default: "" +sort= + +# Moves to next message when the current message is deleted +# +# Default: true +next-message-on-delete=true + +# The directories where the stylesets are stored. It takes a colon-separated +# list of directories. If this is unset or if a styleset cannot be found, the +# following paths will be used as a fallback in that order: +# +# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets +# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets +# /usr/local/share/aerc/stylesets +# /usr/share/aerc/stylesets +# +# default: "" +stylesets-dirs= + +# Uncomment to use box-drawing characters for vertical and horizontal borders. +# +# Default: spaces +# border-char-vertical=│ +# border-char-horizontal=─ + +# Sets the styleset to use for the aerc ui elements. +# +# Default: default +styleset-name=default + +# Activates fuzzy search in commands and their arguments: the typed string is +# searched in the command or option in any position, and need not be +# consecutive characters in the command or option. +#fuzzy-complete=false + +# How long to wait after the last input before auto-completion is triggered. +# +# Default: 250ms +completion-delay=250ms + +# +# Global switch for completion popovers +# +# Default: true +completion-popovers=true + +# Uncomment to use UTF-8 symbols to indicate PGP status of messages +# +# Default: ASCII +#icon-unencrypted= +#icon-encrypted=✔ +#icon-signed=✔ +#icon-signed-encrypted=✔ +#icon-unknown=✘ +#icon-invalid=⚠ + +#[ui:account=foo] +# +# Enable a threaded view of messages. If this is not supported by the backend +# (IMAP server or notmuch), threads will be built by the client. +# +# Default: false +#threading-enabled=false + +# Force client-side thread building +# +# Default: false +#force-client-threads=false + +[statusline] +# Describes the format string for the statusline. +# +# Default: [%a] %S %>%T +render-format=[%a] %S %>%T + +# Specifies the separator between grouped statusline elements. +# +# Default: " | " +# separator= + +# Defines the mode for displaying the status elements. +# Options: text, icon +# +# Default: text +# display-mode= + +[viewer] +# +# Specifies the pager to use when displaying emails. Note that some filters +# may add ANSI codes to add color to rendered emails, so you may want to use a +# pager which supports ANSI codes. +# +# Default: less -R +pager=less -R + +# +# If an email offers several versions (multipart), you can configure which +# mimetype to prefer. For example, this can be used to prefer plaintext over +# html emails. +# +# Default: text/plain,text/html +alternatives=text/plain,text/html + +# +# Default setting to determine whether to show full headers or only parsed +# ones in message viewer. +# +# Default: false +show-headers=false + +# +# Layout of headers when viewing a message. To display multiple headers in the +# same row, separate them with a pipe, e.g. "From|To". Rows will be hidden if +# none of their specified headers are present in the message. +# +# Default: From|To,Cc|Bcc,Date,Subject +header-layout=From|To,Cc|Bcc,Date,Subject + +# Whether to always show the mimetype of an email, even when it is just a single part +# +# Default: false +always-show-mime=false + +# Parses and extracts http links when viewing a message. Links can then be +# accessed with the open-link command. +# +# Default: true +parse-http-links=true + +[compose] +# +# Specifies the command to run the editor with. It will be shown in an embedded +# terminal, though it may also launch a graphical window if the environment +# supports it. Defaults to $EDITOR, or vi. +editor= + +# +# Default header fields to display when composing a message. To display +# multiple headers in the same row, separate them with a pipe, e.g. "To|From". +# +# Default: To|From,Subject +header-layout=To|From,Subject + +# +# Specifies the command to be used to tab-complete email addresses. Any +# occurrence of "%s" in the address-book-cmd will be replaced with what the +# user has typed so far. +# +# The command must output the completions to standard output, one completion +# per line. Each line must be tab-delimited, with an email address occurring as +# the first field. Only the email address field is required. The second field, +# if present, will be treated as the contact name. Additional fields are +# ignored. +address-book-cmd= + +# +# Allow to address yourself when replying +# +# Default: true +reply-to-self=true + +[filters] +# +# Filters allow you to pipe an email body through a shell command to render +# certain emails differently, e.g. highlighting them with ANSI escape codes. +# +# The first filter which matches the email's mimetype will be used, so order +# them from most to least specific. +# +# You can also match on non-mimetypes, by prefixing with the header to match +# against (non-case-sensitive) and a comma, e.g. subject,text will match a +# subject which contains "text". Use header,~regex to match against a regex. +#subject,~^\[PATCH=colordiff +text/plain=sed 's/^>\+.*/\x1b[36m&\x1b[0m/' +text/html=pandoc -f html -t plain +#image/*=catimg -w $(tput cols) - + +[triggers] +# +# Triggers specify commands to execute when certain events occur. +# +# Example: +# new-email=exec notify-send "New email from %n" "%s" + +# +# Executed when a new email arrives in the selected folder +new-email=exec notify-send "New email from %n" "%s" + +[templates] +# Templates are used to populate email bodies automatically. +# + +# The directories where the templates are stored. It takes a colon-separated +# list of directories. If this is unset or if a template cannot be found, the +# following paths will be used as a fallback in that order: +# +# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates +# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates +# /usr/local/share/aerc/templates +# /usr/share/aerc/templates +# +# default: "" +template-dirs= + +# The default template to be used for new messages. +# +# default: new_message +new-message=new_message + +# The default template to be used for quoted replies. +# +# default: quoted_reply +quoted-reply=quoted_reply + +# The default template to be used for forward as body. +# +# default: forward_as_body +forwards=forward_as_body diff --git a/aerc/binds.conf b/aerc/binds.conf new file mode 100644 index 0000000..5cf93cd --- /dev/null +++ b/aerc/binds.conf @@ -0,0 +1,123 @@ +# Binds are of the form = +# To use '=' in a key sequence, substitute it with "Eq": "" +# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit + = :prev-tab + = :next-tab +gT = :prev-tab +gt = :next-tab + = :term + = : + +[messages] +q = :quit + +j = :next + = :next + = :next 50% + = :next 100% + = :next 100% + +k = :prev + = :prev + = :prev 50% + = :prev 100% + = :prev 100% +gg = :select 0 +G = :select -1 + +J = :next-folder +K = :prev-folder +H = :collapse-folder +L = :expand-folder + +v = :mark -t +V = :mark -v + +T = :toggle-threads + + = :view +dd = :prompt 'Really delete this message?' 'delete-message' +A = :archive flat + +C = :compose + +rr = :reply -a +rq = :reply -aq +Rr = :reply +Rq = :reply -q + +#c = :cf +#$ = :term +#! = :term +#| = :pipe + +/ = :search +\ = :filter -a +n = :next-result +N = :prev-result + = :clear + +[messages:folder=Drafts] + = :recall + +[view] +/ = :toggle-key-passthrough/ +q = :close +O = :open +S = :save +| = :pipe +D = :delete +A = :archive flat + + = :open-link + +f = :forward +rr = :reply -a +rq = :reply -aq +Rr = :reply +Rq = :reply -q + +H = :toggle-headers + = :prev-part + = :next-part +J = :next +K = :prev + +[view::passthrough] +$noinherit = true +$ex = + = :toggle-key-passthrough + +[compose] +# Keybindings used when the embedded terminal is not selected in the compose +# view +$ex = + = :prev-field + = :next-field + = + = + = + = :next-field + +[compose::editor] +# Keybindings used when the embedded terminal is selected in the compose view +$noinherit = true + = :prev-field + = :next-field + +[compose::review] +# Keybindings used when reviewing a message to be sent +y = :send +N = :abort +p = :postpone +q = :choose -o d discard abort -o p postpone postpone +e = :edit +a = :attach +d = :detach + +[terminal] +$noinherit = true +$ex = + + = :prev-tab + = :next-tab diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml new file mode 100644 index 0000000..c4a68e8 --- /dev/null +++ b/alacritty/alacritty.yml @@ -0,0 +1,119 @@ +#====================== +# Fonts and colors +#====================== +# Fonts +font: + normal: + family: Menlo # Default fallback font + # Alternative monospace fallback fonts + #family: Monaco + #family: Source Code Pro + + family: MesloLGM Nerd Font # Use a Nerd-Font for pretty vim statusline + #family: NotoSans Mono # Use a Nerd-Font for pretty vim statusline + #family: MesloLGL Nerd Font # Use a Nerd-Font for pretty vim statusline + size: 11.5 + + offset: + x: 1 + y: 1 + glyph_offset: # Aligns powerline fonts + x: 0 + y: 1 + + use_thin_strokes: true + +draw_bold_text_with_bright_colors: false + +# Colors (Gruvbox dark) +colors: + # Cursor colors + cursor: + text: CellBackground + cursor: CellForeground + + # Vi mode colors + search: + matches: + foreground: '#000000' + background: '#ffffff' + focused_match: + foreground: CellBackground + background: CellForeground + bar: + background: '#c5c8c6' + foreground: '#1d1f21' + + selection: + text: '#000000' + background: '#e69f67' + +import: + - ~/.config/alacritty/colors.yml + +#========================== +# Window GUI +#========================== +window: + title: JoJo + position: + x: 536 + y: 164 + dimensions: + columns: 134 # 16 size font + lines: 36 + #columns: 150 # 14 size font + #lines: 40 + padding: + x: 4 + y: 0 + + decorations: None + startup_mode: Windowed + opacity: 1 + + title: Alacritty + dynamic_title: true + +scrolling: + history: 10000 + multiplier: 3 + +bell: + duration: 0 + color: '#ffff99' + command: None + +selection: + save_to_clipboard: true + +cursor: + style: + shape: Block + blinking: Always + vi_mode_style: Block + blink_interval: 400 + unfocused_hollow: true + thickness: 0.15 + +live_config_reload: true + +shell: + program: /bin/bash + args: + - --login + +working_directory: None + +mouse: + double_click: { threshold: 300 } + triple_click: { threshold: 300 } + hide_when_typing: true + +key_bindings: + - { key: LBracket, mods: Control, action: ToggleViMode} + - { key: I, mode: Vi, action: ToggleViMode} + - { key: N, mods: Alt, action: SpawnNewInstance} + - { key: K, mods: Command, chars: "\x08k"} + # let tmux see C-Space + - { key: Space, mods: Control, chars: "\x00" } diff --git a/alacritty/colors.yml b/alacritty/colors.yml new file mode 100644 index 0000000..50159de --- /dev/null +++ b/alacritty/colors.yml @@ -0,0 +1,231 @@ +schemes: + gruvbox_dark: &base16-gruvbox-dark-pale + primary: + background: '#282828' + foreground: '#ebdbb2' + bright_foreground: '#eaeaea' + + # Normal colors + #normal: + # black: '#282828' + # red: '#cc241d' + # green: '#98971a' + # yellow: '#d79921' + # blue: '#458588' + # magenta: '#b16286' + # cyan: '#689d6a' + # white: '#a89984' + + # Brighter colors by default! May be too bright + normal: + black: '#282828' + red: '#fb4934' + green: '#b8bb26' + yellow: '#fabd2f' + blue: '#83a598' + magenta: '#d3869b' + cyan: '#8ec07c' + white: '#ebdbb2' + + # Bright colors + bright: + black: '#928374' + red: '#fb4934' + green: '#b8bb26' + yellow: '#fabd2f' + blue: '#83a598' + magenta: '#d3869b' + cyan: '#8ec07c' + white: '#ebdbb2' + + gruvbox_light: &base16-gruvbox-light-hard + # Light mode ==== + # http://lawlesscreation.github.io/hex-color-visualiser/ + #f9f5d7 # White 1 + #ebdbb2 # White 2 + #d5c4a1 # White 3 + #bdae93 # White 4, light grey + #665c54 # Grey 1 + #504945 # Grey 2 + #3c3836 # Grey 3, light black + #282828 # Grey 4, black + #9d0006 # Cherry red + #af3a03 # Rust red + #b57614 # Yellow + #79740e # Green + #427b58 # Teal + #076678 # Blue + #8f3f71 # Purple + #d65d0e # Orange + primary: + background: '#FDFFD7' # Linux "white"??? + #background: '#f9f5d7' # White 1 (brighter) + #background: '#fbf1c7' # Sepia white + foreground: '#3c3836' # Grey 3, light black + bright_foreground: '#282828' # Grey 4, black + + normal: + #black: '#f9f5d7' # White 1 + black: '#fbf1c7' # Sepia white + red: '#9d0006' # Cherry red + green: '#79740e' # Green + yellow: '#b57614' # Yellow + cyan: '#427b58' # Teal + blue: '#076678' # Blue + magenta: '#8f3f71' # Purple + white: '#282828' # Grey 4, black + + bright: + black: '#f9f5d7' # White 1 + red: '#9d0006' # Cherry red + green: '#79740e' # Green + yellow: '#b57614' # Yellow + cyan: '#427b58' # Teal + blue: '#076678' # Blue + magenta: '#8f3f71' # Purple + white: '#282828' # Grey 4, black + + # Catppuccin! + catppuccin: &catppuccin + # Default colors + primary: + background: '#1E1E28' + foreground: '#DADAE8' + + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '#1E1E28' + cursor: '#B1E3AD' + + # Normal colors + normal: + black: '#6E6C7E' + red: '#E38C8F' + green: '#B1E3AD' + yellow: '#EBDDAA' + blue: '#A4B9EF' + magenta: '#C6AAE8' + cyan: '#E5B4E2' + white: '#DADAE8' + + # Bright colors + bright: + black: '#6E6C7E' + red: '#E38C8F' + green: '#B1E3AD' + yellow: '#EBDDAA' + blue: '#A4B9EF' + magenta: '#C6AAE8' + cyan: '#E5B4E2' + white: '#DADAE8' + + indexed_colors: + - { index: 16, color: '#F2CECF' } + - { index: 17, color: '#3E4058' } + + palenight: &palenight + # Default colors + primary: + background: '0x292d3e' + foreground: '0x959dcb' + + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '0x292d3e' + cursor: '0x959dcb' + + # Normal colors + normal: + black: '0x292d3e' + red: '0xf07178' + green: '0xc3e88d' + yellow: '0xffcb6b' + blue: '0x82aaff' + magenta: '0xc792ea' + cyan: '0x89ddff' + white: '0x959dcb' + + # Bright colors + bright: + black: '0x676e95' + red: '0xf07178' + green: '0xc3e88d' + yellow: '0xffcb6b' + blue: '0x82aaff' + magenta: '0xc792ea' + cyan: '0x89ddff' + white: '0xffffff' + + indexed_colors: + - { index: 16, color: '0xf78c6c' } + - { index: 17, color: '0xff5370' } + - { index: 18, color: '0x444267' } + - { index: 19, color: '0x32374d' } + - { index: 20, color: '0x8796b0' } + - { index: 21, color: '0x959dcb' } + + dracula: &base16-dracula + # Default colors + primary: + background: '0x282a36' + foreground: '0xf8f8f2' + + # Normal colors + normal: + black: '0x000000' + red: '0xff5555' + green: '0x50fa7b' + yellow: '0xf1fa8c' + blue: '0xcaa9fa' + magenta: '0xff79c6' + cyan: '0x8be9fd' + white: '0xbfbfbf' + + # Bright colors + bright: + black: '0x282a35' + red: '0xff6e67' + green: '0x5af78e' + yellow: '0xf4f99d' + blue: '0xcaa9fa' + magenta: '0xff92d0' + cyan: '0x9aedfe' + white: '0xe6e6e6' + + # Defman21 + github: &base16-github + # Default colors + primary: + background: '0xffffff' + foreground: '0x333333' + + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '0xffffff' + cursor: '0x333333' + + # Normal colors + normal: + black: '0xffffff' + red: '0xed6a43' + green: '0x183691' + yellow: '0x795da3' + blue: '0x795da3' + magenta: '0xa71d5d' + cyan: '0x183691' + white: '0x333333' + + # Bright colors + bright: + black: '0x969896' + red: '0x0086b3' + green: '0xf5f5f5' + yellow: '0xc8c8fa' + blue: '0xe8e8e8' + magenta: '0xffffff' + cyan: '0x333333' + white: '0xffffff' + +draw_bold_text_with_bright_colors: false +# This line is changed by `~/.bash_functions`'s `colo` function +colors: *base16-gruvbox-dark-pale diff --git a/bash/.bash_aliases b/bash/.bash_aliases new file mode 100644 index 0000000..6465909 --- /dev/null +++ b/bash/.bash_aliases @@ -0,0 +1,135 @@ +#!/usr/bin/env bash +# =================================================================== +# Core bash aliases +# =================================================================== +# Might be necessary for vim +shopt -s expand_aliases + +# Safety aliases +alias mv='mv -i' +alias cp='cp -i' +alias rm='rm -i' + +# Legibility +alias df='df -h' +alias du='du -h' +alias tdu='du -h -d1 | sort -h' +alias free='free -h' +alias mkdir='mkdir -p' +alias bat='bat --paging=never' +alias tt='/usr/bin/time -f "%MKB, %es"' +alias colo='colo.sh' + +# Other +alias mem='top -l 1 -s 0 | grep PhysMem' +alias please='sudo -E ' +alias cc="clang -Wall -Wextra -Werror -O2 -std=c99 -pedantic" +alias lsblkf="lsblk -o name,label,fstype,mountpoint,fsused,size,state" +alias mr='make run' +alias ed="ed -p '> :'" +alias ra='rg --no-ignore -.' +alias ee='exit' +alias ffprobe='ffprobe -hide_banner' + + +# =================================================================== +# Keybindings +# =================================================================== +if [[ "${-}" =~ i ]]; then + # Vim-ish movement by word + bind '"\C-w":"\ef"' # Move forward one word \x1BF + bind '"\C-b": backward-word' + bind '"\C-j": backward-char' # Back one character + bind '"\C-l": complete' # Tab-completion to match vim + + stty werase ^u + + stty -ixon # i-search down with ^s + + # Figure that out: + #https://superuser.com/questions/1601543/ctrl-x-e-without-executing-command-immediately +fi + + +# =================================================================== +# Navigation aliases +# =================================================================== +alias cd..='cd ..' +alias safe='cd ~/safe' + +# Avoid symlink paths +alias cd='cd -P' +alias pwd='pwd -P' +alias cdb='cd $OLDPWD' # Go back a directory. Works with symlinks + + +# =================================================================== +# Listing aliases +# =================================================================== +# List Long - List files in acending order of size +alias ll='listlong' +alias ls='listlong --ll-ls' + +# Additional listing options with exa +if command -v exa &> /dev/null; then + # Tree List Long - Recursively print a tree view + alias tll='listlong --ll-tree' + # Git List Long - Recursively print a tree view following .gitignore + alias gll='listlong --ll-git-tree' + # Directories List Long - List the directory hierarchy + alias dll='listlong --ll-dir-tree' + # All List Long - Detailed information for files in current working dir + alias all='listlong --ll-all' + # List symlinks + alias llinks='listlong --ll-links' +fi + + +# =================================================================== +# Git +# =================================================================== +if command -v git &> /dev/null; then + alias gitst='git status -s' + alias gitllog='git log --graph --all --oneline --decorate --color=always | sed -n 1,5p' + alias gitlloga='git log --graph --all --oneline --decorate --color=always | bless' + alias gitllogw='git log --graph --all --date=relative --color=always --pretty="format:%C(auto,yellow)%h%C(auto,magenta) %C(auto,blue)%>(14,trunc)%ad %C(auto,green)%<(13,trunc) %aN%C(auto,red)%gD% D %C(auto,reset)%s" | bless' + alias gitdesk='github .' + alias gitcontrib=' + git ls-files | + while read f + do git blame -w -M -C -C --line-porcelain "$f" | grep -I "^author " + done | sort -f | uniq -ic | sort -n --reverse' +fi + + +# =================================================================== +# External programs +# =================================================================== +# nVim +if command -v nvim &> /dev/null; then + alias vi='nvim' vih='nvim +Rooter' +elif command -v vim &> /dev/null; then + alias vi='vim' vih='vim +Rooter' +fi + +# Veracrypt +if command -v veracrypt &> /dev/null + then alias vera='veracrypt -t'; fi + +# Vifm +if command -v vifm &> /dev/null + then alias fm='vifm'; fi + +# Vimiv +if command -v vimiv &> /dev/null + then alias vii='vii.sh'; fi + +# Qemu +if command -v qemu-system-x86_64 &> /dev/null + then alias qemu='qemu-system-x86_64'; fi + +# Python +if command -v python3 &> /dev/null + then alias py='python3' venv='source ./bin/activate'; fi + +# vim: set ft=bash ff=unix: diff --git a/bash/.bash_env b/bash/.bash_env new file mode 100644 index 0000000..6a85003 --- /dev/null +++ b/bash/.bash_env @@ -0,0 +1,98 @@ +#!/usr/bin/env bash +# PATH extensions =================================================== + # Cargo's binaries +export PATH="${HOME}/bin:${HOME}/.cargo/bin:${PATH}" + # Scripts mostly intended for use with hotkeys +export PATH="${HOME}/.configs_pointer/bin/hotkey_scripts:${PATH}" + # Custom scripts +export PATH="${HOME}/.configs_pointer/bin:${HOME}/.configs_pointer/bin/one_shots:${PATH}" + +# History settings ================================================== +# Ignore duplicates common commands in history +export HISTCONTROL=ignoreboth +export HISTIGNORE='history:pwd:exit:ll:ll -a: ls: tree:tty:pass *' + +# Infinite history size +export HISTFILESIZE= +export HISTSIZE= +export HISTTIMEFORMAT="%F %T: " + +# Different history file to avoid truncation. Still truncates... +export HISTFILE=~/.bash_eternal_history + +# Every prompt writes to history +PROMPT_COMMAND="history -a; $PROMPT_COMMAND" + +# MacOS fixes ======================================================= +if [[ $(uname -s) == 'Darwin' ]]; then + # Use coreutils binaries when possible. Man pages still open MacOS binary + # by default. Prefix 'g' to open the coreutils manpage + export PATH="/usr/local/opt/coreutils/libexec/gnubin/:$PATH" + + # Silence login warning about bash deprecation + export BASH_SILENCE_DEPRECATION_WARNING=1 + + # `ls --color` for BSD/MacOS + export CLICOLOR=1 +fi + +# Homebrew ========================================================== +if [[ -x /home/linuxbrew/.linuxbrew/bin/brew ]]; then + eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +fi + +# Stop brew from upgrading all formula when installing something +export HOMEBREW_NO_INSTALL_UPGRADE=1 + +# Swayland ========================================================== +if [[ "$(uname -s)" == "Linux" ]] && pidof sway &>/dev/null; then + export WAYLAND_DISPLAY=wayland-1 + + export SWAYSOCK="/run/user/$(id -u)/sway-ipc.$(id -u).$(pidof sway).sock" +fi + +# Man pages ========================================================= +export MANWIDTH=90 + +export GIT_PAGER='' # Vim can't properly read git-diff colors + +if [[ "$(uname -s)" == "Linux" ]] && command -v nvim &>/dev/null; then + export PAGER="/bin/sh -c \"unset PAGER;col -b -x | \ + nvim -R -c 'set ft=man nomod nolist' -c 'map q :q' \ + -c 'silent! %s/\v[0-9]+;[0-9];[0-9]+;[0-9]+;[0-9]+m//g' \ + -c 'silent! %s/0m//g' \ + -c 'nmap K :Man =expand(\\\"\\\")' -\"" +fi + +# Config ============================================================= +export XDG_CONFIG_HOME=~/.config +export XDG_CACHE_HOME=~/.cache +export XDG_DATA_HOME=~/.local/share +export XDG_STATE_HOME=~/.local/state +export XDG_DATA_DIRS='/usr/local/share:/usr/share' +export XDG_CONFIG_DIRS='/etc/xdg' + + # Enter GPG password using terminal +export GPG_TTY=$(tty) + + # For pass -c +export PASSWORD_STORE_CLIP_TIME=20 + + # Open git commits and , now , in nvim. Absolute path is better +export EDITOR='nvim' + + # Stop bash from exiting from ^d. 8 consecutive ^d will still exit +export IGNOREEOF=8 + + # Ripgrep needs this manually set +export RIPGREP_CONFIG_PATH=~/.config/ripgrep/config + +# Coloring ========================================================== +# Truecolor support gives full rgb support. This looks something like: +# \033[${bg};2;${red};${green};${blue};${special}m] +# +# For LS_COLORS and similar use: +# 38;2;${red};${green};${blue};${special}: +# +# Special modes can be combined. `1` is bold, `4` is underlined, `1;4` is both +# vim: set ft=bash ff=unix: diff --git a/bash/.bash_functions b/bash/.bash_functions new file mode 100644 index 0000000..8fb2330 --- /dev/null +++ b/bash/.bash_functions @@ -0,0 +1,162 @@ +#!/usr/bin/env bash + +# =================================================================== +# Shell fixes +# =================================================================== +# SSH alias completion ============================================== +_ssh() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts=$(grep '^Host' ~/.ssh/config ~/.ssh/config.d/* 2>/dev/null | grep -v '[?*]' | cut -d ' ' -f 2-) + + COMPREPLY+=( $(compgen -W "$opts" -- ${cur}) ) + return 0 +} +complete -F _ssh ssh rpluto + + +# Don't auto-executing line when leaving editor ===================== +_edit_wo_executing() { + local editor="${EDITOR:-vi}" + tmpf="$(mktemp)" + printf '%s\n' "$READLINE_LINE" > "$tmpf" + eval "${editor} ${tmpf}" + READLINE_LINE="$(<"$tmpf")" + READLINE_POINT="${#READLINE_LINE}" + rm -f "${tmpf}" +} + +if [[ "$-" =~ "i" ]]; then + bind -x '"\C-x\C-e":_edit_wo_executing' + bind -x '"\C-g":_edit_wo_executing' +fi + +# End up in the same directory as vifm exited in +vifmmv() { + local dst="$(command vifm --choose-dir - "$@")" + if [ -z "$dst" ]; then + printf 'Directory was not changed\n' + return 1 + fi + cd "$dst" +} + +# Better exiting ==================================================== +# Don't exit with background jobs still running. Particularly for Qemu +function exit () { + if [[ "$(jobs | wc -l)" -ne 0 ]]; then + printf 'Exit prevented.\nThere are background jobs:\n' + jobs + return 1 + fi + + builtin exit +} + +# Necessary alias =================================================== +russy () { + if [[ "$1" == "baka" ]]; then + cargo check + elif [[ $# -eq 0 ]] && [[ -e ./src/lib.rs ]]; then + cargo test + elif [[ $# -eq 0 ]]; then + cargo run + elif [[ $# -eq 1 ]] && [[ "$1" =~ \.rs$ ]]; then + rustc -C opt-level=3 "$1" + elif [[ "$1" == "run" && "$2" =~ \.rs$ ]]; then + rustc -C opt-level=3 "$2" && ./"${2%.*}" + else + eval "cargo $@" + fi +} + + +# =================================================================== +# Switching color schemes +# =================================================================== +complete -W \ + "--help --query dark light dracula github gruvboxdark gruvboxlight" \ + colo colo.sh + +# =================================================================== +# Additional utilities +# =================================================================== +# Colored pagination ================================================ +function bless () { + if [[ $1 =~ "-h" ]]; then + echo 'USAGE:' + echo ' bless ' + else + # Do not quote $1. Prevents piped reads + if command -v bat &> /dev/null; then + bat --color=always $1 | less -r + #cat $1 | vim -R -c 'set ft=man nomod nolist' -c 'map q :q' \ + # -c 'map ' -c 'map b ' \ + # -c 'nmap K :Man =expand(\\\"\\\")' - + else + less -r $1 + fi + fi +} + +# Attach to tmux session ============================================ +function ta() { + if [[ -n "$1" ]]; then + tmux new -As "$1" + elif [[ -n "$TMUX" ]]; then + tmux switch-client -n + elif [[ ("${-}" =~ i && -z "${TMUX}" && -n "${SSH_CONNECTION}") || -n "${SSH_TTY}" ]]; then + tmux new-session -As ssh_tmux 2>&1 \ + | grep -v 'sessions should be nested with care' # Don't care + else + tmux attach 2>/dev/null || tmux new -As 0 + fi +} + +# Image magick ====================================================== +function magika() { + if [[ "$1" == "a" || "$1" == "av1" ]]; then + magick convert "$2" "${2%.*}.avif" + elif [[ "$1" == "i" ]]; then + shift + magick identify "$@" + elif [[ "$1" == "c" ]]; then + shift + magick convert "$@" + else + magick "$@" + fi +} + +# Make a directory and navigate into it ============================= +function cddir() { + if [[ "$#" -lt 1 ]] || [[ "$1" =~ '--help' ]]; then + echo 'Function: cddir()' + echo 'USAGE:' + echo ' cddir ' + else + mkdir -p "$1" && cd ./"$1" + fi +} + +# Change the prompt - alias for change_bash_prompt ================== +function bprompt () { + source ~/.bash_prompt "$@" +} + +# Enable truecolors over an ssh connection ========================== +function truecolor () { + export COLORTERM='truecolor' + + if command -v tmux has-session &> /dev/null; then + tmux setenv COLORTERM truecolor + fi + + source ~/.bash_prompt +} + + +# vim: set ft=bash ff=unix: diff --git a/bash/.bash_profile b/bash/.bash_profile new file mode 100644 index 0000000..0cdbf3c --- /dev/null +++ b/bash/.bash_profile @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +# Source completion scripts ======================================== +source_completion_scripts () { + [ -r "/usr/local/etc/profile.d/bash_completion.sh" ] && . "/usr/local/etc/profile.d/bash_completion.sh" + + [ -f ~/.git-completion.bash ] && . ~/.git-completion.bash + + # Fzf + [ -f ~/.fzf.bash ] && . ~/.fzf.bash + # Arch uses a different location + [ -f /usr/share/fzf/key-bindings.bash ] && . /usr/share/fzf/key-bindings.bash + + if [[ "$(type -t _fzf_setup_completion)" == 'function' ]]; then + _fzf_setup_completion path mpv vi vii nvim vimiv cat + fi +} + +# Welcome prompts =================================================== +print_version_and_platform () { + local os_name bash_version + + if [[ -n "${BASH_VERSION}" ]]; then + bash_version="${BASH_VERSINFO[0]}.${BASH_VERSINFO[1]}.${BASH_VERSINFO[2]}" + fi + + case "$(uname)" in + Linux) + os_name="$(awk '/PRETTY_NAME/ { + split($0, a, "=") + gsub(/"/, "", a[2]) + print a[2] + }' /etc/os-release)" + ;; + Darwin) os_name="MacOS $(sw_vers -productVersion)" ;; + esac + + printf 'GNU bash %s on %s\n\n' \ + "${bash_version:-Unknown}" "${os_name:-Unknown Platform}" +} + +print_user_msg () { + local username tty_name + + username="$(id -un)" + tty_name="$(tty | awk '{ print substr($0, 6) }')" + + printf '%s: %s @ %s\n' \ + "${username}" "${tty_name}" "${HOSTNAME}" +} + +print_welcome_message () { + print_version_and_platform + cal + print_user_msg +} + +# Login items ======================================================= +is_ssh_connection () { + [[ "${-}" =~ i ]] && [[ -z "${TMUX}" ]] && [[ -n "${SSH_CONNECTION}" ]] \ + || [[ -n "${SSH_TTY}" ]] +} + +has_tmux () { + command -v tmux &> /dev/null +} + +set_starting_dir () { + if [[ "$PWD" == "$HOME" && -d ~/safe && "$IS_VIFM_NEST" != 'T' ]]; then + cd ~/safe + fi +} + +# ============================================================================= +# Run script +# ============================================================================= +source ~/.bashrc +source ~/.bash_prompt + +[[ "$IS_VIFM_NEST" == 'T' ]] || print_welcome_message +printf '\n' + +# Start in routing directory on login ==== +set_starting_dir + +# Attach ssh connections to a dedicated tmux session ==== +if is_ssh_connection && has_tmux; then + tmux new-session -As ssh_tmux 2>&1 \ + | grep -v 'sessions should be nested with care' # We don't care +fi + +# Bash completion ==== +source_completion_scripts + +# vim: set ft=bash ff=unix: diff --git a/bash/.bash_prompt b/bash/.bash_prompt new file mode 100755 index 0000000..15221f7 --- /dev/null +++ b/bash/.bash_prompt @@ -0,0 +1,112 @@ +#!/usr/bin/env bash +export PS1 + +function print_help () { + local invoke_name='change_bash_prompt' + + cat << EOF +Change the current bash prompt + +USAGE: $invoke_name [--help] [color-mode] [components ...] + + [-h|--help] Show this message + + host | hostname Hostname of system + tty Terminal's name + pwd | dir Present working directory + user Username + git Git branch + space | tab 4 white space characters + exit | code Last non-zero exit code + +EXAMPLES: + $invoke_name # Reset prompt + $invoke_name tty pwd git exit # Default prompt + $invoke_name tab tab user exit # Very minimal +EOF +} + +# Select color mode ================================================= +function is_default_prompt () { + [[ "$#" -eq 0 ]] +} + +function exit_code () { + local code="$?" + + if [[ "$code" != "0" ]]; then + printf " [%d]" "$code" + fi +} + +function change_bash_prompt () { + # Set colors ====================================================== + local purple='\[\033[0;35;1m\]' + local yellow='\[\033[0;33;1m\]' + local red='\[\033[0;31;1m\]' + + # Prompt components =============================================== + local hostname="${purple}"'[\h]' + local tty="${purple}$(tty | cut -c6-12)" + local cwd="${yellow}"'\W' + local user="${red}"'\u' + local git="${user}" + local exit="${red}"'$(exit_code)' + local prompt_end='\[\e[m\]\$ ' # Trailing nbsp (u00A0) for tmux reverse search + + if [ -f ~/.git-prompt.bash ]; then + local git="${red}"'$(__git_ps1 "(%s)")' + fi + + local prompt='' + + [[ "$IS_VIFM_NEST" != 'T' ]] || prompt+="" # Alert when nested in vifm + + # Default prompts ================================================= + if is_default_prompt "$@"; then + if [[ -n $SSH_TTY ]] || [[ -n $SSH_CLIENT ]] || [[ -n $SSH_CONNECTION ]]; then + prompt+="${hostname}:${cwd} ${git}${exit}" + else + prompt+="${tty}:${cwd} ${git}${exit}" + fi + fi + + # Build customized prompts ======================================== + local seperator=':' + + for opt in "$@"; do + case "$opt" in + host | hostname) prompt+="$hostname" ;; + tty) prompt+="$tty" ;; + cwd | pwd | dir) prompt+="$cwd" ;; + user) prompt+="$user" ;; + exit | code) prompt+="$exit" ;; + git) + prompt+="$git" + seperator='' + ;; + space | tab) + prompt+=" " + seperator='' + ;; + -h | --help) + print_help "$@" + return 0 + ;; + *) + printf 'Unrecognized option `%s`\n' "$opt" + printf 'Rerun with --help for more information\n' + return 1 + ;; + esac + + prompt+="$seperator" + seperator=' ' + done + + PS1="${prompt}${prompt_end}" +} + +change_bash_prompt "$@" + +# vim: set ft=bash ff=unix: diff --git a/bash/.bashrc b/bash/.bashrc new file mode 100644 index 0000000..4be78d0 --- /dev/null +++ b/bash/.bashrc @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +# Source all bash configs files, except prompt and profile +# Adapted from https://github.com/mathiasbynens/dotfiles/blob/main/.bash_profile +# +# Source bash_functions twice to fix interdependency between bash_functions and +# bash_aliases +source ~/.bash_env +source ~/.bash_functions +source ~/.bash_aliases +source ~/.bash_functions + +# shopt -s histappend + +# Suppress prompt warning when switching users +if [[ -r ~/.git-prompt.bash ]]; then + source ~/.git-prompt.bash +fi diff --git a/bash/.inputrc b/bash/.inputrc new file mode 100644 index 0000000..516b9fc --- /dev/null +++ b/bash/.inputrc @@ -0,0 +1,22 @@ +# History selection in reverse search +#"\e[A": history-search-backward +#"\e[B": history-search-forward + +# These keybinds work in readline repls like python +"\C-p": history-search-backward +"\C-n": history-search-forward + +"\C-f": forward-char +"\C-j": backward-char + +"\C-w": forward-word +"\C-b": backward-word + +"\C-u": backward-kill-word + +"\C-l": complete + +set colored-stats On +set completion-ignore-case + +# vim: set ff=unix ft=sh: diff --git a/bash/.profile b/bash/.profile new file mode 100644 index 0000000..0e6ecf7 --- /dev/null +++ b/bash/.profile @@ -0,0 +1,8 @@ +# Infinite history size +export HISTFILESIZE= +export HISTSIZE= +export HISTTIMEFORMAT="%F %T: " +# Different history file to avoid truncation +export HISTFILE=~/.bash_eternal_history + +# vim: set ft=sh ff=unix: diff --git a/bin/battery_status.sh b/bin/battery_status.sh new file mode 100755 index 0000000..44b01ca --- /dev/null +++ b/bin/battery_status.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +# Filters out and prettifies battery information +upower --dump | awk ' + /Device/ { + device[++devices_cnt]["name"] = substr($0, 41); + i = 1; + } + + /(energy|state|percentage|time to)/ { device[devices_cnt][i++] = $0 } + + /model/ { + split($0, a); + + for (k in a) + if (!(tolower(a[k]) ~ /model:/)) + device[devices_cnt]["model"] = device[devices_cnt]["model"] " " a[k]; + } + + END { + for (dev in device) { + if (length(device[dev]["model"]) > 0) + printf "====%s :: %s ========\n", + device[dev]["model"], device[dev]["name"]; + else + printf "==== %s ========\n", device[dev]["name"]; + + asort(device[dev]); + + for (i in device[dev]) { + is_name = (tolower(device[dev][i]) ~ /(device|model)/); + is_label = (device[dev][i] ~ /:/); + + if (!is_name && is_label) + printf "%s\n", device[dev][i]; + } + } + } +' diff --git a/bin/check_domain.sh b/bin/check_domain.sh new file mode 100755 index 0000000..7150e67 --- /dev/null +++ b/bin/check_domain.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +print_help() { + cat < +HELP +} + +if [[ "$1" =~ ^[a-z0-9-]+(\.[a-z]+)+$ ]]; then + whois "$1" | awk -v d_name="$1" ' + BEGIN { is_available = 1 } + + /Updated Date/ { is_available = 0; print } + /Creation Date/ { is_available = 0; print } + /Registry Expiry Date/ { is_available = 0; print } + + END { + if (is_available) { + printf "%s is available!!!\n", d_name + system("notify-send -u critical -t 3600000 \""d_name"\" \"Domain "d_name" is available!\"") + } + } + ' +else + print_help +fi diff --git a/bin/colo.sh b/bin/colo.sh new file mode 100755 index 0000000..52f8d3d --- /dev/null +++ b/bin/colo.sh @@ -0,0 +1,88 @@ +#!/usr/bin/env bash +# Warning: Many other files in these configs depend on this script. Do not +# rename it or remove it from ~/.configs_pointer/bin/ unnecessarily +__print_color_help() { + cat < "$tmp" + mv -f "$tmp" "$ALACRITTY_COLO" +} + +__change_vimiv_colors() { + if [[ -w "$VIMIV_CONF" ]]; then + local tmp="$(mktemp)" + awk -v c="$COLOR_SCHEME" '/^\s*style = /{ $3=c } 1' "$VIMIV_CONF" > "$tmp" + mv -f "$tmp" "$VIMIV_CONF" + fi +} + +case "$1" in + -t | --tone) __query_color_tone ;; + -c | --colorscheme) echo "$COLOR_SCHEME" ;; + -q | --query) __print_current_colors ;; + -h | --help) __print_color_help ;; + light | gruvboxlight) __change_colors_to "base16-gruvbox-light-hard" ;; + dracula) __change_colors_to "base16-dracula" ;; + github) __change_colors_to "base16-github" ;; + dark | gruvboxdark) __change_colors_to "base16-gruvbox-dark-pale" ;; + *) __print_color_help ;; +esac diff --git a/bin/ix.sh b/bin/ix.sh new file mode 100755 index 0000000..18e4b83 --- /dev/null +++ b/bin/ix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# Pastebin for terminal. Copies the paste's URL to the clipboard +# +# ix.io isn't very responsive, so it may appear to freeze for a few seconds +# +# Use with visual selection in vim: +# !ix.sh +# +# Lifted from: https://exobrain.sean.fish/vim/magic_wands/ + +if [[ $1 =~ '-h' ]]; then + declare -r name="$(basename "$0")" + + cat <> /tmp/ix.log <<<"${STDIN}" + +declare url="$(curl -s -F 'f:1=<-' http://ix.io <<<"${STDIN}")" || { + play_error_sound + exit 1 +} + +if [[ "$(uname -s)" == 'Darwin' ]]; then + printf '%s' "${url}" | pbcopy + osascript -e 'display notification "'"URL: ${url}"'" with title "Vim" subtitle "Copied to clipboard"' +else + printf '%s' "${url}" | wl-copy + notify-send -t 2000 'Vim' 'Copied ix url to wl-clipboard' +fi + +# vim: set syn=bash ff=unix: diff --git a/bin/kat b/bin/kat new file mode 100755 index 0000000..b6f57fc --- /dev/null +++ b/bin/kat @@ -0,0 +1,366 @@ +#!/usr/bin/env python3 +# Compiler and tester for kattis problems +# +# kat expects a ./sample directory with files named /input_[0-9]+/ and a +# corresponding /output_[0-9]+/ file. These will be run in sequence from lowest +# to highest number +# +# Supported languages: +# - Rust: Expects a ./src/main.rs file, as well as a ./Cargo.toml +# - Python: Expects with a single .py file or a main.py or ./src/main.py +# - C: Expects a ./main.c file or ./src/main.c +import argparse, sys, os, pathlib, time, subprocess, re +from abc import ABC, abstractmethod +from typing import Tuple +from pathlib import Path + +class ProgrammingLang(ABC): + @abstractmethod + def __init__(self, root: Path, main_file: Path): + pass + + @abstractmethod + def compile_debug(self): + pass + + @abstractmethod + def compile_release(self): + pass + + @abstractmethod + def run_debug(self, input_file, output_file) -> int: + pass + + @abstractmethod + def run_release(self, input_file, output_file) -> int: + pass + +class Rust(ProgrammingLang): + def __init__(self, root: Path, main_file: Path): + self.main_file = main_file + self.root = root + self.bin_name = root.name + self.release_bin = os.path.join(root, 'target', 'release', self.bin_name) + self.debug_bin = os.path.join(root, 'target', 'debug', self.bin_name) + + def compile_debug(self): + cmd = subprocess.run(['cargo', 'build'], cwd=self.root) + if cmd.returncode != 0: + raise Exception(f'Compile time error: code {cmd.returncode}') + + def compile_release(self): + cmd = subprocess.run(['cargo', 'build', '--release'], cwd=self.root) + if cmd.returncode != 0: + raise Exception(f'Compile time error: code {cmd.returncode}') + + def __run(self, input_file, output_file, sub_dir: Path) -> int: + start = time.time() + cmd = subprocess.run( + os.path.join(self.root, 'target', sub_dir, self.bin_name), + stdin=input_file, stdout=output_file) + end = time.time() + if cmd.returncode != 0: + raise Exception(f'Runtime error: code {cmd.returncode}') + return end - start + + def run_debug(self, input_file, output_file) -> int: + return self.__run(input_file, output_file, 'debug') + + def run_release(self, input_file, output_file) -> int: + return self.__run(input_file, output_file, 'release') + +class Clang(ProgrammingLang): + def __init__(self, root: Path, main_file: Path): + self.main_file = main_file + self.root = root + self.bin_name = 'clang_out' + self.release_bin = self.debug_bin = os.path.join(root, self.bin_name) + + def compile_debug(self): + cmd = subprocess.run([ + 'gcc', '-Wall', '-Wextra', '-Werror', + '-g', '-O2', '-std=gnu11', '-static', + self.main_file, + '-o', self.debug_bin, '-lm' + ]) + if cmd.returncode != 0: + raise Exception(f'Compile time error: code {cmd.returncode}') + + def compile_release(self): + cmd = subprocess.run([ + 'gcc', '-g', '-O2', '-std=gnu11', '-static', + self.main_file, + '-o', self.release_bin, '-lm' + ]) + if cmd.returncode != 0: + raise Exception(f'Compile time error: code {cmd.returncode}') + + def run_debug(self, input_file, output_file) -> int: + return self.run_release(input_file, output_file) + + def run_release(self, input_file, output_file) -> int: + start = time.time() + cmd = subprocess.run(self.release_bin, + stdin=input_file, stdout=output_file) + end = time.time() + return end - start + +class CPlusPlus(ProgrammingLang): + def __init__(self, root: Path, main_file: Path): + self.main_file = main_file + self.root = root + self.bin_name = 'clang_out' + self.release_bin = self.debug_bin = os.path.join(root, self.bin_name) + + def compile_debug(self): + cmd = subprocess.run([ + 'g++', '-g', '-O2', '-std=gnu++17', '-static', + '-lrt', '-Wl,--whole-archive', '-lpthread', + '-Wl,--no-whole-archive', + '-Wall', '-Wextra', '-Werror', + self.main_file, + '-o', self.release_bin + ]) + if cmd.returncode != 0: + raise Exception(f'Compile time error: code {cmd.returncode}') + + def compile_release(self): + cmd = subprocess.run([ + 'g++', '-g', '-O2', '-std=gnu++17', '-static', + '-lrt', '-Wl,--whole-archive', '-lpthread', + '-Wl,--no-whole-archive', + self.main_file, + '-o', self.release_bin + ]) + if cmd.returncode != 0: + raise Exception(f'Compile time error: code {cmd.returncode}') + + def run_debug(self, input_file, output_file) -> int: + return self.run_release(input_file, output_file) + + def run_release(self, input_file, output_file) -> int: + start = time.time() + cmd = subprocess.run(self.release_bin, + stdin=input_file, stdout=output_file) + end = time.time() + return end - start + +class Python(ProgrammingLang): + def __init__(self, root: Path, main_file: Path): + self.main_file = main_file + self.root = root + self.bin_name = main_file.name + self.release_bin = self.debug_bin = main_file + + def compile_debug(self): + pass + + def compile_release(self): + pass + + def __run(self, input_file, output_file, interpreter) -> int: + start = time.time() + cmd = subprocess.run([interpreter, self.release_bin], + stdin=input_file, stdout=output_file) + end = time.time() + + if cmd.returncode != 0: + raise Exception(f'Runtime error: {cmd.returncode}') + return end - start + + def run_debug(self, input_file, output_file) -> int: + return self.__run(input_file, output_file, '/usr/bin/python3') + + def run_release(self, input_file, output_file) -> int: + return self.__run(input_file, output_file, '/usr/bin/pypy3') + +# Returns the language object +def find_language(root: Path): + ls = os.listdir(root) + + if 'src' in ls: + src = os.listdir(os.path.join(root, 'src')) + + if 'main.rs' in src: + return Rust(root, Path('src', 'main.rs')) + elif 'main.c' in src: + return Clang(root, Path('src', 'main.c')) + elif 'main.cc' in src: + return CPlusPlus(root, Path('src', 'main.cc')) + elif 'main.cpp' in src: + return CPlusPlus(root, Path('src', 'main.cpp')) + elif 'main.py' in src: + return Python(root, Path('src', 'main.py')) + elif '.py' in '\t'.join(ls): + return Python(root, Path('src', next(p for p in ls if '.py' in p))) + + if 'main.rs' in ls: + return Rust(root, Path('main.rs')) + elif 'main.c' in ls: + return Clang(root, Path('main.c')) + elif 'main.cc' in ls: + return CPlusPlus(root, Path('main.cc')) + elif 'main.cpp' in ls: + return CPlusPlus(root, Path('main.cpp')) + elif 'main.py' in ls: + return Python(root, Path('main.py')) + elif '.py' in '\t'.join(ls): + return Python(root, + Path(os.path.join(root, next(p for p in ls if '.py' in p)))) + + raise Exception('Language not found or not supported') + +def project_root() -> Path: + cwd = Path('.').cwd() + if cwd.name == 'sample' or cwd.name == 'src': + return cwd.parent + return cwd + +def test_files(root: Path, nb: int) -> Tuple[Path, Path, Path]: + t_input = os.path.join(root, f'sample/input_{nb}') + t_output = os.path.join(root, f'sample/output_{nb}') + real_output = os.path.join(root, f'sample/run_output_{nb}') + + return t_input, t_output, real_output + +def is_test_exists(n: str, root: Path) -> bool: + samples = os.listdir(os.path.join(root, 'sample')) + + if f'input_{n}' not in samples: + print(f'sample/input_{n} not found') + return False + + if f'output_{n}' not in samples: + print(f'sample/output_{n} not found') + return False + + return True + +def run_test(lang, n: int, root: Path, is_time: bool, is_debug: bool) -> bool: + t_in_name, t_out_name, r_out_name = test_files(root, n) + + r_out = open(r_out_name, 'w') + t_out = open(t_out_name, 'r') + t_in = open(t_in_name, 'r') + + print(f"==== Testcase {n} ====") + if is_debug: + run_time = lang.run_debug(t_in, r_out) + else: + run_time = lang.run_release(t_in, r_out) + + t_in.close() + r_out.close() + + if is_time: + print("^^^^^^^^^^^^^^^^^^^^^^") + print(f"Time: {run_time : 4.3f}s") + + r_out = open(r_out_name, 'r') + + lines_real = r_out.read().splitlines() + lines_out = t_out.read().splitlines() + + t_out.close() + r_out.close() + + if len(lines_real) != len(lines_out): + if not is_time: + print("^^^^^^^^^^^^^^^^^^^^^^") + print(f"!!! Mismatched output\n" + f"Real line count: {len(lines_real)}\n" + f"Expected line count: {len(lines_out)}") + print(f'!!! Failed on test {n}. See ./sample/run_output_{n}') + return False + + for i in range(len(lines_real)): + if lines_real[i] != lines_out[i]: + if not is_time: + print("^^^^^^^^^^^^^^^^^^^^^^") + print(f"!!! Mismatched output\n" + f"Real Output: `{lines_real[i]}`\n" + f"Expected Out: `{lines_out[i]}`") + + print(f'!!! Failed on test {n}. See ./sample/run_output_{n}') + return False + + return True + +# Returns True if all cases passed. Otherwise returns False and the number of +# test cases +def run_tests(lang, root: Path, is_time: bool, is_debug: bool) -> Tuple[bool, int]: + try: + sample_dir = os.listdir(os.path.join(root, 'sample')) + except FileNotFoundError: + print("No ./sample directory found. Cannot test script") + return [False, None] + + cases = list(filter(lambda x: x is not None, + [re.match(r'^input_([0-9]+)$', f) for f in sample_dir])) + + for case in cases: + if not is_test_exists(case.group(1), root): + raise Exception() + + N = len(cases) + cases.sort(key=lambda x: x.group(0)) + + for case in cases: + try: + if not run_test(lang, case.group(1), root, is_time, is_debug): + return False, N + except Exception as e: + print(e) + return False, N + + return True, N + + +def main(): + parser = argparse.ArgumentParser( + description='Compiler and tester for kattis problems') + + parser.add_argument("-t", "--time", action="store_true", + help="Time the runtime of each test case") + parser.add_argument("-d", "--debug", action="store_true", + help="Use the debugging compiler") + parser.add_argument("test_case", type=str, metavar='T', nargs='?', + help="Time one specific test case in debug") + + args = parser.parse_args() + root = project_root() + + try: + lang = find_language(root) + except Exception as e: + print(f'Failed to detect language: {e}') + sys.exit(1) + + try: + if args.debug or args.test_case is not None: + lang.compile_debug() + else: + lang.compile_release() + except Exception as e: + print(e) + sys.exit(1) + + if args.test_case is not None: + if is_test_exists(args.test_case, root): + if run_test(lang, args.test_case, root, True, True): + print(f'Passed test case ({args.test_case})') + else: + is_passed, n = run_tests(lang, root, + args.time or args.test_case, + args.debug or args.test_case) + if is_passed: + print(f'All test ({n}) cases passed!') + +if __name__ == '__main__': + try: + main() + except KeyboardInterrupt: + print("\nKeyboard interrupt. Program killed"); + sys.exit(1) + else: + sys.exit(0) diff --git a/bin/lgrep b/bin/lgrep new file mode 100755 index 0000000..9c7382c --- /dev/null +++ b/bin/lgrep @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +# Greps file and directory names in given directory for a pattern. If no +# directory is provided, the present working directory is used +search_pattern="${1}" +directory="${2:-$PWD}" + +print_help () { + local exe_name="$(basename "${0}")" + + cat << HELP_MSG +List file names matching matching the pattern in a directory +USAGE: + ${exe_name} [dir] + +EXAMPLES: + ${exe_name} bash ~ + ${exe_name} rc +HELP_MSG +} + +is_help () { + [[ "${#}" -eq 0 ]] || [[ "${1}" == '--help' ]] || [[ "${1}" == '-h' ]] +} + +#define_colors () { +# local colors +# IFS=: colors=(${EXA_COLORS}) +# +# for color in "${colors[@]}"; do +# case "${color}" in +# fi*) +# color_file='\033['"$(cut -c 4- <<<"${color}")"'' ;; +# ln*) +# color_link='\033['"$(cut -c 4- <<<"${color}")"'' ;; +# esac +# done +#} + + +if is_help "${@}"; then + print_help "${0}" + +elif command -v fd &> /dev/null; then + for match in $(fd -aIHd1 "${search_pattern}" "${directory}"); do + printf '%s' "$(basename "${match}")" + + if [[ -h "${match}" ]]; then + printf ' -> %s'\ + "$(readlink "${match}" | awk '{ sub("'"$HOME"'", "~"); print }')" + fi + + printf '\n' + done +else + listlong -a "${directory}" | grep -i --color=always "${search_pattern}" +fi + +# ex: set syntax=bash ff=unix: diff --git a/bin/listlong b/bin/listlong new file mode 100755 index 0000000..21b31e4 --- /dev/null +++ b/bin/listlong @@ -0,0 +1,75 @@ +#!/usr/bin/env bash +# +# Print a directory listing with multiple default presets. Uses `exa` when +# available +# +# WARNING: Many scripts and aliases in these dotfiles depend on this script. Do +# not rename it or remove it from $PATH unnecessarily + +print_help () { + cat << EOF +Directory listing with sensible defaults. Wraps around 'ls' and 'exa' + +USAGE: $(basename "$0") [listing-type] [pass-through-args] [dir] + + [-h|--help] Show this message + + --ll-tree Display a recursive tree hierarchy + --ll-git-tree Display a tree following rules in .gitignore + --ll-dir-tree Display a tree of directories only + --ll-all Display extensive information about the current directory + --ll-links List symlinks in the current directory + --ll-ls Use of 'ls', even if 'exa' is available + + * Passed as argument to 'exa' or 'ls' +EOF +} + +declare PRESET PASS_THROUGH FORCE_LS + +for opt in "$@"; do + case "$opt" in + --ll-*) + [[ -z "${PRESET}" ]] || continue # Only read first preset argument passed + + case "$opt" in + --ll-tree) # Tree List Long - Recursively print a tree view + PRESET='-I ".git|target" --tree' + ;; + --ll-git-tree) # Git List Long - Recursively print a tree view following .gitignore + PRESET='--git-ignore --tree' + ;; + --ll-dir-tree) # Directories List Long - List the directory hierarchy + PRESET='--only-dirs --tree' + ;; + --ll-all) # All List Long - Detailed information for files in current working dir + PRESET='--all --header --links --blocks --group --modified --created --accessed' + ;; + --ll-ls) # Use ls instead of exa. Solves odd exa bugs + FORCE_LS='T' + ;; + --ll-links) # List symlinks + PRESET='--color=always | awk "/->/"' + ;; + esac + ;; + -h | --help) + print_help + exit 0 + ;; + *) + PASS_THROUGH+="$opt " + ;; + esac +done + + +if command -v exa &> /dev/null && [[ "${FORCE_LS}" != 'T' ]]; then + eval "exa --long --sort=size --git --group-directories-first ${PRESET} ${PASS_THROUGH}" +elif ! ls --color &> /dev/null; then + # MacOS default ls + eval "ls -lhSrG ${PASS_THROUGH}" +else + # GNU ls or similar + eval "ls -lhSrG --color --group-directories-first ${PASS_THROUGH}" +fi diff --git a/bin/lyrics_to_html.py b/bin/lyrics_to_html.py new file mode 100755 index 0000000..eb4b67a --- /dev/null +++ b/bin/lyrics_to_html.py @@ -0,0 +1,129 @@ +#!/usr/bin/env python3 +import argparse, os, subprocess, sys + +def html_body(lyrics: list) -> str: + html_body = str(); + + is_in_stanza = False; + lines_in_stanza = 0; + + for line in lyrics: + if not is_in_stanza: # Open new stanza + html_body += f'{"":>6}

\n'; + is_in_stanza = True + lines_in_stanza = 0 + + if line == '\n' and lines_in_stanza > 0: # Close stanza + html_body += f'{"":>6}

\n\n' + is_in_stanza = False + elif line != '\n': # Add non-blank line to stanza + html_body += f'{"":>10}{line.strip()}\n' + lines_in_stanza += 1 + + html_body += f'{"":>6}

\n\n' + return html_body + + +def html_from_template(title, icon, body, url) -> str: + return html_template_top(title, icon) \ + + body \ + + html_template_bottom(title, url); + + +html_template_top = lambda title, icon : """\ + + + + + + """ + title + """ + + + + + +""" + +html_template_bottom = lambda title, url : f""" +

+ Link to video: {str(title)} +

+ + +""" + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Quickly create an html file from lyrics'); + parser.add_argument('-t', '--title', metavar='', type=ascii); + parser.add_argument('-u', '--url', metavar='<url>', type=ascii); + parser.add_argument('-i', '--icon', metavar='<path>', type=ascii); + parser.add_argument('-d', '--download', metavar='<url>', type=ascii, + help='Download mp3 from url'); + parser.add_argument('file', type=ascii, nargs='?', + help='Read lyrics from file'); + args = parser.parse_args(); + + if args.file is not None or not sys.stdin.isatty(): + title = args.title[1:-1] if args.title is not None else ''; + url = args.url[1:-1] if args.url is not None else ''; + icon = args.icon[1:-1] if args.icon is not None else ''; + + # Read lyrics lines + if args.file is not None: + lyrics_file = open(args.file[1:-1], 'r'); + lyrics = lyrics_file.readlines(); + else: + lyrics = sys.stdin.readlines(); + + body = html_body(lyrics); + html = html_from_template(title, icon, body, url); + + sys.stdout.write(html); + sys.exit(0); + else: + parser.print_help(); + sys.exit(1); diff --git a/bin/myip b/bin/myip new file mode 100755 index 0000000..a228b22 --- /dev/null +++ b/bin/myip @@ -0,0 +1,67 @@ +#!/bin/bash +# List system's WAN and LAN ip addresses +# Depends on ifconfig and awk + +if [[ $1 =~ '-h' ]]; then + cat <<EOF +List the system's WAN and LAN addresses +USAGE: + $(basename "$0") +EOF + exit 0 +fi + + +awk_lan () { + awk ' + BEGIN { print "Local:" } + + /UP/ { + split($0, info, /:/) + device_name = '"$1"' + is_up = 1 + } + + match($0, /inet ([0-9]{1,3}\.){3}[0-9]{1,3}(\/[0-9]{1,3})? /) { + if (is_up) { + ip_addr = substr($0, RSTART + 5, RLENGTH - 5) + printf(" %s: %s\n", device_name, ip_addr) + is_up = 0 + } + }' - +} + + +# List all possible inet addresses +if command -v ip address &> /dev/null; then + ip address | awk_lan 'substr(info[2], 2)' +elif command -v ifconfig &> /dev/null; then + ifconfig | awk_lan 'info[1]' +else + echo '`ifconfig` not found' +fi + +# Print network's public IP address +if command -v dig &> /dev/null; then + public_ip=$(dig +short myip.opendns.com @resolver2.opendns.com) +elif command -v host &> /dev/null; then + public_ip=$(host myip.opendns.com resolver1.opendns.com) +fi + +# Backup address fetching. Slower though more reliable +if [[ -z $public_ip ]]; then + if command -v curl &> /dev/null; then + public_ip=$(curl --silent https://ifconfig.me/ip) + elif command -v wget &> /dev/null; then + public_ip=$(wget --quiet -O - https://ifconfig.me/ip) + fi +fi + + +if [[ -n $public_ip ]]; then + echo "$public_ip" | awk ' match($0, /([0-9]{1,3}\.){3}[0-9]{1,3}$/) { + printf("Public (WAN): %s\n", substr($0, RSTART, RLENGTH)) + }' +else + echo 'Public IP not found' +fi diff --git a/bin/notes b/bin/notes new file mode 100755 index 0000000..7bd605a --- /dev/null +++ b/bin/notes @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# Read notes files from ~/.configs_pointer/notes +if [[ $1 =~ '-h' ]]; then + printf 'Open notes files from ~/.configs_pointer/notes\n' + exit 0 +elif ! [[ -h ~/.configs_pointer ]]; then + cat <<ERR +Pointer to configs not found +Please set up a symlink ~/.config_pointer to the configs directory +ERR + exit 1 +elif ! command -v fzf &>/dev/null; then + printf 'Requires fzf\n' + exit 1 +fi + + +# Fzf for notes file +if command -v fd &> /dev/null; then + notes_file=~/.configs_pointer/notes/"$(fd '.md' ~/.configs_pointer/notes -x basename | fzf)" +else + notes_file="$(find ~/.configs_pointer/notes -type f | fzf)" +fi + + +# Use best available pagenator +if command -v nvim &>/dev/null; then + nvim -R "${notes_file}" +elif command -v vim &>/dev/null; then + vim -R "${notes_files}" +elif command -v bat &>/dev/null; then + bat --paging=always "${notes_file}" +else + less "${notes_file}" +fi + diff --git a/bin/play_error_sound.sh b/bin/play_error_sound.sh new file mode 100755 index 0000000..bed28d8 --- /dev/null +++ b/bin/play_error_sound.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Play MacOS system error sound: System Preferences -> Sound -> Sound Effects + +if [[ $(uname) == 'Darwin' ]]; then + afplay $(defaults read .GlobalPreferences.plist \ + | awk '/sound.beep.sound"/ { gsub(/(.*= ")|(";)/, ""); print }') +fi + +# vim: set syntax=bash ff=unix: diff --git a/bin/prettify_bash_history.awk b/bin/prettify_bash_history.awk new file mode 100755 index 0000000..aba8ad1 --- /dev/null +++ b/bin/prettify_bash_history.awk @@ -0,0 +1,9 @@ +#!/usr/bin/env -S awk -f +# Translate the unix-timestamps in bash history to dates. Requires gnu `date` +{ + if ($0 ~ /^#[0-9]+$/) + system("date -d @" substr($0, 2)); + else + print " "$0 +} + diff --git a/bin/random_password.sh b/bin/random_password.sh new file mode 100755 index 0000000..859c79e --- /dev/null +++ b/bin/random_password.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +print_help() { + cat <<HELP +Generate a random password from /dev/urandom, with characters from /[A-z0-9;-]/ + +Usage: $(basename "$0") <output-length> + +Examples: + $(basename "$0") 20 | wl-copy + $(basename "$0") 400 > key_file + +Special characters: /[;-]/ + +Length must be at least $MIN_PASSWORD_LENGTH. Passwords are generated until one of each a +lowercase, uppercase, digit, and special character are in the password. +Both special characters are required for passwords >=$LONG_PASSWORD_LENGTH characters long. +Really long passwords have at least 2 of each special character. +HELP +} + +shopt -s lastpipe +declare -ri LONG_PASSWORD_LENGTH=15 MIN_PASSWORD_LENGTH=6 +declare -gri LENGTH="$1" +declare password="" + +generate_password() { + dd if=/dev/urandom bs=3 count="$(( 10 * LENGTH ))" 2>/dev/null \ + | base64 -w0 \ + | tr '/' '-' \ + | tr '+' ';' \ + | cut -c "1-$LENGTH" \ + | read -r password +} + +contains_characterset() { + local p="$password" + if [[ $LENGTH -ge $(( 2*LONG_PASSWORD_LENGTH )) ]]; then + [[ $p =~ [A-Z] && $p =~ [a-z] && $p =~ [0-9] && $p =~ \;.+\; && $p =~ -.+- ]] + elif [[ $LENGTH -ge $LONG_PASSWORD_LENGTH ]]; then + [[ $p =~ [A-Z] && $p =~ [a-z] && $p =~ [0-9] && $p =~ \; && $p =~ - ]] + else + [[ $p =~ [A-Z] && $p =~ [a-z] && $p =~ [0-9] ]] && [[ $p =~ \; || $p =~ - ]] + fi +} + +if [[ "$1" =~ ^[0-9]+$ && $1 -ge $MIN_PASSWORD_LENGTH ]]; then + while ! contains_characterset; do + generate_password "$1" + done + + echo "$password" +else + print_help + exit 1 +fi diff --git a/bin/rpluto.sh b/bin/rpluto.sh new file mode 100755 index 0000000..db70e24 --- /dev/null +++ b/bin/rpluto.sh @@ -0,0 +1,109 @@ +#!/usr/bin/env bash + +print_long_help() { + cat <<EOF +Start a Pluto Notebook server through an ssh connection + +USAGE: + rpluto [--help] [-p <host-port>] <local-port> <ssh-addr> + +FLAGS: + -h, --help show this help message and exit + +OPTIONS: + -p <host-port> Port use for on host for the Pluto Server + +ARGS: + <local-port> Port on client to connect Pluto Server + <ssh-addr> Either an ~/.ssh/config alias or the host address +EOF +} + +print_short_help() { + cat <<EOF +USAGE: + rpluto [--help] [-p <host-port>] <local-port> <ssh-addr> + +For more information try --help +EOF +} + +print_start_msg() { + cat <<EOF +Starting remote Pluto Notebook. This may take a few seconds... +Wait for a popup or connect here using a browser: + + http://localhost:$1 + +When you're finished type ^C in this terminal +EOF +} + +# 1: Client port +# 2: SSH alias or address +# [3]: Host port +ssh_pluto_tunnel() { + if [[ "$(uname -s)" == "Darwin" ]]; then + sleep 4 && open -n -a "Google Chrome" --args --incognito "http://localhost:$1" & + elif [[ "$(uname -s)" == "Linux" ]]; then + sleep 4 && chromium --incognito "http://localhost:$1" &>/dev/null + fi + + ssh -L "$1":localhost:"${3:-7000}" "$2"\ + "julia -e\ + \"import Pluto; + Pluto.run( + port=${3:-7000}, + require_secret_for_open_links=false, + require_secret_for_access=false + )\"" +} + +exit_msg(){ + printf "\nNotebook has been shutdown\n" + exit 0 +} + + +# Print help and exit ==== +if [[ $1 == '--help' ]]; then + print_long_help + exit 0 +elif [[ "$1" =~ '-h' ]]; then + print_short_help + exit 0 +fi + + +# Parse arguments ==== +positional_args=() + +while [[ "$#" -gt 0 ]]; do + arg="$1" + + case $arg in + -p) + host_port="$2" + shift + shift + ;; + *) + positional_args+=("$1") + shift + ;; + esac +done + +set -- "${positional_args[@]}" + +# Set graceful exit +if [[ "$#" -eq 2 ]]; then + trap exit_msg SIGINT + + print_start_msg "$1" + + ssh_pluto_tunnel $1 $2 $host_port +else + print_short_help + exit 2 +fi diff --git a/bin/screenshot_wayland.sh b/bin/screenshot_wayland.sh new file mode 100755 index 0000000..12d9b89 --- /dev/null +++ b/bin/screenshot_wayland.sh @@ -0,0 +1,241 @@ +#!/usr/bin/env bash +# Take and resize screenshots on wayland +# +# Input sources: Full, selection, dimensions, latest taken screenshot +# Filters: Resize, drop-shadow +# Output sources: File, clipboard +# +# Screenshot default: .png +# Resize default: .avif +# +# Each screenshot has 1 or more input sources and 1 or more output sources. The +# image extention is determined by the output file, --extension option, or +# defaults. Regardless of extension, every screenshot is first saved as a +# lossless PNG then converted to other formats. All intermediate files are +# saved in a temporary directory set by the --tmp-dir option +# +# Setting the --tmp-dir alongside the --resize option will modify the latest +# image in that directory +print_help() { + cat <<HELP +Take and resize screenshots on wayland + +USAGE: $(basename "$1") [FLAGS] <ARG> [FILE] + +FLAGS: + -c, --clipboard Save the screenshot to your clipboard + -h, --help Print this help message and exit + +OPTIONS: + -d, --drop-shadow <size> Save the screenshot with a drop-shadow on a white background + -e, --extension <ext> Change image extention saved + -r, --resize <size> Resize the latest screenshot instead of taking a new one + -s, --size <dimensions> Screenshot exact dimensions + -t, --tmp-dir <dir> Set the temporary save and resize source directory + +ARGS: + area Takes a screenshot of an area selected by the mouse. Like cmd+shift+4 + full Screenshots the full screen + markup Edit latest image in swappy. Incompatible with most options + +EXAMPLES: + $(basename "$1") full ~/Pictures/elaina_bubble_tea.png + $(basename "$1") -c area ~/Pictures/elaina_bubble_tea.png + $(basename "$1") -c -d 10 -s '20,400 200x180' ~/Pictures/elaina_bubble_tea.png + $(basename "$1") --resize 80% ~/Pictures/elaina_bubble_tea.webp + +Saves full original copy under /tmp/screenshots_tmp/. The latest resize is +available at [FILE] or in the clipboard. + +Make sure to specify --clipboard or a file path. There is no default! +HELP +} + +declare CROP SHADOW IS_CLIPBOARD IS_SWAPPY OUTPUT_PATH RESIZE EXT TMP_DIR TMP_PATH +declare -r SLURP_REGEX="^[0-9]+,[0-9]+[[:space:]][0-9]+x[0-9]+$" + +# Not possible to call script without 2 args +parse_args() { + if [[ $# -eq 0 ]]; then + print_help "$0" + return 1 + fi + + while [[ $# -gt 0 ]]; do + case "$1" in + -c | --clipboard) + IS_CLIPBOARD=true + shift + ;; + -d | --drop-shadow) + shift + if [[ "$1" =~ ^[0-9]+x[0-9]+$ ]]; then + SHADOW="$1" + elif [[ "$1" =~ ^[0-9]+$ ]]; then + SHADOW="${1}x${1}" + else + printf 'No size argument found for --drop-shadow option\n' + return 2 + fi + shift + ;; + -e | --extension) + shift + if [[ "$1" =~ ^\.[a-z0-9]+$ ]]; then + EXT="${1:1}" + elif [[ "$1" =~ ^[a-z0-9]+$ ]]; then + EXT="$1" + fi + shift + ;; + -r | --resize) + shift + if [[ "$1" =~ [0-9]+%$ ]]; then + RESIZE="$1" + elif [[ "$1" =~ [0-9]+$ ]]; then + RESIZE="$1%" + else + printf 'Resize amount not specified. Ex: 100%% or 20\n' + return 2 + fi + shift + ;; + -s | --size) + shift + if [[ "$1" =~ $SLURP_REGEX ]]; then + CROP="$1" + else + printf 'No dimension argument found for --tmp-dir option\n' + return 2 + fi + shift + ;; + -t | --tmp-dir) + shift + if [[ -z "$1" ]]; then + printf 'No directory argument found for --tmp-dir option\n' + return 2 + fi + TMP_DIR="$1" + shift + ;; + -h | --help) + print_help "$0" + return 1 + ;; + area) + CROP="area" + shift + ;; + full) + CROP="fullscreen" + shift + ;; + markup) + IS_SWAPPY=true + shift + ;; + *) + if [[ -z "$OUTPUT_PATH" ]]; then + OUTPUT_PATH="$1" + else + printf 'Multiple output paths specified when only one was expected\n' + return 2 + fi + shift + ;; + esac + done + + # Assert valid number of inputs and outputs + if [[ -z "$CROP" && -z "$RESIZE" && -z "$IS_SWAPPY" ]]; then + printf 'No inputs specified!\n' + print_help "$0" + return 1 + fi +} + +# Set defaults +set_global_defaults() { + if [[ -z "$EXT" && -n "$OUTPUT_PATH" ]]; then + EXT="${OUTPUT_PATH##*.}" + elif [[ -z "$EXT" && -n "$RESIZE" ]]; then + EXT='avif' + elif [[ -z "$EXT" ]]; then + EXT='png' + fi + + if [[ -z "$TMP_DIR" ]]; then + TMP_DIR="$HOME/Desktop/screenshots_tmp" + fi + + mkdir -p "$TMP_DIR" + TMP_PATH="${TMP_DIR}/$(date +%s).png" + + if ! [[ -w "$TMP_DIR" ]]; then + printf 'Temporary path %s is not writable. Check permissions\n' "$TMP_PATH" + return 2 + fi +} + +# Save screenshot into tmp +get_screenshot() { + if [[ "$CROP" == "area" ]]; then + grim -g "$(slurp)" "$TMP_PATH" + elif [[ "$CROP" == "fullscreen" ]]; then + grim "$TMP_PATH" + elif [[ "$CROP" =~ $SLURP_REGEX ]]; then + grim -g "$CROP" "$TMP_PATH" + fi +} + +apply_drop_shadow() { + magick convert "$TMP_PATH" \ + \( +clone -background black -shadow "${SHADOW}+0+0" \) \ + +swap -background white -layers merge +repage \ + "$TMP_PATH" +} + +# Resize latest screenshot +resize_latest_screenshot() { + if [[ -n "$IS_SWAPPY" ]] || [[ -n "$RESIZE" && "$RESIZE" == '100%' && "$EXT" == 'png' ]]; then + TMP_PATH="$(fd -e 'png' -E '*_*' . "$TMP_DIR" | sort | tail -1)" + elif [[ -n "$RESIZE" ]]; then + local latest_screenshot="$(fd -e 'png' -E '*_*' . "$TMP_DIR" | sort | tail -1)" + TMP_PATH="${latest_screenshot%.*}_${RESIZE}.${EXT}" + + if [[ -z "$latest_screenshot" ]]; then + printf 'No screenshots found to resize\n' + return 1 + fi + + magick convert "$latest_screenshot" -resize "$RESIZE" "${EXT^^}:$TMP_PATH" + elif [[ "$EXT" != png ]]; then + local source_path="$TMP_PATH" + TMP_PATH="${source_path%.*}.${EXT}" + magick convert "$source_path" "${EXT^^}:$TMP_PATH" + fi +} + +# Copy screenshot to destination +copy_to_destination() { + if [[ "$IS_CLIPBOARD" == true ]]; then + wl-copy < "$TMP_PATH" + elif [[ "$IS_SWAPPY" == true ]]; then + swappy -f "$TMP_PATH" -o "${TMP_PATH%.*}_swappy.png" + fi + if [[ -n "$OUTPUT_PATH" ]]; then + cp "$TMP_PATH" "$OUTPUT_PATH" + fi +} + +if ! parse_args "$@"; then + exit $? +fi +set_global_defaults || exit $? +get_screenshot +[[ -z "$SHADOW" ]] || apply_drop_shadow +resize_latest_screenshot || exit $? +copy_to_destination || exit $? + +# wl-copy https://www.reddit.com/r/swaywm/comments/bb4dam/take_screenshot_to_clipboard/ diff --git a/bin/sway_tree.rs b/bin/sway_tree.rs new file mode 100644 index 0000000..077575f --- /dev/null +++ b/bin/sway_tree.rs @@ -0,0 +1,228 @@ +// Quick and dirty tree representation of sway's tree string +// +// Input looks something like: +// H[T[H[S[Alacritty baobab] T[ArchWiki]]] T[chromium-browser Alacritty]] +// +// This can be found, in the case of one workspace, at +// swaymsg -t get_tree | jq '.nodes[1].nodes[0].representation' +// +// Which can then be piped to this script +// swaymsg -t get_tree | jq '.nodes[1].nodes[0].representation' | sway_tree 2>/dev/null +// +// For the example string above, the output will be +// └─┬(Horizontal) +// ├─┬(Tabbed) +// | └─┬(Horizontal) +// | ├─┬(Stacked) +// | | ├───> [Alacritty] +// | | └───> [Baobab] +// | └─┬(Tabbed) +// | └───> [ArchWiki] +// └─┬(Tabbed) +// ├───> [Chromium-browser] +// └───> [Alacritty] + +use std::io::{self, BufRead}; + +fn main() { + let stdin = io::stdin(); + let sway_representation = stdin.lock().lines().next() + .expect("Could not read from stdin") + .expect("Stdio error"); + + println!("{}", ParserTree::from(&sway_representation).format()); +} + + +#[derive(Debug)] +pub enum State { + ReadingTitle(String), + ExitContainer, + EnterContainer, +} + +#[derive(Debug)] +pub enum Layout { + Horizontal, + Vertical, + Tabbed, + Stacked, +} + +#[derive(Debug)] +pub enum ParserTree { + Container(Layout, Vec<ParserTree>), + Leaf(String), + Empty, +} + +impl ParserTree { + pub fn new() -> Self { + ParserTree::Empty + } + + pub fn from(str_rep: &str) -> Self { + parse_sway_tree(str_rep) + } + + pub fn new_leaf(title: String) -> Self { + ParserTree::Leaf(title) + } + + pub fn container(layout: Layout, nodes: Vec<Self>) -> Self { + Self::Container(layout, nodes) + } + + // Formats a tree view of parsed tree + pub fn format(self) -> String { + self.format_recursive(vec![false], true) + } + + fn format_recursive(self, mut is_branched: Vec<bool>, is_last: bool) -> String { + let indent_size = 2; + + let mut indent = (0..((is_branched.len() - 1) * indent_size)).map(|i| { + if i % indent_size == 0 && is_branched[i / indent_size + 1] { + '|' + } else { + ' ' + } + }).collect::<String>(); + + indent += match is_last { + true => "└─", + false => "├─", + }; + + return match self { + Self::Container(layout, children) => { + indent.push(if children.is_empty() { '─' } else { '┬' }); + + let mut container = indent; + + match layout { + Layout::Horizontal => container.push_str("(Horizontal)\n"), + Layout::Vertical => container.push_str("(Vertical)\n"), + Layout::Tabbed => container.push_str("(Tabbed)\n"), + Layout::Stacked => container.push_str("(Stacked)\n"), + } + + let last_i = children.len() - 1; + is_branched.push(!is_last); + + for (i, child) in children.into_iter().enumerate() { + container += &child.format_recursive(is_branched.clone(), i == last_i); + } + + container + } + Self::Leaf(title) => { + let mut cs = title.chars(); + + let title_cased = match cs.next() { + None => String::from("Untitled"), + Some(f) => f.to_uppercase().collect::<String>() + cs.as_str(), + }; + + format!("{}> {}\n", indent, title_cased) + } + Self::Empty => format!("{} - <>\n", indent), + } + } +} + + +fn parse_sway_tree(rep: &str) -> ParserTree { + let mut state = State::EnterContainer; + + let characters: Vec<char> = rep.chars().collect(); + + let mut container_stack: Vec<(Layout, Vec<ParserTree>)> = Vec::new(); + + let mut c: char; + let mut i = 0; + + loop { + c = characters[i]; + + match state { + State::ReadingTitle(ref mut title) => { + if c == ']' { + let leaf = ParserTree::new_leaf(title.clone()); + + let mut container = container_stack.pop().unwrap(); + container.1.push(leaf); + + let child = ParserTree::container(container.0, container.1); + + if !container_stack.is_empty() { + let parent = container_stack.last_mut().unwrap(); + parent.1.push(child); + } else { + return child + } + + eprintln!("PushLeaf: {:?}", &container_stack); + + state = State::ExitContainer; + } else if c == ' ' { + let leaf = ParserTree::new_leaf(title.clone()); + + let container = container_stack.last_mut().unwrap(); + container.1.push(leaf); + + eprintln!("PushLeaf: {:?}", &container_stack); + + state = State::EnterContainer; + } else { + title.push(c); + } + i += 1; + } + State::EnterContainer => { + let c1 = *characters.get(i + 1).unwrap_or(&'\0'); + + if (c == 'H' || c == 'V' || c == 'T' || c == 'S') && c1 == '[' { + container_stack.push(init_container(c)); + eprintln!("AppendChild: {:?}", &container_stack); + + i += 2; + } else { + state = State::ReadingTitle("".to_string()); + } + } + State::ExitContainer => { + if c == ']' { + eprintln!("AppendParent:{:?}", &container_stack); + let container = container_stack.pop().unwrap(); + let child = ParserTree::container(container.0, container.1); + + if container_stack.len() == 0 { + return child + } else { + let parent = container_stack.last_mut().unwrap(); + parent.1.push(child); + } + + i += 1; + } else { + eprintln!("NextChild: {:?}", &container_stack); + state = State::EnterContainer; + i += 1; + } + } + } + } +} + + +// Creates new parts for a container +fn init_container(layout_char: char) -> (Layout, Vec<ParserTree>) { + match layout_char { + 'H' => (Layout::Horizontal, vec![]), + 'V' => (Layout::Vertical, vec![]), + 'T' => (Layout::Tabbed, vec![]), + 'S' => (Layout::Stacked, vec![]), + _ => unreachable!(), + } +} diff --git a/bin/swaytree.sh b/bin/swaytree.sh new file mode 100755 index 0000000..9c97222 --- /dev/null +++ b/bin/swaytree.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +i=0 + +swaymsg -t get_tree | jq '.nodes[1].nodes[].representation' | tr -d '"' | \ +while read ln; do + space_num="$(swaymsg -t get_tree | jq '.nodes[1].nodes['"$i"'].name' | tr -d '"')" + + printf "Workspace %s :: %s\n" "$space_num" "$ln" + + i=$(( i + 1 )) + printf "%s" "$ln" | sway_tree 2>/dev/null +done diff --git a/bin/switch_keyboards.sh b/bin/switch_keyboards.sh new file mode 100755 index 0000000..e77ebf4 --- /dev/null +++ b/bin/switch_keyboards.sh @@ -0,0 +1,65 @@ +#!/usr/bin/env bash +# Usage: ./switch_keyboards.sh [args] +# +# Args: +# console Loads the console version +# mac Loads the Mac keyboard version +# pc Loads the standard keyboard version +# +# Explanation ========= +# Mac keyboards place their super key adjacent to the spacebar, while standard +# keyboards put alt in that spot: +# +# Macbook: Shift | z +# Fn | Ctrl | Alt | Super | Space +# +# Standard: Shift | z +# Fn | Ctrl | Super | Alt | Space +# +# To preserve consistency when switching keyboards, two versions of the same +# xremap config.yml are available. This script toggles between the two +# +# Xremap can also run in a non-graphical console. For this we don't need to +# remap Super and Alt, though we still need other keys, like capslock. An +# optional "console" argument can be passed to this script to load +# config_console.yml +print_help() { + cat <<HELP +Switches keyboard modifer keys between Mac and PC layouts + +USAGE: $(basename "$0") <ARG> + +ARGS: + mac Remaps assuming super is adjacent to the spacebar + pc Remaps assuming alt is adjacent to the spacebar + console Only remaps capslock to ctrl + help Print this message and exit +HELP +} + +if ! command -v xremap &>/dev/null; then + printf "xRemap not found\nLayouts were not switched\n" + exit 1 +fi + +case "$(echo "$1" | awk '{print tolower($0)}')" in + console) + ln -sf ~/.config/xremap/config_console.yml ~/.config/xremap/config.yml + echo "Switching to minimal console remapping" + ;; + mac) + ln -sf ~/.config/xremap/config_mac.yml ~/.config/xremap/config.yml + echo "Switching to mac layout :: ALT | SUPER | SPACE" + ;; + pc) + ln -sf ~/.config/xremap/config_standard.yml ~/.config/xremap/config.yml + echo "Switching to standard layout :: SUPER | ALT | SPACE" + ;; + *) + print_help + exit 0 + ;; +esac + +systemctl restart xremap +sleep 2 diff --git a/bin/vii.sh b/bin/vii.sh new file mode 100755 index 0000000..c3a6403 --- /dev/null +++ b/bin/vii.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +# Opens vimiv in thumbnail mode, when there's at least one image in the cwd +declare curr_image="$(fd -d 1 -e 'avif' -e 'gif' -e 'heif' -e 'icns' -e 'jpeg' -e 'jpg' -e 'png' -e 'tiff' -e 'webp' | tail -1)" + +if [[ -n "$curr_image" ]]; then + vimiv \ + --debug gui.eventhandler \ + --command 'unbind <space> --mode=image' \ + --command 'bind <space>h enter library --mode=image' \ + --command 'bind <space>l enter thumbnail --mode=image' \ + --command 'enter library' \ + --command 'enter thumbnail' \ + --command 'goto 0' \ + "$curr_image" +else + vimiv \ + --debug gui.eventhandler \ + --command 'unbind <space> --mode=image' \ + --command 'bind <space>h enter library --mode=image' \ + --command 'bind <space>l enter thumbnail --mode=image' \ + "$curr_image" +fi diff --git a/chromium/chromium-flags.conf b/chromium/chromium-flags.conf new file mode 100644 index 0000000..9d02c18 --- /dev/null +++ b/chromium/chromium-flags.conf @@ -0,0 +1,7 @@ +--incognito +--ozone-platform-hint=auto +--enable-features=UseOzonePlatform +--force-dark-mode +--enable-features=WebUIDarkMode +--process-per-site +#--gtk-version=4 diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..4ef0a0b --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,29 @@ +[filter "lfs"] +clean = git-lfs clean -- %f +smudge = git-lfs smudge -- %f +process = git-lfs filter-process +required = true + +[user] +name = Emiliko Mirror +email = emiliko@mami2.moe +signingkey = ABCD1234LONGER + +[core] +editor = nvim +excludesfile = ~/.gitignore_global + +[color] +ui = true + +[merge] +tool = vimdiff + +[alias] +praise = blame + +[commit] +gpgsign = true + +[init] +defaultBranch = main diff --git a/git/.gitignore_global b/git/.gitignore_global new file mode 100644 index 0000000..02850da --- /dev/null +++ b/git/.gitignore_global @@ -0,0 +1,10 @@ +# Vim +*~ +*.swp +Session.vim + +# macOS +.DS_Store + +# Custom +*.chrome diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf new file mode 100644 index 0000000..54f85d5 --- /dev/null +++ b/gnupg/gpg-agent.conf @@ -0,0 +1 @@ +pinentry-program /usr/bin/pinentry-tty diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..8be0d30 --- /dev/null +++ b/install.sh @@ -0,0 +1,349 @@ +#!/usr/bin/env bash +declare MODE="" +declare -r UNIX_CONFIGS=(\ + # Shell + bash/.profile ~/.profile + bash/.inputrc ~/.inputrc + bash/.bashrc ~/.bashrc + bash/.bash_profile ~/.bash_profile + bash/.bash_env ~/.bash_env + bash/.bash_prompt ~/.bash_prompt + bash/.bash_aliases ~/.bash_aliases + bash/.bash_functions ~/.bash_functions + + aerc ~/.config/aerc + alacritty ~/.config/alacritty + git/.gitignore_global ~/.gitignore_global + gnupg/gpg-agent.conf ~/.gnupg/gpg-agent.conf + mako ~/.config/mako + mpv ~/.config/mpv + chromium/chromium-flags.conf ~/.config/chromium-flags.conf + ripgrep ~/.config/ripgrep + swappy ~/.config/swappy + tmux ~/.config/tmux + vifm ~/.config/vifm + vimiv ~/.config/vimiv + warpd ~/.config/warpd + + # Vim and Neovim + vim/.vim ~/.vim + vim/.vimrc ~/.vimrc + vim/nvim ~/.config/nvim + vim/.vim/plugin ~/.config/nvim/plugin + vim/.vim/colors ~/.config/nvim/colors + ) \ + LINUX_ONLY=(\ + # Swayland + sway ~/.config/sway + swaylock ~/.config/swaylock + xremap ~/.config/xremap + yofi ~/.config/yofi + ) \ + MAC_ONLY=(\ + skhd ~/.config/skhd + yabai ~/.config/yabai + sketchybar ~/.config/sketchybar + + skhd/com.skhd.launcher.plist ~/Library/LaunchAgents/com.skhd.launcher.plist + sketchybar/com.sketchybar.launcher.plist ~/Library/LaunchAgents/com.sketchybar.launcher.plist + warpd/com.warpd.launcher.plist ~/Library/LaunchAgents/com.warpd.launcher.plist + other/vlcrc ~/Library/Preferences/org.videolan.vlc/vlcrc + ) + +print_help() { + cat <<HELP +Install or query config files + +ARGS: + mode: One of "status", "install" + +FLAGS: + -s, --silent Silences printout for properly installed configs + -b, --basename Printout includes basename of file for properly installed configs + -h, --help Print this menu and exit + +USAGE: + ./install.sh [flags] <mode> + bash install.sh [flags] <mode> +HELP +} + +main() { + # Verify we're in the right directory ==== + if [[ "$(is_configs_directory)" != "true" ]]; then + printf 'Please move to the top level git directory with this script\n' + printf 'Aborting...\n' + exit 1 + fi + + # Verify or install ~/.configs_pointer ==== + local configs_pointer="$(configs_pointer_is_setup)" + + if [[ "${configs_pointer}" != "valid" ]]; then + if [[ "${configs_pointer}" == "does not exist" ]]; then + if ! ln -s "$PWD" ~/.configs_pointer; then + printf 'Failed to link present directory to ~/.config_pointer\n' + printf 'Aborting...\n' + exit 1 + fi + else + printf '~/.configs_pointer does not point to this directory\n' + printf 'Remove ~/.configs_pointer and rerun this script\n' + printf 'Aborting...\n' + exit 1 + fi + fi + + # Default is status + if [[ $# -eq 0 ]]; then + iterate_over_configs 'status' + exit 0 + fi + + # Parse arguments ==== + while [[ $# -gt 0 ]] + do + case "$1" in + -s | --silent) MODE="${MODE} silent" ;; + -b | --basename) MODE="${MODE} basename" ;; + -h | --help) MODE="${MODE} help" ;; + status) MODE="${MODE} status" ;; + install) MODE="${MODE} install" ;; + *) + printf 'Invalid argument: "%s"\n' "$1" + print_help + exit 1 + ;; + esac + + shift + done + + # Run ==== + if [[ "${MODE}" =~ "help" ]]; then + print_help + exit 0 + elif [[ "${MODE}" =~ "status" ]]; then + iterate_over_configs 'status' + elif [[ "${MODE}" =~ "install" ]]; then + fix_launchd_plists + iterate_over_configs 'install' + create_directory_paths + other_setup + print_install_completion_msg + else + print_help + fi + + exit 0 +} + +####################################### +# Checks if the script is being run from the configs directory. +# Return code: +# 0 if it is the configs directory, 1 otherwise. +# Return string: +# Describes why this likely isn't the configs directory. +####################################### +is_configs_directory() { + if ! [[ -d ./.git ]]; then + printf "Git folder not found in pwd\n" + printf "no .git directory" + return 1 + elif ! [[ -x ./install.sh ]]; then + printf "install.sh not found in pwd\n" + printf "file install.sh not in pwd" + return 1 + fi + + printf "true" + return 0 +} + +configs_pointer_is_setup() { + if ! [[ -e ~/.configs_pointer ]]; then + printf "does not exist" + return 1 + elif ! [[ -L ~/.configs_pointer ]]; then + printf "not a symlink" + return 1 + elif ! [[ -x ~/.configs_pointer/install.sh ]]; then + printf "no install.sh at symlink" + return 1 + elif ! cmp -s ~/.configs_pointer/install.sh ./install.sh; then + printf "install.sh files differ" + return 1 + else + printf "valid" + return 0 + fi +} + +####################################### +# Return the status of a config. +# Arguments: +# 1: Path in configs directory. "from" +# 2: Path on the system. "to" +####################################### +config_status() { + if [[ "$1" -ef "$2" ]]; then + printf "linked" + return 0 + elif [[ -e "$2" ]]; then + printf "conflict" + return 1 + elif ! [[ -e "$1" ]]; then + printf "missing" + return 1 + else + printf "not_linked" + return 1 + fi +} + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Usεr iητεrfαcε fμηcτiδηs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +####################################### +# Prints the status of a config. +# Arguments: +# 1: Status in {"not_linked", "conflict", "linked"} +# 2: System path to config file +# Outputs: +# Writes status to stdout +####################################### +print_config_status() { + if [[ "${MODE}" =~ "basename" ]]; then + local name="$(basename "$2")" + else + local name="$(printf '%s' "$2" | sed 's#'"${HOME}"'#~#')" + fi + + if ! [[ "${MODE}" =~ "silent" ]] || [[ "$1" != "linked" ]]; then + case "$1" in + newly_linked) + printf "★ %s :: Newly linked" "${name}" ;; + not_linked) printf "✗ %s :: Not Linked" "${name}" ;; + conflict) printf "≠ %s :: Conflicting file" "${name}" ;; + missing) printf "φ %s :: Missing config file" "${name}" ;; + linked) printf "✓ %s :: Linked" "${name}" ;; + *) printf "? %s :: Status unclear" "${name}" ;; + esac + + printf "\n" + fi +} + +print_install_completion_msg() { + cat <<END + +Dotfile installation complete. If you have an internet connection, run + + ./install_packages.sh + +to complete the config installation. +END +} + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Cδηfig liηkiηg αrrαys | +#╚─────────────────────────────────────────────────────────────────────────────╝ +create_directory_paths() { + local a=(\ + ~/.config/vifm/fzf-read + ~/bin + ~/safe + ) + + if [[ "$(uname -s)" == "Darwin" ]]; then + a=("${a[@]}" + ~/Library/KeyBindings + ~/Library/Preferences/org.videolan.vlc + ) + fi + + for d in "${a[@]}"; do + mkdir -p "$d" + done +} + +# Launchd plists require absolute paths. To make this portable we bundle a +# .template file which has HOMEPATH in place of absolute paths to $HOME. These +# are replaced at install time to create the .plist. +fix_launchd_plists() { + local a=( + skhd/com.skhd.launcher.plist skhd/com.skhd.launcher.template + sketchybar/com.sketchybar.launcher.plist sketchybar/com.sketchybar.launcher.template + warpd/com.warpd.launcher.plist warpd/com.warpd.launcher.template + ) + + for ((i = 0; i < "${#a[@]}"; i=(i+2) )); do + local plist="${HOME}/.configs_pointer/${a[$i]}" + local template="${HOME}/.configs_pointer/${a[$i + 1]}" + + sed -e 's#HOMEPATH#'"${HOME}"'#g' < "${template}" > "${plist}" + done +} + +# Launchd requires an absolute path for sketchbar, which isn't available to brew +other_setup() { + if which sketchybar &>/dev/null && ! [[ -e ~/.configs_pointer/sketchybar/sketchybar ]]; then + ln -s "$(which sketchybar)" ~/.configs_pointer/sketchybar/sketchybar &>/dev/null + fi +} + +####################################### +# Prints the status of a config. +# Arguments: +# 1: Path to config file. The "from" path. +# 2: Path to system file. The "to" path. +# Outputs: +# Writes status to stdout +####################################### +install_config() { + local status=$(config_status "$1" "$2") + + if [[ "${status}" != "not_linked" ]]; then + printf '%s\n' "${status}" + return 1 + fi + + [[ -d "$1" ]] || mkdir -p "$(dirname "$2")" + + if ln -s "$1" "$2"; then + printf "newly_linked" + return 0 + else + return 1 + fi +} + +# Arguments +# 1: Mode in {"status", "install"} +iterate_over_configs() { + if [[ "$(uname -s)" == "Darwin" ]]; then + local a=("${UNIX_CONFIGS[@]}" "${MAC_ONLY[@]}") + else + local a=("${UNIX_CONFIGS[@]}" "${LINUX_ONLY[@]}") + fi + + for ((i = 0; i < "${#a[@]}"; i=(i+2) )); do + local from="${HOME}/.configs_pointer/${a[$i]}" + local to="${a[$i + 1]}" + + if [[ "$1" == "status" ]]; then + local status="$(config_status "${from}" "${to}")" + print_config_status "${status}" "${to}" + elif [[ "$1" == "install" ]]; then + local status="$(install_config "${from}" "${to}")" + print_config_status "${status}" "${to}" + else + printf 'Invalid mode "%s" provided\n' "$1" + exit 1 + fi + done +} + +main "$@" + +# vim: set ft=bash syn=bash sw=2 ff=unix: diff --git a/macos/DefaultKeyBinding.dict b/macos/DefaultKeyBinding.dict new file mode 100644 index 0000000..f7e3b47 --- /dev/null +++ b/macos/DefaultKeyBinding.dict @@ -0,0 +1,48 @@ +// defaults: https://github.com/ttscoff/KeyBindings +// explained: https://ss64.com/osx/syntax-keybindings.html +// discussion: https://gist.github.com/trusktr/1e5e516df4e8032cbc3d +// Set a binding for repeating action (e.g.: ^u, 5, right arrow) +// > defaults write -g NSRepeatCountBinding -string "^u" +// +// Local list: +// /System/Library/Frameworks/AppKit.framework/Resources/StandardKeyBinding.dict +// +// +// +// General methodology stays as with the rest of the configs +// +// startOfLine backWord backChar forwardChar forwardWord endOfLine +// Movements: ^a ^b ^j ^f w^ e^ +// Selections: ^u ^h ^d k^ + +{ + // Move by char. Overrides emacs defaults + "^f" = (moveForward:); + "^j" = (moveBackward:); + + "^d" = (deleteForward:); + "^h" = (deleteBackward:); + + // Move by word + "^w" = (moveWordForward:); + "^b" = (moveWordBackward:); + + // Select by word + "^@w" = (moveWordForwardAndModifySelection:); + "^@b" = (moveWordBackwardAndModifySelection:); + + // Delete to paragraph/line start/end + //"^u" = (moveToBeginningOfParagraphAndModifySelection:, delete:); + //"^k" = (moveToEndOfParagraphAndModifySelection:, delete:); + "^u" = (moveWordBackwardAndModifySelection:); + "^k" = (moveToEndOfParagraphAndModifySelection:); + + // Select to paragraph/line start/end + "^@u" = (moveToBeginningOfParagraphAndModifySelection:); + "^@k" = (moveToEndOfParagraphAndModifySelection:); + + // Uppercase word + "^y" = (uppercaseWord:, moveWordForward:, moveWordBackward:); +} + +// ex: set ft=javascript: diff --git a/mako/config b/mako/config new file mode 100644 index 0000000..62b16df --- /dev/null +++ b/mako/config @@ -0,0 +1,10 @@ +font=noto-sans +background-color=#F4A66EFF +text-color=#000000 +padding=10 +border-size=4 +border-color=#000000 +border-radius=6 +progress-color=over #000000 +default-timeout=5000 +max-visible=6 diff --git a/mpv/input.conf b/mpv/input.conf new file mode 100644 index 0000000..ed5d4e4 --- /dev/null +++ b/mpv/input.conf @@ -0,0 +1,207 @@ +# mpv keybindings +# +# Location of user-defined bindings: ~/.config/mpv/input.conf +# +# Lines starting with # are comments. Use SHARP to assign the # key. +# Copy this file and uncomment and edit the bindings you want to change. +# +# List of commands and further details: DOCS/man/input.rst +# List of special keys: --input-keylist +# Keybindings testing mode: mpv --input-test --force-window --idle +# +# Use 'ignore' to unbind a key fully (e.g. 'ctrl+a ignore'). +# +# Strings need to be quoted and escaped: +# KEY show-text "This is a single backslash: \\ and a quote: \" !" +# +# You can use modifier-key combinations like Shift+Left or Ctrl+Alt+x with +# the modifiers Shift, Ctrl, Alt and Meta (may not work on the terminal). +# +# The default keybindings are hardcoded into the mpv binary. +# You can disable them completely with: --no-input-default-bindings + +# Developer note: +# On compilation, this file is baked into the mpv binary, and all lines are +# uncommented (unless '#' is followed by a space) - thus this file defines the +# default key bindings. + +# If this is enabled, treat all the following bindings as default. +# default-bindings start + +# MBTN_LEFT ignore # don't do anything +# MBTN_LEFT_DBL cycle fullscreen # toggle fullscreen +F cycle fullscreen +# MBTN_RIGHT cycle pause # toggle pause/playback mode +# MBTN_BACK playlist-prev # skip to the previous file +# MBTN_FORWARD playlist-next # skip to the next file + +# Mouse wheels, touchpad or other input devices that have axes +# if the input devices supports precise scrolling it will also scale the +# numeric value accordingly +# WHEEL_UP seek 10 # seek 10 seconds forward +# WHEEL_DOWN seek -10 # seek 10 seconds backward +# WHEEL_LEFT add volume -2 +# WHEEL_RIGHT add volume 2 +# + +# Anime filter keys +Ctrl+1 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode A (Fast)" +Ctrl+2 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode B (Fast)" +Ctrl+3 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode C (Fast)" +Ctrl+4 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_Restore_CNN_S.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode A+A (Fast)" +Ctrl+5 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_S.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode B+B (Fast)" +Ctrl+6 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Restore_CNN_S.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode C+A (Fast)" + +Ctrl+0 no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared" + +# # Seek units are in seconds, but note that these are limited by keyframes +RIGHT seek 4 exact # seek 5 seconds forward +LEFT seek -4 exact # seek 5 seconds backward +j seek -12 exact +l seek 12 exact +# UP seek 60 # seek 1 minute forward +# DOWN seek -60 # seek 1 minute backward +# Do smaller, always exact (non-keyframe-limited), seeks with shift. +# Don't show them on the OSD (no-osd). +# Shift+RIGHT no-osd seek 1 exact # seek exactly 1 second forward +# Shift+LEFT no-osd seek -1 exact # seek exactly 1 second backward +# Shift+UP no-osd seek 5 exact # seek exactly 5 seconds forward +# Shift+DOWN no-osd seek -5 exact # seek exactly 5 seconds backward +# Ctrl+LEFT no-osd sub-seek -1 # seek to the previous subtitle +# Ctrl+RIGHT no-osd sub-seek 1 # seek to the next subtitle +# Ctrl+Shift+LEFT sub-step -1 # change subtitle timing such that the previous subtitle is displayed +# Ctrl+Shift+RIGHT sub-step 1 # change subtitle timing such that the next subtitle is displayed +# Alt+left add video-pan-x 0.1 # move the video right +# Alt+right add video-pan-x -0.1 # move the video left +# Alt+up add video-pan-y 0.1 # move the video down +# Alt+down add video-pan-y -0.1 # move the video up +# Alt++ add video-zoom 0.1 # zoom in +# Alt+- add video-zoom -0.1 # zoom out +# Alt+BS set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 # reset zoom and pan settings +# PGUP add chapter 1 # seek to the next chapter +# PGDWN add chapter -1 # seek to the previous chapter +# Shift+PGUP seek 600 # seek 10 minutes forward +# Shift+PGDWN seek -600 # seek 10 minutes backward +# [ multiply speed 1/1.1 # decrease the playback speed +# ] multiply speed 1.1 # increase the playback speed +# { multiply speed 0.5 # halve the playback speed +# } multiply speed 2.0 # double the playback speed +# BS set speed 1.0 # reset the speed to normal +# Shift+BS revert-seek # undo the previous (or marked) seek +# Shift+Ctrl+BS revert-seek mark # mark the position for revert-seek +# q quit +# Q quit-watch-later # exit and remember the playback position +# q {encode} quit 4 +# ESC set fullscreen no # leave fullscreen +# ESC {encode} quit 4 +# p cycle pause # toggle pause/playback mode +. frame-step # advance one frame and pause +, frame-back-step # go back by one frame and pause +SPACE cycle pause # toggle pause/playback mode +k cycle pause # toggle pause/playback mode +# > playlist-next # skip to the next file +# ENTER playlist-next # skip to the next file +# < playlist-prev # skip to the previous file +# O no-osd cycle-values osd-level 3 1 # toggle displaying the OSD on user interaction or always +# o show-progress # show playback progress +# P show-progress # show playback progress +# i script-binding stats/display-stats # display information and statistics +# I script-binding stats/display-stats-toggle # toggle displaying information and statistics +# ` script-binding console/enable # open the console +# z add sub-delay -0.1 # shift subtitles 100 ms earlier +# Z add sub-delay +0.1 # delay subtitles by 100 ms +# x add sub-delay +0.1 # delay subtitles by 100 ms +[ add sub-delay -0.1 # shift subtitles 100 ms earlier +] add sub-delay +0.1 # delay subtitles by 100 ms +{ add sub-delay -10 # shift subtitles 10s earlier +} add sub-delay +10 # delay subtitles by 10s +( add audio-delay -0.1 # change audio/video sync by delaying the audio +) add audio-delay +0.1 # change audio/video sync by shifting the audio earlier +# ctrl++ add audio-delay 0.100 # change audio/video sync by delaying the audio +# ctrl+- add audio-delay -0.100 # change audio/video sync by shifting the audio earlier +# Shift+g add sub-scale +0.1 # increase the subtitle font size +# Shift+f add sub-scale -0.1 # decrease the subtitle font size +# 9 add volume -2 +# / add volume -2 +# 0 add volume 2 +# * add volume 2 +m cycle mute # toggle mute +# 1 add contrast -1 +# 2 add contrast 1 +# 3 add brightness -1 +# 4 add brightness 1 +# 5 add gamma -1 +# 6 add gamma 1 +# 7 add saturation -1 +# 8 add saturation 1 +# Alt+0 set current-window-scale 0.5 # halve the window size +# Alt+1 set current-window-scale 1.0 # reset the window size +# Alt+2 set current-window-scale 2.0 # double the window size +# d cycle deinterlace # toggle the deinterlacing filter +# r add sub-pos -1 # move subtitles up +# R add sub-pos +1 # move subtitles down +# t add sub-pos +1 # move subtitles down +# v cycle sub-visibility # hide or show the subtitles +# Alt+v cycle secondary-sub-visibility # hide or show the secondary subtitles +# V cycle sub-ass-vsfilter-aspect-compat # toggle stretching SSA/ASS subtitles with anamorphic videos to match the historical renderer +# u cycle-values sub-ass-override "force" "no" # toggle overriding SSA/ASS subtitle styles with the normal styles +# j cycle sub # switch subtitle track +# J cycle sub down # switch subtitle track backwards +n cycle sub # switch subtitle track +N cycle sub down # switch subtitle track backwards +# SHARP cycle audio # switch audio track +a cycle audio +A cycle audio down +# _ cycle video # switch video track +# T cycle ontop # toggle placing the video on top of other windows +# f cycle fullscreen # toggle fullscreen +# s screenshot # take a screenshot of the video in its original resolution with subtitles +# S screenshot video # take a screenshot of the video in its original resolution without subtitles +# Ctrl+s screenshot window # take a screenshot of the window with OSD and subtitles +# Alt+s screenshot each-frame # automatically screenshot every frame; issue this command again to stop taking screenshots +# w add panscan -0.1 # decrease panscan +# W add panscan +0.1 # shrink black bars by cropping the video +# e add panscan +0.1 # shrink black bars by cropping the video +# A cycle-values video-aspect-override "16:9" "4:3" "2.35:1" "-1" # cycle the video aspect ratio ("-1" is the container aspect) +# POWER quit +# PLAY cycle pause # toggle pause/playback mode +# PAUSE cycle pause # toggle pause/playback mode +# PLAYPAUSE cycle pause # toggle pause/playback mode +# PLAYONLY set pause no # unpause +# PAUSEONLY set pause yes # pause +# STOP quit +# FORWARD seek 60 # seek 1 minute forward +# REWIND seek -60 # seek 1 minute backward +# NEXT playlist-next # skip to the next file +# PREV playlist-prev # skip to the previous file +# VOLUME_UP add volume 2 +# VOLUME_DOWN add volume -2 += add volume 4 +- add volume -4 +# MUTE cycle mute # toggle mute +CLOSE_WIN quit +# CLOSE_WIN {encode} quit 4 +ctrl+q quit +ctrl+w quit +# E cycle edition # switch edition +# l ab-loop # set/clear A-B loop points +# L cycle-values loop-file "inf" "no" # toggle infinite looping +# ctrl+c quit 4 +# DEL script-binding osc/visibility # cycle OSC visibility between never, auto (mouse-move) and always +# ctrl+h cycle-values hwdec "auto" "no" # toggle hardware decoding +# F8 show-text ${playlist} # show the playlist +# F9 show-text ${track-list} # show the list of video, audio and sub tracks + +# +# Legacy bindings (may or may not be removed in the future) +# +# ! add chapter -1 # seek to the previous chapter +# @ add chapter 1 # seek to the next chapter + +# +# Not assigned by default +# (not an exhaustive list of unbound commands) +# + +# ? cycle sub-forced-only # toggle DVD forced subs +# ? stop # stop playback (quit or enter idle mode) diff --git a/mpv/mpv.conf b/mpv/mpv.conf new file mode 100644 index 0000000..4a83d33 --- /dev/null +++ b/mpv/mpv.conf @@ -0,0 +1,145 @@ +################### +# custom settings # +################### +volume='60' # Don't blast on open (use -/=) + +save-position-on-quit # Starts from where you left off last time + +#no-input-default-bindings # Disables all keybinds, including scripts! +no-input-builtin-bindings # Disables all default keybinds + +# +# Example mpv configuration file +# +# Warning: +# +# The commented example options usually do _not_ set the default values. Call +# mpv with --list-options to see the default values for most options. There is +# no builtin or example mpv.conf with all the defaults. +# +# +# Configuration files are read system-wide from /usr/local/etc/mpv.conf +# and per-user from ~/.config/mpv/mpv.conf, where per-user settings override +# system-wide settings, all of which are overridden by the command line. +# +# Configuration file settings and the command line options use the same +# underlying mechanisms. Most options can be put into the configuration file +# by dropping the preceding '--'. See the man page for a complete list of +# options. +# +# Lines starting with '#' are comments and are ignored. +# +# See the CONFIGURATION FILES section in the man page +# for a detailed description of the syntax. +# +# Profiles should be placed at the bottom of the configuration file to ensure +# that settings wanted as defaults are not restricted to specific profiles. + +################## +# video settings # +################## + +# Start in fullscreen mode by default. +#fs=yes + +# force starting with centered window +#geometry=50%:50% + +# don't allow a new window to have a size larger than 90% of the screen size +#autofit-larger=90%x90% + +# Do not close the window on exit. +#keep-open=yes + +# Do not wait with showing the video window until it has loaded. (This will +# resize the window once video is loaded. Also always shows a window with +# audio.) +#force-window=immediate + +# Disable the On Screen Controller (OSC). +#osc=no + +# Keep the player window on top of all other windows. +#ontop=yes + +# Specify high quality video rendering preset (for --vo=gpu only) +# Can cause performance problems with some drivers and GPUs. +#profile=gpu-hq + +# Force video to lock on the display's refresh rate, and change video and audio +# speed to some degree to ensure synchronous playback - can cause problems +# with some drivers and desktop environments. +#video-sync=display-resample + +# Enable hardware decoding if available. Often, this does not work with all +# video outputs, but should work well with default settings on most systems. +# If performance or energy usage is an issue, forcing the vdpau or vaapi VOs +# may or may not help. +#hwdec=auto + +################## +# audio settings # +################## + +# Specify default audio device. You can list devices with: --audio-device=help +# The option takes the device string (the stuff between the '...'). +#audio-device=alsa/default + +# Do not filter audio to keep pitch when changing playback speed. +#audio-pitch-correction=no + +# Output 5.1 audio natively, and upmix/downmix audio with a different format. +#audio-channels=5.1 +# Disable any automatic remix, _if_ the audio output accepts the audio format. +# of the currently played file. See caveats mentioned in the manpage. +# (The default is "auto-safe", see manpage.) +#audio-channels=auto + +################## +# other settings # +################## + +# Pretend to be a web browser. Might fix playback with some streaming sites, +# but also will break with shoutcast streams. +#user-agent="Mozilla/5.0" + +# cache settings +# +# Use a large seekable RAM cache even for local input. +#cache=yes +# +# Use extra large RAM cache (needs cache=yes to make it useful). +#demuxer-max-bytes=500M +#demuxer-max-back-bytes=100M +# +# Disable the behavior that the player will pause if the cache goes below a +# certain fill size. +#cache-pause=no +# +# Store cache payload on the hard disk instead of in RAM. (This may negatively +# impact performance unless used for slow input such as network.) +#cache-dir=~/.cache/ +#cache-on-disk=yes + +# Display English subtitles if available. +#slang=en + +# Play Finnish audio if available, fall back to English otherwise. +#alang=fi,en + +# Change subtitle encoding. For Arabic subtitles use 'cp1256'. +# If the file seems to be valid UTF-8, prefer UTF-8. +# (You can add '+' in front of the codepage to force it.) +#sub-codepage=cp1256 + +# You can also include other configuration files. +#include=/path/to/the/file/you/want/to/include + +############ +# profiles # +############ +[waifu] +sub-font='Hiragino Sans W3' +#sub-auto='all' +audio-device='coreaudio/~:AMS2_StackedOutput:0' +#sub-file-paths='../' diff --git a/mpv/scripts/subs_to_clipboard.js b/mpv/scripts/subs_to_clipboard.js new file mode 100644 index 0000000..d0b2062 --- /dev/null +++ b/mpv/scripts/subs_to_clipboard.js @@ -0,0 +1,209 @@ +// Copy the current subtitles to the clipboard +// +// You may select the copied subtitles with `qwer` by default or just +// `<TAB><TAB>` to copy all of them +// +// Make sure to edit g.afterCopyAction[Mac|Linux] below. This command will be +// run by bash after the subtitles are copied to clipboard. For example to +// search them up in an online dictionary + + +// Rebind keys here +var key_binds = { + // Keys to move selection. Letters mean `move<Left/Right><Plus/Minus>`. + // moveLP increases the selection size by 1 character to the left + moveLP: "q", + moveLM: "w", + moveRM: "e", + moveRP: "r", + + // Start and stop copying + copyKey: "TAB", +}; + + +// Global +var g = { + osd: mp.create_osd_overlay("ass-events"), + has_moved_selection: false, + sub_chars: undefined, + sub_len: function () { return this.sub_chars.length }, + start: 0, + end: 0, + + // Shell script to run after copying. Both examples below assume chrome + // with a dictionary is open on workspace 3 and the "seach box focus" + // Chrome extension is installed + // MacOS version ====== + // Uses skhd, not preinstalled + afterCopyActionMac: "/usr/bin/env -S bash -c '" + + 'skhd -k "cmd + shift - a"' // Move to left desktop + + ' && sleep .6' + + ' && skhd -k "ctrl - l"' // Focus search bar + + ' && sleep .1' + + ' && skhd -k "cmd - a"' // Select entire search bar + + ' && skhd -k "cmd - v"' // Paste clipboard + + ' && skhd -k "return"' // Search + + "'", + // Linux version ====== + // Uses wtype, intended for swayland + afterCopyActionLinux: "/usr/bin/env -S bash -c '" + + 'wtype -M logo -k 3' // Move to workspace 3 + + ' && sleep .2' + + ' && wtype -M alt -k l' // Focus jisho.org searchbar + + ' && sleep .2' + + ' && wtype -M ctrl -k v' // Paste + + ' && wtype -k return' // Search + + "'", +}; + + +mp.add_key_binding(key_binds.copyKey, "startCopySubs", main); + + +function main() { + if (!initSelection()) { + mp.osd_message('No subtitles found', 1); + } + + mp.add_forced_key_binding(key_binds.moveLP, "moveLP", function () { moveSelection(true, 'left') }); + mp.add_forced_key_binding(key_binds.moveLM, "moveLM", function () { moveSelection(false, 'left') }); + mp.add_forced_key_binding(key_binds.moveRM, "moveRM", function () { moveSelection(false, 'right') }); + mp.add_forced_key_binding(key_binds.moveRP, "moveRP", function () { moveSelection(true, 'right') }); + + mp.add_forced_key_binding(key_binds.copyKey, "copySubs", function () { + copySelection(); + mp.add_forced_key_binding(key_binds.copyKey, "startCopySubs", main); + }); + + g.has_moved_selection = false; +} + + +// Create a new selection printing on OSD +// Returns true when a new selection has been created +function initSelection() { + g.sub_chars = []; + var chars = mp.get_property('sub-text') + .replace('\n', '\\N') + .replace(/\u202A/g, '') // Left to right embed + .replace(/\u202C/g, '') // Right to left embed + .split(''); + + if (chars.length === 0) return false; + + // Combine \N with previous character + for (var i = 0; i < chars.length; i++) { + if (chars[i+1] + chars[i+2] === '\\N') + g.sub_chars.push(chars[i] + chars[++i] + chars[++i]) + else + g.sub_chars.push(chars[i]); + } + + // Select middle half of subs, the [1/4, 3/4] range + g.start = Math.floor(g.sub_len() / 4); + g.end = Math.floor(g.sub_len() * 3 / 4); + + renderSelection(); + return true +} + + +// Write updated selection to osd +function renderSelection() { + var ass_str = ""; + + // Color selected characters in gruvbox yellow + for (var i = 0; i < g.sub_len(); i++) { + if (i === g.start) ass_str += "{\\c&H1476B7&}"; + ass_str += g.sub_chars[i]; + if (i === g.end) ass_str += "{\\c&HFFFFFF&}"; + } + + g.osd.data = "{\\an2}" + ass_str; + g.osd.update(); +} + + +// Increase or decrease the selection. At least one character must be selected +function moveSelection(is_additive, side) { + if (is_additive && side === 'left') + g.start -= (g.start !== 0); + else if (side === 'left') + g.start += (g.start < g.end); + else if (is_additive) + g.end += (g.end !== g.sub_len()); + else + g.end -= g.start < g.end; + + g.has_moved_selection = true; + renderSelection(); +} + + +// Remove selection from OSD and reset it to as before +function clearSelection() { + for (var bind in key_binds) + mp.remove_key_binding(key_binds[bind]); + g.osd.remove(); + g.sub_chars = []; +} + + +// Copy the current selection to the clipboard +function copySelection() { + var selected = g.sub_chars.join('').replace(/\\N/g, ''); // Removes linebreaks + + if (g.has_moved_selection) { + selected = selected.slice(g.start, g.end + 1); + } + clearSelection(); + + kernel_name = mp.command_native({ + name: "subprocess", + capture_stdout: true, + args: ["uname", "-s"], + }).stdout; + + if (kernel_name.match("Darwin")) { + mp.command("run bash -c \"echo '" + selected + "' | pbcopy\""); + mp.osd_message('Copied to clipboard', 1); + + if (g.afterCopyActionMac) + mp.command("run " + g.afterCopyActionMac); + } else if (kernel_name.match("Linux")) { + mp.command("run bash -c \"echo '" + selected + "' | wl-copy\""); + mp.osd_message('Copied to clipboard', 1); + + if (g.afterCopyActionLinux) + mp.command("run " + g.afterCopyActionLinux); + } else { + mp.msg.log("error", "Unrecognized kernel name: '" + kernel_name + "'"); + } +} + + +// Depreciated +function copySubs() { + var subs = mp.get_property('sub-text').replace(/\u202a/g, ''); + + mp.command("run bash -c \"echo '" + subs + "' | pbcopy\""); + + mp.osd_message('Copied to clipboard', 1); + + //var is_windows = mp.get_property_native('options/vo-mmcss-profile', o).match(/o/); + //var is_mac = mp.get_property_native('options/cocoa-force-dedicated-gpu', o).match(/o/); + + //mp.msg.info(is_windows ? "Is windows" : "Not windows?"); + //mp.msg.info(is_mac ? "Is mac" : "Not a mac?"); + + //if (is_windows) { + // mp.osd_message('Windows is not supported at this time\nClipboard unchanged', 4); + // return + //} else if (is_mac) { + // mp.command("run /usr/bin/env -S bash -c 'echo \"" + subs + "\" | pbcopy'"); + //} else { + // mp.command("run /usr/bin/env -S bash -c 'echo \"" + subs + "\" | xclip'"); + //} +} + diff --git a/package_install.sh b/package_install.sh new file mode 100755 index 0000000..ef35ac9 --- /dev/null +++ b/package_install.sh @@ -0,0 +1,309 @@ +#!/usr/bin/env bash +declare PACMAN="" + +# Linux and Cargo packages are written in pairs: (package_name, binary_name). +# Brew packages only use their binary name and are intended for MacOS. +# The binary name is used to check if the package is already installed from +# another source +declare -r \ + LINUX_PACKAGES=(\ + 'dante' 'aerc' + 'w3m' 'aerc' + 'aerc' 'aerc' + 'alacritty' 'alacritty' + 'bat' 'bat' + 'calc' 'calc' + 'dust' 'dust' + 'exa' 'exa' + 'fd' 'fd' + 'foliate' 'foliate' + 'fuzzel' 'fuzzel' + 'fzf' 'fzf' + 'gawk' 'gawk' + 'git' 'git' + 'git-lfs' 'git-lfs' + 'grim' 'grim' + 'pass' 'pass' + 'slurp' 'slurp' + 'swappy' 'swappy' + 'imv' 'imv' + 'jq' 'jq' + 'mpv' 'mpv' + 'neofetch' 'neofetch' + 'neovim' 'nvim' + 'paru' 'paru' + 'ripgrep' 'rg' + 'sway' 'sway' + 'swaybg' 'swaybg' + 'swaylock' 'swaylock' + 'tealdeer' 'tldr' + 'tmux' 'tmux' + 'udisks2' 'udisksctl' + 'vifm' 'vifm' + 'viu' 'viu' + 'wl-clipboard' 'wl-paste' + 'wtype' 'wtype' + 'zathura-pdf-mupdf' 'zathura' + 'zathura' 'zathura' + ) \ + CARGO_PACKAGES=(\ + 'alacritty' 'alacritty' + 'bat' 'bat' + 'du-dust' 'dust' + 'exa' 'exa' + 'fd-find' 'fd' + 'ripgrep' 'rg' + 'tealdeer' 'tldr' + 'viu' 'viu' + ) \ + BREW_PACKAGES=(\ + 'bash' 'bat' 'calc' 'coreutils' 'dust' 'exa' 'fd' 'fzf' 'gawk' 'git' + 'imagemagick' 'jq' 'mmv' 'mpv' 'neofetch' 'node' 'nvim' 'pngpaste' + 'python3' 'ripgrep' 'skhd' 'tealdeer' 'tmux' 'vifm' 'viu' 'yabai' + ) \ + AUR_PACKAGES=(\ + 'mmv' 'mmv' + 'nerd-fonts-meslo' 'font-manager' + 'vimiv-qt-git' 'vimiv' + 'warpd-wayland-git' 'warpd' + 'wev' 'wev' + 'wlsunset' 'wlsunset' + ) + +print_help() { + cat <<HELP +Install packages and external scripts. Uses the default package manager for +your system. May not work on some distros + +USAGE: + ./install_packages.sh [ARGS] + +ARGS: + ssh Downloads essential packages directly via curl + help Prints this message and exits (default) + status Lists the download status of packages and exits + install Installs packages using package managers +HELP +} + +main() { + if ! set_package_manager; then + printf "Failed to find package manager\nAborting...\n" + exit 1 + else + printf "Found \`%s\` as system package manager\n" "${PACMAN}" + fi + + if [[ "$(uname -s)" == "Darwin" && "$1" == "install" ]]; then + cp -n ~/.configs_pointer/other/madoka_error.aiff ~/Library/Sounds/madoka_error.aiff + install_brew_packages + elif [[ "$(uname -s)" == "Linux" && "$1" == "install" ]]; then + install_linux_packages + elif [[ "$1" == "ssh" ]]; then + install_curl_packages + elif [[ "$1" == "status" ]]; then + list_packages + exit 0 + else + print_help + exit 0 + fi + + if [[ "$1" == "install" ]]; then + install_web_packages + install_cargo_packages + fi + + printf 'Done\n' +} + +set_package_manager () { + if ! command -v brew &>/dev/null && [[ "$(uname -s)" == "Darwin" ]]; then + eval "$(curl -fsSL 'https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh')" + fi + + if command -v paru &> /dev/null; then PACMAN='paru -S' + elif command -v pacman &> /dev/null; then PACMAN='sudo pacman -S' + elif command -v apt-get &> /dev/null; then PACMAN='sudo apt-get install' + elif command -v apk &> /dev/null; then PACMAN='sudo apk add' + elif command -v rpm &> /dev/null; then PACMAN='rpm -ihv' + elif command -v brew &> /dev/null; then PACMAN='brew install' + else + return 1 + fi +} + +list_packages() { + if [[ "$(uname -s)" == "Darwin" ]]; then + printf "==== Installed by \`%s\` =============\n" "${PACMAN}" + + for pkg in "${BREW_PACKAGES[@]}"; do + print_package_status "$pkg" "brew" + done + elif [[ "$(uname -s)" == "Linux" ]]; then + printf "==== Installed by \`%s\` =============\n" "${PACMAN}" + + for ((i = 0; i < "${#LINUX_PACKAGES[@]}"; i=(i+2) )); do + print_package_status "${LINUX_PACKAGES[$i + 1]}" "$PACMAN" + done + fi + + printf "==== Installed by \`cargo install\` =============\n" + for ((i = 0; i < "${#CARGO_PACKAGES[@]}"; i=(i+2) )); do + print_package_status "${CARGO_PACKAGES[$i + 1]}" "cargo" + done +} + +print_package_status() { + if [[ "$2" == "cargo" ]] && [[ -x "${HOME}/.cargo/bin/$1" ]]; then + printf "✓ %s :: Installed\n" "$1" + elif [[ "$2" == "cargo" ]]; then + printf "✗ %s :: Not installed\n" "$1" + elif [[ "$2" == brew* ]] && brew list "$1" &>/dev/null; then + printf "✓ %s :: Installed\n" "$1" + elif [[ "$2" == brew* ]]; then + printf "✗ %s :: Not installed\n" "$1" + elif command -v "$1" &> /dev/null; then + printf "✓ %s :: Installed\n" "$1" + else + printf "✗ %s :: Not installed\n" "$1" + fi +} + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Pαckαgε iηsταllεrs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +install_web_packages() { + if ! command -v rustup &>/dev/null && ask "Install rustup?"; then + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + fi + + if ! [[ -e ~/.config/tmux/plugins/tpm ]] && ask "Install tmux's plugin manager?"; then + git clone --depth 1 'https://github.com/tmux-plugins/tpm' ~/.config/tmux/plugins/tpm + ~/.config/tmux/plugins/tpm/tpm + ~/.config/tmux/plugins/tpm/bin/install_plugins + ~/.config/tmux/plugins/tpm/tpm + fi + + if [[ ! -f ~/.git-prompt.bash ]] && ask "Download git-prompt for bash?"; then + curl --output ~/.git-prompt.bash\ + 'https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh' + fi + + if [[ ! -f ~/.git-completion.bash ]] && ask "Download git-completion for bash?"; then + curl --output ~/.git-completion.bash\ + 'https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash' + fi + + if [[ ! -f ~/.fzf.bash ]] && ask "Download fzf-completion for bash?"; then + curl --output ~/.fzf.bash\ + 'https://raw.githubusercontent.com/junegunn/fzf/master/shell/completion.bash' + fi + + if ask "Install vim plugins?"; then + if command -v vim &>/dev/null; then + vim +$'if !has(\'nvim\') | PlugInstall --sync | endif' +qall + elif command -v vi &>/dev/null; then + vi +$'if !has(\'nvim\') | PlugInstall --sync | endif' +qall + else + printf "Run :PlugInstall in nVim to finish setting up vim's plugins\n" + fi + + if command -v pip3 &>/dev/null && ! pip3 list 2>&1 | grep -q '^pynvim'; then + pip3 install pynvim + fi + fi +} + +install_cargo_packages() { + if ! command -v cargo &> /dev/null; then + printf 'Cargo package manager not found\n' + return 1 + fi + + for ((i = 0; i < "${#CARGO_PACKAGES[@]}"; i=(i+2) )); do + local bin="${CARGO_PACKAGES[$i + 1]}" + local name="${CARGO_PACKAGES[$i]}" + + if ! command -v "${bin}" &>/dev/null && ask "Cargo install ${name}?"; then + cargo install "${name}" + fi + done +} + +install_brew_packages() { + brew tap koekeishiya/formulae + + printf 'Checking brew packages. Brew is slow. This may take a while...\n' + + for pkg in "${BREW_PACKAGES[@]}"; do + if [[ -z "$(brew list "${pkg}")" ]] \ + && ! command -v "${pkg}" &>/dev/null \ + && ask "Install ${pkg}?"; then + brew install "${pkg}" + fi + done +} + +# May or may not work. Tested with pacman on arch +install_linux_packages() { + for ((i = 0; i < "${#LINUX_PACKAGES[@]}"; i=(i+2) )); do + local bin="${LINUX_PACKAGES[$i + 1]}" + local name="${LINUX_PACKAGES[$i]}" + + if ! command -v "${bin}" &>/dev/null && ask "Install ${name}?"; then + eval "${PACMAN} ${name}" + fi + done +} + +# Very tentative. Only works on linux and only installs essentials for ssh +install_curl_packages() { + mkdir -p ~/bin + + if ! command -v fzf &>/dev/null && ask 'Download fzf?'; then + curl --output 'fzf_download.tar.gz' \ + -LO 'https://github.com/junegunn/fzf/releases/download/0.28.0/fzf-0.28.0-linux_amd64.tar.gz' + tar xf 'fzf_download.tar.gz' + chmod u+x ./fzf + rm -f 'fzf_download.tar.gz' + fi + + if ! command -v neofetch &>/dev/null && ask 'Download neofetch?'; then + curl --output "neofetch.tar.gz" \ + -LO 'https://github.com/dylanaraps/neofetch/archive/refs/tags/7.1.0.tar.gz' + tar xf 'neofetch.tar.gz' + mv ./neofetch-*/neofetch ./neofetch + rm -rf 'neofetch.tar.gz' 'neofetch-7.1.0' + fi + + if ! command -v tmux &>/dev/null && ask 'Download tmux?'; then + curl --output 'tmux.tar.gz' \ + -LO 'https://github.com/tmux/tmux/releases/download/3.2a/tmux-3.2a.tar.gz' + tar xf 'tmux.tar.gz' + (cd tmux-* && ./configure && make && mv ./tmux ../tmux) + rm -rf 'tmux.tar.gz' ./tmux-* + fi + + if ! command -v nvim &>/dev/null && ask 'Download neovim?'; then + curl -LO 'https://github.com/neovim/neovim/releases/latest/download/nvim.appimage' + chmod u+x ./nvim.appimage + mv ./nvim.appimage ./nvim + fi +} + +####################################### +# Arguments: +# 1: Prompt message +# Return: +# 0 for yes, 1 for no +####################################### +ask () { + read -rp $'\n'"$1 ([y]/n) " + [[ "${REPLY:-y}" =~ ^[Yy][es]?$ ]] +} + + +main "$@" + +# vim: set ft=bash syn=bash sw=2 ff=unix: diff --git a/ripgrep/config b/ripgrep/config new file mode 100644 index 0000000..f62167a --- /dev/null +++ b/ripgrep/config @@ -0,0 +1,8 @@ +--glob +!git/* + +--glob +!node_modules + +--glob +!target diff --git a/sketchybar/com.sketchybar.launcher.template b/sketchybar/com.sketchybar.launcher.template new file mode 100644 index 0000000..2b5ba0b --- /dev/null +++ b/sketchybar/com.sketchybar.launcher.template @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>com.sketchybar.launcher</string> + + <key>ProgramArguments</key> + <array> + <string>HOMEPATH/bin/sketchybar</string> + </array> + + <key>EnvironmentVariables</key> + <dict> + <key>PATH</key> + <string>HOMEPATH/.config/sketchybar:HOMEPATH/.config/sketchybar/plugins:/bin:/usr/local/bin</string> + </dict> + + <key>RunAtLoad</key> + <true/> + + <key>ThrottleInterval</key> + <integer>10</integer> + + <key>StandardOutPath</key> + <string>/tmp/sketchy.out</string> + + <key>StandardErrorPath</key> + <string>/tmp/sketchy.err</string> + </dict> +</plist> +<!-- vim: set ft=xml: --> diff --git a/sketchybar/plugins/yabai_spaces.js b/sketchybar/plugins/yabai_spaces.js new file mode 100755 index 0000000..c56efdb --- /dev/null +++ b/sketchybar/plugins/yabai_spaces.js @@ -0,0 +1,110 @@ +#!/usr/bin/env node +// Tmux-line inspired yabai spaces on sketchybar +const sh = require('child_process'); + +const mode = process.argv[2]; +const curr_space_id = process.env.YABAI_SPACE_ID; +const prev_space_id = process.env.YABAI_RECENT_SPACE_ID; + +if (mode === "--update" ) + updateSketchybar(); +else if (mode === "--refresh") + refreshOnly(prev_space_id, curr_space_id); +else + console.error(`Mode ${mode} is invalid\nUse one of --refresh or --update`); + +// Wrapper around child process spawn +function spawn(cmd, args, name) { + let output = sh.spawnSync(cmd, args); + + if (output.status !== 0) { + console.error(`${name} failed with exit code ${output.status}`); + + if (output.stderr) console.error(output.stderr.toString()); + else console.log("No stderr"); + + process.exit(1); + } + + return output +} + + +// Refreshes "focus" colors between previous and current space +// Args: ID of current and previous spaces +function refreshOnly(prev, curr) { + prev = `yabai_space_${prev}`; + curr = `yabai_space_${curr}`; + + spawn( + "sketchybar", + [ + "--set", prev, + `label.background.color=0xFF4E4E4E`, + `label.color=0xFFEBDBB2`, + + "--set", curr, + `label.background.color=0xFFC8CB36`, + `label.color=0xFF000000`, + ], + `Refreshing ${prev} and ${curr}` + ); +} + + +// Removes all current yabai spaces from sketchybar. Then creates new spaces +// from current data +function updateSketchybar() { + let spaces = spawn("yabai", ["-m", "query", "--spaces"], "Yabai query"); + + spaces = JSON.parse(spaces.stdout); + + removeSketchybarSpaces(); + + // Reorder spaces based on index. Yabai does not guarantee order + let ordered_spaces = new Array(spaces.length); + + spaces.forEach(s => { + ordered_spaces[s.index - 1] = { + id: s.id, + is_focused: s.focused === 1, + }; + }); + + // Construct sketchybar shell call + let sketchy_args = new Array(); + + ordered_spaces.forEach((s, i) => { + sketchy_args.push( + "--add", "space", `yabai_space_${s.id}`, "left", + "--set", `yabai_space_${s.id}`, + `label=E${i + 1}`, // Works best with crashnumberingserif font + "label.font=crashnumberingserif:Normal:28.0", + `label.color=0xFF${s.is_focused ? "000000" : "EBDBB2"}`, + "label.background.height=30", + "label.background.corner_radius=20", + `label.background.color=0xFF${s.is_focused ? "C8CB36" : "4E4E4E"}`, + "label.padding_left=6", + "label.padding_right=20", + `click_script=yabai -m space --focus ${i + 1}` + ); + }); + + spawn("sketchybar", sketchy_args, "Sketchybar add all spaces"); +} + + +// Remove all yabai spaces from sketchybar +function removeSketchybarSpaces() { + let bar = spawn("sketchybar", ["--query", "bar"], "Sketchybar query"); + + let tag, sketchy_args = new Array(); + + JSON.parse(bar.stdout).items.forEach(item => { + tag = item.match(/yabai_space_[0-9]+/); + + if (tag) sketchy_args.push("--remove", tag); + }); + + if (sketchy_args.length) spawn("sketchybar", sketchy_args, "Remove all"); +} diff --git a/sketchybar/sketchybarrc b/sketchybar/sketchybarrc new file mode 100755 index 0000000..b9abfb2 --- /dev/null +++ b/sketchybar/sketchybarrc @@ -0,0 +1,155 @@ +#!/usr/bin/env bash +# This is a demo config to bring across some of the most important commands more easily. +# For a more advanced configuration example see https://github.com/FelixKratz/SketchyBar/discussions/47#discussion-3587958 +FONT="Meslo" + +############## BAR ############## +sketchybar -m --bar height=35 \ + blur_radius=40 \ + position=bottom \ + padding_left=10 \ + padding_right=10 \ + corner_radius=20 \ + topmost=false \ + color=0x44000000 + #color=0x44FF8700 +#spaces=() +#for i in {1..8} +#do +# spaces+=(--add space space$i left \ +# --set space$i associated_display=1 associated_space=$i icon=$i) +#done + +sketchybar -m \ + --add item yabai_spaces left \ + --set yabai_spaces script="~/.config/sketchybar/plugins/yabai_spaces.js --update" \ + --subscribe yabai_spaces #front_app_switched #\ + #"${spaces[@]}" + +sketchybar -m --add event window_created \ + --add event window_destroyed + +############## GLOBAL DEFAULTS ############## +sketchybar -m --default updates=when_shown \ + drawing=on \ + cache_scripts=on \ + icon.font="Hack Nerd Font:Bold:17.0" \ + icon.color=0xffffffff \ + label.font="Hack Nerd Font:Bold:14.0" \ + label.color=0xffffffff + +############## SPACE DEFAULTS ############## +sketchybar -m --default label.padding_left=2 \ + label.padding_right=2 \ + icon.padding_left=8 \ + label.padding_right=8 + +############## PRIMARY DISPLAY SPACES ############## +#sketchybar -m --add space code left \ +# --set code associated_display=1 \ +# associated_space=1 \ +# icon.font="Hack Nerd Font:Bold:20.0" \ +# icon= \ +# icon.highlight_color=0xff48aa2a \ +# label=code \ +# click_script="yabai -m space --focus 1" \ +# \ +# --add space tex left \ +# --set tex associated_display=1 \ +# associated_space=2 \ +# icon= \ +# icon.highlight_color=0xfffab402 \ +# label=tex \ +# click_script="yabai -m space --focus 2" + + +############## ITEM DEFAULTS ############### +#sketchybar -m --default label.padding_left=2 \ +# icon.padding_right=2 \ +# icon.padding_left=6 \ +# label.padding_right=6 +# +# +############### LEFT ITEMS ############## +#sketchybar -m --add item space_separator left \ +# --set space_separator icon= \ +# associated_space=1 \ +# icon.padding_left=15 \ +# label.padding_right=15 \ +# icon.font="Hack Nerd Font:Bold:15.0" \ +# \ +# --add item gitNotifications left \ +# --set gitNotifications associated_space=1 \ +# update_freq=300 \ +# icon.font="Hack Nerd Font:Bold:18.0" \ +# icon= \ +# script="~/.config/sketchybar/plugins/gitNotifications.sh" \ +# click_script="open https://github.com/notifications" \ +# --subscribe gitNotifications system_woke \ +# \ +# --add item githubIndicator left \ +# --set githubIndicator associated_space=1 \ +# update_freq=1000 \ +# icon.font="Hack Nerd Font:Bold:18.0" \ +# icon= \ +# click_script="open https://github.com" \ +# script="~/.config/sketchybar/plugins/githubIndicator.sh" \ +# --subscribe githubIndicator system_woke \ +# \ +# --add item topmem left \ +# --set topmem associated_space=1 \ +# icon.padding_left=10 \ +# update_freq=15 \ +# script="~/.config/sketchybar/plugins/topmem.sh" +# +############### RIGHT ITEMS ############## +#sketchybar -m --add item clock right \ +# --set clock update_freq=10 \ +# script="~/.config/sketchybar/plugins/clock.sh" \ +# \ +# --add item mailIndicator right \ +# --set mailIndicator associated_space=1,2,3 \ +# update_freq=30 \ +# script="~/.config/sketchybar/plugins/mailIndicator.sh" \ +# icon.font="Hack Nerd Font:Bold:20.0" \ +# icon= \ +# click_script="osascript -e 'tell application \"Mail\" to activate'" +# +## Creating Graphs +#sketchybar -m --add graph cpu_user right 200 \ +# --set cpu_user graph.color=0xffffffff \ +# update_freq=2 \ +# width=0 \ +# associated_space=1 \ +# label.padding_left=0 \ +# icon= \ +# script="~/.config/sketchybar/plugins/cpu_graph.sh" \ +# lazy=on \ +# \ +# --add graph cpu_sys right 200 \ +# --set cpu_sys label.padding_left=0 \ +# associated_space=1 \ +# icon= \ +# graph.color=0xff48aa2a \ +# \ +# --add item topproc right \ +# --set topproc associated_space=1 \ +# label.padding_right=10 \ +# update_freq=15 \ +# script="~/.config/sketchybar/plugins/topproc.sh" + +###################### CENTER ITEMS ################### + +# Adding custom events which can listen on distributed notifications from other running processes +#sketchybar -m --add event spotify_change "com.spotify.client.PlaybackStateChanged" \ +# --add item spotifyIndicator center \ +# --set spotifyIndicator script="~/.config/sketchybar/plugins/spotifyIndicator.sh" \ +# --set spotifyIndicator click_script="osascript -e 'tell application \"Spotify\" to pause'" \ +# --subscribe spotifyIndicator spotify_change + +############## FINALIZING THE SETUP ############## +sketchybar -m --update + +~/.config/sketchybar/plugins/yabai_spaces.js --refresh +echo "sketchybar configuration loaded.." + diff --git a/skhd/com.skhd.launcher.template b/skhd/com.skhd.launcher.template new file mode 100644 index 0000000..0eae8a0 --- /dev/null +++ b/skhd/com.skhd.launcher.template @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>com.skhd.launcher</string> + + <key>ProgramArguments</key> + <array> + <string>/usr/local/bin/skhd</string> + <string>--no-hotload</string> + </array> + + <key>EnvironmentVariables</key> + <dict> + <key>PATH</key> + <string>HOMEPATH/.configs_pointer/skhd/scripts:HOMEPATH/bin:HOMEPATH/.configs_pointer/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string> + </dict> + + <key>RunAtLoad</key> + <true/> + + <key>KeepAlive</key> + <dict> + <key>SuccessfulExit</key> + <false/> + <key>Crashed</key> + <true/> + </dict> + + + + <key>ThrottleInterval</key> + <integer>10</integer> + + <key>StandardOutPath</key> + <string>/tmp/skhd.out</string> + + <key>StandardErrorPath</key> + <string>/tmp/skhd.err</string> + </dict> +</plist> diff --git a/skhd/scripts/record_audio_line b/skhd/scripts/record_audio_line new file mode 100755 index 0000000..371b930 --- /dev/null +++ b/skhd/scripts/record_audio_line @@ -0,0 +1,41 @@ +#!/bin/bash +# Record a few seconds of system audio, and save. Intended to seamlessly record +# audio for anki cards, while watching anime. MacOS only +# +# May require changing capture device. Find available options with: +# $ ffmpeg -f avfoundation -list_devices true -i "" +# Change the number in the ffmpeg argument to desired device. BlackHole-2ch is +# recommended for recording macos system audio. Make sure vlc's output device +# is an aggregate of BlackHole-2ch and the speakers +# +# External dependencies: ffmepg, BlackHole-2ch + +if [[ $(uname) != 'Darwin' ]]; then + printf 'This is meant for MacOS\nAborting...\n' + exit 1 +fi + +recording_name="$(date +'%m_%d_%Y-%H_%M_%S' | awk '{printf("%s%s", $0, ".mp3")}')" + +mkdir -p ~/Desktop/anki_recordings + +ffmpeg \ + -f avfoundation \ + -i ":2" -filter:a "atempo=0.95" \ + -t "${1:-6}" \ + ~/"Desktop/anki_recordings/${recording_name}" + +unset recording_name + +# Further reference ==== +# Rec audio with ffmpeg +# https://apple.stackexchange.com/questions/326388/terminal-command-to-record-audio-through-macbook-microphone +# +# With vlc? Wouldn't require BlackHole-2ch this way +# https://forum.videolan.org/viewtopic.php?t=87923 +# +# Trim on the fly? Save a unix timestamp in a file, then have ffmpeg trim the +# recording based on the time in the file. Use a second hotkey to edit the +# file's time with the current timestamp. Default should be +10s from start +# https://unix.stackexchange.com/questions/182602/trim-audio-file-using-start-and-stop-times +# ex: set syntax=bash:ff=unix: diff --git a/skhd/scripts/shrink_screenshot_clipboard b/skhd/scripts/shrink_screenshot_clipboard new file mode 100755 index 0000000..28d1b1d --- /dev/null +++ b/skhd/scripts/shrink_screenshot_clipboard @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +# $ shrink_screenshot_clipboard [resize-percent] +# +# Resize the image on the clipboard and save as +# ~/Desktop/shrink_screenshot_out.png. Intended for use with the MacOS +# screenshot tool +# +# External dependencies: pngpaste, convert (ImageMagick) + +if [[ $(uname) != 'Darwin' ]]; then + printf 'This is meant for MacOS\nAborting...\n' + exit 1 +fi + + # Random seed at the end to avoid conflicts +screenshot=$(mktemp) + +if pngpaste - > "$screenshot"; then + convert "$screenshot" -resize "${1:-50}%" ~/Desktop/shrink_screenshot_out.png +else + # Play error sound to notify script failing + play_error_sound + osascript -e 'display notification "Failed to resize clipboard" with title "Skhd"' +fi + +unset screenshot +# vim: set syn=bash ff=unix: diff --git a/skhd/scripts/shrink_screenshot_desktop b/skhd/scripts/shrink_screenshot_desktop new file mode 100755 index 0000000..0aef065 --- /dev/null +++ b/skhd/scripts/shrink_screenshot_desktop @@ -0,0 +1,26 @@ +#!/bin/bash +# $ shrink_screenshot_desktop [resize-percent] +# +# Half the size of the lastest screenshot on the desktop. Saves as +# ~/Desktop/shrink_screenshot_out.png. Intended for use with the MacOS +# screenshot tool +# +# External dependencies: fd, convert (ImageMagick) + +if [[ $(uname) != 'Darwin' ]]; then + printf 'This is meant for MacOS\nAborting...\n' + exit 1 +fi + +#fd 'Screen Shot' --extension 'png' ~/Desktop | awk 'END { gsub(/ /, " ", $0); print }' +#screenshot=~/"Desktop/$(ls -tr ~/Desktop | grep 'Screen Shot .*\.png$' | tail -n 1)" +screenshot="$(ls -tr ~/Desktop/*"Screen Shot"*".png" | tail -n 1)" + +if [[ $screenshot != '' ]]; then + convert "$screenshot" -resize "${1:-50}%" ~/Desktop/shrink_screenshot_out.png +else + # Play error sound to notify script failing + play_error_sound +fi +unset screenshot +# ex: set syntax=bash:ff=unix: diff --git a/skhd/skhdrc b/skhd/skhdrc new file mode 100644 index 0000000..2a0967a --- /dev/null +++ b/skhd/skhdrc @@ -0,0 +1,460 @@ +# Reference: +# https://github.com/koekeishiya/skhd/blob/master/examples/skhdrc +# https://github.com/koekeishiya/skhd/issues/1 + +# Applications without hotkeys +.blacklist [ + #"iTerm2" + "Terminal" + "MacVim" + "Parallels Desktop" + #"qutebrowser" + #"cool-retro-term" +] + +# Match Firefox's incognito shortcut to Chrome's +cmd + shift - n [ + "Firefox" : skhd -k "cmd + shift - p" + * ~ +] + +cmd + ctrl - n [ + "Google Chrome" : skhd -k "cmd + shift - n" \ + && skhd -t "~/Documents/other_stuff/canvas/Konachan.com - 320663 book dampi elaina_(majo_no_tabitabi) flowers gray_eyes gray_hair long_hair majo_no_tabitabi stairs witch.jpg" \ + && skhd -k "return" + * ~ +] + +# Prevent full quit +cmd - q [ + "Google Chrome": play_error_sound + "Preview": play_error_sound + * ~ +] + +cmd + ctrl - y : skhd -k "alt - left"\ + && skhd -t "~~"\ + && skhd -k "alt - right"\ + && skhd -t "~~" + +cmd + ctrl - r : skhd -t "AsExpectedOfRust" + +cmd + ctrl - a : open -na "Chromium" --args --incognito \ + --window-size=1250,800 --window-position=200,140 + +# Rofi menu +#cmd + shift - space : ~/.configs_pointer/skhd/scripts/rofi_macos + +#0x35 : skhd -k "0x32" + +#cmd - r : skhd -t "step"; skhd -k "0x24" +#ctrl - h : skhd -k "backspace" + + +#default < escape : skhd -k "0x32" +#default < cmd - escape : skhd -k "cmd - 0x32" +#default < 0x35 : skhd -k "~" + +#[ Never Quit ] +#@PassThroughOther +#@Include Google Chrome +#@Include Preview +# +#<M-q> :: play_error_sound + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Kεybδαrd δvεrr𝓲dεs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +# By letter ==== +ctrl - j [ + "Alacritty" ~ + * : skhd -k "left" +] +ctrl - f [ + "Alacritty" ~ + * : skhd -k "right" +] +ctrl - h [ + "Alacritty" ~ + * : skhd -k "backspace" +] +ctrl - d [ + "Alacritty" ~ + "qutebrowser" ~ + * : skhd -k "delete" +] +# Vertically ==== +ctrl - p [ + "Alacritty" ~ + * : skhd -k "up" +] +ctrl - n [ + "Alacritty" ~ + * : skhd -k "down" +] +# By word ==== +ctrl - b [ + "Alacritty" ~ + * : skhd -k "alt - left" +] +ctrl - w [ + "Alacritty" ~ + * : skhd -k "alt - right" +] +ctrl - u [ + "Alacritty" ~ + "qutebrowser" ~ + * : skhd -k "alt + shift - left" +] +ctrl - r [ + "Alacritty" ~ + * : skhd -k "alt + shift - right" +] +# By line ==== +ctrl - a [ + "Alacritty" ~ + * : skhd -k "cmd - left" +] +ctrl - e [ + "Alacritty" ~ + * : skhd -k "cmd - right" +] +ctrl - k [ + "Alacritty" ~ + "qutebrowser" ~ + * : skhd -k "cmd + shift - right" +] +# Other ==== +ctrl - 0x21 [ # <C-[> + "Alacritty" ~ + * : skhd -k "escape" +] +ctrl - y [ + "Alacritty" ~ + * : skhd -k "cmd - c" +] + + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Gεnεrαl cδmmαnd mδdε | +#╚─────────────────────────────────────────────────────────────────────────────╝ +:: general @ : sketchybar -m --bar color=0xFFFF8700 # \ + #ffplay -t '1000' -nodisp -autoexit -loglevel error \ + #~/.config/skhd/stutter-woosh.wav + +# Toggle general mode ==== +default < cmd - g ; general +general < escape ; default +general < ctrl - 0x21 : sketchybar -m --bar color=0x44000000; \ + skhd -k "escape" + +# Shrink screenshot and save to desktop ==== +general < 0 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 100 # Save clipboard to desktop +general < 9 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 90 # Shrink from clipboard +general < 8 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 80 +general < 7 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 70 +general < 6 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 60 +general < 5 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 50 +general < 4 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 40 +general < 3 : skhd -k "ctrl - 0x21"; shrink_screenshot_clipboard 30 +#general < d : skhd -k "ctrl - 0x21"; shrink_screenshot_desktop # Lastest screenshot on ~/Desktop + +# Vi-like scrolling for browsers ==== +general < g : skhd -k "ctrl - 0x21"; skhd -k "cmd - up"; skhd -k "cmd + ctrl - g" +general < shift- g : skhd -k "ctrl - 0x21"; skhd -k "cmd - down"; skhd -k "cmd + ctrl - g" +general < ctrl - u : skhd -k "ctrl - 0x21"; skhd -k "alt - up"; skhd -k "cmd + ctrl - g" +general < ctrl - d : skhd -k "ctrl - 0x21"; skhd -k "alt - down"; skhd -k "cmd + ctrl - g" +general < k : skhd -k "ctrl - 0x21"; skhd -k "up"; skhd -k "cmd + ctrl - g" +general < j : skhd -k "ctrl - 0x21"; skhd -k "down"; skhd -k "cmd + ctrl - g" +general < shift- h : skhd -k "ctrl - 0x21"; skhd -k "cmd - left"; skhd -k "cmd + ctrl - g" +general < shift- l : skhd -k "ctrl - 0x21"; skhd -k "cmd - right";skhd -k "cmd + ctrl - g" +general < shift- j : skhd -k "ctrl - 0x21"; skhd -k "cmd + alt - left"; skhd -k "cmd + ctrl - g" +general < shift- k : skhd -k "ctrl - 0x21"; skhd -k "cmd + alt - right";skhd -k "cmd + ctrl - g" + + +cmd + ctrl - q : record_audio_line 10 # Audio capture while watching on vlc + + +# Other convenience tools ==== +### Upload clipboard to pastebin +cmd + ctrl - x : pbpaste | ix + +### Backup and restore chrome incognito windows +cmd + ctrl - e : chrome_session close \ + ~/.config/skhd/last_incognito_window.chrome \ + && osascript -e \ + 'display notification "Chrome window backed up" with title "Skhd"' + +cmd + ctrl - r : chrome_session restore \ + ~/.config/skhd/last_incognito_window.chrome + + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Yαbαi ωiηdδω mαηαgεr | +#╚─────────────────────────────────────────────────────────────────────────────╝ +# Keybind methodology: +# In general +# Spaces use gamer-style `wasd` +# Windows use vim-style `hjkl` +# +# <<Default mode>>: +# All default mode bindings are indentically available in yabai mode +# cmd shift {a,d} : switches to adjacent space +# cmd shift {h,j,k,l} : switches to window in that direction +# cmd {[, ]} : move window onto left or right stack +# cmd shift {[, ]} : move window onto top or bottom stack +# cmd tab : cycle across stacks clockwise +# cmd ` : cycle within stack +# +# +# <<Yabai mode>>: +# Prefix : cmd e +# Escape : esc, enter, <M-[> +# +# x : close window +# +# = : Balance bsp tree on y axis +# +# === Stacks +# +# === Resize window +# {q,w,e,r} : Resize window on horizontally. qw resize left, er resize right +# lcmd {q,w,e,r} : Resize window on vertically. qw resize top, er resize bottom +# Add shift to the above for a smaller increment +# +# === Spaces +# shift {a,d} : Move window to adjacent space, and switch to that space +# ctrl {a,d} : Reorder space +# n : Create new space on right, move current window and switch to it +# ctrl q : Close space +# +# === Floating +# ctrl [0-9] : Set numpad position of floating window TODO +# +# === Pinning +# m : Swap to pinning mode +# c : From pinning mode, clears pin list +# [0-9] : From pinning mode, pins current window to specified number +# alt [0-9] : From default mode, switch to pinned window +# shift cmd space : From default mode pulls up rofi menu for pinned windows +# +# Oneshots +default < cmd + shift - a : yabai -m space --focus prev +default < cmd + shift - d : yabai -m space --focus next +#default < cmd - h : # Stop accidentally hiding windows +## Switching windows +default < lcmd - h : yabai -m window --focus west +default < lcmd - j : yabai -m window --focus south +default < lcmd - k : yabai -m window --focus north +default < lcmd - l : yabai -m window --focus east + +# Moving windows onto stacks <M-{[,]}> +default < lcmd - 0x21 : ~/.config/yabai/move_to_stack.sh 'west' +default < lcmd - 0x1E : ~/.config/yabai/move_to_stack.sh 'east' +default < shift + lcmd - 0x21 : ~/.config/yabai/move_to_stack.sh 'north' +default < shift + lcmd - 0x1E : ~/.config/yabai/move_to_stack.sh 'south' + +# Cycle within stack with <M-`> <M-S-`> +#default < lcmd - 0x32 : yabai -m window --focus stack.prev\ +# || yabai -m window --focus stack.last +#default < lcmd + shift - 0x32 : yabai -m window --focus stack.next\ +# || yabai -m window --focus stack.first +## Cycle between stacks with <M-Tab> +#default < cmd - 0x30 : yabai -m window --focus \ +# "$(yabai -m query --windows --space | ~/.config/yabai/cycle_stack.js)" + + +# Pop out window +cmd + ctrl - p : yabai -m window --toggle float && \ + yabai -m window --grid 40:40:0:2:33:38 +# Center window +cmd + ctrl - c : yabai -m window --toggle float && \ + yabai -m window --grid 80:80:11:2:58:71 + +# Yabai Mode ======================================================== +# Assumes enter and exit sounds are set up +:: yabai @ : sketchybar -m --bar color=0xFFC8CB36; #\ + #ffplay -nodisp -autoexit -t "1000" \ + #~/.config/skhd/slow_air_woosh.wav &>/dev/null + +default < lcmd - e ; yabai +yabai < escape ; default +yabai < return : sketchybar -m --bar color=0x44000000; \ + skhd -k "escape" #&&\ + #ffplay -nodisp -autoexit -t "700"\ + #~/.config/skhd/correct_ping.wav &>/dev/null +yabai < ctrl - k : sketchybar -m --bar color=0x44000000; skhd -k "escape" +yabai < ctrl - 0x21 : sketchybar -m --bar color=0x44000000; skhd -k "escape" + #ffplay -nodisp -autoexit -t "700"\ + #~/.config/skhd/correct_ping.wav &>/dev/null + + +#╔─────────────────────────────────────────────────────────────────────╗ +#│ Wiηdδωs | +#╚─────────────────────────────────────────────────────────────────────╝ +# Window switching +yabai < lcmd - h : yabai -m window --focus west +yabai < lcmd - j : yabai -m window --focus south +yabai < lcmd - k : yabai -m window --focus north +yabai < lcmd - l : yabai -m window --focus east + +# Move windows within a space +# Lcmd: Move | Rcmd: Swap +yabai < lcmd + shift - h : yabai -m window --warp west +yabai < lcmd + shift - j : yabai -m window --warp south +yabai < lcmd + shift - k : yabai -m window --warp north +yabai < lcmd + shift - l : yabai -m window --warp east + +yabai < rcmd - h : yabai -m window --swap west +yabai < rcmd - j : yabai -m window --swap south +yabai < rcmd - k : yabai -m window --swap north +yabai < rcmd - l : yabai -m window --swap east + +# Manipulate bsp +yabai < ctrl - b : yabai -m space --layout bsp; ~/.config/yabai/toggle_outline.bash +yabai < ctrl - f : yabai -m space --layout float +yabai < ctrl - y : yabai -m space --mirror y-axis +yabai < ctrl - x : yabai -m space --mirror x-axis +yabai < ctrl - r : yabai -m space --rotate 270 +yabai < ctrl - s : yabai -m window --toggle split +yabai < ctrl - o : ~/.config/yabai/toggle_border.bash +yabai < 0x18 : yabai -m space --balance # = sign + +# Swapping stacks <M-S-[> <M-]> +# --swap moves target window onto current window. We want the opposite +yabai < cmd - 0x21 : ~/.config/yabai/move_to_stack.sh 'west' +yabai < cmd - 0x1E : ~/.config/yabai/move_to_stack.sh 'east' +yabai < shift + cmd - 0x21 : ~/.config/yabai/move_to_stack.sh 'north' +yabai < shift + cmd - 0x1E : ~/.config/yabai/move_to_stack.sh 'south' + +# Cycle within stack with <M-`> <M-S-`> +yabai < lcmd - 0x32 : yabai -m window --focus stack.prev\ + || yabai -m window --focus stack.last +yabai < lcmd + shift - 0x32 : yabai -m window --focus stack.next\ + || yabai -m window --focus stack.first +# Cycle between stacks with <M-Tab> +#TODO: Depreciate or fix +#yabai < cmd - 0x30 : yabai -m window --focus \ +# "$(yabai -m query --windows --space | ~/.config/yabai/cycle_stack.js)" + +yabai < x : yabai -m window --close +yabai < 0x1B : yabai -m window --minimize # Uses - + +# Rofi select windows with ; +yabai < 0x29 : skhd -k "return" && ~/.config/yabai/rofi_window.js + +# Move window between spaces +yabai < shift - a : yabai -m window --space prev && \ + yabai -m space --focus prev +yabai < shift - d : yabai -m window --space next && \ + yabai -m space --focus next + +# Resize window + # Horizontal +yabai < q : yabai -m window --resize left:-30:0 +yabai < w : yabai -m window --resize left:30:0 +yabai < e : yabai -m window --resize right:-30:0 +yabai < r : yabai -m window --resize right:30:0 + # Vertical +yabai < lcmd - q : yabai -m window --resize top:0:-30 +yabai < lcmd - w : yabai -m window --resize top:0:30 +yabai < lcmd - e : yabai -m window --resize bottom:0:-30 +yabai < lcmd - r : yabai -m window --resize bottom:0:30 + # Horizontal - fine +yabai < shift - q : yabai -m window --resize left:-10:0 +yabai < shift - w : yabai -m window --resize left:10:0 +yabai < shift - e : yabai -m window --resize right:-10:0 +yabai < shift - r : yabai -m window --resize right:10:0 + # Vertical - fine +yabai < lcmd + shift - q : yabai -m window --resize top:0:-10 +yabai < lcmd + shift - w : yabai -m window --resize top:0:10 +yabai < lcmd + shift - e : yabai -m window --resize bottom:0:-10 +yabai < lcmd + shift - r : yabai -m window --resize bottom:0:10 + +# Pinning windows === +:: pinning @ : sketchybar -m --bar color=0xFFB8BB26 +yabai < m ; pinning +pinning < escape ; default +pinning < ctrl - 0x21 ; yabai + +pinning < c : ~/.config/yabai/pin_window.js --clear; skhd -k "ctrl - 0x21" + +pinning < 1 : ~/.config/yabai/pin_window.js --set 1 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 2 : ~/.config/yabai/pin_window.js --set 2 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 3 : ~/.config/yabai/pin_window.js --set 3 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 4 : ~/.config/yabai/pin_window.js --set 4 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 5 : ~/.config/yabai/pin_window.js --set 5 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 6 : ~/.config/yabai/pin_window.js --set 6 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 7 : ~/.config/yabai/pin_window.js --set 7 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 8 : ~/.config/yabai/pin_window.js --set 8 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" +pinning < 9 : ~/.config/yabai/pin_window.js --set 9 \ + $(yabai -m query --windows --space | jq '.[0]["id"]'); \ + skhd -k "ctrl - 0x21" + +# Focuses pinned window +yabai < alt - 1 : ~/.config/yabai/pin_window.js --focus 1 +yabai < alt - 2 : ~/.config/yabai/pin_window.js --focus 2 +yabai < alt - 3 : ~/.config/yabai/pin_window.js --focus 3 +yabai < alt - 4 : ~/.config/yabai/pin_window.js --focus 4 +yabai < alt - 5 : ~/.config/yabai/pin_window.js --focus 5 +yabai < alt - 6 : ~/.config/yabai/pin_window.js --focus 6 +yabai < alt - 7 : ~/.config/yabai/pin_window.js --focus 7 +yabai < alt - 8 : ~/.config/yabai/pin_window.js --focus 8 +yabai < alt - 9 : ~/.config/yabai/pin_window.js --focus 9 + +default < alt - 1 : ~/.config/yabai/pin_window.js --focus 1 +default < alt - 2 : ~/.config/yabai/pin_window.js --focus 2 +default < alt - 3 : ~/.config/yabai/pin_window.js --focus 3 +default < alt - 4 : ~/.config/yabai/pin_window.js --focus 4 +default < alt - 5 : ~/.config/yabai/pin_window.js --focus 5 +default < alt - 6 : ~/.config/yabai/pin_window.js --focus 6 +default < alt - 7 : ~/.config/yabai/pin_window.js --focus 7 +default < alt - 8 : ~/.config/yabai/pin_window.js --focus 8 +default < alt - 9 : ~/.config/yabai/pin_window.js --focus 9 + +default < cmd + shift - space : ~/.config/yabai/pin_window.js --rofi + +yabai < f : yabai -m window --toggle float + +# Spaces ==== +# Switch space +yabai < cmd + shift - a : yabai -m space --focus prev && yabai -m window --focus +yabai < cmd + shift - d : yabai -m space --focus next && yabai -m window --focus + +default < cmd + shift - 1 : yabai -m space --focus 1 && yabai -m window --focus +default < cmd + shift - 2 : yabai -m space --focus 2 && yabai -m window --focus +default < cmd + shift - 3 : yabai -m space --focus 3 && yabai -m window --focus +default < cmd + shift - 4 : yabai -m space --focus 4 && yabai -m window --focus +default < cmd + shift - 9 : yabai -m space --focus last && yabai -m window --focus + +# Reorder space +yabai < ctrl - a : yabai -m space --move prev && ~/.config/sketchybar/plugins/yabai_spaces.js --update +yabai < ctrl - d : yabai -m space --move next && ~/.config/sketchybar/plugins/yabai_spaces.js --update +yabai < n : ~/.config/yabai/new_space.js && ~/.config/sketchybar/plugins/yabai_spaces.js --update +yabai < ctrl - q : ~/.config/yabai/close_space.js && ~/.config/sketchybar/plugins/yabai_spaces.js --update + +# Float ==== +# Center window +yabai < c : yabai -m window --toggle float && \ + yabai -m window --grid 80:80:11:2:58:71 + +# Picture in picture +yabai < p : yabai -m window --toggle sticky && \ + yabai -m window --toggle pip + diff --git a/swappy/config b/swappy/config new file mode 100644 index 0000000..002d97e --- /dev/null +++ b/swappy/config @@ -0,0 +1,9 @@ +[Default] +save_dir=/dev/shm +save_filename_format=%s_swappy.png +show_panel=true +line_size=5 +text_size=20 +text_font=lovebeat +paint_mode=brush +early_exit=false diff --git a/sway/brightness_lock.sh b/sway/brightness_lock.sh new file mode 100755 index 0000000..fece529 --- /dev/null +++ b/sway/brightness_lock.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# Locks the screen and lowers-brightness. Restores brightness on unlock +declare brightness_lvl; + +if ! command -v ddcutil &>/dev/null && command -v light &>/dev/null; then + lvl="$(light -G)" + + (swaylock; light -S "$lvl") & + light -S 3 +elif command -v ddcutil &>/dev/null; then + lvl="$(ddcutil getvcp 10 | awk '{ + gsub(" ",""); # Remove spaces + split($0, a, "="); + split(a[2], a, ","); + print a[1] + }')" + + if [[ "$lvl" =~ ^[0-9]+$ ]]; then + (swaylock; ddcutil setvcp 10 "$lvl") & + ddcutil setvcp 10 1 + else + swaylock + fi +else + swaylock +fi + + diff --git a/sway/config b/sway/config new file mode 100644 index 0000000..5389817 --- /dev/null +++ b/sway/config @@ -0,0 +1,442 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Sεττiηg ναriαblεs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +# Linux MacOS Wayland identifier code +# Alt Opt Alt_{L,R} Mod1 00000008 +# Logo key Command Super_{L,R} Mod4 00000040 +# Control Ctrl Control_{L,R} Control 00000004 +# Shift Shift Shift_{L,R} +# Fn Fn XF86Fn +# +# Arrow keys are Left|Down|Up|Right +# +set $mod1 Mod4 +set $mod2 Mod4+Shift + +# Pane movement keys - vim +set $pane_left h +set $pane_down j +set $pane_up k +set $pane_right l + +# Symmetric keys - mpv +set $left_outer q +set $left_inner w +set $right_inner e +set $right_outer r + +# Space movement keys - gaming +set $space_up w +set $space_left a +set $space_down s +set $space_right d + +# Resize keys - vim windows +set $size_up comma +set $size_down period + +set $term alacritty +set $menu fuzzel -fmonospace:size=14 -l10 -w40 \ + -b222222e0 -t8ec07cff -mffaf00ff -s222222ff -Sebdbb2ff -Cffaf00ff + + +# Sound effects and additional features +set $volume_command ~/.config/sway/pulse_audio_volume.sh +set $volume_notify_sound ~/.config/sway/pop_sound.mp3 + +set $screenshot_sound ffplay -nodisp -autoexit -v error \ + ~/.config/sway/screenshot_sound.mp3 + +# TODO: Unique sensible name +set $original_path ~/Desktop/shrink_screenshot_out.png +set $compress_path ~/Desktop/shrink_screenshot_out.webp +set $shrink_path ~/Desktop/shrink_screenshot_out.png + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Pαηεs αηd cδηταiηεrs | +#╚─────────────────────────────────────────────────────────────────────────────╝ + # Move focus +bindsym $mod1+$pane_left focus left +bindsym $mod1+$pane_down focus down +bindsym $mod1+$pane_up focus up +bindsym $mod1+$pane_right focus right + + # Move focused window +bindsym $mod2+$pane_left move left +bindsym $mod2+$pane_down move down +bindsym $mod2+$pane_up move up +bindsym $mod2+$pane_right move right + + # Layout modifiers +bindsym $mod2+f floating toggle +bindsym $mod2+s layout stacking +bindsym $mod2+t layout tabbed +bindsym $mod2+r layout toggle + + # Binary split container +bindsym $mod1+b split toggle +bindsym $mod1+v split none +bindsym $mod1+m fullscreen + + # Switch container layout Stacking|Tabbed|Rotate-bsp +bindsym $mod1+s layout stacking +bindsym $mod1+t layout tabbed +bindsym $mod1+r layout toggle split + + # Traverse window tree +bindsym $mod1+u focus parent +bindsym $mod1+d focus child + + # Alt-tab cycles windows, like on proprietary systems +bindsym $mod1+tab exec ~/.config/sway/cycle_windows.py next +bindsym $mod2+tab exec ~/.config/sway/cycle_windows.py previous + + # Swap focus between the tiling area and the floating area +#bindsym $mod+space focus mode_toggle + + # Important rust jerk +bindsym $mod1+ctrl+r exec wtype "asExpectedOfRust" + +# rEsize containers ==== +bindsym $mod1+e mode "resize" + +mode "resize" { + # Horizontal, shift for fine adjust + bindsym $size_up resize grow width 16px + bindsym $size_down resize shrink width 16px + bindsym $size_up+Shift resize grow width 4px + bindsym $size_down+Shift resize shrink width 4px + + # Vertical, shift for fine adjust + bindsym $mod1+$size_down resize shrink height 16px + bindsym $mod1+$size_up resize grow height 16px + bindsym $mod1+$size_down+Shift resize shrink height 4px + bindsym $mod1+$size_up+Shift resize grow height 4px + + # Escaping + bindsym $mod1+f mode "workspace_tuning" + + bindsym Shift+end mode "default" + bindsym Ctrl+k mode "default" + bindsym Ctrl+bracketleft mode "default" + bindsym Escape mode "default" +} + +# Gaps ==== +bindsym $mod2+bracketright gaps inner current minus 3 +bindsym $mod2+bracketleft gaps inner current plus 3 +#bindsym $mod2+equal gaps toggle + # Standard outer gapping for 27" screen +bindsym $mod2+c gaps vertical current set 100, \ + gaps horizontal current set 200 + # Same as above, shifted left slightly +bindsym $mod2+g gaps vertical current set 100, \ + gaps left current set 150, \ + gaps right current set 250 + +bindsym $mod1+g mode "gapping" +mode "gapping" { + # General resize + bindsym $mod2+bracketright gaps inner current minus 3 + bindsym $mod2+bracketleft gaps inner current plus 3 + + # Horizontal + bindsym q gaps left current minus 2 + bindsym w gaps left current plus 2 + bindsym e gaps right current plus 2 + bindsym r gaps right current minus 2 + + # Vertical + bindsym $mod1+q gaps top current minus 2 + bindsym $mod1+w gaps top current plus 2 + bindsym $mod1+e gaps bottom current plus 2 + bindsym $mod1+r gaps bottom current minus 2 + + # Escaping + bindsym Shift+end mode "default" + bindsym Ctrl+k mode "default" + bindsym Ctrl+bracketleft mode "default" + bindsym Escape mode "default" +} + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Wδrksραcεs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +bindsym $mod1+bracketleft workspace prev +bindsym $mod1+bracketright workspace next + +bindsym $mod2+a workspace prev +bindsym $mod2+d workspace next + +bindsym $mod1+1 workspace number 1 +bindsym $mod1+2 workspace number 2 +bindsym $mod1+3 workspace number 3 +bindsym $mod1+4 workspace number 4 +bindsym $mod1+5 workspace number 5 +bindsym $mod1+6 workspace number 6 +bindsym $mod1+7 workspace number 7 +bindsym $mod1+8 workspace number 8 +bindsym $mod1+9 workspace number 9 + +# Advanced workspace tuning ==== +bindsym $mod1+f mode "workspace_tuning" + +mode "workspace_tuning" { + + # Move focused container to workspace + bindsym 1 move container to workspace number 1 + bindsym 2 move container to workspace number 2 + bindsym 3 move container to workspace number 3 + bindsym 4 move container to workspace number 4 + bindsym 5 move container to workspace number 5 + bindsym 6 move container to workspace number 6 + bindsym 7 move container to workspace number 7 + bindsym 8 move container to workspace number 8 + bindsym 9 move container to workspace number 9 + + # Swap containers + bindsym $mod1+$pane_left mark --add "_swap", focus left, swap container with mark "_swap", focus left, unmark "_swap" + bindsym $mod1+$pane_down mark --add "_swap", focus down, swap container with mark "_swap", focus down, unmark "_swap" + bindsym $mod1+$pane_up mark --add "_swap", focus up, swap container with mark "_swap", focus up, unmark "_swap" + bindsym $mod1+$pane_right mark --add "_swap", focus right, swap container with mark "_swap", focus right, unmark "_swap" + + # Stack, Tab, Rotate + bindsym s layout stacking + bindsym t layout tabbed + bindsym r layout toggle split + + bindsym f fullscreen + bindsym Shift+f fullscreen + + # Escaping + bindsym $mod1+e mode "resize" + + bindsym Shift+end mode "default" + bindsym Ctrl+k mode "default" + bindsym Ctrl+bracketleft mode "default" + bindsym Escape mode "default" +} + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Iηρμτ αηd δμτρμτ αdjμsτmεητs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +# Trackpad more like MacOS +input 1452:634:bcm5974 { + tap enabled + natural_scroll enabled + accel_profile adaptive + pointer_accel 0.36 +} + +output * background ~/.config/sway/secondary_wallpaper.png fill +output eDP-1 background ~/.config/sway/default_wallpaper.png fill +output DP-1 background ~/.config/sway/default_wallpaper.png fill +output DP-3 background ~/.config/sway/default_wallpaper.png fill + +output DP-1 scale 2 +output DP-3 scale 2 + +default_border pixel 2 + # Adjust gamma. More important for external displays. Laptops are usually fine +exec wlsunset -t 4000 -T 6500 -g 0.9 + +# Volume controls +bindsym XF86AudioRaiseVolume exec $volume_command 4 $volume_notify_sound +bindsym XF86AudioLowerVolume exec $volume_command -4 $volume_notify_sound +bindsym shift+XF86AudioRaiseVolume exec $volume_command 1 $volume_notify_sound +bindsym shift+XF86AudioLowerVolume exec $volume_command -1 $volume_notify_sound +bindsym XF86AudioMute exec ~/.config/sway/toggle_mute.sh + +# External brightness control + # For laptops +bindsym XF86MonBrightnessUp exec light -A 1 +bindsym XF86MonBrightnessDown exec light -U 1 + # For external monitors +bindsym F4 exec ddcutil setvcp 10 - 4 +bindsym F5 exec ddcutil setvcp 10 + 4 +bindsym Shift+F4 exec ddcutil setvcp 10 - 1 +bindsym Shift+F5 exec ddcutil setvcp 10 + 1 + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Hδτkεy dαεmδη | +#╚─────────────────────────────────────────────────────────────────────────────╝ + # Terminal +bindsym $mod2+Return exec $term + # Chromium +bindsym $mod2+n exec chromium + # Firefox +bindsym $mod2+p exec MOZ_ENABLE_WAYLAND=1 firefox --private-window + # App launcher, like spotlight +bindsym $mod1+space exec $menu + # Reload sway config +bindsym $mod1+ctrl+s reload + # Close window +bindsym $mod2+q kill + # Dragging windows +floating_modifier $mod1 normal + # Screenlock +bindsym $mod2+i exec ~/.config/sway/brightness_lock.sh + # Scratchpad +bindsym $mod1+Shift+minus move scratchpad +bindsym $mod1+minus scratchpad show + # Warpd - Keyboard-driven mouse +bindsym Mod4+Control+j exec warpd --hint +bindsym Mod4+Control+n exec warpd --normal + # Xremap +exec sudo ~/.configs_pointer/bin/switch_keyboard.sh pc + # IME Module +bindsym $mod1+i exec ~/.config/sway/toggle_fcitx.sh + # Mako notifications +exec mako + # Exit sway (logs you out of your Wayland session) +bindsym $mod2+Escape exec swaynag -t warning -m 'Are you sure you want to exit sway?' -b 'Yes, exit sway' 'swaymsg exit' + +# Screenshots ==== +bindsym $mod2+6 mode "screenshots" +bindsym $mod2+5 mode "screenshots"; exec ~/.configs_pointer/bin/screenshot_wayland.sh area --clipboard && $screenshot_sound +bindsym $mod2+4 mode "screenshots"; exec ~/.configs_pointer/bin/screenshot_wayland.sh \ + -c -d 40 -s "$(~/.config/sway/window_dimensions.sh)" $original_path && $screenshot_sound + +mode "screenshots" { + # Screenshooting in processing "steps" + # 1. Get screenshot + bindsym a exec ~/.configs_pointer/bin/screenshot_wayland.sh area --clipboard \ + $original_path && $screenshot_sound + bindsym f exec ~/.configs_pointer/bin/screenshot_wayland.sh full --clipboard \ + $original_path && $screenshot_sound + bindsym s mode "default"; exec ~/.configs_pointer/bin/screenshot_wayland.sh markup + + # 2. Downsize the screenshot, since 4k is too big + bindsym 1 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '10%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 2 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '20%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 3 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '30%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 4 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '40%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 5 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '50%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 6 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '60%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 7 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '70%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 8 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '80%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 9 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '90%' --clipboard --extension png $shrink_path && $screenshot_sound + bindsym 0 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '100%' --clipboard --extension png $shrink_path && $screenshot_sound + + # OR compress image + bindsym space mode "shrink_screenshots" + + # 3. Copy the smaller image back to clipboard and return to default + bindsym return mode "default" + bindsym Shift+end mode "default" + bindsym Ctrl+k mode "default" + bindsym Ctrl+bracketleft mode "default" + bindsym Escape mode "default" +} + +mode "shrink_screenshots" { + # 2. Compress the screenshot, hard + bindsym 1 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '10%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 2 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '20%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 3 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '30%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 4 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '40%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 5 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '50%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 6 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '60%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 7 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '70%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 8 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '80%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 9 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '90%' --clipboard --extension webp $compress_path && $screenshot_sound + bindsym 0 exec ~/.configs_pointer/bin/screenshot_wayland.sh --resize '100' --clipboard --extension webp $compress_path && $screenshot_sound + + bindsym space mode "screenshots" + + # 3. Back out + bindsym return mode "default" + bindsym Shift+end mode "default" + bindsym Ctrl+k mode "default" + bindsym Ctrl+bracketleft mode "default" + bindsym Escape mode "default" +} + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Sτylεs | +#╚─────────────────────────────────────────────────────────────────────────────╝ +bar { + position bottom + + binding_mode_indicator yes + + # Vertical horizontal + gaps 0 10 + + mode dock + + status_command while ~/.config/sway/swaybar_status.sh; do sleep 60; done + + colors { + # Foreground color + statusline #e7d6ad + background #22222200 + + # border background text + focused_workspace #F4B36Eff #F4B36Eff #000000 + inactive_workspace #00000000 #444444 #e7d6ad + urgent_workspace #fadb2f #fadb2f #000000 + + #binding_mode #8ec07c #8ec07c #000000 + #binding_mode #8ec07c #d3869b #000000 + binding_mode #fadb2f #fadb2f #000000 + } +} + +# Colors +client.focused #F4A66E #F4A66E #000000 #F4A66E #F4A66E +#client.focused #FFFFFF #FFFFFF #000000 #ffffff #ffffff + +#╔─────────────────────────────────────────────────────────────────────────────╗ +#│ Oτhεr | +#╚─────────────────────────────────────────────────────────────────────────────╝ +# Sleep settings for laptops TODO: systemctl suspend? +set $laptop 'eDP-1' +set $sleep sleep 3 && swaylock + +bindswitch --reload --locked lid:on exec \ + swaymsg output $laptop dpms off && swaylock +bindswitch --reload --locked lid:off exec \ + swaymsg output $laptop dpms on + +#bindswitch --reload --locked lid:on exec swaymsg output $laptop_screen disable + +#bindswitch --reload --locked lid:on exec '[ $(swaymsg -t get_outputs | grep name | wc -l) == 1 ] && ($sleep) || ($notify "Clamshell mode" "Laptop screen off" && swaymsg output $laptop_screen disable)' +# +#bindswitch --reload --locked lid:off output $laptop_screen enable + +include /etc/sway/config.d/* + +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +# +#exec swayidle -w \ +# timeout 101 'swaylock' \ +# timeout 314 'swaymsg "output * dpms off"' \ +# resume 'swaymsg "output * dpms on"' \ +# timeout 626 'systemctl suspend ' \ +# before-sleep 'swaylock' + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. diff --git a/sway/cycle_windows.py b/sway/cycle_windows.py new file mode 100755 index 0000000..ce04ae6 --- /dev/null +++ b/sway/cycle_windows.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 +# From https://gist.github.com/SidharthArya/f4d80c246793eb61be0ae928c9184406 +import sys +import json +import subprocess + +direction=bool(sys.argv[1] == 'next') +swaymsg = subprocess.run(['swaymsg', '-t', 'get_tree'], stdout=subprocess.PIPE) +data = json.loads(swaymsg.stdout) +current = data["nodes"][1]["current_workspace"] +workspace = int(data["nodes"][1]["current_workspace"])-1 +roi = data["nodes"][1]["nodes"][workspace] +temp = roi +windows = list() + +def getNextWindow(): + if focus < len(windows) - 1: + return focus+1 + else: + return 0 + +def getPrevWindow(): + if focus > 0: + return focus-1 + else: + return len(windows)-1 + +def makelist(temp): + for nodes in "floating_nodes", "nodes": + for i in range(len(temp[nodes])): + if temp[nodes][i]["name"] is None: + makelist(temp[nodes][i]) + else: + windows.append(temp[nodes][i]) + +def focused(temp_win): + for i in range(len(temp_win)): + if temp_win[i]["focused"] == True: + return i + +makelist(temp) +focus = focused(windows) + +if direction: + attr = f"[con_id={windows[getNextWindow()]['id']}]" +else: + attr = f"[con_id={windows[getPrevWindow()]['id']}]" + +sway = subprocess.run(['swaymsg', attr, 'focus']) +sys.exit(sway.returncode) diff --git a/sway/pulse_audio_volume.sh b/sway/pulse_audio_volume.sh new file mode 100755 index 0000000..af8f21a --- /dev/null +++ b/sway/pulse_audio_volume.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +# Simple wrapper around pactl to keep volume in [0,100]% range. Optionally +# plays an indicator sound after changing the volume +# +# Args: +# 1: Change amount in percent. An integer +# 2: Sound file to play. No sound is played if omitted or invalid +declare -r ADJUST="$1" +declare -r NOTIFY_SOUND="$2" + +declare -r MAX_VOLUME="100" + +set_volume() { + if ! pactl set-sink-volume @DEFAULT_SINK@ "${1}%"; then + printf "Failed to set default sink volume\n" >&2 + exit 1 + fi + + [[ -z "$NOTIFY_SOUND" ]] || play_notify_sound "$NOTIFY_SOUND" +} + +play_notify_sound() { + if ! [[ -r "$1" ]]; then + printf "File '%s' is not readable" "$1" >&2 + exit 1 + fi + + if command -v ffmpeg &>/dev/null; then + ffplay -nodisp -autoexit -v error "$1" + elif command -v afplay &>/dev/null; then + afplay "$1" + else + printf "Failed to find sound player for volume indication sound\n" >&2 + fi +} + +if ! [[ "$ADJUST" =~ ^-?[0-9]+$ ]]; then + printf "No volume change amount provided\n" >&2 + exit 1 +fi + +readonly curr_volume=$(pactl get-sink-volume @DEFAULT_SINK@ | awk ' + match($0, /[0-9]+%/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }') + +if ! [[ "$curr_volume" =~ ^[0-9]+$ ]]; then + printf "Failed to find default sink's volume: %s\n" "$curr_volume" >&2 +fi + +declare -ir new_volume=$(($curr_volume + $ADJUST)) + +printf "Changing volumes from %d -> %d\n" "$curr_volume" "$new_volume" >&2 +if [[ "$new_volume" -gt "$MAX_VOLUME" ]]; then + set_volume "$MAX_VOLUME" +elif [[ "$new_volume" -lt "0" ]]; then + set_volume "0" +else + set_volume "$new_volume" +fi diff --git a/sway/swaybar_status.sh b/sway/swaybar_status.sh new file mode 100755 index 0000000..c59a854 --- /dev/null +++ b/sway/swaybar_status.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +battery_charge() { + if [[ -r /sys/class/power_supply/BAT0/uevent ]]; then + cat /sys/class/power_supply/BAT0/uevent | awk ' + /CHARGE_NOW/ { split($0, a, "="); curr = a[2]; n++ } + /CHARGE_FULL=/ { split($0, a, "="); full = a[2]; n++ } + + END { if (n == 2) printf "%.1f", curr / full * 100 } + ' + fi +} + +display_brightness() { + if command -v ddcutil &>/dev/null; then + ddcutil getvcp 10 | awk ' + match($0, /[0-9]+,/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }' + else + light -G | awk '{ split($0, a, "."); printf "%s", a[1] }' + fi +} + +get_volume() { + pactl get-sink-volume @DEFAULT_SINK@ | awk ' + match($0, /[0-9]+%/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }' +} + +remaining_ram() { + free --mega | awk '/Mem/ { + split($0, a, " ") + + used = a[3] / 1000 + shared = a[5] / 1000 + available = a[7] / 1000 + + printf "%0.1fG / %.1fG", used + shared, available + }' +} + +ramu="$(remaining_ram)" +brightness="$(display_brightness)" +volume="$(get_volume)" +charge="$(battery_charge)" +time="$(date +'%d %a %l:%M %p' | awk '{ gsub(/ +/, " "); print }')" + +output='' + +[[ -z "$brightness" ]] || output+="${brightness}cd | " +[[ -z "$volume" ]] || output+="${volume}dB | " +[[ -z "$charge" ]] || output+="[${charge}%] | " +[[ -z "$ramu" ]] || output+="${ramu} | " +[[ -z "$time" ]] || output+="$time" + +printf "%s" "$output" diff --git a/sway/toggle_fcitx.sh b/sway/toggle_fcitx.sh new file mode 100755 index 0000000..4415de2 --- /dev/null +++ b/sway/toggle_fcitx.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +CURRENT_ID="$(pgrep ^fcitx5$)" + +if [[ -n "$CURRENT_ID" ]]; then + kill "$CURRENT_ID" +else + fcitx5 -d --replace +fi diff --git a/sway/toggle_mute.sh b/sway/toggle_mute.sh new file mode 100755 index 0000000..b992f8e --- /dev/null +++ b/sway/toggle_mute.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# Toggles between muted and the previous volume. Uses `pactl` +# +# EXAMPLES: +# ./toggle_mute.sh # Default toggles based on current volume +# ./toggle_mute.sh mute +# ./toggle_mute.sh unmute +declare -r vol="$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{ printf $5 }')" +declare -r store=~/.config/sway/toggle_mute_data + +# Saves the current non-zero volume and mutes +mute_and_save () { + [[ "$vol" == "0%" ]] || printf "%s" "$vol" > "$store" + pactl set-sink-volume @DEFAULT_SINK@ 0% +} + +# Restores previous volume, or sets to 10% +unmute () { + if [[ "$vol" == "0%" && "$(head "$store")" =~ [0-9]+% ]]; then + pactl set-sink-volume @DEFAULT_SINK@ "$(head "$store")" + else + pactl set-sink-volume @DEFAULT_SINK@ 10% + fi +} + +# Main ====== +case "$1" in + mute) + mute_and_save + ;; + unmute) + unmute + ;; + *) + if [[ "$vol" == "0%" ]]; then + unmute + else + mute_and_save + fi + ;; +esac + +ffplay -nodisp -autoexit -v error ~/.config/sway/pop_sound.mp3 diff --git a/sway/window_dimensions.sh b/sway/window_dimensions.sh new file mode 100755 index 0000000..8cae310 --- /dev/null +++ b/sway/window_dimensions.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# Gets a slurp-like output for the focused window with sway borders cropped +declare -a a=( $(swaymsg -t get_tree | jq '.. + | (.nodes? // empty)[] | select(.focused==true) + | .rect.x, .window_rect.x, .rect.y, .window_rect.y, .window_rect.width, .window_rect.height, .rect.height') ) + +if [[ ${#a[@]} -eq 0 ]]; then + a=( $(swaymsg -t get_tree | jq '.. + | (.floating_nodes? // empty)[] | select(.focused==true) + | .rect.x, .window_rect.x, .rect.y, .window_rect.y, .window_rect.width, .window_rect.height, .rect.height') ) +fi + +if [[ ${#a[@]} -ne 7 ]]; then + printf 'Failed to find window\n' + exit 1 +elif [[ $((${a[5]} + ${a[3]})) -eq ${a[6]} ]]; then + printf '%d,%d %dx%d\n' \ + "$((${a[0]} + ${a[1]}))" \ + "${a[2]}" \ + "${a[4]}" \ + "$((${a[5]} - ${a[3]}))" +else + printf '%d,%d %dx%d\n' \ + "$((${a[0]} + ${a[1]}))" \ + "$((${a[2]} + ${a[3]}))" \ + "${a[4]}" \ + "${a[5]}" +fi diff --git a/swaylock/config b/swaylock/config new file mode 100644 index 0000000..30be9c1 --- /dev/null +++ b/swaylock/config @@ -0,0 +1,24 @@ +show-failed-attempts +image=~/.config/swaylock/default_wallpaper.png +bs-hl-color=83A598 + +indicator-radius=60 +indicator-thickness=20 + +inside-color=D3869B +ring-color=8EC07C +key-hl-color=FABD2F +line-color=FABD2F00 +text-color=222222 + +inside-ver-color=222222 +ring-ver-color=EBDBB2 +text-ver-color=EBDBB2 + +inside-wrong-color=282828 +ring-wrong-color=FB4934 +text-wrong-color=EBDBB2 + +inside-clear-color=222222 +ring-clear-color=EBDBB2 +text-clear-color=EBDBB2 diff --git a/systemd/xremap.service b/systemd/xremap.service new file mode 100644 index 0000000..dbd007d --- /dev/null +++ b/systemd/xremap.service @@ -0,0 +1,9 @@ +[Unit] +Description=xRemap keyboard remapper + +[Service] +Type=simple +ExecStart=/usr/local/bin/xremap /etc/xremap/config.yml + +[Install] +WantedBy=default.target diff --git a/tmux/tmux.conf b/tmux/tmux.conf new file mode 100644 index 0000000..5f1750c --- /dev/null +++ b/tmux/tmux.conf @@ -0,0 +1,173 @@ +# General Settings ================================================== +# Ctrl-space as prefix +unbind-key C-b +unbind-key C-Space +set-option -g prefix C-Space +bind-key C-Space send-prefix + +set -s copy-command 'wl-copy' +set -g mouse on + +# vi keybinds in copy mode +set-window-option -g mode-keys vi +set -g mode-keys vi +set-option -s set-clipboard off + +# Start window index at 1, for chromium-like tab switching +set -g base-index 1 + +# 100k line scrollback +set-option -g history-limit 100000 + +# Avoid ESC delay +set -s escape-time 0 + +# Full colors +set -g default-terminal "xterm-256color" # 'xterm' not 'tmux' for vim's sake +set -ag terminal-overrides ",*256*:RGB" + +# Window and Panes ================================================== +# Fast Alt-bound keybinds + # Adjacent windows +bind-key -n M-l next +bind-key -n M-h prev + + # Move between panes. Mix of vim up/down and vimium's tabs left/right +bind-key -n M-k select-pane -t '{top-right}' +bind-key -n M-j select-pane -t '{bottom-left}' + + # Move windows +bind-key -n M-[ swap-window -t -1 \; prev +bind-key -n M-] swap-window -t +1 \; next + + # Goto window, like chromium tabs +bind-key -n M-1 select-window -t 1 +bind-key -n M-2 select-window -t 2 +bind-key -n M-3 select-window -t 3 +bind-key -n M-4 select-window -t 4 +bind-key -n M-5 select-window -t 5 +bind-key -n M-6 select-window -t 6 +bind-key -n M-7 select-window -t 7 +bind-key -n M-8 select-window -t '{end}' + +# Slower prefix-bound keybinds + # Move between panes +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + + # Resize panes +bind -r C-h resize-pane -L +bind -r C-j resize-pane -D +bind -r C-k resize-pane -U +bind -r C-l resize-pane -R + + # Swap panes +bind-key L swap-pane -s '{right-of}' +bind-key K swap-pane -s '{up-of}' +bind-key J swap-pane -s '{down-of}' +bind-key H swap-pane -s '{left-of}' + + # Split panes like vim +bind v split-window -h -c '#{pane_current_path}' +bind s split-window -v -c '#{pane_current_path}' +bind T new-window -c "#{pane_current_path}" + + # Move current pane between windows +bind-key g command-prompt -p "grab pane from:" "join-pane -s '%%'" +bind-key m command-prompt -p "move pane to:" "join-pane -t '%%'" + + # Pop out current pane into a new window +bind-key p break-pane -t : + + # Toggle pane synchronization +bind-key C-s setw synchronize-panes + + # Switch sessions with ( ) +bind-key -n M-0 switch-client -n +bind-key -n M-9 switch-client -p + +# Tmux Keybinds ===================================================== +# Reload tmux quickly +unbind R +bind R source-file ~/.config/tmux/tmux.conf \; display 'Reloaded tmux config' + +# Faster command prompt +bind ';' command-prompt -I "" + +# F12 toggles the outer tmux session's key interception. Keys get passed +# through to the inner session +bind -T root F12 \ + set prefix None \;\ + set key-table off \;\ + if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\ + set status-position top \;\ + refresh-client -S + +bind -T off F12 \ + set -u prefix C-Space \;\ + set -u key-table \;\ + set status-position bottom \;\ + refresh-client -S + +# Copy mode keybinds + # Move to line ends +bind-key -T copy-mode-vi 'L' send-keys '$' +bind-key -T copy-mode-vi 'H' send-keys '^' + + # Navigate to previous command prompt +bind-key b copy-mode\;\ + send-keys -X start-of-line\;\ + send-keys -X search-backward " " + + # Copy mode selection +bind P paste-buffer +bind-key -T copy-mode-vi v send-keys -X begin-selection +bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle +bind-key -T copy-mode-vi C-k send-keys -X cancel + + # Copy via mouse selection or y key +bind-key -T copy-mode-vi y send-keys -X copy-pipe 'wl-copy' +bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe 'wl-copy' + +# Statusline ======================================================== +set-option -g status-position bottom +set -g status-left-length 32 + +set -g status-bg "black" +set -g status-fg "grey" + +set-option -g status-left "#[fg=yellow, bg=black bold] #H " + +set-window-option -g window-status-current-format "\ +#[fg=black, bg=green] #I* \ +#[fg=black, bg=green bold] #W \ +#[fg=green, bg=black]" + +set-window-option -g window-status-format "\ +#[fg=black, bg=grey]\ +#[fg=black, bg=grey] #I  #W \ +#[fg=grey, bg=black]" + +set-option -g status-right "\ +#[fg=yellow, bg=black] #S  #(whoami) \ +#[fg=black, bg=yellow] CPU: #{cpu_percentage} " + +set-window-option -g window-status-separator '' + +# Plugins =========================================================== +set -g @plugin 'nhdaly/tmux-better-mouse-mode' +set -g @plugin 'tmux-plugins/tmux-cpu' + +set -g @scroll-speed-num-lines-per-scroll "1" +set -g @emulate-scroll-for-no-mouse-alternate-buffer "on" # Scroll manpages +set -g @plugin 'mattdavis90/base16-tmux' + +set -g @colors-base16 'gruvbox-light-soft' + +run '~/.config/tmux/plugins/tpm/tpm' + +# Overwriting options =============================================== +set -g pane-active-border-style "fg=white" +set -g pane-border-style "fg=brightblack" diff --git a/vifm/colors/Default.vifm b/vifm/colors/Default.vifm new file mode 100644 index 0000000..e7101eb --- /dev/null +++ b/vifm/colors/Default.vifm @@ -0,0 +1,85 @@ +" You can edit this file by hand. +" The " character at the beginning of a line comments out the line. +" Blank lines are ignored. + +" The Default color scheme is used for any directory that does not have +" a specified scheme and for parts of user interface like menus. A +" color scheme set for a base directory will also +" be used for the sub directories. + +" The standard ncurses colors are: +" Default = -1 = None, can be used for transparency or default color +" Black = 0 +" Red = 1 +" Green = 2 +" Yellow = 3 +" Blue = 4 +" Magenta = 5 +" Cyan = 6 +" White = 7 + +" Light versions of colors are also available (set bold attribute): +" LightBlack +" LightRed +" LightGreen +" LightYellow +" LightBlue +" LightMagenta +" LightCyan +" LightWhite + +" Available attributes (some of them can be combined): +" bold +" underline +" reverse or inverse +" standout +" italic (on unsupported systems becomes reverse) +" none + +" Vifm supports 256 colors you can use color numbers 0-255 +" (requires properly set up terminal: set your TERM environment variable +" (directly or using resources) to some color terminal name (e.g. +" xterm-256color) from /usr/lib/terminfo/; you can check current number +" of colors in your terminal with tput colors command) + +" highlight group cterm=attrs ctermfg=foreground_color ctermbg=background_color + +highlight clear + +highlight Win cterm=none ctermfg=white ctermbg=black +highlight Directory cterm=bold ctermfg=cyan ctermbg=default +highlight Link cterm=bold ctermfg=yellow ctermbg=default +highlight BrokenLink cterm=bold ctermfg=red ctermbg=default +highlight HardLink cterm=none ctermfg=yellow ctermbg=default +highlight Socket cterm=bold ctermfg=magenta ctermbg=default +highlight Device cterm=bold ctermfg=red ctermbg=default +highlight Fifo cterm=bold ctermfg=cyan ctermbg=default +highlight Executable cterm=bold ctermfg=green ctermbg=default +highlight Selected cterm=bold ctermfg=magenta ctermbg=default +highlight CurrLine cterm=bold,reverse ctermfg=default ctermbg=default +highlight TopLine cterm=none ctermfg=black ctermbg=white +highlight TopLineSel cterm=bold ctermfg=black ctermbg=default +highlight StatusLine cterm=bold ctermfg=black ctermbg=white +highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black +highlight CmdLine cterm=none ctermfg=white ctermbg=black +highlight ErrorMsg cterm=none ctermfg=red ctermbg=black +highlight Border cterm=none ctermfg=black ctermbg=white +highlight OtherLine ctermfg=default ctermbg=default +highlight JobLine cterm=bold,reverse ctermfg=black ctermbg=white +highlight SuggestBox cterm=bold ctermfg=default ctermbg=default +highlight CmpMismatch cterm=bold ctermfg=white ctermbg=red +highlight AuxWin ctermfg=default ctermbg=default +highlight TabLine cterm=none ctermfg=white ctermbg=black +highlight TabLineSel cterm=bold,reverse ctermfg=default ctermbg=default +highlight User1 ctermfg=default ctermbg=default +highlight User2 ctermfg=default ctermbg=default +highlight User3 ctermfg=default ctermbg=default +highlight User4 ctermfg=default ctermbg=default +highlight User5 ctermfg=default ctermbg=default +highlight User6 ctermfg=default ctermbg=default +highlight User7 ctermfg=default ctermbg=default +highlight User8 ctermfg=default ctermbg=default +highlight User9 ctermfg=default ctermbg=default +highlight OtherWin ctermfg=default ctermbg=default +highlight LineNr ctermfg=default ctermbg=default +highlight OddLine ctermfg=default ctermbg=default diff --git a/vifm/colors/gruvbox-dark.vifm b/vifm/colors/gruvbox-dark.vifm new file mode 100644 index 0000000..54d059a --- /dev/null +++ b/vifm/colors/gruvbox-dark.vifm @@ -0,0 +1,88 @@ +" gruvbox color scheme approximation for vifm + +" Reset all styles first +highlight clear + +" Window colors +"highlight Border cterm=none ctermfg=black ctermbg=white +"highlight TopLine cterm=none ctermfg=black ctermbg=white +"highlight TopLineSel cterm=bold ctermfg=black ctermbg=default + +highlight Win cterm=none ctermfg=white ctermbg=black +highlight OtherWin cterm=none ctermfg=black ctermbg=white + +highlight LineNr ctermfg=default ctermbg=default +highlight OddLine ctermfg=default ctermbg=default + +highlight Border cterm=none ctermfg=235 ctermbg=default +highlight TopLine cterm=none ctermfg=214 ctermbg=235 +highlight TopLineSel cterm=bold ctermfg=214 ctermbg=237 +highlight CurrLine cterm=bold,reverse ctermfg=default ctermbg=default + +highlight TopLine cterm=bold ctermfg=white ctermbg=239 +highlight TopLineSel cterm=bold ctermfg=black ctermbg=green + +highlight TabLine cterm=bold ctermfg=default ctermbg=default +highlight TabLineSel cterm=bold ctermfg=black ctermbg=green + +highlight Border cterm=bold ctermfg=white ctermbg=239 +highlight StatusLine cterm=bold ctermfg=white ctermbg=239 + +" Filetype colors =================================================== +"highlight Directory cterm=bold ctermfg=cyan ctermbg=default +highlight Directory cterm=bold ctermfg=blue ctermbg=default +highlight Directory cterm=bold ctermfg=109 ctermbg=default +"highlight Link cterm=bold ctermfg=yellow ctermbg=default +highlight Link cterm=bold ctermfg=magenta ctermbg=default +highlight BrokenLink cterm=bold ctermfg=red ctermbg=default +highlight HardLink cterm=none ctermfg=yellow ctermbg=default +highlight Socket cterm=bold ctermfg=magenta ctermbg=default +highlight Device cterm=bold ctermfg=red ctermbg=default +highlight Fifo cterm=bold ctermfg=yellow ctermbg=default +highlight Executable cterm=bold ctermfg=green ctermbg=default + + " Visual selection +highlight Selected cterm=bold ctermfg=default ctermbg=239 + " Highlight on cursor for the inactive pane +highlight OtherLine ctermfg=default ctermbg=239 + + +highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black +highlight CmdLine cterm=none ctermfg=white ctermbg=black +highlight ErrorMsg cterm=none ctermfg=red ctermbg=black +highlight JobLine cterm=bold,reverse ctermfg=black ctermbg=white +highlight SuggestBox cterm=bold ctermfg=default ctermbg=default +highlight CmpMismatch cterm=bold ctermfg=white ctermbg=red +highlight AuxWin ctermfg=default ctermbg=default + +"highlight TabLine cterm=none ctermfg=white ctermbg=black +"highlight TabLineSel cterm=bold,reverse ctermfg=default ctermbg=default + +highlight User1 ctermfg=default ctermbg=default +highlight User2 ctermfg=default ctermbg=default +highlight User3 ctermfg=default ctermbg=default +highlight User4 ctermfg=default ctermbg=default +highlight User5 ctermfg=default ctermbg=default +highlight User6 ctermfg=default ctermbg=default +highlight User7 ctermfg=default ctermbg=default +highlight User8 ctermfg=default ctermbg=default +highlight User9 ctermfg=default ctermbg=default +highlight OtherWin ctermfg=default ctermbg=default + +" Special files ===================================================== + " Darkish purple for media +highlight {*.aac,*.anx,*.asf,*.au,*.avi,*.ts,*.axa,*.axv,*.divx,*.flac,*.m2a, + \*.m2v,*.m4a,*.m4p,*.m4v,*.mid,*.midi,*.mka,*.mkv,*.mov,*.mp3,*.mp4, + \*.flv,*.mp4v,*.mpc,*.mpeg,*.mpg,*.nuv,*.oga,*.ogg,*.ogv,*.ogx,*.pbm, + \*.pgm,*.qt,*.ra,*.ram,*.rm,*.spx,*.vob,*.wav,*.wma,*.wmv,*.xvid, + \*.ac3,*.webm} cterm=bold + \ ctermfg=139 ctermbg=default + + " Same darkish purple for pictures +highlight {*.avif,*.bmp,*.gif,*.jpeg,*.jpg,*.ico,*.png,*.ppm,*.svg,*.svgz,*.tga, + \*.tif,*.tiff,*.webp,*.xbm,*.xcf,*.xpm,*.xspf,*.xwd} cterm=bold + \ ctermfg=139 ctermbg=default + + " Project root files +highlight {README*,SUMMARY.md,MAKEFILE} cterm=underline,bold + \ ctermfg=yellow ctermbg=default diff --git a/vifm/colors/gruvbox-light.vifm b/vifm/colors/gruvbox-light.vifm new file mode 100644 index 0000000..b49d9d7 --- /dev/null +++ b/vifm/colors/gruvbox-light.vifm @@ -0,0 +1,79 @@ +" Light mode gruvbox. Only slight changes from darkmode + +" Reset all styles first +highlight clear + +" Window colors +highlight Win cterm=none ctermfg=white ctermbg=black +highlight OtherWin cterm=none ctermfg=black ctermbg=white + +highlight LineNr ctermfg=default ctermbg=default +highlight OddLine ctermfg=default ctermbg=default + +highlight Border cterm=none ctermfg=235 ctermbg=default +highlight TopLine cterm=none ctermfg=214 ctermbg=235 +highlight TopLineSel cterm=bold ctermfg=214 ctermbg=237 +highlight CurrLine cterm=bold,reverse ctermfg=default ctermbg=default +highlight CurrLine cterm=bold,reverse ctermfg=default ctermbg=default + +highlight TopLine cterm=bold ctermfg=black ctermbg=white +highlight TopLineSel cterm=bold ctermfg=black ctermbg=green + +highlight TabLine cterm=bold ctermfg=default ctermbg=default +highlight TabLineSel cterm=bold ctermfg=black ctermbg=green + +highlight Border cterm=bold ctermfg=white ctermbg=white +highlight StatusLine cterm=bold ctermfg=black ctermbg=white + +" Filetype colors =================================================== +highlight Directory cterm=bold ctermfg=blue ctermbg=default +highlight Link cterm=bold ctermfg=magenta ctermbg=default +highlight BrokenLink cterm=bold ctermfg=red ctermbg=default +highlight HardLink cterm=none ctermfg=yellow ctermbg=default +highlight Socket cterm=bold ctermfg=magenta ctermbg=default +highlight Device cterm=bold ctermfg=red ctermbg=default +highlight Fifo cterm=bold ctermfg=yellow ctermbg=default +highlight Executable cterm=bold ctermfg=green ctermbg=default + +highlight Selected cterm=bold ctermfg=default ctermbg=251 +highlight OtherLine ctermfg=default ctermbg=251 + +highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black +highlight CmdLine cterm=none ctermfg=white ctermbg=black +highlight ErrorMsg cterm=none ctermfg=red ctermbg=black +highlight JobLine cterm=bold,reverse ctermfg=black ctermbg=white +highlight SuggestBox cterm=bold ctermfg=default ctermbg=default +highlight CmpMismatch cterm=bold ctermfg=white ctermbg=red +highlight AuxWin ctermfg=default ctermbg=default + +"highlight TabLine cterm=none ctermfg=white ctermbg=black +"highlight TabLineSel cterm=bold,reverse ctermfg=default ctermbg=default + +highlight User1 ctermfg=default ctermbg=default +highlight User2 ctermfg=default ctermbg=default +highlight User3 ctermfg=default ctermbg=default +highlight User4 ctermfg=default ctermbg=default +highlight User5 ctermfg=default ctermbg=default +highlight User6 ctermfg=default ctermbg=default +highlight User7 ctermfg=default ctermbg=default +highlight User8 ctermfg=default ctermbg=default +highlight User9 ctermfg=default ctermbg=default +highlight OtherWin ctermfg=default ctermbg=default + +" Special files ===================================================== + " Darkish purple for media +highlight {*.aac,*.anx,*.asf,*.au,*.avi,*.ts,*.axa,*.axv,*.divx,*.flac,*.m2a, + \*.m2v,*.m4a,*.m4p,*.m4v,*.mid,*.midi,*.mka,*.mkv,*.mov,*.mp3,*.mp4, + \*.flv,*.mp4v,*.mpc,*.mpeg,*.mpg,*.nuv,*.oga,*.ogg,*.ogv,*.ogx,*.pbm, + \*.pgm,*.qt,*.ra,*.ram,*.rm,*.spx,*.vob,*.wav,*.wma,*.wmv,*.xvid, + \*.ac3,*.webm} cterm=bold + \ ctermfg=5 ctermbg=default + + " Same darkish purple for pictures +highlight {*.avif,*.bmp,*.gif,*.jpeg,*.jpg,*.ico,*.png,*.ppm,*.svg,*.svgz,*.tga, + \*.tif,*.tiff,*.webp,*.xbm,*.xcf,*.xpm,*.xspf,*.xwd} cterm=bold + \ ctermfg=5 ctermbg=default + + " Project root files +highlight {README*,SUMMARY.md,MAKEFILE,makefile,Cargo.toml} cterm=underline,bold + \ ctermfg=yellow ctermbg=default diff --git a/vifm/scripts/vifm_bg_open.sh b/vifm/scripts/vifm_bg_open.sh new file mode 100755 index 0000000..0d211d3 --- /dev/null +++ b/vifm/scripts/vifm_bg_open.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +print_help() { + cat <<HELP +Open given files in backgrounded programs, preferably using GUI apps + +Intended for use with vifm +HELP +} + +open_file() { + case "${1##*.}" in + pdf) + zathura "$1" & + ;; + avif|icns|jpeg|jpg|png|webp) + imv "$1" & + ;; + mkv|mp3|mp4|webm) + local has_video="$(ffprobe -hide_banner "$1" 2>&1 | awk '/Stream.+Video/')" + + if [[ -n "$TMUX" && -z "$has_video" ]]; then + tmux split-window -h + sleep .2 # Let bash login, otherwise command won't get sent + tmux send-keys "mpv $1" Enter + else + mpv --force-window "$1" &>/dev/null & + fi + ;; + html) + chromium "$1" &>/dev/null & + ;; + esac +} + +if [[ -z ${SWAYSOCK+x} ]]; then + printf 'Sway not running. Will not open gui apps\n' >&2 + exit 1 +fi + +for arg in "$@" +do + case "$arg" in + -h|--help) + print_help + exit 0 + ;; + *) + open_file "$arg" + ;; + esac +done + +#swaymsg [con_mark=vifm_window] focus diff --git a/vifm/vifmrc b/vifm/vifmrc new file mode 100644 index 0000000..71d267f --- /dev/null +++ b/vifm/vifmrc @@ -0,0 +1,346 @@ +" [n]ormal, [v]isual, [d]ialogue, [q]uick view, [m]enu, [c]ommand +" Ctrl+k as Esc +nnoremap <C-k> <ESC> +vnoremap <C-k> <ESC> +dnoremap <C-k> <ESC> +qnoremap <C-k> q +mnoremap <C-k> <ESC> +cnoremap <C-k> <C-c> + +" Quickly access command line +nnoremap ; : +vnoremap ; : +mnoremap ; : + " Run external command +nnoremap ! :!! + +" Invert sorting order +nnoremap r :invert o<cr> + +" Special filters with , +nnoremap , z + +" Toggle explore +qnoremap e q + +" Vifm unique mappings ============================================== +" Open editor for command line +nnoremap : q: + +" Toggle previewing "o[ther] viewer" +nnoremap o :view<cr> +qnoremap o :view<cr> +vnoremap o :view<cr>gv + +" Open sorting menu +nnoremap s :sort<cr> + +" Open bash shell in cwd +nnoremap <C-l> :!/usr/bin/env IS_VIFM_NEST='T' bash -l<cr> +nnoremap <C-f> :!/usr/bin/env IS_VIFM_NEST='T' bash -l<cr> + +" Open cwd in finder +nnoremap <space>ofinder :!open .<cr> + +nnoremap <space>ogadd :!git add %c<cr> + +" Logical conflict mappings + " Navigate back from symlinks +nnoremap H :cd -<cr> +"nnoremap L l + + " Open file in existing instance of macvim +nnoremap O :!mvim --remote-tab-silent %f<cr> + +" Windows and buffers =============================================== +" Window control with leader +"nnoremap <space>w <C-w> + +" Open and switch to split, like in vim +nnoremap <space>ws :split<cr><space> +nnoremap <space>wv :vsplit<cr><space> + +" Expand current window +nnoremap <space>wo :only<cr> + +" Close current window +nnoremap <space>wc <space>:only<cr> + +" eXchange windows +nnoremap <space>wx <C-w>x + +" Open a new tab +nnoremap <space>wT :tabnew<cr> +" Close tab +nnoremap <space>wC :tabclose<cr> + + " Quick window switching. [N]ormal and [Q]uick view modes +nnoremap <space>l <C-w>l +nnoremap <space>h <C-w>h +nnoremap <space>j <C-w>j +nnoremap <space>k <C-w>k + +qnoremap <space>l <C-w>l +qnoremap <space>h <C-w>h +qnoremap <space>j <C-w>j +qnoremap <space>k <C-w>k + + " Window movement +nnoremap <space><space>h <C-w>H +nnoremap <space><space>j <C-w>J +nnoremap <space><space>k <C-w>K +nnoremap <space><space>l <C-w>L + +" Window resizing + " < increases, > decreases +nnoremap <space>, 4<C-w>> +nnoremap <space>. 4<C-w>< +nnoremap <space><space>, 4<C-w>+ +nnoremap <space><space>. 4<C-w>- + + " Set windows to be equally sized +nnoremap <space><space>= <C-w>= + +" Emacs-like movements + " Move by character +cnoremap <C-f> <right> +cnoremap <C-j> <left> + " Delete by character. Note: <delete> not <del> +cnoremap <C-d> <delete> +cnoremap <C-h> <bs> + " Move by word +cnoremap <C-b> <a-b> +cnoremap <C-w> <a-f> + " Delete left word +cnoremap <C-u> <C-w> + " Jump to end of line +cnoremap <C-a> <home> +cnoremap <C-e> <end> + +" Clipboard ============================================== +" Copy file or directory paths to clipboard +if executable('pbcopy') + nnoremap yd :!echo %d | pbcopy<cr> + nnoremap yf :!echo %c:p | pbcopy<cr> + nnoremap yp :!echo %c:p | sed 's#'"${HOME}"'#~#' | pbcopy<cr> +elseif executable('wl-copy') + nnoremap yd :!echo %d | wl-copy<cr> + nnoremap yf :!echo %c:p | wl-copy<cr> + nnoremap yp :!echo %c:p | sed 's#'"${HOME}"'#~#' | wl-copy<cr> +elseif executable('xclip') + nnoremap yd :!echo %d | xclip %i<cr> + nnoremap yf :!echo %c:p | xclip %i<cr> + nnoremap yp :!echo %c:p | sed 's#'"${HOME}"'#~#' | xclip %i<cr> +elseif executable('xsel') + nnoremap yd :!echo -n %d | xsel --input --primary %i && + \ echo -n %d | xsel --clipboard --input %i<cr> + nnoremap yf :!echo -n %c:p | xsel --input --primary %i && + \ echo -n %c:p | xsel --clipboard --input %i<cr> +endif + +" Experimental =========================================== +nnoremap <space>m :sync %d<cr><space> + " Toggle dotfiles +"nnoremap gh :set dotfiles!<cr> +"nnoremap <space>. :set dotfiles!<cr> + " Smaller scrolling movements +"nnoremap <C-u> 6k +"vnoremap <C-u> 6k +"nnoremap <C-d> 6j +"vnoremap <C-d> 6j + +nnoremap <space>orestore :!git restore %c<cr> +nnoremap <space>oadd :!git add %c<cr> + +"command! pngcopy :!osascript -e 'set the clipboard to (read (POSIX file "'.%c.'") as PNG picture)' + +" =================================================================== +" Settings +" =================================================================== + " Don't use this directly. <C-l> loads additional configs +set shell='/usr/bin/env bash' +set vicmd='nvim --' + +set syscalls "nosyscalls for third party tools like `cp` instead + +set vifminfo=dhistory,savedirs,chistory,state,tui,shistory, + \phistory,fhistory,dirstack,registers,bookmarks,bmarks + +set trash " Required for moving files with dd/p +set history=1000 " Directory history scrollback +set undolevels=1000 " Maximum undos stored + +set nofollowlinks +set sortnumbers +set timefmt=%m/%d\ %H:%M " See `man date` or `man strftime` for details + +" Show list of matches on tab completion in command-line mode +set wildmenu +set wildstyle=popup + +set vimhelp " Extra highlighting with vim's help file format +set nohlsearch " Don't highlight search results automatically +set incsearch " Incremental highlights while typing +set scrolloff=2 + + " Backwards compatibility. Enables <C-i> without 't' +set cpoptions="fs" + +set sort +size + " Resolve symlinked paths like cd -P +set chaselinks + +set tablabel="%t" +set statusline="%16A %u:%-g %s (%d) -> %T" + +command! Light :colorscheme gruvbox-light Default Default-256 +command! Dark :colorscheme gruvbox-dark Default Default-256 + +if system('colo.sh --tone') == 'light' + Light +else + Dark +endif + +" =================================================================== +" Preload defaults +" =================================================================== +" :mark mark /full/directory/path [filename] +" Common directories +mark h ~/ +mark c ~/.configs_pointer/ +mark d ~/Downloads/ +mark s ~/safe/ +mark v ~/.config/vifm/ + +set millerview + + +" =================================================================== +" Commands +" =================================================================== +" Only 3 view modes are available. Full screen and 2 window splits +" :only :split :vsplit +command! hsplit :split + +command! duplicate :clone + +command! mview :set millerview! + +command! finder :!open . + +" Git-like shortcuts +command! stash :norm! zR +command! stashpop :norm! zM +command! stashdrop :norm! zO + +" Vifm doesn't support escaping modfiers like `exe "norm! \<C-w>h"`, so we use +" a remap ahead of time +nnoremap + <C-w>h +command! preview :tabnew | set nomillerview | vsplit | sync! | exe 'norm +' | exe ':24wincmd-' | view +" i for image +nnoremap <space>i :preview<cr> +nnoremap <space><space>i :!~/.configs_pointer/bin/vii.sh &>/dev/null &<cr> + +" =================================================================== +" Fzf intergration +" https://github.com/vifm/vifm/issues/279#issuecomment-319980898 +" =================================================================== + " Write the current bookmarks to a file +command! fzfreadbmarks :exe "normal! :bmarks\r:write ~/.config/vifm/fzf-read/bookmarks\rq" + + " Automatically navigate into directories and symlinks to directories +command! navigateIfDir :if system('[[ ! -d '.expand('%c').' ]] || printf "T"') == 'T' | exe 'norm l' | endif + +" Prefer to use popup window. Requires 90 $COLUMNS and tmux >=3.2. Yabai on +" MacOS causes it to crash regardless. Use full-screen as a fallback +command! fzfbmarks + \ :if $TMUX != '' && &columns > 90 + \ | exe 'cd "'.system('cat ~/.config/vifm/fzf-read/bookmarks | fzf-tmux -p 90,30 | sed "s/:.*//" ').'"' + \ | else + \ | exe 'cd "'.term('cat ~/.config/vifm/fzf-read/bookmarks | fzf 2>/dev/tty | sed "s/:.*//" ').'"' + \ | endif + +command! fdcddir + \ :if $TMUX != '' && &columns > 90 + \ | exe 'cd "'.system('fd -HE ''.git'' -t d . | fzf-tmux -p 90,30').'"' + \ | else + \ | exe 'cd "'.term('fd -HE ''.git'' -t d . | fzf 2>/dev/tty').'"' + \ | endif + +command! fdeditfiles + \ :if $TMUX != '' && &columns > 90 + \ | exe 'edit "'.system('fd -HE ''.git'' -t f . | fzf-tmux -p 90,30').'"' + \ | else + \ | exe 'edit "'.term('fd -HE ''.git'' -t f . | fzf 2>/dev/tty').'"' + \ | endif + +command! fdmvcursor + \ :if $TMUX != '' && &columns > 90 + \ | exe 'goto "'.system('fd --maxdepth=1 -HE ''.git'' . | fzf-tmux -p 90,30').'"' | navigateIfDir + \ | else + \ | exe 'goto "'.term('fd --maxdepth=1 -HE ''.git'' . | fzf 2>/dev/tty').'"' | navigateIfDir + \ | endif + + " Read in latests bookmarks before fzfinding through them +command! fzfmarks :fzfreadbmarks | fzfbmarks + +nnoremap <space>r :fzfmarks<cr> +nnoremap <space>e :fdcddir<cr> +nnoremap <space>f :fdeditfiles<cr> +nnoremap <space>; :fdmvcursor<cr> + + +" =================================================================== +" Defaults +" =================================================================== +" Directory-local options, see :h vifm-'sort' +autocmd DirEnter ~/Downloads setlocal sort=-mtime + +" Tmux won't work with sixel at all. Alacritty is currently very unstable with +" it and flickers a lot. Set $TMUX for blurrier faster version. Quanity on +" MacOS with viu seems to get worse the more images you preview +if $TMUX == '' + fileviewer <video/*> + \ vifm-sixel video %pw %ph %c %pd + \ %pc + \ vifm-sixel clear + + fileviewer <image/*> + \ montage %c -geometry "2000x1100" -background none sixel:- %pd + \ %pc + \ vifm-sixel clear +else + fileviewer <video/*> + \ ffmpegthumbnailer -s 0 -i %c:p -o ~/.config/vifm/thumbnail_output.jpg && + \ viu ~/.config/vifm/thumbnail_output.jpg -w %pw %v + \ viu ~/.config/vifm/thumbnail_output.jpg -h %ph %s + + fileviewer <image/*> + \ viu %c:p -w %pw %v + \ viu %c:p -h %ph %s +endif + + " Bat as default previewer. Put it at the end since there's no way to + " overwrite this setting +fileviewer *[^/] env -uCOLORTERM bat --color always --theme ansi --wrap never --pager never %c -p + + +filetype *.mp4,*.mkv,*.mov,*.webm,*.mp3,*.flac mpv %c + +if system('uname') == 'Darwin' + filetype *.jpg,*.jpeg,*.png,*.icns open -a Preview.app %c:p + filetype *.pdf open -a 'skim' %c || open %c:p +else + filetype *.pdf zathura %c + filetype *.epub foliate %c %i & + + nnoremap L :! ~/.config/vifm/scripts/vifm_bg_open.sh "%c" &<cr> + vnoremap L :! ~/.config/vifm/scripts/vifm_bg_open.sh "%f" &<cr> + + " Wayland only + filetype <image/*> imv %c:p +endif + + +" vim: set syn=vifm ft=vifm ff=unix: diff --git a/vim/.vim/UltiSnips/math_preamble.tex b/vim/.vim/UltiSnips/math_preamble.tex new file mode 100644 index 0000000..16995bb --- /dev/null +++ b/vim/.vim/UltiSnips/math_preamble.tex @@ -0,0 +1,83 @@ +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage[dutch]{babel} +\usepackage{amsmath, amssymb, amsthm} +%\usepackage{libertine, newtxmath} % conflicts with lmodern remove sigmas +\usepackage[dvipsnames]{xcolor} % For background colors + +\definecolor{gruv-box-background}{RGB}{34, 34, 34} % Backwards compatibility +\definecolor{gruv-box-dark-bg}{RGB}{34, 34, 34} +\definecolor{gruv-box-light-bg}{RGB}{235, 219, 178} +\definecolor{gruv-box-yellow}{RGB}{255, 175, 0} + + % Sans-serif font. Clarifies distinction between math and text +\usepackage{helvet} + +% Number sets +\newcommand{\N}{\mathbb{N}} +\newcommand{\Z}{\mathbb{Z}} +\newcommand{\R}{\mathbb{R}} +\newcommand{\C}{\mathbb{C}} +\newcommand{\Deriv}[1]{\frac{\text{d}}{\text{d}#1}} +\newcommand{\Part}[1]{\frac{\partial}{\partial #1}} + +% Boxes +\usepackage[dvipsnames]{xcolor} +\usepackage{tikz,lipsum,lmodern} +%\usepackage{lmodern} +\usepackage[most]{tcolorbox} +\usepackage{tabularx} + +% Code +\usepackage{listings} +\usepackage[hashEnumerators,smartEllipses]{markdown} % Doesn't work + +% Fancy letters using \mathbcal{letter} +\DeclareFontFamily{U}{BOONDOX-calo}{\skewchar\font=45 } +\DeclareFontShape{U}{BOONDOX-calo}{m}{n}{ + <-> s*[1.05] BOONDOX-r-calo}{} +\DeclareFontShape{U}{BOONDOX-calo}{b}{n}{ + <-> s*[1.05] BOONDOX-b-calo}{} +\DeclareMathAlphabet{\mathbcal}{U}{BOONDOX-calo}{m}{n} +\SetMathAlphabet{\mathbcal}{bold}{U}{BOONDOX-calo}{b}{n} +\DeclareMathAlphabet{\mathbcal}{U}{BOONDOX-calo}{b}{n} + +\lstset{frame=tb, + language=Python, + aboveskip=3mm, + belowskip=3mm, + showstringspaces=false, + columns=flexible, + basicstyle={\small\ttfamily}, + numbers=none, + numberstyle=\tiny\color{gray}, + keywordstyle=\color{blue}, + commentstyle=\color{orange}, + stringstyle=\color{mauve}, + breaklines=true, + breakatwhitespace=true, + tabsize=3 +} + +%\usepackage{geometry} +%\geometry{ +% paper=letterpaper, % Paper size, change to letterpaper for US letter size +% top=1in, % Top margin +% bottom=1in, % Bottom margin +% left=1in, % Left margin +% right=1in, % Right margin +% headheight=1in, % Header height +% footskip=1.4cm, % Space from the bottom margin to the baseline of the footer +% headsep=10pt % Space from the top margin to the baseline of the header +%} + +\pdfsuppresswarningpagegroup=1 + +\usepackage{lipsum} +\newenvironment{myindent} +{\par\leftskip4cm\relax\rightskip1cm\relax} +{\par\leftskip0cm\relax\rightskip0cm\relax} + +\def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]} +\let\endchangemargin=\endlist diff --git a/vim/.vim/UltiSnips/tex.snippets b/vim/.vim/UltiSnips/tex.snippets new file mode 100644 index 0000000..51060f1 --- /dev/null +++ b/vim/.vim/UltiSnips/tex.snippets @@ -0,0 +1,551 @@ +global !p +def math(): + return vim.eval('vimtex#syntax#in_mathzone()') == '1' + +def comment(): + return vim.eval('vimtex#syntax#in_comment()') == '1' + +def env(name): + [x,y] = vim.eval("vimtex#env#is_inside('" + name + "')") + return x != '0' and y != '0' + +endglobal + + +# Color boxes =================================================<<<{{{ +snippet block "Simple box with colored border, interior, and text" +\begin{tcolorbox}[ + coltext={${1:gruv-box-yellow}}, + colback={${2:gruv-box-background}}, + colframe={$1}] + $3 +\end{tcolorbox}$4 +endsnippet + +snippet titlebox "Box with a centered title and color option" A +\begin{tcolorbox}[title={\centering ${1:untitled}}, + colframe={${2:Magenta!75!black}}] + $3 +\end{tcolorbox}$4 +endsnippet + +snippet splitbox "Box with a top, bottom, and title" +\begin{tcolorbox}[title={${1:untitled}},colframe={${2:Magenta}}] + $3 +\tcblower + $4 +\end{tcolorbox}$0 +endsnippet + +snippet minipage "Small page indent" A +\hfill\begin{minipage}{\dimexpr\textwidth-2.2cm} + $1 +\end{minipage}$0 +endsnippet + +snippet ebox "Box for containing examples" +\hfill\begin{minipage}{\dimexpr\textwidth-2.2cm} + \begin{tcolorbox}[title={${1:Ex: untitled}},colframe={${2:Magenta!75!black}}] + $3 + \end{tcolorbox}\medskip +\end{minipage}$0 +endsnippet + +snippet inbox "Indented titled box" +\hfill\begin{minipage}{\dimexpr\textwidth-2.2cm} + \begin{tcolorbox}[title={${1:untitled}},colframe={${2:Magenta!75!black}}] + $3 + \end{tcolorbox}\medskip +\end{minipage}$0 +endsnippet + +snippet code "Code environment" +\begin{lstlisting} + $1 +\end{lstlisting}$2 +endsnippet + +# }}}>>> + +# Environments ================================================<<<{{{ +snippet begin "begin{} / end{}" bA +\\begin{$1} + $0 +\\end{$1} +endsnippet + +context "math()" +snippet case "cases" wA +\begin{cases} + $1 +\end{cases} +endsnippet + +snippet enum "Enumerate" bA +\begin{enumerate} + \item $0 +\end{enumerate} +endsnippet + +priority 100 +snippet item "First item" bA +\item $0 +endsnippet + +snippet desc "Description" b +\begin{description} + \item[$1] $0 +\end{description} +endsnippet + +snippet mk "Math" wA +$${1}$$2 +endsnippet + +snippet dm "Math" wA +\[ + ${1:${VISUAL}} +\] $0 +endsnippet + +snippet dl "Math" wA +\[ ${1:${VISUAL}} \]$0 +endsnippet + +snippet align "Align" bA +\begin{align*} + ${1:${VISUAL}} +\end{align*} +endsnippet + +priority 10 +snippet item "Itemize" bA +\begin{itemize} + \item $0 +\end{itemize} +endsnippet + +snippet chmargin "Bigger left margin" bA +\begin{changemargin}{3cm}{0cm} + $0 +\end{changemargin} +endsnippet + +# }}}>>> + +# Fractions ===================================================<<<{{{ +context "math()" +snippet // "Standard fraction, nothing fancy" iA +\\frac{$1}{$2}$0 +endsnippet + +snippet / "Fraction" i +\\frac{${VISUAL}}{$1}$0 +endsnippet + +context "math()" +snippet '(-?(\d+)|(\d*)(\\)?([A-Za-z]+)((\^|_)(\{\d+\}|\d))*)/' "powerful frac like 2/" wrA +\\frac{`!p snip.rv = match.group(1)`}{$1}$0 +endsnippet + +priority 1000 +context "math()" +snippet '^.*\)/' "() frac" wrA +`!p +stripped = match.string[:-1] +depth = 0 +i = len(stripped) - 1 +while True: + if stripped[i] == ')': depth += 1 + if stripped[i] == '(': depth -= 1 + if depth == 0: break; + i-=1 +snip.rv = stripped[0:i] + "\\frac{" + stripped[i+1:-1] + "}" +`{$1} $0 +endsnippet + +snippet part "partial derivative d/dx" w +\frac{\partial ${1:V}}{\partial ${2:x}}$0 +endsnippet + +# }}}>>> + +# Sub/Super scripts ===========================================<<<{{{ +priority 10 +context "math()" +snippet '([A-Za-z])(-?\d) ' "auto exponentiate like x-2 -> x^{-2}" wrA +`!p snip.rv = match.group(1)`^{`!p snip.rv = match.group(2)`} $0 +endsnippet + +context "math()" +snippet td "exponentiate" iA +^{$1}$0 +endsnippet + +priority 20 +context "math()" +snippet '([A-Za-z])_([-\w\d]{2,})(,)? ' "auto subscript after space" wrA +`!p snip.rv = match.group(1)`_{`!p snip.rv = match.group(2)`}`!p +if match.group(3) is not None: + snip.rv = match.group(3)`$0 +endsnippet + +context "math()" +snippet '([A-Za-z|\]])ud' "auto 上下 script" wrA +`!p snip.rv = match.group(1)`^{${1:exp}}_{${2:sub}} $0 +endsnippet + +context "math()" +snippet sqrt "\sqrt{}" iA +\sqrt{${1:${VISUAL}}}$0 +endsnippet + +# }}}>>> + +# Equality shortcuts ==========================================<<<{{{ +snippet == "aligned equals" iA +&= $1 \\\\ +endsnippet + +snippet n= "not equal" iA +\neq +endsnippet + +snippet <= "leq" iA +\le +endsnippet + +snippet >= "geq" iA +\ge +endsnippet + +snippet >> ">>" iA +\gg +endsnippet + +snippet << "<<" iA +\ll +endsnippet + +snippet ~~ "~" iA +\sim +endsnippet + +# }}}>>> + +# Matricies ===================================================<<<{{{ +snippet (mat "round brackets" i +\begin{pmatrix} + $1 +\end{pmatrix} $0 +endsnippet + +snippet [mat "square brackets" i +\begin{bmatrix} + $1 +\end{bmatrix} $0 +endsnippet + +snippet |mat "square brackets" i +\begin{vmatrix} + $1 +\end{vmatrix} $0 +endsnippet + +priority 100 +snippet cvec "column vector" iA +\begin{pmatrix} ${1:x}_${2:1}\\\\ \vdots\\\\ $1_${2:n} \end{pmatrix} +endsnippet + +# }}}>>> + +# Enclosing delimiters ========================================<<<{{{ +context "math()" +snippet () "() delimiters" iA +\left( ${1:${VISUAL}} \right)$0 +endsnippet + +snippet lr "() delimiters" i +\left( ${1:${VISUAL}} \right)$0 +endsnippet + +snippet lr( "() delimiters" i +\left( ${1:${VISUAL}} \right)$0 +endsnippet + +snippet lr| "|| delimiters" i +\left| ${1:${VISUAL}} \right|$0 +endsnippet + +snippet lr|| "|| || for vector magnitudes" i +\left\| ${1:${VISUAL}} \right\|$0 +endsnippet + +snippet lr{ "{} delimiters" i +\left\\{ ${1:${VISUAL}} \right\\}$0 +endsnippet + +snippet lrb "{} delimiters" i +\left\\{ ${1:${VISUAL}} \right\\}$0 +endsnippet + +snippet lr[ "[] delimiters" i +\left[ ${1:${VISUAL}} \right]$0 +endsnippet + +snippet lr< "<> delimiters" i +\left< ${1:${VISUAL}} \right>$0 +endsnippet + +snippet lra "<> delimiters" iA +\left<${1:${VISUAL}} \right>$0 +endsnippet + +context "math()" +snippet set "set" wA +\\{$1\\} $0 +endsnippet + +# }}}>>> + +# Math symbols with numbers ===================================<<<{{{ +snippet sum "sum" w +\sum_{i=${1:0}}^{${2:\infty}} ${3:a_i z^i} +endsnippet + +snippet taylor "taylor" w +\sum_{${1:k}=${2:0}}^{${3:\infty}} ${4:c_$1} (x-a)^$1 $0 +endsnippet + +snippet lim "limit" w +\lim_{${1:x} \to ${2:\infty}} $0 +endsnippet + +priority 300 +context "math()" +snippet dint "integral" wA +\int_{${1:-\infty}}^{${2:\infty}} $4 \,d${3:x}$0 +endsnippet + +# }}}>>> + +# Symbol shortcuts ============================================<<<{{{ +snippet ooo "\infty" iA +\infty +endsnippet + +context "math()" +snippet EE "geq" iA +\exists +endsnippet + +priority 300 +context "math()" +snippet 'prime(\d+)' "prime like x^(4)" wrA +^{(`!p snip.rv = match.group(1)`)} $0 +endsnippet + +context "math()" +snippet AA "forall" iA +\forall +endsnippet + +snippet lll "l" iA +\ell +endsnippet + +context "math()" +snippet nabla "nabla" iA +\nabla +endsnippet + +context "math()" +snippet xx "cross" iA +\times +endsnippet + +priority 100 +snippet ** "cdot" iA +\cdot +endsnippet + +priority 100 +context "math()" +snippet -> "to" iA +\to +endsnippet + +priority 200 +context "math()" +snippet <-> "leftrightarrow" iA +\leftrightarrow +endsnippet + +context "math()" +snippet !> "mapsto" iA +\mapsto +endsnippet + +snippet Nn "cap" iA +\cap +endsnippet + +snippet UU "cup" iA +\cup +endsnippet + +snippet uuu "bigcup" iA +\bigcup_{${1:i \in ${2: I}}} $0 +endsnippet + +snippet nnn "bigcap" iA +\bigcap_{${1:i \in ${2: I}}} $0 +endsnippet + +context "math()" +snippet iff "iff" Ai +\iff +endsnippet + +priority 100 +snippet ... "ldots" iA +\ldots +endsnippet + +# }}}>>> + +# Set related symbols =========================================<<<{{{ +priority 10 +context "math()" +snippet 'cc ' "subset" rAi +\\subset $0 +endsnippet + +snippet notin "not in " iA +\not\in +endsnippet + +context "math()" +snippet inn "in " iA +\in +endsnippet + +snippet NN "n" iA +\N +endsnippet + +snippet OO "emptyset" iA +\O +endsnippet + +snippet RR "real" iA +\R +endsnippet + +snippet QQ "Q" iA +\Q +endsnippet + +snippet ZZ "Z" iA +\Z +endsnippet + +# }}}>>> + +# Symbols right on top ========================================<<<{{{ +context "math()" +snippet conj "conjugate" iA +\overline{$1}$0 +endsnippet + +priority 10 +context "math()" +snippet "bar" "bar" riA +\bar{$1}$0 +endsnippet +# Used to be: \overline{$1}$0 + + +priority 100 +context "math()" +snippet "([a-zA-Z])bar" "bar" riA +\overline{`!p snip.rv=match.group(1)`} +endsnippet + +priority 10 +context "math()" +snippet "hat" "hat" riA +\hat{$1}$0 +endsnippet + +priority 100 +context "math()" +snippet "([a-zA-Z])hat" "hat" riA +\hat{`!p snip.rv=match.group(1)`} +endsnippet + +# }}}>>> + +# Mathematical functions ======================================<<<{{{ +priority 100 +context "math()" +snippet '(?<!\\)(sin|cos|tan|arccot|sec|cot|csc|ln|log|exp|star|perp)' "ln" rwA +\\`!p snip.rv = match.group(1)` +endsnippet + +priority 200 +context "math()" +snippet '(?<!\\)(arcsin|arccos|arctan|arccot|arccsc|arcsec|pi|zeta|theta|phi)' "ln" rwA +\\`!p snip.rv = match.group(1)`$0 +endsnippet + + +priority 30 +context "math" +snippet ' (?<!\\)int(_[A-Za-z]+)? ' "blank integral, with possible subscript" rwA +\\int`!p +if match.group(1) is not None: + snip.rv = "_{" + match.group(1)[1:] + "}"`$0 +endsnippet + +priority 20 +context "math()" +snippet 'vec([A-Za-z0])(_((\{\w+\})?|(\w)))? ' "vector arrow [with subscript]" rwA +\\vec{`!p +snip.rv = match.group(1) + +if match.group(2) is not None: + snip.rv += match.group(2)`}$0 +endsnippet + +# }}}>>> + +# Misc ========================================================<<<{{{ +context "math()" +snippet tt "text" iA +\text{$1}$0 +endsnippet + +context "math()" +snippet '(?<!\\)(mathbcal)' "Autocomplete for special chars" rwA +\\mathbcal{$1}$2 +endsnippet + +# }}}>>> + +# Huge environments ===========================================<<<{{{ +snippet template "Basic template" b +\documentclass[a4paper]{article} + +\usepackage[margin=1in]{geometry} % Set margin preference + +\input{~/.vim/UltiSnips/math_preamble.tex} + +\begin{document} + \pagecolor{gruv-box-dark-bg} + \color{gruv-box-yellow} + \fontfamily{phv}\selectfont + + $0 +\end{document} +endsnippet diff --git a/vim/.vim/colors/base16-atelier-estuary-light.vim b/vim/.vim/colors/base16-atelier-estuary-light.vim new file mode 100644 index 0000000..7dd9993 --- /dev/null +++ b/vim/.vim/colors/base16-atelier-estuary-light.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Estuary Light scheme by Bram de Haan (http://atelierbramdehaan.nl) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-estuary-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "f4f3ec" +let g:base16_gui00 = "f4f3ec" +let s:gui01 = "e7e6df" +let g:base16_gui01 = "e7e6df" +let s:gui02 = "929181" +let g:base16_gui02 = "929181" +let s:gui03 = "878573" +let g:base16_gui03 = "878573" +let s:gui04 = "6c6b5a" +let g:base16_gui04 = "6c6b5a" +let s:gui05 = "5f5e4e" +let g:base16_gui05 = "5f5e4e" +let s:gui06 = "302f27" +let g:base16_gui06 = "302f27" +let s:gui07 = "22221b" +let g:base16_gui07 = "22221b" +let s:gui08 = "ba6236" +let g:base16_gui08 = "ba6236" +let s:gui09 = "ae7313" +let g:base16_gui09 = "ae7313" +let s:gui0A = "a5980d" +let g:base16_gui0A = "a5980d" +let s:gui0B = "7d9726" +let g:base16_gui0B = "7d9726" +let s:gui0C = "5b9d48" +let g:base16_gui0C = "5b9d48" +let s:gui0D = "36a166" +let g:base16_gui0D = "36a166" +let s:gui0E = "5f9182" +let g:base16_gui0E = "5f9182" +let s:gui0F = "9d6c7c" +let g:base16_gui0F = "9d6c7c" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#f4f3ec" + let g:terminal_color_1 = "#ba6236" + let g:terminal_color_2 = "#7d9726" + let g:terminal_color_3 = "#a5980d" + let g:terminal_color_4 = "#36a166" + let g:terminal_color_5 = "#5f9182" + let g:terminal_color_6 = "#5b9d48" + let g:terminal_color_7 = "#5f5e4e" + let g:terminal_color_8 = "#878573" + let g:terminal_color_9 = "#ba6236" + let g:terminal_color_10 = "#7d9726" + let g:terminal_color_11 = "#a5980d" + let g:terminal_color_12 = "#36a166" + let g:terminal_color_13 = "#5f9182" + let g:terminal_color_14 = "#5b9d48" + let g:terminal_color_15 = "#22221b" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#f4f3ec", + \ "#ba6236", + \ "#7d9726", + \ "#a5980d", + \ "#36a166", + \ "#5f9182", + \ "#5b9d48", + \ "#5f5e4e", + \ "#878573", + \ "#ba6236", + \ "#7d9726", + \ "#a5980d", + \ "#36a166", + \ "#5f9182", + \ "#5b9d48", + \ "#22221b", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-estuary-light" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-atelier-plateau-light.vim b/vim/.vim/colors/base16-atelier-plateau-light.vim new file mode 100644 index 0000000..488ca7b --- /dev/null +++ b/vim/.vim/colors/base16-atelier-plateau-light.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atelier Plateau Light scheme by Bram de Haan (http://atelierbramdehaan.nl) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-plateau-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "f4ecec" +let g:base16_gui00 = "f4ecec" +let s:gui01 = "e7dfdf" +let g:base16_gui01 = "e7dfdf" +let s:gui02 = "8a8585" +let g:base16_gui02 = "8a8585" +let s:gui03 = "7e7777" +let g:base16_gui03 = "7e7777" +let s:gui04 = "655d5d" +let g:base16_gui04 = "655d5d" +let s:gui05 = "585050" +let g:base16_gui05 = "585050" +let s:gui06 = "292424" +let g:base16_gui06 = "292424" +let s:gui07 = "1b1818" +let g:base16_gui07 = "1b1818" +let s:gui08 = "ca4949" +let g:base16_gui08 = "ca4949" +let s:gui09 = "b45a3c" +let g:base16_gui09 = "b45a3c" +let s:gui0A = "a06e3b" +let g:base16_gui0A = "a06e3b" +let s:gui0B = "4b8b8b" +let g:base16_gui0B = "4b8b8b" +let s:gui0C = "5485b6" +let g:base16_gui0C = "5485b6" +let s:gui0D = "7272ca" +let g:base16_gui0D = "7272ca" +let s:gui0E = "8464c4" +let g:base16_gui0E = "8464c4" +let s:gui0F = "bd5187" +let g:base16_gui0F = "bd5187" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#f4ecec" + let g:terminal_color_1 = "#ca4949" + let g:terminal_color_2 = "#4b8b8b" + let g:terminal_color_3 = "#a06e3b" + let g:terminal_color_4 = "#7272ca" + let g:terminal_color_5 = "#8464c4" + let g:terminal_color_6 = "#5485b6" + let g:terminal_color_7 = "#585050" + let g:terminal_color_8 = "#7e7777" + let g:terminal_color_9 = "#ca4949" + let g:terminal_color_10 = "#4b8b8b" + let g:terminal_color_11 = "#a06e3b" + let g:terminal_color_12 = "#7272ca" + let g:terminal_color_13 = "#8464c4" + let g:terminal_color_14 = "#5485b6" + let g:terminal_color_15 = "#1b1818" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#f4ecec", + \ "#ca4949", + \ "#4b8b8b", + \ "#a06e3b", + \ "#7272ca", + \ "#8464c4", + \ "#5485b6", + \ "#585050", + \ "#7e7777", + \ "#ca4949", + \ "#4b8b8b", + \ "#a06e3b", + \ "#7272ca", + \ "#8464c4", + \ "#5485b6", + \ "#1b1818", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atelier-plateau-light" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-dracula.vim b/vim/.vim/colors/base16-dracula.vim new file mode 100644 index 0000000..a626e42 --- /dev/null +++ b/vim/.vim/colors/base16-dracula.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Dracula scheme by Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-dracula.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "282a36" +let g:base16_gui00 = "282a36" +let s:gui01 = "3a3c4e" +let g:base16_gui01 = "3a3c4e" +let s:gui02 = "4d4f68" +let g:base16_gui02 = "4d4f68" +let s:gui03 = "626483" +let g:base16_gui03 = "626483" +let s:gui04 = "62d6e8" +let g:base16_gui04 = "62d6e8" +let s:gui05 = "e9e9f4" +let g:base16_gui05 = "e9e9f4" +let s:gui06 = "f1f2f8" +let g:base16_gui06 = "f1f2f8" +let s:gui07 = "f7f7fb" +let g:base16_gui07 = "f7f7fb" +let s:gui08 = "ea51b2" +let g:base16_gui08 = "ea51b2" +let s:gui09 = "b45bcf" +let g:base16_gui09 = "b45bcf" +let s:gui0A = "00f769" +let g:base16_gui0A = "00f769" +let s:gui0B = "ebff87" +let g:base16_gui0B = "ebff87" +let s:gui0C = "a1efe4" +let g:base16_gui0C = "a1efe4" +let s:gui0D = "62d6e8" +let g:base16_gui0D = "62d6e8" +let s:gui0E = "b45bcf" +let g:base16_gui0E = "b45bcf" +let s:gui0F = "00f769" +let g:base16_gui0F = "00f769" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#282936" + let g:terminal_color_1 = "#ea51b2" + let g:terminal_color_2 = "#ebff87" + let g:terminal_color_3 = "#00f769" + let g:terminal_color_4 = "#62d6e8" + let g:terminal_color_5 = "#b45bcf" + let g:terminal_color_6 = "#a1efe4" + let g:terminal_color_7 = "#e9e9f4" + let g:terminal_color_8 = "#626483" + let g:terminal_color_9 = "#ea51b2" + let g:terminal_color_10 = "#ebff87" + let g:terminal_color_11 = "#00f769" + let g:terminal_color_12 = "#62d6e8" + let g:terminal_color_13 = "#b45bcf" + let g:terminal_color_14 = "#a1efe4" + let g:terminal_color_15 = "#f7f7fb" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#282936", + \ "#ea51b2", + \ "#ebff87", + \ "#00f769", + \ "#62d6e8", + \ "#b45bcf", + \ "#a1efe4", + \ "#e9e9f4", + \ "#626483", + \ "#ea51b2", + \ "#ebff87", + \ "#00f769", + \ "#62d6e8", + \ "#b45bcf", + \ "#a1efe4", + \ "#f7f7fb", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-dracula" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-github.vim b/vim/.vim/colors/base16-github.vim new file mode 100644 index 0000000..41d2f6c --- /dev/null +++ b/vim/.vim/colors/base16-github.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Github scheme by Defman21 + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-github.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "f5f5f5" +let g:base16_gui01 = "f5f5f5" +let s:gui02 = "c8c8fa" +let g:base16_gui02 = "c8c8fa" +let s:gui03 = "969896" +let g:base16_gui03 = "969896" +let s:gui04 = "e8e8e8" +let g:base16_gui04 = "e8e8e8" +let s:gui05 = "333333" +let g:base16_gui05 = "333333" +let s:gui06 = "ffffff" +let g:base16_gui06 = "ffffff" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "ed6a43" +let g:base16_gui08 = "ed6a43" +let s:gui09 = "0086b3" +let g:base16_gui09 = "0086b3" +let s:gui0A = "795da3" +let g:base16_gui0A = "795da3" +let s:gui0B = "183691" +let g:base16_gui0B = "183691" +let s:gui0C = "183691" +let g:base16_gui0C = "183691" +let s:gui0D = "795da3" +let g:base16_gui0D = "795da3" +let s:gui0E = "a71d5d" +let g:base16_gui0E = "a71d5d" +let s:gui0F = "333333" +let g:base16_gui0F = "333333" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#ffffff" + let g:terminal_color_1 = "#ed6a43" + let g:terminal_color_2 = "#183691" + let g:terminal_color_3 = "#795da3" + let g:terminal_color_4 = "#795da3" + let g:terminal_color_5 = "#a71d5d" + let g:terminal_color_6 = "#183691" + let g:terminal_color_7 = "#333333" + let g:terminal_color_8 = "#969896" + let g:terminal_color_9 = "#ed6a43" + let g:terminal_color_10 = "#183691" + let g:terminal_color_11 = "#795da3" + let g:terminal_color_12 = "#795da3" + let g:terminal_color_13 = "#a71d5d" + let g:terminal_color_14 = "#183691" + let g:terminal_color_15 = "#ffffff" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#ffffff", + \ "#ed6a43", + \ "#183691", + \ "#795da3", + \ "#795da3", + \ "#a71d5d", + \ "#183691", + \ "#333333", + \ "#969896", + \ "#ed6a43", + \ "#183691", + \ "#795da3", + \ "#795da3", + \ "#a71d5d", + \ "#183691", + \ "#ffffff", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-github" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-gruvbox-dark-medium.vim b/vim/.vim/colors/base16-gruvbox-dark-medium.vim new file mode 100644 index 0000000..8ac51b8 --- /dev/null +++ b/vim/.vim/colors/base16-gruvbox-dark-medium.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Gruvbox dark, medium scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-dark-medium.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "222222" +let g:base16_gui00 = "222222" +let s:gui01 = "3c3836" +let g:base16_gui01 = "3c3836" +let s:gui02 = "504945" +let g:base16_gui02 = "504945" +let s:gui03 = "665c54" +let g:base16_gui03 = "665c54" +let s:gui04 = "bdae93" +let g:base16_gui04 = "bdae93" +let s:gui05 = "d5c4a1" +let g:base16_gui05 = "d5c4a1" +let s:gui06 = "ebdbb2" +let g:base16_gui06 = "ebdbb2" +let s:gui07 = "fbf1c7" +let g:base16_gui07 = "fbf1c7" +let s:gui08 = "fb4934" +let g:base16_gui08 = "fb4934" +let s:gui09 = "fe8019" +let g:base16_gui09 = "fe8019" +let s:gui0A = "fabd2f" +let g:base16_gui0A = "fabd2f" +let s:gui0B = "b8bb26" +let g:base16_gui0B = "b8bb26" +let s:gui0C = "8ec07c" +let g:base16_gui0C = "8ec07c" +let s:gui0D = "83a598" +let g:base16_gui0D = "83a598" +let s:gui0E = "d3869b" +let g:base16_gui0E = "d3869b" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#282828" + let g:terminal_color_1 = "#fb4934" + let g:terminal_color_2 = "#b8bb26" + let g:terminal_color_3 = "#fabd2f" + let g:terminal_color_4 = "#83a598" + let g:terminal_color_5 = "#d3869b" + let g:terminal_color_6 = "#8ec07c" + let g:terminal_color_7 = "#d5c4a1" + let g:terminal_color_8 = "#665c54" + let g:terminal_color_9 = "#fb4934" + let g:terminal_color_10 = "#b8bb26" + let g:terminal_color_11 = "#fabd2f" + let g:terminal_color_12 = "#83a598" + let g:terminal_color_13 = "#d3869b" + let g:terminal_color_14 = "#8ec07c" + let g:terminal_color_15 = "#fbf1c7" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#282828", + \ "#fb4934", + \ "#b8bb26", + \ "#fabd2f", + \ "#83a598", + \ "#d3869b", + \ "#8ec07c", + \ "#d5c4a1", + \ "#665c54", + \ "#fb4934", + \ "#b8bb26", + \ "#fabd2f", + \ "#83a598", + \ "#d3869b", + \ "#8ec07c", + \ "#fbf1c7", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-gruvbox-dark-medium" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-gruvbox-dark-pale.vim b/vim/.vim/colors/base16-gruvbox-dark-pale.vim new file mode 100644 index 0000000..f3a055b --- /dev/null +++ b/vim/.vim/colors/base16-gruvbox-dark-pale.vim @@ -0,0 +1,429 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Gruvbox dark, pale scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-dark-pale.sh" + endif +endif + +" GUI color definitions + " Background black +let s:gui00 = "262626" +let g:base16_gui00 = "262626" + " Brighter black +let s:gui01 = "3a3a3a" +let g:base16_gui01 = "3a3a3a" + " Even brighter black +let s:gui02 = "4e4e4e" +let g:base16_gui02 = "4e4e4e" + " Blanced greys +let s:gui03 = "8a8a8a" +let g:base16_gui03 = "8a8a8a" +let s:gui04 = "949494" +let g:base16_gui04 = "949494" + " White: Text +let s:gui05 = "dab997" +let g:base16_gui05 = "dab997" + " Unused? +let s:gui06 = "d5c4a1" +let g:base16_gui06 = "d5c4a1" +let s:gui07 = "ebdbb2" +let g:base16_gui07 = "ebdbb2" + " Red: Replace mode +let s:gui08 = "d75f5f" +let g:base16_gui08 = "d75f5f" + " Orange: Comments, Numbers, Constants +let s:gui09 = "ff8700" +let g:base16_gui09 = "ff8700" + " Yellow: Bash variables, Julia types, Fzf fraction +let s:gui0A = "ffaf00" +let g:base16_gui0A = "ffaf00" + " Green: Strings, Normal mode +let s:gui0B = "afaf00" +let g:base16_gui0B = "afaf00" + " Teal: Bash +, Command mode +let s:gui0C = "85ad85" +let g:base16_gui0C = "85ad85" + " Grey maybe? Mixes with Normal mode? +let s:gui0D = "83adad" +let g:base16_gui0D = "83adad" + " Violet: Visual mode, Conditionals +let s:gui0E = "d485ad" +let g:base16_gui0E = "d485ad" + " Rust: Bash test brackets +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" + +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#262626" + let g:terminal_color_1 = "#d75f5f" + let g:terminal_color_2 = "#afaf00" + let g:terminal_color_3 = "#ffaf00" + let g:terminal_color_4 = "#83adad" + let g:terminal_color_5 = "#d485ad" + let g:terminal_color_6 = "#85ad85" + let g:terminal_color_7 = "#dab997" + let g:terminal_color_8 = "#8a8a8a" + let g:terminal_color_9 = "#d75f5f" + let g:terminal_color_10 = "#afaf00" + let g:terminal_color_11 = "#ffaf00" + let g:terminal_color_12 = "#83adad" + let g:terminal_color_13 = "#d485ad" + let g:terminal_color_14 = "#85ad85" + let g:terminal_color_15 = "#ebdbb2" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#262626", + \ "#d75f5f", + \ "#afaf00", + \ "#ffaf00", + \ "#83adad", + \ "#d485ad", + \ "#85ad85", + \ "#dab997", + \ "#8a8a8a", + \ "#d75f5f", + \ "#afaf00", + \ "#ffaf00", + \ "#83adad", + \ "#d485ad", + \ "#85ad85", + \ "#ebdbb2", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-gruvbox-dark-pale" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +" call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Comment", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-gruvbox-light-hard.vim b/vim/.vim/colors/base16-gruvbox-light-hard.vim new file mode 100644 index 0000000..d1adcdd --- /dev/null +++ b/vim/.vim/colors/base16-gruvbox-light-hard.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Gruvbox light, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-light-hard.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "f9f5d7" +let g:base16_gui00 = "f9f5d7" +let s:gui01 = "ebdbb2" +let g:base16_gui01 = "ebdbb2" +let s:gui02 = "d5c4a1" +let g:base16_gui02 = "d5c4a1" +let s:gui03 = "bdae93" +let g:base16_gui03 = "bdae93" +let s:gui04 = "665c54" +let g:base16_gui04 = "665c54" +let s:gui05 = "504945" +let g:base16_gui05 = "504945" +let s:gui06 = "3c3836" +let g:base16_gui06 = "3c3836" +let s:gui07 = "282828" +let g:base16_gui07 = "282828" +let s:gui08 = "9d0006" +let g:base16_gui08 = "9d0006" +let s:gui09 = "af3a03" +let g:base16_gui09 = "af3a03" +let s:gui0A = "b57614" +let g:base16_gui0A = "b57614" +let s:gui0B = "79740e" +let g:base16_gui0B = "79740e" +let s:gui0C = "427b58" +let g:base16_gui0C = "427b58" +let s:gui0D = "076678" +let g:base16_gui0D = "076678" +let s:gui0E = "8f3f71" +let g:base16_gui0E = "8f3f71" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#f9f5d7" + let g:terminal_color_1 = "#9d0006" + let g:terminal_color_2 = "#79740e" + let g:terminal_color_3 = "#b57614" + let g:terminal_color_4 = "#076678" + let g:terminal_color_5 = "#8f3f71" + let g:terminal_color_6 = "#427b58" + let g:terminal_color_7 = "#504945" + let g:terminal_color_8 = "#bdae93" + let g:terminal_color_9 = "#9d0006" + let g:terminal_color_10 = "#79740e" + let g:terminal_color_11 = "#b57614" + let g:terminal_color_12 = "#076678" + let g:terminal_color_13 = "#8f3f71" + let g:terminal_color_14 = "#427b58" + let g:terminal_color_15 = "#282828" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#f9f5d7", + \ "#9d0006", + \ "#79740e", + \ "#b57614", + \ "#076678", + \ "#8f3f71", + \ "#427b58", + \ "#504945", + \ "#bdae93", + \ "#9d0006", + \ "#79740e", + \ "#b57614", + \ "#076678", + \ "#8f3f71", + \ "#427b58", + \ "#282828", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-gruvbox-light-hard" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-gruvbox-light-medium.vim b/vim/.vim/colors/base16-gruvbox-light-medium.vim new file mode 100644 index 0000000..71c4700 --- /dev/null +++ b/vim/.vim/colors/base16-gruvbox-light-medium.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Gruvbox light, medium scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-light-medium.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "fbf1c7" +let g:base16_gui00 = "fbf1c7" +let s:gui01 = "ebdbb2" +let g:base16_gui01 = "ebdbb2" +let s:gui02 = "d5c4a1" +let g:base16_gui02 = "d5c4a1" +let s:gui03 = "bdae93" +let g:base16_gui03 = "bdae93" +let s:gui04 = "665c54" +let g:base16_gui04 = "665c54" +let s:gui05 = "504945" +let g:base16_gui05 = "504945" +let s:gui06 = "3c3836" +let g:base16_gui06 = "3c3836" +let s:gui07 = "282828" +let g:base16_gui07 = "282828" +let s:gui08 = "9d0006" +let g:base16_gui08 = "9d0006" +let s:gui09 = "af3a03" +let g:base16_gui09 = "af3a03" +let s:gui0A = "b57614" +let g:base16_gui0A = "b57614" +let s:gui0B = "79740e" +let g:base16_gui0B = "79740e" +let s:gui0C = "427b58" +let g:base16_gui0C = "427b58" +let s:gui0D = "076678" +let g:base16_gui0D = "076678" +let s:gui0E = "8f3f71" +let g:base16_gui0E = "8f3f71" +let s:gui0F = "d65d0e" +let g:base16_gui0F = "d65d0e" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#fbf1c7" + let g:terminal_color_1 = "#9d0006" + let g:terminal_color_2 = "#79740e" + let g:terminal_color_3 = "#b57614" + let g:terminal_color_4 = "#076678" + let g:terminal_color_5 = "#8f3f71" + let g:terminal_color_6 = "#427b58" + let g:terminal_color_7 = "#504945" + let g:terminal_color_8 = "#bdae93" + let g:terminal_color_9 = "#9d0006" + let g:terminal_color_10 = "#79740e" + let g:terminal_color_11 = "#b57614" + let g:terminal_color_12 = "#076678" + let g:terminal_color_13 = "#8f3f71" + let g:terminal_color_14 = "#427b58" + let g:terminal_color_15 = "#282828" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#fbf1c7", + \ "#9d0006", + \ "#79740e", + \ "#b57614", + \ "#076678", + \ "#8f3f71", + \ "#427b58", + \ "#504945", + \ "#bdae93", + \ "#9d0006", + \ "#79740e", + \ "#b57614", + \ "#076678", + \ "#8f3f71", + \ "#427b58", + \ "#282828", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-gruvbox-light-medium" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-material-palenight.vim b/vim/.vim/colors/base16-material-palenight.vim new file mode 100644 index 0000000..f48d767 --- /dev/null +++ b/vim/.vim/colors/base16-material-palenight.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Material Palenight scheme by Nate Peterson + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-material-palenight.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "292D3E" +let g:base16_gui00 = "292D3E" +let s:gui01 = "444267" +let g:base16_gui01 = "444267" +let s:gui02 = "32374D" +let g:base16_gui02 = "32374D" +let s:gui03 = "676E95" +let g:base16_gui03 = "676E95" +let s:gui04 = "8796B0" +let g:base16_gui04 = "8796B0" +let s:gui05 = "959DCB" +let g:base16_gui05 = "959DCB" +let s:gui06 = "959DCB" +let g:base16_gui06 = "959DCB" +let s:gui07 = "FFFFFF" +let g:base16_gui07 = "FFFFFF" +let s:gui08 = "F07178" +let g:base16_gui08 = "F07178" +let s:gui09 = "F78C6C" +let g:base16_gui09 = "F78C6C" +let s:gui0A = "FFCB6B" +let g:base16_gui0A = "FFCB6B" +let s:gui0B = "C3E88D" +let g:base16_gui0B = "C3E88D" +let s:gui0C = "89DDFF" +let g:base16_gui0C = "89DDFF" +let s:gui0D = "82AAFF" +let g:base16_gui0D = "82AAFF" +let s:gui0E = "C792EA" +let g:base16_gui0E = "C792EA" +let s:gui0F = "FF5370" +let g:base16_gui0F = "FF5370" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#292D3E" + let g:terminal_color_1 = "#F07178" + let g:terminal_color_2 = "#C3E88D" + let g:terminal_color_3 = "#FFCB6B" + let g:terminal_color_4 = "#82AAFF" + let g:terminal_color_5 = "#C792EA" + let g:terminal_color_6 = "#89DDFF" + let g:terminal_color_7 = "#959DCB" + let g:terminal_color_8 = "#676E95" + let g:terminal_color_9 = "#F07178" + let g:terminal_color_10 = "#C3E88D" + let g:terminal_color_11 = "#FFCB6B" + let g:terminal_color_12 = "#82AAFF" + let g:terminal_color_13 = "#C792EA" + let g:terminal_color_14 = "#89DDFF" + let g:terminal_color_15 = "#FFFFFF" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#292D3E", + \ "#F07178", + \ "#C3E88D", + \ "#FFCB6B", + \ "#82AAFF", + \ "#C792EA", + \ "#89DDFF", + \ "#959DCB", + \ "#676E95", + \ "#F07178", + \ "#C3E88D", + \ "#FFCB6B", + \ "#82AAFF", + \ "#C792EA", + \ "#89DDFF", + \ "#FFFFFF", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-material-palenight" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-monokai.vim b/vim/.vim/colors/base16-monokai.vim new file mode 100644 index 0000000..9930f5d --- /dev/null +++ b/vim/.vim/colors/base16-monokai.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Monokai scheme by Wimer Hazenberg (http://www.monokai.nl) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-monokai.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "272822" +let g:base16_gui00 = "272822" +let s:gui01 = "383830" +let g:base16_gui01 = "383830" +let s:gui02 = "49483e" +let g:base16_gui02 = "49483e" +let s:gui03 = "75715e" +let g:base16_gui03 = "75715e" +let s:gui04 = "a59f85" +let g:base16_gui04 = "a59f85" +let s:gui05 = "f8f8f2" +let g:base16_gui05 = "f8f8f2" +let s:gui06 = "f5f4f1" +let g:base16_gui06 = "f5f4f1" +let s:gui07 = "f9f8f5" +let g:base16_gui07 = "f9f8f5" +let s:gui08 = "f92672" +let g:base16_gui08 = "f92672" +let s:gui09 = "fd971f" +let g:base16_gui09 = "fd971f" +let s:gui0A = "f4bf75" +let g:base16_gui0A = "f4bf75" +let s:gui0B = "a6e22e" +let g:base16_gui0B = "a6e22e" +let s:gui0C = "a1efe4" +let g:base16_gui0C = "a1efe4" +let s:gui0D = "66d9ef" +let g:base16_gui0D = "66d9ef" +let s:gui0E = "ae81ff" +let g:base16_gui0E = "ae81ff" +let s:gui0F = "cc6633" +let g:base16_gui0F = "cc6633" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#272822" + let g:terminal_color_1 = "#f92672" + let g:terminal_color_2 = "#a6e22e" + let g:terminal_color_3 = "#f4bf75" + let g:terminal_color_4 = "#66d9ef" + let g:terminal_color_5 = "#ae81ff" + let g:terminal_color_6 = "#a1efe4" + let g:terminal_color_7 = "#f8f8f2" + let g:terminal_color_8 = "#75715e" + let g:terminal_color_9 = "#f92672" + let g:terminal_color_10 = "#a6e22e" + let g:terminal_color_11 = "#f4bf75" + let g:terminal_color_12 = "#66d9ef" + let g:terminal_color_13 = "#ae81ff" + let g:terminal_color_14 = "#a1efe4" + let g:terminal_color_15 = "#f9f8f5" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#272822", + \ "#f92672", + \ "#a6e22e", + \ "#f4bf75", + \ "#66d9ef", + \ "#ae81ff", + \ "#a1efe4", + \ "#f8f8f2", + \ "#75715e", + \ "#f92672", + \ "#a6e22e", + \ "#f4bf75", + \ "#66d9ef", + \ "#ae81ff", + \ "#a1efe4", + \ "#f9f8f5", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-monokai" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-nord.vim b/vim/.vim/colors/base16-nord.vim new file mode 100644 index 0000000..b612425 --- /dev/null +++ b/vim/.vim/colors/base16-nord.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Nord scheme by arcticicestudio + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-nord.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "2E3440" +let g:base16_gui00 = "2E3440" +let s:gui01 = "3B4252" +let g:base16_gui01 = "3B4252" +let s:gui02 = "434C5E" +let g:base16_gui02 = "434C5E" +let s:gui03 = "4C566A" +let g:base16_gui03 = "4C566A" +let s:gui04 = "D8DEE9" +let g:base16_gui04 = "D8DEE9" +let s:gui05 = "E5E9F0" +let g:base16_gui05 = "E5E9F0" +let s:gui06 = "ECEFF4" +let g:base16_gui06 = "ECEFF4" +let s:gui07 = "8FBCBB" +let g:base16_gui07 = "8FBCBB" +let s:gui08 = "88C0D0" +let g:base16_gui08 = "88C0D0" +let s:gui09 = "81A1C1" +let g:base16_gui09 = "81A1C1" +let s:gui0A = "5E81AC" +let g:base16_gui0A = "5E81AC" +let s:gui0B = "BF616A" +let g:base16_gui0B = "BF616A" +let s:gui0C = "D08770" +let g:base16_gui0C = "D08770" +let s:gui0D = "EBCB8B" +let g:base16_gui0D = "EBCB8B" +let s:gui0E = "A3BE8C" +let g:base16_gui0E = "A3BE8C" +let s:gui0F = "B48EAD" +let g:base16_gui0F = "B48EAD" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#2E3440" + let g:terminal_color_1 = "#88C0D0" + let g:terminal_color_2 = "#BF616A" + let g:terminal_color_3 = "#5E81AC" + let g:terminal_color_4 = "#EBCB8B" + let g:terminal_color_5 = "#A3BE8C" + let g:terminal_color_6 = "#D08770" + let g:terminal_color_7 = "#E5E9F0" + let g:terminal_color_8 = "#4C566A" + let g:terminal_color_9 = "#88C0D0" + let g:terminal_color_10 = "#BF616A" + let g:terminal_color_11 = "#5E81AC" + let g:terminal_color_12 = "#EBCB8B" + let g:terminal_color_13 = "#A3BE8C" + let g:terminal_color_14 = "#D08770" + let g:terminal_color_15 = "#8FBCBB" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#2E3440", + \ "#88C0D0", + \ "#BF616A", + \ "#5E81AC", + \ "#EBCB8B", + \ "#A3BE8C", + \ "#D08770", + \ "#E5E9F0", + \ "#4C566A", + \ "#88C0D0", + \ "#BF616A", + \ "#5E81AC", + \ "#EBCB8B", + \ "#A3BE8C", + \ "#D08770", + \ "#8FBCBB", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-nord" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/colors/base16-tomorrow.vim b/vim/.vim/colors/base16-tomorrow.vim new file mode 100644 index 0000000..17b2977 --- /dev/null +++ b/vim/.vim/colors/base16-tomorrow.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Tomorrow scheme by Chris Kempson (http://chriskempson.com) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has("gui_running") + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-tomorrow.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "ffffff" +let g:base16_gui00 = "ffffff" +let s:gui01 = "e0e0e0" +let g:base16_gui01 = "e0e0e0" +let s:gui02 = "d6d6d6" +let g:base16_gui02 = "d6d6d6" +let s:gui03 = "8e908c" +let g:base16_gui03 = "8e908c" +let s:gui04 = "969896" +let g:base16_gui04 = "969896" +let s:gui05 = "4d4d4c" +let g:base16_gui05 = "4d4d4c" +let s:gui06 = "282a2e" +let g:base16_gui06 = "282a2e" +let s:gui07 = "1d1f21" +let g:base16_gui07 = "1d1f21" +let s:gui08 = "c82829" +let g:base16_gui08 = "c82829" +let s:gui09 = "f5871f" +let g:base16_gui09 = "f5871f" +let s:gui0A = "eab700" +let g:base16_gui0A = "eab700" +let s:gui0B = "718c00" +let g:base16_gui0B = "718c00" +let s:gui0C = "3e999f" +let g:base16_gui0C = "3e999f" +let s:gui0D = "4271ae" +let g:base16_gui0D = "4271ae" +let s:gui0E = "8959a8" +let g:base16_gui0E = "8959a8" +let s:gui0F = "a3685a" +let g:base16_gui0F = "a3685a" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#ffffff" + let g:terminal_color_1 = "#c82829" + let g:terminal_color_2 = "#718c00" + let g:terminal_color_3 = "#eab700" + let g:terminal_color_4 = "#4271ae" + let g:terminal_color_5 = "#8959a8" + let g:terminal_color_6 = "#3e999f" + let g:terminal_color_7 = "#4d4d4c" + let g:terminal_color_8 = "#8e908c" + let g:terminal_color_9 = "#c82829" + let g:terminal_color_10 = "#718c00" + let g:terminal_color_11 = "#eab700" + let g:terminal_color_12 = "#4271ae" + let g:terminal_color_13 = "#8959a8" + let g:terminal_color_14 = "#3e999f" + let g:terminal_color_15 = "#1d1f21" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +elseif has("terminal") + let g:terminal_ansi_colors = [ + \ "#ffffff", + \ "#c82829", + \ "#718c00", + \ "#eab700", + \ "#4271ae", + \ "#8959a8", + \ "#3e999f", + \ "#4d4d4c", + \ "#8e908c", + \ "#c82829", + \ "#718c00", + \ "#eab700", + \ "#4271ae", + \ "#8959a8", + \ "#3e999f", + \ "#1d1f21", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-tomorrow" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/vim/.vim/ftdetect/bash.vim b/vim/.vim/ftdetect/bash.vim new file mode 100644 index 0000000..2184d87 --- /dev/null +++ b/vim/.vim/ftdetect/bash.vim @@ -0,0 +1,4 @@ +augroup checkBash + au! + au BufRead,BufNewFile * if len(match(getline(1), '\v#![a-z/]* ?bash')) == 1 | set filetype=bash | endif +augroup END diff --git a/vim/.vim/ftdetect/ipython.vim b/vim/.vim/ftdetect/ipython.vim new file mode 100644 index 0000000..928fd94 --- /dev/null +++ b/vim/.vim/ftdetect/ipython.vim @@ -0,0 +1 @@ +au BufRead,BufNewFile *.ipy set filetype=python diff --git a/vim/.vim/ftdetect/mips.vim b/vim/.vim/ftdetect/mips.vim new file mode 100644 index 0000000..7183a59 --- /dev/null +++ b/vim/.vim/ftdetect/mips.vim @@ -0,0 +1,3 @@ +au BufRead,BufNewFile *.mips set filetype=mips +au BufRead,BufNewFile *.s set filetype=mips +au BufRead,BufNewFile *.s IndentLinesEnable diff --git a/vim/.vim/ftplugin/awk.vim b/vim/.vim/ftplugin/awk.vim new file mode 100644 index 0000000..0c5a242 --- /dev/null +++ b/vim/.vim/ftplugin/awk.vim @@ -0,0 +1,5 @@ +" Awk ==================================================== +iabbrev <buffer> #! #!/usr/bin/env -S awk -f +iabbrev <buffer> initmodeline # vim: set ft=awk ff=unix: + +" vim: set ft=vim ff=unix: diff --git a/vim/.vim/ftplugin/bash.vim b/vim/.vim/ftplugin/bash.vim new file mode 100644 index 0000000..1ae748f --- /dev/null +++ b/vim/.vim/ftplugin/bash.vim @@ -0,0 +1,10 @@ +" Bash =================================================== +iabbrev <buffer> #! #!/usr/bin/env bash +iabbrev <buffer> initmodeline # vim: set ft=bash ff=unix: + + " Indents of 2 instead of default 4 +setlocal tabstop=2 +setlocal softtabstop=2 +setlocal shiftwidth=2 + +" vim: set ft=vim ff=unix: diff --git a/vim/.vim/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim new file mode 100644 index 0000000..5140774 --- /dev/null +++ b/vim/.vim/ftplugin/c.vim @@ -0,0 +1,12 @@ +" Clang ================================================== +iabbrev <buffer> initmodeline // vim: set ft=c ff=unix: + + " Increase indent to match linux guidelines +setlocal tabstop=4 +setlocal softtabstop=4 +setlocal shiftwidth=4 + + +match Type /\v[ ^]([A-Z][A-Za-z_]+[ $])|([uif]((8)|([1-8]{2})))/ + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/html.vim b/vim/.vim/ftplugin/html.vim new file mode 100644 index 0000000..c466f57 --- /dev/null +++ b/vim/.vim/ftplugin/html.vim @@ -0,0 +1,14 @@ +" HTML =================================================== +" By default, vim loads this for markdown files too +if (&filetype !=# "markdown") && (&filetype !=# "javascript") + +iabbrev <buffer> #! <!DOCTYPE html> +iabbrev <buffer> initmodeline # vim: set ft=html ff=unix: + + " Indents of 2 instead of default 4 +setlocal tabstop=2 +setlocal softtabstop=2 +setlocal shiftwidth=2 + +endif +" vim: set ft=vim ff=unix: diff --git a/vim/.vim/ftplugin/javascript.vim b/vim/.vim/ftplugin/javascript.vim new file mode 100644 index 0000000..8a5d56b --- /dev/null +++ b/vim/.vim/ftplugin/javascript.vim @@ -0,0 +1,9 @@ +" Javascript ============================================= +iabbrev <buffer> #! #!/usr/bin/env node +iabbrev <buffer> initmodeline // vim: set ft=javascript ff=unix: + +setlocal tabstop=4 +setlocal softtabstop=4 +setlocal shiftwidth=4 + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/julia.vim b/vim/.vim/ftplugin/julia.vim new file mode 100644 index 0000000..7d0d5a5 --- /dev/null +++ b/vim/.vim/ftplugin/julia.vim @@ -0,0 +1,9 @@ +" Julia ================================================== +iabbrev <buffer> #! #!/usr/bin/env julia +iabbrev <buffer> initmodeline # vim: set ft=julia ff=unix: + +" Set REPL commands ==== +let g:ipython_cell_run_command = 'Base.run(`clear`); include("{filepath}")' +let g:ipython_cell_cell_command = 'include_string(Main, clipboard())' + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/make.vim b/vim/.vim/ftplugin/make.vim new file mode 100644 index 0000000..7457a9f --- /dev/null +++ b/vim/.vim/ftplugin/make.vim @@ -0,0 +1,4 @@ +" Makefile =============================================== +au Filetype make iabbrev <buffer> initmodeline # vim: set ft=make ff=unix: + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/man.vim b/vim/.vim/ftplugin/man.vim new file mode 100644 index 0000000..a09df82 --- /dev/null +++ b/vim/.vim/ftplugin/man.vim @@ -0,0 +1,3 @@ + " Set interior window width to mathc $MANWIDTH +nnoremap <leader><leader>= :exe 'vertical resize ' . (str2nr($MANWIDTH) - 2)<CR> + diff --git a/vim/.vim/ftplugin/markdown.vim b/vim/.vim/ftplugin/markdown.vim new file mode 100644 index 0000000..399c7eb --- /dev/null +++ b/vim/.vim/ftplugin/markdown.vim @@ -0,0 +1,12 @@ +" Markdown =============================================== +" Loaded before html.vim by default + +iabbrev <buffer> initmodeline <!-- vim: set ft=markdown ff=unix tw=80 spell wrap linebreak: --> + +" Infamous em-dash +iabbrev em — + + " Spelling in prose. Break lines with gq +setlocal spell wrap linebreak textwidth=80 + +" vim: set syn=vim ff=unix: diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim new file mode 100644 index 0000000..1ee146d --- /dev/null +++ b/vim/.vim/ftplugin/python.vim @@ -0,0 +1,51 @@ +" Python ================================================= +iabbrev <buffer> #! #!/usr/bin/env python3 +iabbrev <buffer> initmodeline # ex: set ft=python ff=unix: + + " Bug fix for python interpreter seeing #!.../python3^M +set fileformat=unix + + " Indent guides for python +IndentLinesEnable + +" Linting ==== +setlocal makeprg=pylint\ --reports=n\ --output-format=parseable\ %:p +setlocal errorformat=%f:%l:\ %m + +" Set REPL commands ==== +"highlight IPythonCell guifg='#85AD85' guibg='#85AD85' +"hi IPythonCell cterm=bold gui=bold guibg=#222222 guifg=#85ad85 +"hi IPythonCell guifg=#222222 guibg=#dab997 +"hi! link IPythonCell Comment + + " Fix for extended syntax plugin +highlight Error NONE + + " Python: function and class names +onoremap ih :execute ":normal! ?def [A-z]\\+(\\\|class [A-z]*\\(:\\\|(\\)\r:noh\rwve"<CR> + +" IPython cell =========================================== + " For true REPL-supporting languages +let g:ipython_cell_delimit_cells_by = 'tags' +let g:ipython_cell_tag = ['##', '# %%', '#%%', '# <codecell>'] +let g:ipython_cell_highlight_cells = 1 + + " Use Makefile for REPL-like experience for most languages +let g:ipython_cell_cell_command = '%paste -q' +let g:ipython_cell_run_command = '%run {options} "{filepath}"' + + +hi! link IPythonCell Todo + +" Command hotkeys + " Connect to running Jupyter kernel +nnoremap <leader>q :JupyterConnect<CR> + " Run entire file from top to bottom +nnoremap <leader>f :JupyterRunFile<CR> + " Run current cell +nnoremap <leader>r :JupyterSendCell<CR> +nnoremap <leader>e :JupyterSendCell<CR> + " Insert block seperator above +nnoremap <leader>b O<ESC>S## Block<ESC>vb<C-g> + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/rust.vim b/vim/.vim/ftplugin/rust.vim new file mode 100644 index 0000000..509e400 --- /dev/null +++ b/vim/.vim/ftplugin/rust.vim @@ -0,0 +1,16 @@ +" Rust =================================================== +iabbrev <buffer> initmodeline // vim: set ft=rust ff=unix: + + " Rust's longer line standard +setlocal colorcolumn=100 + + " Folds open by default +let g:rust_fold = 1 + + " Jump to naming of rust fn, struct, and enum names +onoremap ih :execute ":normal! ?fn [a-z]\\+\\\|\\(struct\\\|enum\\) [A-Z]\r:noh\rwve"<CR> + + " Set interior window width to 100 columns +nnoremap <leader><leader>= :vertical resize 104<CR> + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/snippets.vim b/vim/.vim/ftplugin/snippets.vim new file mode 100644 index 0000000..20178fd --- /dev/null +++ b/vim/.vim/ftplugin/snippets.vim @@ -0,0 +1,10 @@ +" Snippets =============================================== +iabbrev <buffer> initmodeline # vim: set ft=snippets ff=unix: + +setlocal foldmethod=marker + + " Fold by default +setlocal foldlevelstart=0 +setlocal foldmarker=<<<{{{,}}}>>> + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/svelte.vim b/vim/.vim/ftplugin/svelte.vim new file mode 100644 index 0000000..4801998 --- /dev/null +++ b/vim/.vim/ftplugin/svelte.vim @@ -0,0 +1,4 @@ +" Svelte ================================================= +set shiftwidth=2 + +" vim: set ft=vim ff=unix: diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim new file mode 100644 index 0000000..f1e1a5d --- /dev/null +++ b/vim/.vim/ftplugin/tex.vim @@ -0,0 +1,15 @@ + " Compile pdf +nnoremap <buffer> <leader>r :VimtexCompileSS<CR> +nnoremap <buffer> <leader>f :VimtexCompileSS<CR> + + " Fix unreadable highlight for matching environments +highlight MatchParen guibg=#000000 +"highlight MatchParen guibg=#ff8700 guifg=#3a3a3a + + " Doesn't work. Fights with Vimtex plugin +hi! clear Conceal +"setlocal conceallevel=2 + +set textwidth=80 + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/vifm.vim b/vim/.vim/ftplugin/vifm.vim new file mode 100644 index 0000000..596dae4 --- /dev/null +++ b/vim/.vim/ftplugin/vifm.vim @@ -0,0 +1,6 @@ +" Vim file manager ======================================= +iabbrev <buffer> initmodeline " vim: set ft=vifm ff=unix: + +setlocal syn=vifm + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/init_scripts/external_plugins.vim b/vim/.vim/init_scripts/external_plugins.vim new file mode 100644 index 0000000..b1cee48 --- /dev/null +++ b/vim/.vim/init_scripts/external_plugins.vim @@ -0,0 +1,251 @@ +" ======================================================== +" External plugins +" ======================================================== + +" Disable syntax-breaking from polyglot +let g:polyglot_disabled = ['markdown', 'sh'] + +" Download vimplug, if not already installed +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +endif + +call plug#begin('~/.vim/plugged') + +" General vim improvements ========================================== +" Vim basics ==== + " fuzzy searching buffers/files +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'junegunn/fzf.vim' + " Disables hlsearch after search is done +Plug 'romainl/vim-cool' + " File system bindings +Plug 'tpope/vim-eunuch' + " Movement extension +"Plug 'justinmk/vim-sneak' +"Plug 'easymotion/vim-easymotion' + +" Vim windows ==== + " Tmux-like zoom for windows +Plug 'dhruvasagar/vim-zoom' + " Focus window +Plug 'junegunn/goyo.vim' + " Quickfix markings +Plug 'https://gitlab.com/hauleth/qfx.vim' + " Vim file manager binds +Plug 'vifm/vifm.vim' + +" Git ==== + " Starts vim in root git directory +Plug 'airblade/vim-rooter' + " Git diff in the left column +Plug 'airblade/vim-gitgutter' + " Git command integration +"Plug 'tpope/vim-fugitive' + +" Browser ==== +"Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } +"Plug 'subnut/nvim-ghost.nvim', {'do': ':call nvim_ghost#installer#install()'} +"Plug 'soywod/himalaya', {'rtp': 'vim'} + +" REPL interaction ==== + " Interact with REPL through tmux +Plug 'jpalardy/vim-slime' + " Cleaner REPL interactions +Plug 'hanschen/vim-ipython-cell' + " Jupyter notebooks intergration +Plug 'jupyter-vim/jupyter-vim' + +" Language specific ================================================= +" Syntax support ==== +Plug 'rust-lang/rust.vim' +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +"Plug 'arzg/vim-rust-syntax-ext' +Plug 'JuliaEditorSupport/julia-vim' +Plug 'evanleck/vim-svelte', {'branch': 'main'} +Plug 'catppuccin/nvim', {'as': 'catppuccin'} +Plug 'dracula/vim', { 'as': 'dracula' } +Plug 'RRethy/nvim-base16' +Plug 'waycrate/swhkd-vim' + +" Python ==== + " Shows line indent guides +Plug 'Yggdroot/indentLine' + " More highlights +"Plug 'numirias/semshi', { 'do': ':UpdateRemotePlugins' } +Plug 'sheerun/vim-polyglot' +"Plug 'hdima/python-syntax' + +" Latex ==== + " LaTeX support +Plug 'lervag/vimtex' + " LaTex snippets. Requires python +Plug 'SirVer/ultisnips', { 'tag': '*3.2' } + +call plug#end() + +" Quickfix markings with window +nnoremap <leader>oo :cw<bar>QFxPlace<CR> +nnoremap <leader>oc :ccl<bar>QFxClear<CR> + +" No prompt when vim-rooter causes a directory change +let g:rooter_silent_chdir = 1 +let g:rooter_manual_only = 1 + +" Disables by default. See language specific section for when it's enabled +let g:indentLine_enabled = 0 + +" Use scss with svelt +let g:svelte_preprocessors = ['typescript', 'scss', 'sass'] + +" Vifm =================================================== + " Disable netrw entirely +"let g:loaded_netrw = 1 +"let g:loaded_netrwPlugin = 1 + +let g:vifm_replace_netrw = 1 +let g:vifm_replace_netrw_cmd = "Vifm" +"let g:vifm_exec_args = +"let g:vifm_embed_split = 1 + +" TreeSitter ============================================= +lua <<EOF +require('nvim-treesitter.configs').setup { + ensure_installed = "rust", + hightlight = { enable = true }, + indent = { enable = true } +} +EOF + +" Sneak ================================================== +"let g:sneak#s_next = 0 + +" 2-character Sneak instead of 1-character forwared +"omap s <Plug>Sneak_s +"omap S <Plug>Sneak_S +" +"map , <Plug>Sneak_; + +" VimTex ================================================= +let g:tex_flavor = 'latex' +"let g:vimtex_view_method = 'skim' " Requires SkimPDF installed +let g:vimtex_view_method = 'zathura' +let g:vimtex_quickfix_mode = '0' + +" UltiSnips ============================================== + " Expand and jump only with tab +let g:UltiSnipsExpandTrigger = '<tab>' +let g:UltiSnipsJumpForwardTrigger = '<tab>' +let g:UltiSnipsJumpBackwardTrigger = '<s-tab>' + " Only search for UltiSnips directory +let g:UltiSnipsSnippetDirectories = ['UltiSnips'] + " No warning message when UltiSnips is skipped +let g:UltiSnipsNoPythonWarning = 1 + +command! Texsnips :split ~/.vim/UltiSnips/tex.snippets +command! Texpreamble :split ~/.vim/UltiSnips/math_preamble.tex + +" Vim-zoom =============================================== +nmap <leader>wz <Plug>(zoom-toggle) + +" Catppuccin +let g:catppuccin_flavour = "mocha" + +" Slime ================================================== +let g:slime_target = "tmux" +let g:slime_paste_file = "$HOME/.slime_paste" +let g:slime_python_ipython = 1 +let g:slime_default_config = { + \ 'socket_name': get(split($TMUX, ','), 0), + \ 'target_pane': '{last}' } + +" Slime Studio =========================================== +" Using slime to quickly create dynamic terminal REPLs +" <leader> once to run the current command +" <leader><leader> to change the command +let g:slime_studio_command1 = 'echo "make"' +let g:slime_studio_command2 = 'echo "make run"' +let g:slime_studio_command3 = 'echo "make submit"' + +nnoremap <leader>r :exe "SlimeSend1 " . g:slime_studio_command1<CR> +nnoremap <leader><leader>r + \ :let g:slime_studio_command1 = + \ input("Slime Studio (1): ", g:slime_studio_command1)<CR> + +nnoremap <leader>e :exe "SlimeSend1 " . g:slime_studio_command2<CR> +nnoremap <leader><leader>e + \ :let g:slime_studio_command2 = + \ input("Slime Studio (2): ", g:slime_studio_command2)<CR> + +nnoremap <leader>f :exe "SlimeSend1 " . g:slime_studio_command3<CR> +nnoremap <leader><leader>f + \ :let g:slime_studio_command3 = + \ input("Slime Studio (3): ", g:slime_studio_command3)<CR> + +" Gitgutter ============================================== + " Disables git diff by default +let g:gitgutter_enabled = 0 + + " Remove key bindings from gitgutter +let g:gitgutter_map_keys = 0 + + " Toggle gitgutter +nnoremap <leader>ogit :GitGutterToggle<CR> + +" FZF setup ============================================== + " Open hotkeys for fzf +nnoremap <C-p> :Files<CR> +nnoremap <leader>; :Buffers<CR> + + " Edit config files +command! -bang Config call fzf#vim#files('~/.vim/init_scripts', <bang>0) + + " Window at the bottom with no preview +let g:fzf_layout = { 'down': '~20%' } +let g:fzf_preview_window = [] + + " Files for fzf to search +let RG_TEMPLATE = 'rg --hidden --no-ignore --follow ' + \ . '-g ''!.git'' -g ''!target'' ' + \ . '-g ''!*node_modules'' -g ''!*build_kite'' ' + \ . '-g ''!site-packages'' -g ''!__pycache__'' ' + \ . '-g ''!Cargo.lock'' -g ''!bazel-*'' ' + \ . '-g ''!.DS_Store'' -g ''!*.swp'' ' + \ . '-g ''!*.fls'' -g ''!*.log'' -g ''!*.aux'' -g ''!*.mp3'' ' + \ . '-g ''!*.fdb_latexmk'' -g ''!*.synctex.gz'' ' + \ . '-g ''!*.pdf'' -g ''!*.o'' ' + \ . '-g ''!*.iso'' -g ''!*.qcow2'' -g ''!*.img'' ' + \ . '-g ''!*.mp4'' -g ''!*.mkv'' ' + \ . '-g ''!*.jpg'' -g ''!*.png'' ' + +let $FZF_DEFAULT_COMMAND = RG_TEMPLATE . '--files ' + + " Use ripgrep with fzf (from Jonhoo) +noremap <leader>s :Rg<CR> +command! -bang -nargs=* Rg + \ call fzf#vim#grep( + \ RG_TEMPLATE + \ . '--column --ignore --line-number --no-heading --color=always ' + \ . shellescape(<q-args>), 1, + \ <bang>0 ? fzf#vim#with_preview('up:60%') + \ : fzf#vim#with_preview('right:50%:hidden', '?'), + \ <bang>0) + + " FZF colors match vim colorscheme +let g:fzf_colors = +\ { 'fg': ['fg', 'Normal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Comment'], + \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], + \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], + \ 'hl+': ['fg', 'Statement'], + \ 'info': ['fg', 'PreProc'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'Conditional'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'] } + +" vim: set ff=unix ft=vim: diff --git a/vim/.vim/init_scripts/init.vim b/vim/.vim/init_scripts/init.vim new file mode 100644 index 0000000..7af3a26 --- /dev/null +++ b/vim/.vim/init_scripts/init.vim @@ -0,0 +1,18 @@ +" Source startup scripts +source ~/.vim/init_scripts/key_mappings.vim + +source ~/.vim/init_scripts/settings.vim + +source ~/.vim/init_scripts/external_plugins.vim + +" Extra =========================================== +let $BASH_ENV = '~/.bash_aliases' + +" From Jonhoo, sets ripgrep as grep +if executable('rg') + set grepprg=$FZF_DEFAULT_COMMAND + set grepformat=%f:%l:%c:%m +endif + +" Quickly take a note +command! Note :split ~/.vim/vim_notepad.md diff --git a/vim/.vim/init_scripts/key_mappings.vim b/vim/.vim/init_scripts/key_mappings.vim new file mode 100644 index 0000000..0b94f43 --- /dev/null +++ b/vim/.vim/init_scripts/key_mappings.vim @@ -0,0 +1,164 @@ +" ======================================================== +" # Keyboard shortcuts +" ======================================================== +let mapleader = "\<Space>" + +" Ctrl+k as Esc +nnoremap <C-k> <ESC> +inoremap <C-k> <ESC> +vnoremap <C-k> <ESC> +snoremap <C-k> <ESC> +xnoremap <C-k> <ESC> +cnoremap <C-k> <C-c> +onoremap <C-k> <ESC> +lnoremap <C-k> <ESC> +" Works in neovim not in vanilla vim +tnoremap <C-k> <ESC> + +" Stop accidentally pulling up manpages +nnoremap <S-k> <NOP> + +" Suspend with Ctrl+f +inoremap <C-f> <esc>:sus<CR> +vnoremap <C-f> :sus<CR> +nnoremap <C-f> :sus<CR> + +" Navigation ========================================= +" Jump to line start/end using homerow +noremap H ^ +noremap L $ + +" Move by lines +nnoremap j gj +nnoremap k gk + +" Repeat last f/F/t/T motion forward +nnoremap , ; +vnoremap , ; +onoremap , ; + +" Case insensitive search +nnoremap <leader>/ /\c + +" Jump to grep matches +nnoremap <leader>gn :cnext<CR> +nnoremap <leader>gN :cprev<CR> + +" Emacs-like movements +"inoremap <C-f> <right> +"inoremap <C-j> <left> +inoremap <C-h> <BS> +inoremap <C-d> <Del> +inoremap <C-u> <C-w> + + " Jump to end of line +inoremap <C-a> <home> +inoremap <C-e> <end> + + +" Command prompt ========================================= +" ; as : for commands +nnoremap ; : +vnoremap ; : + +" Emacs-like movements + " Move by character +cnoremap <C-f> <right> +cnoremap <C-j> <left> + " Delete by character +cnoremap <C-d> <del> +cnoremap <C-h> <bs> + " Move by word +cnoremap <C-b> <C-left> +cnoremap <C-w> <C-right> + " Delete left word +cnoremap <C-u> <C-w> + " Jump to end of line +cnoremap <C-a> <home> +cnoremap <C-e> <end> + +" Open cmdline history +cnoremap <C-g> <C-f>i + +" Open cmdline history from Normal +nnoremap ; : +nnoremap : q:i + +" Windows and buffers ==================================== +" Move to mark +nnoremap ' ` +"nnoremap ` ' + +" Switch buffers +nnoremap <leader>n :bnext<CR> +nnoremap <leader>N :bprevious<CR> + +" Window control with leader +nnoremap <leader>w <C-w> + + " Quick window switching +nnoremap <leader>h <C-w>h +nnoremap <leader>j <C-w>j +nnoremap <leader>k <C-w>k +nnoremap <leader>l <C-w>l + + " Window movement +nnoremap <leader><leader>h <C-w>H +nnoremap <leader><leader>j <C-w>J +nnoremap <leader><leader>k <C-w>K +nnoremap <leader><leader>l <C-w>L + +" Window resizing + " < increases, > decreases +nnoremap <leader>, 10<C-w>> +nnoremap <leader>. 10<C-w>< + + " Vertical resizing +nnoremap <leader><leader>, 10<C-w>+ +nnoremap <leader><leader>. 10<C-w>- + + " Set interior window width to 80 columns +nnoremap <leader><leader>= :vertical resize 84<CR> + +" Editing remaps ======================================== +" Uppercase previous word from Insert mode +inoremap <C-y> <ESC>vbU`>a + + " Autocompletion - word and line +inoremap <C-l> <C-n> +"inoremap <C-l> <C-x><C-n> + + + " Yank to clipboard +nnoremap Y "+y +vnoremap Y "+y + + " Convenient macro replays +nnoremap @ q +nnoremap q @ + +" Extended options ====================================== +" These use <leader>o as a prefix + + " Enable spellcheck +nnoremap <leader>ospell :set spell!<CR> +command! Spell :set spell! + + " Copy current visual selection to ix.io +vnoremap <silent> <leader>oix :w !ix.sh &<CR> +command! Ix :w !ix.sh & + + " Open first URL on line +nnoremap <silent> <leader>ourl :silent call OpenURL()<CR> +command! Url :silent call OpenURL() + + " Create a pretty block comment. Supports 3 types of comments +nnoremap <leader>opretty :call PrettySectionComment()<CR> +command! Pretty :call PrettySectionComment('#') +command! Prettyc :call PrettySectionComment('/*') +command! Prettyrs :call PrettySectionComment('//') +command! Prettyjs :call PrettySectionComment('//') + + " Open with vifm +nnoremap <leader>onet :EditVifm getcwd()<CR> +nnoremap <leader>otnet :exe 'TabVifm' getcwd()<CR> diff --git a/vim/.vim/init_scripts/settings.vim b/vim/.vim/init_scripts/settings.vim new file mode 100644 index 0000000..7043acb --- /dev/null +++ b/vim/.vim/init_scripts/settings.vim @@ -0,0 +1,153 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +set shell=/bin/bash + +" =================================================================== +" File settings +" =================================================================== +set fileformat=unix " Proper EOL + +" Tabs to spaces +set expandtab " tabs are space +set tabstop=4 " 4 spaces per TAB +set softtabstop=4 " 4 spaces in tab when editing +set shiftwidth=4 " 4 spaces to use for autoindent +set copyindent " copy indents from the previous line +set autoindent +filetype plugin indent on " Vim's auto-indenting is broken without this + +" Allow buffers to be hidden +set hidden + +" Prevent accidental writes +au BufWritePre [:;']* throw 'Forbidden file name: ' . expand('<afile>') + +" Embedded code in markdown +let g:markdown_fenced_languages = ['bash', 'rust', 'javascript', 'c', 'toml'] + +" =================================================================== +" Human-facing settings +" =================================================================== +" Relative line numbering +set number relativenumber + +" Line cursor in Insert. Neovim ignores this +let &t_SI = "\e[6 q" +let &t_EI = "\e[2 q" + +set hlsearch incsearch " Live incremental searches + +" Shows uncompleted mapping keystokes in the bottom right +set showcmd + +" Scroll before hitting top or bottom of window +set scrolloff=2 + +" Mouse support +set mouse=a " In all modes +map <ScrollWheelUp> <C-Y> +map <ScrollWheelDown> <C-E> + +" Fast bracket matches +set showmatch +set matchtime=0 " Set to 0 for no latency + +" More natural window splitting +set splitbelow +set splitright + +set colorcolumn=80 " 80 character column marker + +" Highlight active line except in Insert +au InsertEnter,InsertLeave * set cul! +set cursorline + +" Wrap h l movements across lines +set whichwrap+=>,l +set whichwrap+=<,h + +set backspace=eol,start,indent " Movement of deletion keys + +" Wider spaced Menlo font with Nerd Font glyphs +set guifont=MesloLGM\ Nerd\ Font:h16 + +" Mark trailing whitespace with • ==== +set list " Toggle with :set invlist +set listchars=tab:•\ ,trail:•,extends:•,precedes:•,nbsp:␣ + + " Hide whitespace markers in Insert +augroup trailing_whitespace + au! + au InsertEnter * set nolist + au InsertLeave * set list +augroup END + +" Fold .vim files on triple '{' marks +augroup vimrc_folds + au Filetype vim setlocal foldmethod=marker + au Filetype vim,BufReadPre setlocal foldlevelstart=0 +augroup END + + +" =================================================================== +" Syntax colors +" =================================================================== +" Use base16 colors: +" https://github.com/chriskempson/base16-vim +" Previews: https://base16.netlify.app/ + +syntax on +set termguicolors " Actual colors +set background=dark " Colorscheme overrides this option +let base16colorspace=256 + +if !has('gui_running') + set t_Co=256 +endif + +" Brighten comment highlight, when switching color schemes +function! FixHighlights() + hi! link IPythonCell Todo + call Base16hi("Comment", g:base16_gui09, "", g:base16_cterm09, "", "", "") +endfunction + +command! FH :call FixHighlights() + +" Color schemes ==== + " Switch to common themes quickly +command! Light :colo base16-gruvbox-light-medium | FH +command! Lighth :colo base16-gruvbox-light-hard | FH +command! Darkb :colo base16-gruvbox-dark-bright | FH +command! Dark :colo base16-gruvbox-dark-pale | FH +command! Darkh :colo base16-gruvbox-dark-medium | FH + +" 1: Foreground = medium, Background = very dark -- Blackboard-like +" 2: Foreground = high, Background = low +" 3: Foreground = medium, Background = medium -- purple-ish +" 4: Foreground = medium-high, Background = medium -- Nord blue +command! Dark1 :colo base16-dracula | FH +command! Dark2 :colo base16-monokai | FH +command! Dark3 :colo base16-material-palenight | FH +command! Dark4 :colo base16-nord | FH + +" 1: Foreground = dark, Background = very bright -- Paper like +" 2: Foreground = dark, Background = maximum white -- Paper like +" 3: Foreground = dark, Background = low bright -- Low contrast +" 4: Foreground = dark, Background = low bright -- Low contrast +command! Light1 :colo base16-github | FH +command! Light2 :colo base16-tomorrow | FH +command! Light3 :colo base16-atelier-estuary-light | FH +command! Light4 :colo base16-atelier-plateau-light | FH + +" Switch theme to match terminal ==== +if !has('termguicolors') + colo Default +elseif executable('colo.sh') + exec 'colo ' . system('colo.sh --colorscheme') +elseif executable(expand('~/.configs_pointer/bin/colo.sh')) + exec 'colo ' . system('~/.configs_pointer/bin/colo.sh --colorscheme') +else + echom "Using fallback color scheme" + Dark +endif + +call FixHighlights() diff --git a/vim/.vim/plugin/auto_session.vim b/vim/.vim/plugin/auto_session.vim new file mode 100644 index 0000000..537b0cb --- /dev/null +++ b/vim/.vim/plugin/auto_session.vim @@ -0,0 +1,76 @@ +" Always use sessions on entry and exit: +" +" Examples: +" Assuming [[ $(pwd) == ~/.vim/colors ]] +" Actions vary based on if command line arguments were passed. +" +" Plugin doesn't load for: +" - When vim is entered in exmode +" - When vim is entered as a GUI +" +" $ vim +" Called with no args: +" // On entry: +" // Source ~/.vim/colors/Session.vim if available +" // On exit: +" // If only one window and tab is open, DELETE the Session.vim file +" // If multiple windows and/or tabs are open, OVERWRITE Session.vim +" +" $ vim ~/.vimrc +" Called with args: +" // On entry: +" // Doesn't source any Session.vim +" // On exit: +" // If only one window and tab is open, DOES NOT DELETE Session.vim +" // If multiple windows and/or tabs are open, OVERWRITE Session.vim +" +" $ ex +" $ vim -e +" // Won't run this plugin +" +" https://stackoverflow.com/questions/5142099/how-to-auto-save-vim-session-on-quit-and-auto-reload-on-start-including-split-wi + +" Save argc before Session.vim overwrites it +let s:init_argc_len = argc() + +fu! SaveSess() + " Don't delete or source Session.vim when explicit files were called. + " Still overwrites old Session.vim if multiple windows are open on exit + if (tabpagenr('$') == 1) && (winnr('$') == 1) && (s:init_argc_len == 0) + execute 'silent! call delete("' . getcwd() . '/Session.vim")' + elseif (tabpagenr('$') > 1) || (winnr('$') > 1) + execute 'mksession! ' . getcwd() . '/Session.vim' + endif +endfunction + +fu! RestoreSess() + if filereadable(getcwd() . '/Session.vim') + execute 'source ' . getcwd() . '/Session.vim' + endif +endfunction + + +" Don't run plugin if vim started in ex-mode or gui +let s:is_no_run = (mode() =~# '^c') || has("gui_running") + +if !s:is_no_run + " Only restore sessions without explict files being opened + if s:init_argc_len == 0 + autocmd VimEnter * nested call RestoreSess() + endif + autocmd VimLeave * call SaveSess() +endif + + +" Testing from within vim +fu! Testsavesess() + if s:is_no_run + echom 'Exmode or GUI detected: this plugin won''t effect any Session.vim files' + elseif (tabpagenr('$') == 1) && (winnr('$') == 1) && (s:init_argc_len == 0) + echom 'Deletes ' . getcwd() . '/Session.vim on exit' + elseif (tabpagenr('$') > 1) || (winnr('$') > 1) + echom 'Overwrites ' . getcwd() . '/Session.vim on exit' + else + echom 'Won''t touch anything' + endif +endfunction diff --git a/vim/.vim/plugin/clear_whitespace.vim b/vim/.vim/plugin/clear_whitespace.vim new file mode 100644 index 0000000..4fcc0e7 --- /dev/null +++ b/vim/.vim/plugin/clear_whitespace.vim @@ -0,0 +1,16 @@ +" Removes trailing white space across the entire file +function! RemoveTailingWhitespace() + let l:prev_search = @/ " Search register + let l:cur_pos = getcurpos() " Cursor position + + silent! %s/\V\s\+\$// + + let @/ = l:prev_search " Restore search register + call setpos('.', l:cur_pos) " Move cursor back to starting place +endfunction + + + " Always remove tailing whitespace on write +autocmd BufWrite * call RemoveTailingWhitespace() + +command! Trim call RemoveTailingWhitespace() diff --git a/vim/.vim/plugin/fix_highlights.vim b/vim/.vim/plugin/fix_highlights.vim new file mode 100644 index 0000000..bd7daaf --- /dev/null +++ b/vim/.vim/plugin/fix_highlights.vim @@ -0,0 +1,5 @@ +" Fix highlights when switching color schemes +function! FixHighlights() + hi! link IPythonCell Todo + call Base16hi("Comment", g:base16_gui09, "", g:base16_cterm09, "", "", "") +endfunction diff --git a/vim/.vim/plugin/open_url.vim b/vim/.vim/plugin/open_url.vim new file mode 100644 index 0000000..eec6425 --- /dev/null +++ b/vim/.vim/plugin/open_url.vim @@ -0,0 +1,25 @@ +" Opens the first URL on the current line. On macs, the tab is opened in +" incongito +" Note: `gx` can do something very similar by default in vim +function! OpenURL() + let s:open_url = matchstr(getline("."), '\vhttps?://[A-z0-9-\._~/?\[\]@!\$&\(\)*+,;=#%]+') + let l:kernel_name = matchstr(system('uname'), '\v(Darwin)|(Linux)') + + if s:open_url == '' + echom 'No URL found on this line' + elseif l:kernel_name == 'Darwin' + call system("open -n -a 'Google Chrome' --args --incognito '" . s:open_url . "'") + elseif executable('chromium') + call system("chromium --incognito '" . s:open_url . "'") + elseif executable('chromium-browser') + call system("chromium-browser --incognito '" . s:open_url . "'") + elseif executable('google-chrome') + call system("google-chrome --incognito '" . s:open_url . "'") + elseif executable('chrome-browser') + call system("chrome-browser --incognito '" . s:open_url . "'") + elseif executable('firefox') + call system("firefox '" . s:open_url . "'") + else + echom 'No browser found' + endif +endfunction diff --git a/vim/.vim/plugin/pretty_section_comment.vim b/vim/.vim/plugin/pretty_section_comment.vim new file mode 100644 index 0000000..73cb294 --- /dev/null +++ b/vim/.vim/plugin/pretty_section_comment.vim @@ -0,0 +1,52 @@ +" Creates a pretty comment box +"╔─────────────────────────────────────────────────────────────────────────────╗ +"│ L𝓲kε τh𝓲s bεαμτy! | +"╚─────────────────────────────────────────────────────────────────────────────╝ +function! PrettySectionComment(type) + " Fancy unicode + silent! s/A/Λ/g + silent! s/a/α/g + silent! s/e/ε/g + silent! s/n/η/g + silent! s/o/δ/g + silent! s/p/ρ/g + silent! s/t/τ/g + silent! s/u/μ/g + silent! s/v/ν/g + silent! s/w/ω/g + silent! s/x/χ/g + + if a:type ==# '/*' + call append(line(".") - 1, + \ "/*─────────────────────────────────────────────────────────────────────────────╗") + call append(line("."), + \ "╚─────────────────────────────────────────────────────────────────────────────*/") + elseif a:type ==# '//' + call append(line(".") - 1, + \ "//╔────────────────────────────────────────────────────────────────────────────╗") + call append(line("."), + \ "//╚────────────────────────────────────────────────────────────────────────────╝") + else + call append(line(".") - 1, + \ "#╔─────────────────────────────────────────────────────────────────────────────╗") + call append(line("."), + \ "#╚─────────────────────────────────────────────────────────────────────────────╝") + endif + + " Delete text + exe "normal! ^D0" + " Insert 80 spaces + exe "normal! 80i \<esc>" + + " Paste back in commented text + if a:type ==# '/*' + exe "normal! 0i│ \<C-r>\"\<esc>" + elseif a:type ==# '//' + exe "normal! 0i//│ \<C-r>\"\<esc>" + else + exe "normal! 0i#│ \<C-r>\"\<esc>" + endif + + " Add closing bar on right + exe "normal! 079li|\<esc>" +endfunction diff --git a/vim/.vim/plugin/statusbars/statusline.vim b/vim/.vim/plugin/statusbars/statusline.vim new file mode 100644 index 0000000..1c9dc16 --- /dev/null +++ b/vim/.vim/plugin/statusbars/statusline.vim @@ -0,0 +1,354 @@ +" Very minital statusline for vim +" Supports vim 8.0 and up and neovim 0.4 and likely earlier versions + + " Always show +set laststatus=2 + +" ======================================================== +" # Statusline highlights +" ====================================================={{{ +augroup statusbars_colorscheme_matching + au! + autocmd ColorScheme * call ReloadStatlnColors() +augroup END + +" Function taken from vim airline +" https://github.com/vim-airline/vim-airline/blob/master/autoload/airline/highlighter.vim#L17 +function! GuiColors(rgb, fallback) + if a:rgb[0] !~ '#' + return a:fallback + endif + return a:rgb +endfunction + + " Also set as active tabline hue +let g:StatlnPrimaryColor = '#000000' +" \ GuiColors(synIDattr(synIDtrans(hlID('String')), 'fg', 'gui'), '#000000') + +" Updates statusline colors +function! ReloadStatlnColors() + call SetGlobalPrimaryColor() + + let g:StatlnPrimaryFG = GuiColors(synIDattr(synIDtrans(hlID('Normal')), 'bg', 'gui'), '#222222') + \ | let g:StatlnSubtle = GuiColors(synIDattr(synIDtrans(hlID('Normal')), 'fg', 'gui'), '#DAB997') + \ | let g:StatlnSubtleBG = GuiColors(synIDattr(synIDtrans(hlID('Visual')), 'bg', 'gui'), '#4E4E4E') + \ | let g:StatlnIdle = GuiColors(synIDattr(synIDtrans(hlID('Search')), 'bg', 'gui'), '#FFAF00') + \ | let g:StatlnIdleBG = GuiColors(synIDattr(synIDtrans(hlID('Normal')), 'bg', 'gui'), '#222222') + + " Colored accent highlight changing based on the mode + " Statusline: Left and right corners + " TabLine: Active tab + execute 'highlight StatlnPrimaryHL' + \ . ' guifg=' . g:StatlnPrimaryFG + \ . ' guibg=' . g:StatlnPrimaryColor + \ . ' term=bold cterm=bold gui=bold' + + highlight! link TabLineActiveHL StatlnPrimaryHL + + " Primary highlight transitions for powerline seperators + " Statusline: Left/right corners to adjacent + " Tabline: Active <-> Idle tabs + execute 'highlight StatlnPrimaryToSubtleHL guifg=' . g:StatlnSubtleBG . ' guibg=' . g:StatlnPrimaryColor + highlight! link TabLineIdleToActiveHL StatlnPrimaryToSubtleHL + + execute 'highlight StatlnSubtleToPrimaryHL guifg=' . g:StatlnPrimaryColor . ' guibg=' . g:StatlnSubtleBG + highlight! link TabLineActiveToIdleHL StatlnSubtleToPrimaryHL + + " Small Statusline: Center -> blank right side + " TabLine: Active tab -> blank right side + execute 'highlight TabLineActiveToBGHL guifg=' . g:StatlnPrimaryColor . ' guibg=' . g:StatlnIdleBG + execute 'highlight StatlnPrimaryToIdleHL guifg=' . g:StatlnIdleBG . ' guibg=' . g:StatlnPrimaryColor + + " Secondary highlight + " Statusline: Adjacent to corners + " Tabline: Inactive (idle) tabs + execute 'highlight StatlnSubtleHL guifg=' . g:StatlnSubtle . ' guibg=' . g:StatlnSubtleBG + highlight! link TabLineIdleHL StatlnSubtleHL + + " Secondary highlight transitions for powerline seperators + " StatusLine: Into/from the middle gap + " Small StatusLine: Blank left side -> center + " Tabline: Inactive tab -> blank right side + execute 'highlight StatlnSubtleToIdleHL guifg=' . g:StatlnIdleBG . ' guibg=' . g:StatlnSubtleBG + execute 'highlight StatlnIdleToPrimaryHL guifg=' . g:StatlnPrimaryColor . ' guibg=' . g:StatlnIdleBG + + execute 'highlight StatlnIdleToSubtleHL guifg=' . g:StatlnSubtleBG . ' guibg=' . g:StatlnIdleBG + highlight! link TabLineIdleToBGHL StatlnIdleToSubtleHL + + " Tertiary highlight + " StatusLine: Background of statusline and inactive buffers + execute 'highlight StatlnIdleHL guifg=' . g:StatlnIdle ' guibg=' . g:StatlnIdleBG + execute 'highlight StatlnIdleInverseHL guifg=' . g:StatlnIdleBG ' guibg=' . g:StatlnIdle + +endfunction + + +" Sets primary color highlight for statusline and tabline, based on the mode +" Updates the name of the mode in the statusline +function! SetGlobalPrimaryColor() + let l:mode = mode() " Returns vim's current mode + + if l:mode ==# 'n' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('String')), 'fg', 'gui'), '#AFAF00') + let g:mode_str = 'NORMAL' " Light green + elseif l:mode ==# 'i' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui'), '#83ADAD') + let g:mode_str = 'INSERT' " Light blue + elseif l:mode ==# 'R' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Error')), 'bg', 'gui'), '#D75F5F') + let g:mode_str = 'REPLACE' " Light red + elseif l:mode ==# 'v' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Keyword')), 'fg', 'gui'), '#D485AD') + let g:mode_str = 'VISUAL' " Pink/light purple + elseif l:mode ==# 'V' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Keyword')), 'fg', 'gui'), '#D485AD') + let g:mode_str = "V-LINE" " Pink/light purple + elseif l:mode ==# "\<C-v>" + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Keyword')), 'fg', 'gui'), '#D485AD') + let g:mode_str = "V-BLOCK" " Pink/light purple + elseif l:mode ==# 's' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Special')), 'fg', 'gui'), '#85AD85') + let g:mode_str = 'SELECT' " Turquoise + elseif l:mode ==# 'c' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Special')), 'fg', 'gui'), '#85AD85') + let g:mode_str = 'COMMAND' " Turquoise + elseif l:mode ==# '!' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Special')), 'fg', 'gui'), '#85AD85') + let g:mode_str = 'SHELL' " Turquoise + elseif l:mode ==# 't' + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Special')), 'fg', 'gui'), '#85AD85') + let g:mode_str = 'TERM' " Turquoise + else + let g:StatlnPrimaryColor = GuiColors(synIDattr(synIDtrans(hlID('Special')), 'fg', 'gui'), '#85AD85') + let g:mode_str = 'UNKNOWN' " Turquoise + endif +endfunction + +" }}} + + +" ======================================================== +" # Statusline helper functions +" ====================================================={{{ +" Returns the current git branch, or an empty string +function! StatlnGitBranch() + let l:branch = system('git branch --show-current') + + if l:branch !~ ' ' + return '  ' + else + return '' + endif +endfunction + + +" Modified buffer indicator +function! StatlnModified() + let l:is_modified = getbufinfo(bufnr('%'))[0].changed + + if l:is_modified && &readonly + let l:modified_marker = '[!]' " Ah! You modified a read-only buffer + elseif l:is_modified + let l:modified_marker = '[+]' + elseif &readonly + let l:modified_marker = '[-]' + else + let l:modified_marker = '' " No indicator for unmodified normal buffer + endif + + return l:modified_marker +endfunction + + +" Set the primary status/tabline color and the mode string +function! StatlnMode() + call SetGlobalPrimaryColor() + call ReloadStatlnColors() + + " Redraws tabline and updates the global mode color + " Required to synchronize tabline and statusline properly + set tabline=%!TabLine() + + return g:mode_str . ' ' +endfunction + + +" Upper estimate for the length of the active stausline, not inluding the +" middle gap +function! EstStatlnLength() + let l:mode_len = 11 + let l:buff_len = len(fnamemodify(bufname("%"), ':t')) + 7 + + let l:file_type_len = len(&filetype) + 6 + let l:line_metrics_len = len(string(line('$'))) * 2 + 12 + + return l:mode_len + l:buff_len + l:file_type_len + l:line_metrics_len +endfunction + +" }}} + + +" ======================================================== +" # Build and reload Statusline +" ====================================================={{{ +" Statusline for active window +" +" Switches to a compact version for narrow windows +function! ActiveStatusline() + " Update statusline on all events + let l:track_mode='%{strpart(StatlnMode(), 0, 0)}' + + " Compact statusline ============================================ + " Current buffer's name centered with mode-specific background color + let l:left='%#StatlnIdleHL#' . '%{StatlnSmall("margin_left")}' + \ . '%#StatlnIdleToPrimaryHL#' . '%{StatlnSmall("seperator")}' + let l:buff='%#StatlnPrimaryHL#' . '%{StatlnSmall("file_name")}' + \ . '%#StatlnPrimaryToIdleHL#' . '%{StatlnSmall("seperator")}' + let l:right='%#StatlnIdleHL#' . '%{StatlnSmall("margin_right")}' + + let l:small_line = l:left . l:buff . l:right + + " Left side ===================================================== + " Current mode bold and with a mode-specific background color + let l:mode='%#StatlnPrimaryHL#' . '%{StatlnFull("mode")}' + \ . '%#StatlnPrimaryToSubtleHL#' . '%{StatlnFull("seperator")}' + " Current buffer's name and an indicator if it was modified + let l:buff='%#StatlnSubtleHL#' . '%{StatlnFull("file_name")}' + \ . '%#StatlnSubtleToIdleHL#' . '%{StatlnFull("seperator")}' + + let l:left_side = l:mode . l:buff . '%#StatlnIdleHL#' + + " Right side ==================================================== + let l:trans_from_gap='%#StatlnIdleToSubtleHL#' . '%{StatlnFull("seperator")}' + " File type in [] + let l:file_type='%#StatlnSubtleHL#' . '%{StatlnFull("file_type")}' + \ . '%#StatlnSubtleToPrimaryHL#' . '%{StatlnFull("seperator")}' + " Scroll percentage, column, line / total lines, with mode-background color + let l:line_metrics='%#StatlnPrimaryHL#%{StatlnFull("line_metrics")}' + + let l:right_side='%=' . l:trans_from_gap . l:file_type . l:line_metrics + + let l:full_line = l:left_side . l:right_side + + " Return all. Only one line with render at a time + return l:track_mode . l:small_line . l:full_line +endfunction + + +" Returns component for the compact statusline +" +" Returns empty strings if the window is wide enough for a full sized +" statusline +function! StatlnFull(part) + let l:is_small_window = winwidth(0) <= EstStatlnLength() - 18 + + if !l:is_small_window + if 'mode' ==# a:part + return ' ' . StatlnMode() + + elseif 'seperator' ==# a:part + return ' ' + + elseif 'file_name' ==# a:part + let l:file_name = fnamemodify(bufname('%'), ':t') + " Blank buffer + if len(l:file_name) == 0 + let l:file_name = '[No Name]' + endif + return ' ' . l:file_name . ' ' . StatlnModified() + + elseif 'file_type' ==# a:part + " Blank buffer + if len(&filetype) == 0 + return '' + endif + return '[' . &filetype . ']' + + elseif 'line_metrics' ==# a:part + let l:total = line('$') + let l:current = line('.') + let l:frac = ' ' . l:current . '/' . l:total . ' ' + + let l:col = printf('%2S', col('.')) + + let l:percent = float2nr(l:current * 100 / l:total) . '% ☰ ' + + return l:percent . l:col . l:frac + + else + echom 'Error: a:part for the full statusline doesn''t match any part' + return '' + endif + else + " Part indicated shouldn't render, since the compact statusline should + " be rendering instead + return '' + endif +endfunction + + +" Returns component for full sized statusline +" +" Returns empty strings if the window is too narrow for a full sized +" statusline +function! StatlnSmall(part) + let l:is_small_window = winwidth(0) <= EstStatlnLength() - 18 + + if l:is_small_window + if 'margin_left' ==# a:part + return repeat('—', 7) . ' ' + + elseif 'margin_right' ==# a:part + let l:len = winwidth(0) + \ - strchars(StatlnSmall('margin_left')) + \ - strchars(StatlnSmall('file_name')) + \ - 3 "Unclear where this magical constant appears + + return ' ' . repeat('—', l:len - 1) + + elseif 'seperator' ==# a:part + return ' ' + + elseif 'file_name' ==# a:part + return ' ' . fnamemodify(bufname("%"), ':t') . ' ' . StatlnModified() + + else + echom 'Error: a:part for the compact statusline doesn''t match any part' + return '' + endif + else + " Part shouldn't render since the window is wide enough for the full + " statusline to render instead + return '' + endif +endfunction + + +" Status line for all windows except the focused window +" +" Transparent background with em-dash margins around the buffer's name +function! IdleStatusline() + call ReloadStatlnColors() + set fillchars=stlnc:— " All empty space filled with em-dashes + + " Left padding to align file name with active stl. + " Same background as editor makes it very minimalist + return '%#StatlnIdleHL#—————————— %t %{StatlnModified()} ' +endfunction + + +augroup SetStatusLine + autocmd! + au BufEnter,WinEnter * let &l:stl = ActiveStatusline() + au BufLeave,WinLeave * let &l:stl = IdleStatusline() + + " Updates status/tabline when entering command prompt + au CmdlineEnter * redraw +augroup end + +" }}} + + +" Further reading: + " https://shapeshed.com/vim-statuslines/ + " https://www.reddit.com/r/vim/comments/ld8h2j/i_made_a_status_line_from_scratch_no_plugins_used/ diff --git a/vim/.vim/plugin/statusbars/tabline.vim b/vim/.vim/plugin/statusbars/tabline.vim new file mode 100644 index 0000000..71f178f --- /dev/null +++ b/vim/.vim/plugin/statusbars/tabline.vim @@ -0,0 +1,230 @@ +" Creates a simple lightweight tabline intended for vanilla vim + +" Always display tabline +set showtabline=2 + +" ======================================================== +" # TODO Weather notification TODO +" ====================================================={{{ +function! Weather() + let l:forecasts = GetForecast() + + if l:forecasts[0] + " First index is to unwrap tuple returned by GetForecast() + " Forecast in 3 hours + let l:next_forecast = l:forecasts[1][0]['weather'][0] + + " TODO: Change tabsline instead of just echoing + echom WeatherCondition(l:next_forecast) + else + " TODO: Better error reporting in tabline + echom 'Error: `' . l:forecasts[1] . '`' + endif +endfunction + +" Tries to grab the weather off OpenWeather +" +" Returns: +" First item indicates the api call was successful. Second item contains +" relevent data returned by the api +" +" [1, list]: List of forecasts in 3h intervals +" [0, str]: String is the error message from the server +function! GetForecast() + " Makes request for json + let l:response = system('curl --silent ''http://api.openweathermap.org/data/2.5/forecast?q=edmonton&appid=317f9cc8efd9ce81736994c0497eb7b2''') + let l:json = json_decode(l:response) + " let l:unix_epoch = str2nr(system('date +"%s"')) + + " Success case is code 200 + if l:json['cod'] ==# '200' + " List of forecasts in 3h intervals + return [1, l:json['list']] + else + return [0, l:json['message']] + endif +endfunction + + +" Returns a simple string for the general idea of the weather conditions +" Arg: +" forecast (dict): one time's forecast dictionary, parsed from json +" +" Return: +" str: General idea of the weather +function! WeatherCondition(forecast) + " Numerical identification for weather conditions + " See id codes here: https://openweathermap.org/weather-conditions + let l:forecast_id = a:forecast['id'] + + if l:forecast_id[:0] ==# '2' + " Thunderstorm + return 'Thunderstorm' + elseif l:forecast_id[:0] ==# '5' || l:forecast_id[:0] ==# '3' + " Rain or `drizzle` + return 'Rain' + elseif l:forecast_id[:0] ==# '6' + " Snow + return 'Snow' + elseif l:forecast_id[:0] ==# '8' + " Cloudly or clear. Nothing exciting + return 'Normal' + elseif l:forecast_id[:0] ==# '7' + " Atmospheric abnormality ex: Dust, Smoke, Sand, Tornado + if l:forecast_id ==# '781' + " Tornado! + return 'Tornado' + elseif l:forecast_id ==# '711' + " Smoke + return 'Smoke' + elseif l:forecast_id ==# '741' + " Fog + return 'Fog' + elseif l:forecast_id ==# '761' + " Dust + return 'Dust' + else + return 'Atomspheric abnormality' + endif + else + " Error: should have matched above + return 'Error: Failed to find weather condition code `' . l:forecast_id . '`' + endif +endfunction + +" }}} + +" ======================================================== +" # Build TabLine +" ====================================================={{{ + +" Creates visual label/title for a tab +function! TabLabel(tab_num) + let l:tab_label = '' + + " Different highlight for active tab ================= + if a:tab_num ==# tabpagenr() + " Is active tab + let l:tab_HL = '%#TabLineActiveHL#' + + if a:tab_num ==# tabpagenr('$') + " Active tab is last tab + let l:tab_trans_HL = '%#TabLineActiveToBGHL#' + else + let l:tab_trans_HL = '%#TabLineActiveToIdleHL#' + endif + + let l:tab_seperator = '' + elseif a:tab_num ==# tabpagenr() - 1 + " Tab right before active tab + let l:tab_HL = '%#TabLineIdleHL#' + let l:tab_trans_HL = '%#TabLineIdleToActiveHL#' + let l:tab_seperator = '' + elseif a:tab_num ==# tabpagenr('$') + " Last tab and it's idle + let l:tab_HL = '%#TabLineIdleHL#' + let l:tab_trans_HL = '%#TabLineIdleToBGHL#' + let l:tab_seperator = '' + else + " Inactive tab not adjacent to active tab + let l:tab_HL = '%#TabLineIdleHL#' + let l:tab_trans_HL = '%#TabLineIdleHL#' + let l:tab_seperator = '' + endif + + let l:tab_label .= l:tab_HL + + " Ordered list of buffer ids open in the tab ========= + let l:buff_list = tabpagebuflist(a:tab_num) + + " Path to first buffer in the tab + let l:curr_buff_path = bufname(l:buff_list[0]) + + " Truncate file path to tail only + let l:tab_title = fnamemodify(l:curr_buff_path, ':t') + + let l:click_mark = '%' . a:tab_num . 'T' " Support for mouse clicks + + " Tab number, file name, powerline seperator ========= + let l:tab_label .= + \ l:click_mark . ' ' . a:tab_num . ' ' . l:tab_title . ' ' . l:tab_trans_HL . l:tab_seperator + + let s:columns_used += strchars(a:tab_num . l:tab_title . l:tab_seperator) + 4 + + " If tabline is not full + if &columns - s:columns_used > 0 + return l:tab_label + else + return '' +endfunction + + +" Tab count on the left +" Clicking it moves jumps to the last tab, except from the last tab, where it +" jumps to the first tab +function! TabLineLabel() + " Edge case for + if tabpagenr() == 1 + let l:trans_HL = '%#TabLineActiveHL#' + let l:tab_seperator = '' + else + let l:trans_HL = '%#TabLineActiveToIdleHL#' + let l:tab_seperator = '' + endif + + "TODO: If rapidly clicked, creates new blank + if tabpagenr() == tabpagenr('$') + let l:click_mark = '%' . 1 . 'T' " Jump to first tab, when on last tab + else + let l:click_mark = '%' . tabpagenr('$') . 'T' " Jump to last tab + endif + + + let l:tab_counter_str = ' Tabs: ' . tabpagenr('$') . ' ' + + let l:tab_counter = + \ l:click_mark . '%#TabLineActiveHL# Tabs: ' . tabpagenr('$') . ' ' . l:trans_HL . l:tab_seperator + + let s:columns_used += strchars(l:tab_counter_str) + + return l:tab_counter +endfunction + + +" Build and return tabline, with the same hues as the statusline +function! TabLine() + call ReloadStatlnColors() + + let s:columns_used = 0 " Count to prevent overflow + "TODO: implement hidden markers + "let s:is_hidden_left = 0 " Tabs hidden on the right + "let s:is_hidden_right = 0 " Tabs hidden on the left + + let l:tabline_tab_count = TabLineLabel() + + " Tries adding the previous, active, and next tabs before any others + " In case of overflow, active tab will be shown + if tabpagenr('$') < 3 || tabpagenr() < 3 + let l:start_iter = 1 + else + let l:start_iter = tabpagenr() - 1 " Tab before active tab + endif + + " All tabs after and including the tab before the active tab + let l:active_onwards = '' + for i in range(l:start_iter, tabpagenr('$')) + let l:active_onwards .= TabLabel(i) " Visible tab label + endfor + + " All tabs preceeding the tab before the active tab + let l:preceeding_active = '' + for i in range(l:start_iter - 1, 1, -1) + let l:preceeding_active = TabLabel(i) . l:preceeding_active " Visible tab label + endfor + + return l:tabline_tab_count . l:preceeding_active . l:active_onwards +endfunction + +au BufEnter,BufLeave,WinEnter,WinLeave * set tabline=%!TabLine() + +" }}} diff --git a/vim/.vim/syntax/mips.vim b/vim/.vim/syntax/mips.vim new file mode 100644 index 0000000..b420313 --- /dev/null +++ b/vim/.vim/syntax/mips.vim @@ -0,0 +1,272 @@ +" Vim syntax file +" Language: MIPS +" Maintainer: Alex Brick <alex@alexrbrick.com> +" Last Change: 2007 Oct 18 +" +" As downloaded from +" https://www.vim.org/scripts/script.php?script_id=2045 + +if version < 600 + syntax clear +"elseif exists("b:current_syntax") +" finish +endif + +setlocal iskeyword+=- +syntax case match + +syntax match mipsComment /#.*/ +syntax match mipsNumber /\<[-]\?\d\+\>/ " Decimal numbers +syntax match mipsNumber /\<-\?0\(x\|X\)[0-9a-fA-F]\+\>/ " Hex numbers +syntax region mipsString start=/"/ skip=/\\"/ end=/"/ +syntax region mipsCharacter start=/'/ end=/'/ +syntax match mipsLabelColon /:/ contained +syntax match mipsLabel /\w\+:/ contains=mipsLabelColon + +" Registers +syntax match mipsRegister "\$zero" +syntax match mipsRegister "\$v0" +syntax match mipsRegister "\$v1" +syntax match mipsRegister "\$a0" +syntax match mipsRegister "\$a1" +syntax match mipsRegister "\$a2" +syntax match mipsRegister "\$a3" +syntax match mipsRegister "\$t0" +syntax match mipsRegister "\$t1" +syntax match mipsRegister "\$t2" +syntax match mipsRegister "\$t3" +syntax match mipsRegister "\$t4" +syntax match mipsRegister "\$t5" +syntax match mipsRegister "\$t6" +syntax match mipsRegister "\$t7" +syntax match mipsRegister "\$t8" +syntax match mipsRegister "\$t9" +syntax match mipsRegister "\$s0" +syntax match mipsRegister "\$s1" +syntax match mipsRegister "\$s2" +syntax match mipsRegister "\$s3" +syntax match mipsRegister "\$s4" +syntax match mipsRegister "\$s5" +syntax match mipsRegister "\$s6" +syntax match mipsRegister "\$s7" +syntax match mipsRegister "\$k0" +syntax match mipsRegister "\$k1" +syntax match mipsRegister "\$gp" +syntax match mipsRegister "\$sp" +syntax match mipsRegister "\$fp" +syntax match mipsRegister "\$ra" + +let i = 0 +while i < 32 + " This is for the regular registers + execute 'syntax match mipsRegister "\$' . i . '\(\d\+\)\@!"' + " And this is for the FP registers + execute 'syntax match mipsRegister "\$f' . i . '\(\d\+\)\@!"' + let i = i + 1 +endwhile + +" Directives +syntax match mipsDirective "\.2byte" +syntax match mipsDirective "\.4byte" +syntax match mipsDirective "\.8byte" +syntax match mipsDirective "\.aent" +syntax match mipsDirective "\.align" +syntax match mipsDirective "\.aascii" +syntax match mipsDirective "\.ascii" +syntax match mipsDirective "\.asciiz" +syntax match mipsDirective "\.byte" +syntax match mipsDirective "\.comm" +syntax match mipsDirective "\.cpadd" +syntax match mipsDirective "\.cpload" +syntax match mipsDirective "\.cplocal" +syntax match mipsDirective "\.cprestore" +syntax match mipsDirective "\.cpreturn" +syntax match mipsDirective "\.cpsetup" +syntax match mipsDirective "\.data" +syntax match mipsDirective "\.double" +syntax match mipsDirective "\.dword" +syntax match mipsDirective "\.dynsym" +syntax match mipsDirective "\.end" +syntax match mipsDirective "\.endr" +syntax match mipsDirective "\.ent" +syntax match mipsDirective "\.extern" +syntax match mipsDirective "\.file" +syntax match mipsDirective "\.float" +syntax match mipsDirective "\.fmask" +syntax match mipsDirective "\.frame" +syntax match mipsDirective "\.globl" +syntax match mipsDirective "\.gpvalue" +syntax match mipsDirective "\.gpword" +syntax match mipsDirective "\.half" +syntax match mipsDirective "\.kdata" +syntax match mipsDirective "\.ktext" +syntax match mipsDirective "\.lab" +syntax match mipsDirective "\.lcomm" +syntax match mipsDirective "\.loc" +syntax match mipsDirective "\.mask" +syntax match mipsDirective "\.nada" +syntax match mipsDirective "\.nop" +syntax match mipsDirective "\.option" +syntax match mipsDirective "\.origin" +syntax match mipsDirective "\.repeat" +syntax match mipsDirective "\.rdata" +syntax match mipsDirective "\.sdata" +syntax match mipsDirective "\.section" +syntax match mipsDirective "\.set" +syntax match mipsDirective "\.size" +syntax match mipsDirective "\.space" +syntax match mipsDirective "\.struct" +syntax match mipsDirective "\.text" +syntax match mipsDirective "\.type" +syntax match mipsDirective "\.verstamp" +syntax match mipsDirective "\.weakext" +syntax match mipsDirective "\.word" + +" Arithmetic and Logical Instructions +syntax keyword mipsInstruction abs +syntax keyword mipsInstruction add.d add addu addi addiu +syntax keyword mipsInstruction and andi +syntax keyword mipsInstruction clo clz +syntax keyword mipsInstruction div divu +syntax keyword mipsInstruction mult multu mul mulo mulou madd maddu msub msubu +syntax keyword mipsInstruction neg negu +syntax keyword mipsInstruction nor +syntax keyword mipsInstruction not +syntax keyword mipsInstruction or ori +syntax keyword mipsInstruction rem remu +syntax keyword mipsInstruction sll sllv sra srav srl srlv +syntax keyword mipsInstruction rol ror +syntax keyword mipsInstruction sub subu +syntax keyword mipsInstruction xor xori + +" Constant-Manipulating Instructions +syntax keyword mipsInstruction lui li +syntax keyword mipsInstruction slt sltu slti sltiu +syntax keyword mipsInstruction seq +syntax keyword mipsInstruction sge sgeu +syntax keyword mipsInstruction sgt sgtu +syntax keyword mipsInstruction sle sleu +syntax keyword mipsInstruction sne + +" Branch Instructions +syntax keyword mipsInstruction b +syntax keyword mipsInstruction bc1f bc1t +syntax keyword mipsInstruction beq beqz +syntax keyword mipsInstruction bgez bgezal bgtz +syntax keyword mipsInstruction blez bltzal bltz +syntax keyword mipsInstruction bne bnez +syntax keyword mipsInstruction bge bgeu +syntax keyword mipsInstruction bgt bgtu +syntax keyword mipsInstruction ble bleu +syntax keyword mipsInstruction blt bltu + +" Jump Instructions +syntax keyword mipsInstruction j jal jalr jr + +" Trap Instructions +syntax keyword mipsInstruction teq teqi +syntax keyword mipsInstruction tne tnei +syntax keyword mipsInstruction tge tgeu tgei tgeiu +syntax keyword mipsInstruction tlt tltu tlti tltiu + +" Load Instructions +syntax keyword mipsInstruction la +syntax keyword mipsInstruction lb lbu lh lhu +syntax keyword mipsInstruction lw lwc1 lwl lwr +syntax keyword mipsInstruction ld ldc1 ldl ldr +syntax keyword mipsInstruction ulh ulhu ulw +syntax keyword mipsInstruction ll + +" Store Instructions +syntax keyword mipsInstruction sb sh sw swc1 sdc1 swl swr sd ush usw sc + +" Data Movement Instructions +syntax keyword mipsInstruction move +syntax keyword mipsInstruction mfhi mflo +syntax keyword mipsInstruction mthi mtlo +syntax keyword mipsInstruction mfc0 mfc1 +syntax match mipsInstruction "mfc1\.d" +syntax keyword mipsInstruction mtc0 mtc1 +syntax keyword mipsInstruction movn movz movf movt + +" Floating-Point Instructions +syntax match mipsInstruction "abs\.d" +syntax match mipsInstruction "abs\.s" +syntax match mipsInstruction "add\.d" +syntax match mipsInstruction "add\.s" +syntax match mipsInstruction "ceil\.w\.d" +syntax match mipsInstruction "ceil\.w\.s" +syntax match mipsInstruction "c\.eq\.d" +syntax match mipsInstruction "c\.eq\.s" +syntax match mipsInstruction "c\.le\.d" +syntax match mipsInstruction "c\.le\.s" +syntax match mipsInstruction "c\.lt\.d" +syntax match mipsInstruction "c\.lt\.s" +syntax match mipsInstruction "cvt\.d\.s" +syntax match mipsInstruction "cvt\.d\.w" +syntax match mipsInstruction "cvt\.s\.d" +syntax match mipsInstruction "cvt\.s\.w" +syntax match mipsInstruction "cvt\.w\.d" +syntax match mipsInstruction "cvt\.w\.s" +syntax match mipsInstruction "div\.d" +syntax match mipsInstruction "div\.s" +syntax match mipsInstruction "floor\.w\.d" +syntax match mipsInstruction "floor\.w\.s" +syntax match mipsInstruction "l\.d" +syntax match mipsInstruction "l\.s" +syntax match mipsInstruction "mov\.d" +syntax match mipsInstruction "mov\.s" +syntax match mipsInstruction "movf\.d" +syntax match mipsInstruction "movf\.s" +syntax match mipsInstruction "movt\.d" +syntax match mipsInstruction "movt\.s" +syntax match mipsInstruction "movn\.d" +syntax match mipsInstruction "movn\.s" +syntax match mipsInstruction "movz\.d" +syntax match mipsInstruction "movz\.s" +syntax match mipsInstruction "mul\.d" +syntax match mipsInstruction "mul\.s" +syntax match mipsInstruction "neg\.d" +syntax match mipsInstruction "neg\.s" +syntax match mipsInstruction "round\.w\.d" +syntax match mipsInstruction "round\.w\.s" +syntax match mipsInstruction "sqrt\.d" +syntax match mipsInstruction "sqrt\.s" +syntax match mipsInstruction "s\.d" +syntax match mipsInstruction "s\.s" +syntax match mipsInstruction "sub\.d" +syntax match mipsInstruction "sub\.s" +syntax match mipsInstruction "trunc\.w\.d" +syntax match mipsInstruction "trunc\.w\.s" + +" Exception and Interrupt Instructions +syntax keyword mipsKeyWord eret +syntax keyword mipsKeyWord syscall +syntax keyword mipsKeyWord break +syntax keyword mipsKeyWord nop + +hi def link mipsComment Comment +hi def link mipsNumber Number +hi def link mipsString String +hi def link mipsCharacter Identifier + " _main: and such +hi def link mipsLabel Define + " $a0 +hi def link mipsRegister Statement +"hi def link mipsRegister Identifier + " .text and such +hi def link mipsDirective Function + " lw and such +hi def link mipsInstruction Function +hi def link mipsKeyWord Special + +"hi def link mipsComment Comment +"hi def link mipsNumber Number +"hi def link mipsString String +"hi def link mipsLabel Label +"hi def link mipsRegister Identifier +"hi def link mipsDirective Type +"hi def link mipsInstruction Statement +"hi def link mipsKeyWord Special + +let b:current_syntax = "mips" diff --git a/vim/.vimrc b/vim/.vimrc new file mode 100644 index 0000000..97459e2 --- /dev/null +++ b/vim/.vimrc @@ -0,0 +1,12 @@ +" Load init scripts shared with neovim +source ~/.vim/init_scripts/init.vim + +" Convenience grepping +nnoremap <leader>gn :execute ":normal! :cnext\r"<CR> +nnoremap <leader>gN :execute ":normal! :cprevious\r"<CR> + +" Remap python directory for MacOS +" Change this path if python isn't dynamicallly loading +if system("uname") =~ 'Darwin' + set pythonthreedll=/usr/local/Frameworks/Python.framework/Python +endif diff --git a/vim/nvim/init.vim b/vim/nvim/init.vim new file mode 100644 index 0000000..96b77a1 --- /dev/null +++ b/vim/nvim/init.vim @@ -0,0 +1,23 @@ +" Sync vim configs to neovim +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vim/init_scripts/init.vim + +" Astolfo-inspired welcome prompt +echom "UwU" + +" Open nvim/init.vim for quick editing +command! Nim :normal! :vsplit $MYVIMRC<CR><C-w>H +command! Nims :normal! :w<CR>:source $MYVIMRC<CR>:x<CR> + +" Reset cursor to vertical bar when leaving +"au VimLeave * set guicursor=a:ver0-blinkon0 +"au VimLeave * call nvim_cursor_set_shape("vertical-bar") + +set guicursor=n-v-c:block-Cursor/lCursor-blinkon0,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor +set inccommand=nosplit + +if !has('python3') + echom 'Warning: No python 3 support. UltiSnips won''t be available' + echom 'Run: $ python3 -m pip install --user --upgrade pynvim' +endif diff --git a/vim/nvim/plugin b/vim/nvim/plugin new file mode 120000 index 0000000..0fe2f62 --- /dev/null +++ b/vim/nvim/plugin @@ -0,0 +1 @@ +/home/emiliko/.configs_pointer/vim/.vim/plugin \ No newline at end of file diff --git a/vimiv/keys.conf b/vimiv/keys.conf new file mode 100644 index 0000000..940d794 --- /dev/null +++ b/vimiv/keys.conf @@ -0,0 +1,102 @@ +[GLOBAL] +j : scroll down +h : scroll left +l : scroll right +k : scroll up +<colon> : command +o : command --text='open ' +yy : copy-image +yp : copy-name --abspath +#dd : delete %% +gi : enter image +gl : enter library +gm : enter manipulate +gt : enter thumbnail +<space>l : enter thumbnail +<space>h : enter library +f : toggle library +G : goto -1 +gg : goto 1 +m : mark %% +. : repeat-command +/ : search +? : search --reverse +N : search-next +P : search-prev +b : set statusbar.show! +tl : toggle library +tm : toggle manipulate +tt : toggle thumbnail + +zz : spawn imv %% +T : spawn imv %% +<ctrl>l : spawn "alacritty --working-directory $(dirname %%)" + +[IMAGE] +#<space> : unbind +q : enter thumbnail ++ : zoom in +<equal> : zoom in +- : zoom out +M : center +| : flip +_ : flip --vertical +<end> : goto -1 +<home> : goto 1 +<page-down> : next +j : next +n : next +<ctrl>n : next --keep-zoom +. : play-or-pause +<page-up> : prev +k : prev +p : prev +<ctrl>p : prev --keep-zoom +<ctrl>r : rotate +W : scale --level=1 +#<equal> : scale --level=fit +#w : scale --level=fit +#E : scale --level=fit-height +#e : scale --level=fit-width +#J : scroll-edge down +#H : scroll-edge left +#L : scroll-edge right +#L : scroll-edge right +#K : scroll-edge up +#sl : set slideshow.delay +0.5 +#sh : set slideshow.delay -0.5 +#ss : slideshow + +[LIBRARY] +q : enter thumbnail +go : goto 1 --open-selected +n : scroll down --open-selected +p : scroll up --open-selected +L : set library.width +0.05 +H : set library.width -0.05 +k : scroll up --open-selected +j : scroll down --open-selected +<return> : enter image + +[THUMBNAIL] ++ : zoom in +<equal> : zoom in +- : zoom out +H : first-of-line +L : end-of-line +<return> : open-selected + +[COMMAND] +<tab> : complete +<ctrl>l : complete +<shift><tab> : complete --inverse +<ctrl>p : history-substr-search next +<ctrl>n : history-substr-search prev +<escape> : leave-commandline +<ctrl>k : leave-commandline + +[MANIPULATE] +<colon> : command +f : fullscreen +b : set statusbar.show! +dd : discard diff --git a/vimiv/styles/base16-dracula b/vimiv/styles/base16-dracula new file mode 100644 index 0000000..b4d80f8 --- /dev/null +++ b/vimiv/styles/base16-dracula @@ -0,0 +1,31 @@ +; base16-dracula +; +; base16: (https://github.com/chriskempson/base16) +; +; Scheme: Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula) +; Template: Christian Karl <karlch at protonmail dot com> + +[STYLE] +; Colors +base00 = #282936 +base01 = #3a3c4e +base02 = #4d4f68 +base03 = #626483 +base04 = #62d6e8 +base05 = #e9e9f4 +base06 = #f1f2f8 +base07 = #f7f7fb +base08 = #ea51b2 +base09 = #b45bcf +base0a = #00f769 +base0b = #ebff87 +base0c = #a1efe4 +base0d = #62d6e8 +base0e = #b45bcf +base0f = #00f769 + +; Additional custom overrides, e.g. +; font = 10pt Hack +; thumbnail.padding = 32 + +; vim:ft=dosini diff --git a/vimiv/styles/base16-github b/vimiv/styles/base16-github new file mode 100644 index 0000000..b4e9236 --- /dev/null +++ b/vimiv/styles/base16-github @@ -0,0 +1,37 @@ +; base16-github +; +; base16: (https://github.com/chriskempson/base16) +; +; Scheme: Defman21 +; Template: Christian Karl <karlch at protonmail dot com> + +[STYLE] +; Colors +; Background behind image +base00 = #ffffff +; Background behind tree +base01 = #f5f5f5 +;Status bar color +base02 = #c8c8fa +base03 = #969896 +base04 = #e8e8e8 +base05 = #333333 +; Image text color +base06 = #a71d5d +base07 = #ffffff +base08 = #ed6a43 +base09 = #0086b3 +base0a = #795da3 +base0b = #183691 +base0c = #183691 +; Selected image text bg color +;base0d = #795da3 +base0d = #d0d0d0 +base0e = #a71d5d +base0f = #333333 + +; Additional custom overrides, e.g. +; font = 10pt Hack +; thumbnail.padding = 32 + +; vim:ft=dosini diff --git a/vimiv/styles/base16-gruvbox-dark-pale b/vimiv/styles/base16-gruvbox-dark-pale new file mode 100644 index 0000000..1992274 --- /dev/null +++ b/vimiv/styles/base16-gruvbox-dark-pale @@ -0,0 +1,36 @@ +; base16-gruvbox-dark-pale +; +; base16: (https://github.com/chriskempson/base16) +; +; Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) +; Template: Christian Karl <karlch at protonmail dot com> + +[STYLE] +; Colors +base00 = #262626 +base01 = #3a3a3a +base02 = #4e4e4e +base03 = #8a8a8a +base04 = #949494 +base05 = #dab997 +base06 = #d5c4a1 +base07 = #ebdbb2 +base08 = #d75f5f +base09 = #ff8700 +base0a = #ffaf00 +base0b = #afaf00 +base0c = #85ad85 +base0d = #83adad +base0e = #d485ad +base0f = #d65d0e + +; Additional custom overrides, e.g. +; font = 10pt Hack +; thumbnail.padding = 32 +#library.fg = #ffaf00 +library.fg = #ebdbb2 +#library.selected.bg = #d485ad +#thumbnail.selected.bg = #d485ad +#base0f = #d65d0e + +; vim:ft=dosini diff --git a/vimiv/styles/base16-gruvbox-light-hard b/vimiv/styles/base16-gruvbox-light-hard new file mode 100644 index 0000000..3c7569e --- /dev/null +++ b/vimiv/styles/base16-gruvbox-light-hard @@ -0,0 +1,31 @@ +; base16-gruvbox-light-hard +; +; base16: (https://github.com/chriskempson/base16) +; +; Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) +; Template: Christian Karl <karlch at protonmail dot com> + +[STYLE] +; Colors +base00 = #f9f5d7 +base01 = #ebdbb2 +base02 = #d5c4a1 +base03 = #bdae93 +base04 = #665c54 +base05 = #504945 +base06 = #3c3836 +base07 = #282828 +base08 = #9d0006 +base09 = #af3a03 +base0a = #b57614 +base0b = #79740e +base0c = #427b58 +base0d = #076678 +base0e = #8f3f71 +base0f = #d65d0e + +; Additional custom overrides, e.g. +; font = 10pt Hack +; thumbnail.padding = 32 + +; vim:ft=dosini diff --git a/vimiv/vimiv.conf b/vimiv/vimiv.conf new file mode 100644 index 0000000..fef1cf4 --- /dev/null +++ b/vimiv/vimiv.conf @@ -0,0 +1,65 @@ +[GENERAL] +monitor_filesystem = True +shuffle = False +startup_library = True +style = base16-gruvbox-dark-pale + +[COMMAND] +history_limit = 100 + +[COMPLETION] +fuzzy = False + +[SEARCH] +ignore_case = True +incremental = True + +[IMAGE] +autoplay = True +autowrite = ask +overzoom = 1.0 + +[LIBRARY] +width = 0.3 +show_hidden = False + +[THUMBNAIL] +size = 128 + +[SLIDESHOW] +delay = 2.0 +indicator = slideshow: + +[STATUSBAR] +collapse_home = True +show = True +message_timeout = 60000 +mark_indicator = <b>*</b> +left = {pwd} +left_image = {index}/{total} {basename} [{zoomlevel}] +left_thumbnail = {thumbnail-index}/{thumbnail-total} {thumbnail-name} +left_manipulate = {basename} {image-size} Modified: {modified} {processing} +center_thumbnail = {thumbnail-size} +center = {slideshow-indicator} {slideshow-delay} {transformation-info} +right = {keys} {mark-count} {mode} +right_image = {keys} {mark-indicator} {mark-count} {mode} + +[KEYHINT] +delay = 500 +timeout = 5000 + +[TITLE] +fallback = vimiv +image = vimiv - {basename} + +[METADATA] +keys1 = Exif.Image.Make, Exif.Image.Model, Exif.Image.DateTime, Exif.Photo.ExposureTime, Exif.Photo.FNumber, Exif.Photo.IsoSpeedRatings, Exif.Photo.FocalLength, Exif.Photo.LensMake, Exif.Photo.LensModel, Exif.Photo.ExposureBiasValue +keys2 = Exif.Photo.ExposureTime, Exif.Photo.FNumber, Exif.Photo.IsoSpeedRatings, Exif.Photo.FocalLength +keys3 = Exif.Image.Artist, Exif.Image.Copyright + +[PLUGINS] +print = default +imageformats = avif + +[ALIASES] + diff --git a/warpd/com.warpd.launcher.template b/warpd/com.warpd.launcher.template new file mode 100644 index 0000000..6e0f01b --- /dev/null +++ b/warpd/com.warpd.launcher.template @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>com.warpd.launcher</string> + + <key>ProgramArguments</key> + <array> + <string>HOMEPATH/bin/warpd</string> + <string>-f</string> + </array> + + <key>RunAtLoad</key> + <true/> + + <key>KeepAlive</key> + <dict> + <key>SuccessfulExit</key> + <false/> + <key>Crashed</key> + <false/> + </dict> + + <key>ThrottleInterval</key> + <integer>10</integer> + + <key>StandardOutPath</key> + <string>/tmp/warpd.out</string> + + <key>StandardErrorPath</key> + <string>/tmp/warpd.err</string> + + <key>ProcessType</key> + <string>Interactive</string> + </dict> +</plist> diff --git a/warpd/config b/warpd/config new file mode 100644 index 0000000..d477f9e --- /dev/null +++ b/warpd/config @@ -0,0 +1,32 @@ +repeat_interval: 20 +speed: 220 +max_speed: 1600 +decelerator_speed: 50 +acceleration: 700 +accelerator_acceleration: 2900 +buttons: m , . +oneshot_buttons: n - = +oneshot_timeout: 300 +grid_exit: C-k +hint_exit: C-k +exit: C-k +drag: v +copy_and_exit: C-c +hint: C-M-f +left: h +down: j +up: k +right: l +cursor_color: #f4a66e +cursor_size: 7 +hist_back: C-o +hist_forward: C-i +hint_size: 71 +hint_fgcolor: #222222 +hint_bgcolor: #f4a66e +hint_border_radius: 0 +hint_chars: abcdefghijklmnopqrstuvwxyz +hint_font: NotoMono +indicator: bottomright +indicator_color: #f4a66e +indicator_size: 40 diff --git a/xremap/config_console.yml b/xremap/config_console.yml new file mode 100644 index 0000000..ef5e57b --- /dev/null +++ b/xremap/config_console.yml @@ -0,0 +1,13 @@ +# Small modmap for graphical console +modmap: + - name: Better-ctrl + remap: + KEY_CAPSLOCK: + held: Control_l + alone: Control_l + - name: Mac-keyboard-layout-for-pc + remap: + Alt_l: Super_l + Super_l: Alt_l + Alt_r: Super_r + Super_r: Alt_r diff --git a/xremap/config_mac.yml b/xremap/config_mac.yml new file mode 100644 index 0000000..285a165 --- /dev/null +++ b/xremap/config_mac.yml @@ -0,0 +1,69 @@ +# Mac-like keyboard, with super adjacent to the spacebar +modmap: + - name: Better-ctrl + remap: + KEY_CAPSLOCK: Control_l + +keymap: + - name: disable-sleep + remap: + sleep: l + - name: Emacs-ish + application: + not: [Alacritty, zathura, org.pwmt.zathura, vimiv] + remap: + C-j: left + C-f: right + C-p: up + C-n: down + + C-b: C-left + C-w: C-right + + C-a: home + C-e: end + + C-u: { with_mark: Shift-C-Left } + + C-h: [backspace, { set_mark: false}] + C-d: [delete, { set_mark: false}] + + # bracketleft, according to wev + C-leftbrace: esc + #C-space: { set_mark: true } + + - name: Mac-Compatiblity + application: + not: [Alacritty] + remap: + Super_l-a: C-a + + - name: Browsers + # Similar-ish to MacOS. We bind to Alt instead of Super, since Ctrl is + # already used by the emacs bindings. Alt and Super are switched for PC + # keyboards to mimic MacOS + application: + only: [chromium, google-chrome, firefox] + remap: + Alt_l-w: Control_r-w + Alt_l-n: C-n + # For searchbar focusing. L/R to prevent recursion + Control_l-l: Alt_r-l + Alt_l-l: Control_r-l + # Extended emacs for discord and online editors + C-k: Shift-end + # Stop getting stuck in tabs without vimium + Alt_l-j: Control_r-Shift-Tab + Alt_l-k: Control_r-Tab + # Prevent 12am discord calls + Ctrl-apostrophe: Apostrophe + - name: Chromium + application: + only: [chromium, google-chrome] + remap: + Alt_l-Shift-n: C-Shift-n + - name: Firefox + application: + only: [firefox] + remap: + Alt_l-Shift-n: C-Shift-p diff --git a/xremap/config_standard.yml b/xremap/config_standard.yml new file mode 100644 index 0000000..d8210ef --- /dev/null +++ b/xremap/config_standard.yml @@ -0,0 +1,77 @@ +# Standard keyboard with alt key adjacent to spacebar +modmap: + - name: Better-ctrl + remap: + KEY_CAPSLOCK: Control_l + - name: Mac-Command + remap: + Alt_l: Super_l + Super_l: Alt_l + Alt_r: Super_r + Super_r: Alt_r + +keymap: + - name: disable-sleep + remap: + sleep: l + - name: Emacs-ish + application: + not: [Alacritty, zathura, org.pwmt.zathura, vimiv] + remap: + C-j: left + C-f: right + C-p: up + C-n: down + + C-b: C-left + C-w: C-right + + C-a: home + C-e: end + + C-u: { with_mark: Shift-C-Left } + + C-h: [backspace, { set_mark: false}] + C-d: [delete, { set_mark: false}] + + # bracketleft, according to wev + C-leftbrace: esc + #C-space: { set_mark: true } + + - name: Mac-Compatiblity + application: + not: [Alacritty] + remap: + Super_l-a: C-a + + - name: Browsers + # Similar-ish to MacOS. We bind to Alt instead of Super, since Ctrl is + # already used by the emacs bindings. Alt and Super are switched for PC + # keyboards to mimic MacOS + application: + only: [chromium, google-chrome, firefox] + remap: + Alt_l-w: Control_r-w + Alt_l-n: C-n + # For searchbar focusing. L/R to prevent recursion + Control_l-l: Alt_r-l + Alt_l-l: Control_r-l + # Find-in-page + Alt_l-f: Control_r-f + # Extended emacs for discord and online editors + C-k: Shift-end + # Stop getting stuck in tabs without vimium + Alt_l-j: Control_r-Shift-Tab + Alt_l-k: Control_r-Tab + # Prevent 12am discord calls + Ctrl-apostrophe: Apostrophe + - name: Chromium + application: + only: [chromium, google-chrome] + remap: + Alt_l-Shift-n: C-Shift-n + - name: Firefox + application: + only: [firefox] + remap: + Alt_l-Shift-n: C-Shift-p diff --git a/yabai/close_space.js b/yabai/close_space.js new file mode 100755 index 0000000..669e74e --- /dev/null +++ b/yabai/close_space.js @@ -0,0 +1,44 @@ +#!/usr/bin/env node +// Closes the current space and moves all this space's windows to the left +// window. Focuses the left space after closing. If the space closed is +// left-most, the window on the right is used instead +const sh = require('child_process'); + +function shellCall(cmd, args, name) { + let output = sh.spawnSync(cmd, args); + + if (output.status !== 0) { + console.error(`${name} failed with exit code ${output.status}`); + console.error(output.stderr.toString()); + return null + } + + return output +} + + +let space = shellCall("yabai", ["-m", "query", "--spaces", "--space"], "Yabai space query"); + +if (space === null) + process.exit(1); + +space = JSON.parse(space.stdout); + +move_to = space.index === 1 ? 2 : space.index - 1; + +if (space.index === 1) { + let spaces = shellCall("yabai", ["-m", "query", "--spaces"]) || process.exit(1); + spaces = JSON.parse(spaces.stdout); + + if (spaces.length === 1) + process.exit(0); + +} + +for (win_id of space.windows.reverse()) { + shellCall("yabai", ["-m", "window", "--focus", win_id]); + shellCall("yabai", ["-m", "window", "--space", move_to]); +} + +shellCall("yabai", ["-m", "space", "--destroy"], "Yabai space destroy"); +shellCall("yabai", ["-m", "space", "--focus", space.index === 1 ? 1 : move_to], "Yabai space focus"); diff --git a/yabai/cycle_stack.js b/yabai/cycle_stack.js new file mode 100755 index 0000000..572e2bf --- /dev/null +++ b/yabai/cycle_stack.js @@ -0,0 +1,49 @@ +#!/usr/bin/env node +// Find the top windows of each stack in the current space. Returns the window +// id of the next window at the top of a stack. If only one stack is present, +// that stack will be returned +// +// The interpretation of "next" here is in terms of window id order, not +// anything to do with the layout +// +// This script must be used in a pipe, for example: +// yabai -m query --windows --space | cycle_stack.js +process.stdin.on('data', function(data) { + let windows = JSON.parse(data.toString()); + + let stacks_top = {}; + let ordered_ids = []; + let focused; + + // Find all the windows at the top of a stack + for (win of windows) { + let key1 = [win.frame.x, win.frame.y].toString(); // Top left corner + let key2 = // Bottom right corner + [win.frame.x + win.frame.w, win.frame.y + win.frame.h].toString(); + + let win_obj = { id: win.id, app: win.app }; + ordered_ids.push(win.id); + + if (!(key1 in stacks_top || key2 in stacks_top) && win.visible) { + stacks_top[key1] = stacks_top[key2] = win_obj; + } + + if (win.focused == 1) + focused = win.id; + } + + let ids = []; + + for (const top of Object.values(stacks_top)) + if (!ids.includes(top.id)) + ids.push(top.id); + + ids.sort(); // By window id + + let next_stack = ids.indexOf(focused) + 1; + + if (next_stack == ids.length) + process.stdout.write(ids[0].toString()); + else + process.stdout.write(ids[next_stack].toString()); +}); diff --git a/yabai/move_to_stack.sh b/yabai/move_to_stack.sh new file mode 100755 index 0000000..2232b2c --- /dev/null +++ b/yabai/move_to_stack.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +# Args: +# 1: Direction of stack +declare stack="" +declare selected_window="$(yabai -m query --windows --space |\ + jq '.[] | select(.focused == 1) .id')" + +if ! yabai -m window --focus "$1"; then + echo "Cannot focus $1" >&2 + play_error_sound + exit 1 +fi + + +if [[ -n "${selected_window}" ]]; then + yabai -m window --stack "${selected_window}" + yabai -m window --focus "${selected_window}" +else + echo "Window id ${selected_window} not found..." >&2 + case "$1" in + west) yabai -m window --stack east ;; + east) yabai -m window --stack west ;; + north) yabai -m window --stack south ;; + south) yabai -m window --stack north ;; + esac +fi diff --git a/yabai/new_space.js b/yabai/new_space.js new file mode 100755 index 0000000..ab70396 --- /dev/null +++ b/yabai/new_space.js @@ -0,0 +1,19 @@ +#!/usr/bin/env node +// Creates a new space on the right and moves the current window into it +const sh = require('child_process'); + +let win = sh.spawnSync("yabai", ["-m", "query", "--windows", "--window"]); + +if (win.status !== 0) { + console.error(`Yabai space query failed with exit code ${win.status}`); + console.error(win.stderr.toString()); + process.exit(1); +} + +win = JSON.parse(win.stdout); + +sh.spawnSync("yabai", ["-m", "space", "--create"]); +sh.spawnSync("yabai", ["-m", "window", "--space", "last"]); +sh.spawnSync("yabai", ["-m", "space", "--focus", "last"]); +sh.spawnSync("yabai", ["-m", "space", "--move", win.space + 1]); +sh.spawnSync("yabai", ["-m", "window", "--focus", win.id]); diff --git a/yabai/pin_window.js b/yabai/pin_window.js new file mode 100755 index 0000000..5939762 --- /dev/null +++ b/yabai/pin_window.js @@ -0,0 +1,149 @@ +#!/usr/bin/env node +// "Pins" a window id to a number and saves it in +// ~/.config/yabai/pinnned_windows.json +// +// Args: +// --set <pin> <id> : Overwrites <pin> with <id> +// --focus <pin> : Focuses window with id <pin>, if it's still around +// --rofi : Pulls up a rofi menu to select from pinned windows +// --clear : Removes all current pins +// +// Examples: +// ./pin_window.js --set 1 120 +// ./pin_window.js --set 4 130 +// ./pin_window.js --focus 4 +// ./pin_window.js --focus 8 +// ./pin_window.js --rofi # Pulls up gui rofi menu +// ./pin_window.js --clear # Removes ~/.config/yabai/pinned_windows.json +// +const sh = require('child_process'); +const fs = require('fs'); +const file_path = process.env.HOME + '/.config/yabai/pinned_windows.json'; + +const mode = process.argv[2]; +const pin = process.argv[3]; +const id = process.argv[4]; + + +// Parse flags +if (mode === "--set") updatePins(pin, id); +else if (mode === "--focus") focusPin(pin); +else if (mode === "--clear") fs.unlinkSync(file_path); +else if (mode === "--rofi") rofiMenu(); +else console.error(`Mode ${mode} is invalid`); + + +// Changes space and focuses on the window at specified pin +function focusPin(pin) { + const pins = updatePins(); + + const id = parseInt(pins[pin]["id"]); + const space_index = parseInt(pins[pin]["space"]); + + let space = sh.spawnSync("yabai", ["-m", "query", "--spaces", "--space"]); + + if (space.status !== 0) { + console.error(`Querying space exited with code: ${space.status}`) + console.error(space.stderr.toString()); + process.exit(1); + } + + space = JSON.parse(space.stdout); + + if (!space.windows.includes(id)) + sh.spawnSync("yabai", ["-m", "space", "--focus", space_index]); + + sh.spawnSync("yabai", ["-m", "window", "--focus", id]); +} + + +// Queries and updates ~/.config/yabai/pinned_windows.json by making sure all +// windows specified are still running and updates titles. Passing in argument +// adds a new window +// +// Args: +// new_pin (string | number) : Hotkey for pin +// new_id (string | number) : Id of newly pinned window +// +// Returns: +// obj: Latest pins. Same as those saved to the file +function updatePins(new_pin, new_id) { + if (global.pins && !new_pin && !new_id) + return global.pins; // Prevent double updates + + // Specifies the format of a pin object for each window + function pinObject(pin, id) { + let query = sh.spawnSync("yabai", ["-m", "query", "--windows", "--window", id]); + + if (query.status === 0) { + let info = JSON.parse(query.stdout); + + return { + pin: pin, + id: id, + app: info.app, + title: info.title, + space: info.space, + } + } else { + return null + } + } + + let old_pins; + try { + old_pins = JSON.parse(fs.readFileSync(file_path)); + } catch { + old_pins = {}; + } + + // Upate old pins + let new_pins = {}; + + for (const [pin, data] of Object.entries(old_pins)) { + let pin_obj = pinObject(pin, data.id); + + if (pin_obj !== null) + new_pins[pin] = pin_obj; + } + + // Seed new pin + if (new_pin && new_id) { + let pin_obj = pinObject(new_pin, new_id); + + if (pin_obj !== null) + new_pins[pin] = pin_obj; + } + + + // Save updated + fs.writeFileSync(file_path, JSON.stringify(new_pins)); + global.pins = new_pins; // Prevent double updates + + return new_pins +} + + +// Creates a rofi menu and switches to that window +function rofiMenu() { + const pins = updatePins(); + + // Create list entries for rofi menu + const rofi_list = Object.entries(pins).map(([_, info]) => + [info.pin, `${info.pin}. ${info.app} >>> ${info.title}`]); + + + if (rofi_list.length) { + let msg = rofi_list.map(([_, s]) => s).join('\n') + .replaceAll(`'`, "") + .replaceAll("\\", "\\\\"); + + let choice = sh.spawnSync("bash", ["-c", `printf '${msg}' | choose -i -c FABD2F -b 416A33 -f "noto sans bold" -s 30`]); + + if (choice.status === 0) { + let pin = rofi_list[parseInt(choice.stdout.toString())][0]; + + focusPin(pin); + } + } +} diff --git a/yabai/rofi_window.js b/yabai/rofi_window.js new file mode 100755 index 0000000..a3ec8ad --- /dev/null +++ b/yabai/rofi_window.js @@ -0,0 +1,56 @@ +#!/usr/bin/env node +// Creates a rofi menu for all windows and switches to selected window +// Very buggy for some reason... +const sh = require('child_process'); + +let windows = sh.spawnSync("yabai", ["-m", "query", "--windows"]); + +if (windows.status !== 0) { + console.error(`Yabai window query failed with exit code ${windows.status}`); + console.error(windows.stderr.toString()); + process.exit(1); +} + +windows = JSON.parse(windows.stdout); + +if (windows.length === 0) + process.exit(0); + +// Create list entries for rofi menu === +const rofi_list = windows.map(function(win) { return { + msg: `${win.space}. ${win.app} >>> ${win.title}`, + space: win.space, + id: win.id, +}}); + +if (rofi_list.length === 0) + process.exit(0); + +let msg = rofi_list.map(win_obj => win_obj.msg) + .join('\n') + .replaceAll(`'`, "") + .replaceAll("\\", "\\\\"); + +let choice = + sh.spawnSync("bash", ["-c", `printf '${msg}' | choose -i -c FABD2F -b 416A33 -f "noto sans bold" -s 30`]); + +if (choice.status !== 0) + process.exit(0); + +// Focus selected space and window +let window = rofi_list[parseInt(choice.stdout.toString())]; + +let space = sh.spawnSync("yabai", ["-m", "query", "--spaces", "--space"]); + +if (space.status !== 0) { + console.error(`Querying space exited with code: ${space.status}`) + console.error(space.stderr.toString()); + process.exit(1); +} + +space = JSON.parse(space.stdout); + +if (!space.windows.includes(window.id)) + sh.spawnSync("yabai", ["-m", "space", "--focus", window.space]); + +sh.spawnSync("yabai", ["-m", "window", "--focus", window.id]); diff --git a/yabai/toggle_outline.bash b/yabai/toggle_outline.bash new file mode 100755 index 0000000..4160f54 --- /dev/null +++ b/yabai/toggle_outline.bash @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +# Turns on outline and turns off shadows in bsp spaces. Leaves them on for +# floating spaces + +if [[ "$(yabai -m query --spaces --space | jq '.type')" =~ bsp ]]; then + yabai -m config window_shadow off + yabai -m config window_border on +else + yabai -m config window_shadow on + yabai -m config window_border off +fi + + diff --git a/yabai/yabairc b/yabai/yabairc new file mode 100755 index 0000000..33f6d3f --- /dev/null +++ b/yabai/yabairc @@ -0,0 +1,55 @@ +#!/usr/bin/env sh + +# ===== Rules ================================== +#yabai -m rule --add app!="not_my_app" manage=off +yabai -m rule --add label="System Preferences" app="^System Preferences$" manage=off +yabai -m rule --add label="Rofi" app="^choose$" manage=off +yabai -m rule --add label="Finder" app="^Finder$" manage=off +#yabai -m rule --add label="GIMP-2.10" app="^GIMP-2.10$" manage=off +#yabai -m rule --add label="Skim" app="^Skim$" manage=off +yabai -m rule --add label="Anki" app="^Anki$" manage=off +yabai -m rule --add label="Digital Color Meter" app="^Digital Color Meter$" manage=off + +# global settings +yabai -m config mouse_follows_focus off +yabai -m config focus_follows_mouse off +yabai -m config window_origin_display default +yabai -m config window_placement second_child +yabai -m config window_topmost off +yabai -m config window_shadow on +yabai -m config window_opacity off +yabai -m config window_border off +yabai -m config split_ratio 0.6 +yabai -m config auto_balance off +yabai -m config mouse_action1 move +yabai -m config mouse_action2 resize +yabai -m config mouse_drop_action swap + +# general space settings +yabai -m config layout float +yabai -m config top_padding 20 +yabai -m config bottom_padding 20 +yabai -m config left_padding 20 +yabai -m config right_padding 20 +yabai -m config window_gap 20 +yabai -m config external_bar all:20:60 + +yabai -m config window_border off +yabai -m config window_border_width 3 +yabai -m config active_window_border_color 0xFFF4A66E +#yabai -m config active_window_border_color 0xFFFF9933 +yabai -m config normal_window_border_color 0x00FFFFFF +yabai -m config insert_feedback_color 0xffd75f5f + +yabai -m config window_shadow on +yabai -m config window_topmost off + +# Sketchybar event signals +#yabai -m signal --add event=window_created action="sketchybar -m --trigger window_created &> /dev/null" +#yabai -m signal --add event=window_destroyed action="sketchybar -m --trigger window_destroyed &> /dev/null" +#yabai -m signal --add event=space_changed action="~/.config/sketchybar/plugins/yabai_spaces.js --update &" +yabai -m signal --add event=space_changed action="~/.config/yabai/toggle_outline.bash" +yabai -m signal --add event=space_changed action="~/.config/sketchybar/plugins/yabai_spaces.js --refresh" + +rm ~/.config/yabai/pinned_windows.json +~/.config/sketchybar/plugins/yabai_spaces.js --update diff --git a/yofi/yofi.config b/yofi/yofi.config new file mode 100644 index 0000000..5cf3986 --- /dev/null +++ b/yofi/yofi.config @@ -0,0 +1,92 @@ +# Width/height of the app in pixels +width = 600 +height = 512 + +# If set forces usage of basic window instead of Layer Shell wayland protocol +force_window = false + +# if unset, renders window centered +# window_offsets = [500, -50] # in format [top_offset_pixels, left_offset_pixels] + +# font = "DejaVu Sans" +# or you may use an absolute path, e.g: +# font = "/usr/share/fonts/TTF/DejaVuSans.ttf" +#font = "/usr/share/fonts/adobe-source-code-pro/SourceCodePro-Regular.oft" +#font = "cantarell" +#font = "noto" +#font = "DejaVu Sans" +# TODO: Panics on pretty much everything +font_size = 20 + +# Color of the app background +# Colors are specified in 0xRRGGBBAA format +#bg_color = 0x272822ee +bg_color = 0x222222e0 +# Color for the fonts +# font_color = 0xf8f8f2ff +# TODO: Doesn't work +font_color = 0xebdbb2ff + +# HiDPI scaling factor; default is requested from compositor but +# fractional values are truncated, so one may want to set it explicitly. +# scale = 3 +scale = 1 + +# TOML sections are scope config values for a related blocks. +# This one for instance is for input field area. +[input_text] +# font = ... +font_color = 0xf8f8f2ff +bg_color = 0x75715eff + +# Margin/padding values are specified as in CSS but only in pixels. +# So it's either a single value for all directions +# or two values, the first for top/bottom and the second for left/right +# or finally four values for top, right, bottom and left directions respectively. +margin = "5" # equivalent to "5 5 5 5" +padding = "3 -4" # equivalent to "1.7 -4 1.7 -4" + +# Section for items in the search results area. +[list_items] +# font = ... +#font_color = 0xf8f8f2ff +font_color = 0xebdbb2ff + +# Font color for an item that currently selected +#selected_font_color = 0xa6e22eff +#selected_font_color = 0xa6e22e00 +selected_font_color = 0xebdbb2ff + +# if specified, search matches are emphasized with this color +#match_color = 0xfabd2fff # Yellow +# TODO: Underline +match_color = 0x8ec07cff + +margin = "5 10" + +# If set to true hides the desktop actions +hide_actions = true +# Specify left margin for action line +action_left_margin = 60 + +# Additional spacing between list items. +# By default there's a space around 10 pixels +# the value can be reduced by specifying a negative value +item_spacing = 2 + +# Spacing between an icon and a text. +icon_spacing = 5 + +# Sections for the icons. When this section presents, icons are displayed +[icon] +# For now app only supports fixed sized icons and there's no icon up/down-scaling yet. +# More info: https://github.com/l4l/yofi/issues/76#issuecomment-1023631399 +size = 16 + +# For the icon search path +theme = "Adwaita" + +# If no icon found for an entry, this one will be used instead +fallback_icon_path = "/usr/share/icons/Adwaita/16x16/categories/applications-engineering-symbolic.symbolic.png" + +# vim: set ft=toml: