Mercurial > dotfiles
changeset 552:f308f66cad13
Add fif (find in file) command to search for words and view in fzf
author | zegervdv <zegervdv@me.com> |
---|---|
date | Tue, 01 Feb 2022 19:03:03 +0100 |
parents | 2cce224318f9 |
children | 4b9b6694aa5b |
files | .chezmoiexternal.toml dot_config/bat/themes/One Dark.tmTheme dot_config/ripgrep/ripgreprc dot_zshrc |
diffstat | 4 files changed, 890 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.chezmoiexternal.toml Tue Feb 01 15:22:08 2022 +0100 +++ b/.chezmoiexternal.toml Tue Feb 01 19:03:03 2022 +0100 @@ -19,11 +19,6 @@ stripComponents = 1 refreshPeriod = "168h" -[".config/bat/themes/One Dark.tmTheme"] - type = "file" - url = "https://raw.githubusercontent.com/andresmichel/one-dark-theme/master/One Dark.tmTheme" - refreshPeriod = "168h" - [".zsh/zsh-history-substring-search.zsh"] type = "file" url = "https://github.com/zsh-users/zsh-history-substring-search/raw/master/zsh-history-substring-search.zsh"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dot_config/bat/themes/One Dark.tmTheme Tue Feb 01 19:03:03 2022 +0100 @@ -0,0 +1,876 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>author</key> + <string>IceTimux / Andres Michel</string> + <key>name</key> + <string>One Dark</string> + <key>settings</key> + <array> + <dict> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#6c7079</string> + <key>background</key> + <string>#2B303B</string> + <key>invisibles</key> + <string>#747369</string> + <key>caret</key> + <string>#528bff</string> + <key>lineHighlight</key> + <string>#2c5372</string> + <key>bracketContentsOptions</key> + <string>underline</string> + <key>bracketContentsForeground</key> + <string>#528bff</string> + <key>bracketsOptions</key> + <string>underline</string> + <key>bracketsForeground</key> + <string>#528bff</string> + <key>tagsOptions</key> + <string>underline</string> + <key>tagsForeground</key> + <string>#528bff</string> + <key>findHighlight</key> + <string>#314365</string> + <key>findHighlightForeground</key> + <string>#528bff</string> + <key>gutter</key> + <string>#2B303B</string> + <key>gutterForeground</key> + <string>#636d8388</string> + <key>selection</key> + <string>#bbccf51b</string> + <key>selectionBorder</key> + <string>#bbccf51b</string> + <key>inactiveSelection</key> + <string>#bbccf51b</string> + <key>guide</key> + <string>#464c55</string> + <key>activeGuide</key> + <string>#464c55</string> + <key>stackGuide</key> + <string>#464c55</string> + <key>highlight</key> + <string>#528bff80</string> + <key>highlightForeground</key> + <string>#528bff</string> + <key>shadow</key> + <string>#2B303B</string> + <key>shadowWidth</key> + <string>1</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Text and source</string> + <key>scope</key> + <string>text, source</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#abb2bf</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Text</string> + <key>scope</key> + <string>variable.parameter.function</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Comments</string> + <key>scope</key> + <string>comment, punctuation.definition.comment</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5f697a</string> + <key>fontStyle</key> + <string> italic</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Delimiters</string> + <key>scope</key> + <string>none</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Operators</string> + <key>scope</key> + <string>keyword.operator</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Keywords</string> + <key>scope</key> + <string>keyword</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Variables</string> + <key>scope</key> + <string>variable</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Functions</string> + <key>scope</key> + <string>entity.name.function, meta.require, support.function.any-method</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5cb3fa</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Classes</string> + <key>scope</key> + <string>support.class, entity.name.class, entity.name.type.class</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#f0c678</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Classes</string> + <key>scope</key> + <string>meta.class</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Methods</string> + <key>scope</key> + <string>keyword.other.special-method</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5cb3fa</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Storage</string> + <key>scope</key> + <string>storage</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Support</string> + <key>scope</key> + <string>support.function</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5ebfcc</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Strings, Inherited Class</string> + <key>scope</key> + <string>string, constant.other.symbol, entity.other.inherited-class</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#9acc76</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Integers</string> + <key>scope</key> + <string>constant.numeric</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Floats</string> + <key>scope</key> + <string>none</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Boolean</string> + <key>scope</key> + <string>none</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Constants</string> + <key>scope</key> + <string>constant</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Tags</string> + <key>scope</key> + <string>entity.name.tag</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Attributes</string> + <key>scope</key> + <string>entity.other.attribute-name</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Attribute IDs</string> + <key>scope</key> + <string>entity.other.attribute-name.id, punctuation.definition.entity</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Selector</string> + <key>scope</key> + <string>meta.selector</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Values</string> + <key>scope</key> + <string>none</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Headings</string> + <key>scope</key> + <string>markup.heading punctuation.definition.heading, entity.name.section</string> + <key>settings</key> + <dict> + <key>fontStyle</key> + <string></string> + <key>foreground</key> + <string>#5cb3fa</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Units</string> + <key>scope</key> + <string>keyword.other.unit</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Bold</string> + <key>scope</key> + <string>markup.bold, punctuation.definition.bold</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#f0c678</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Italic</string> + <key>scope</key> + <string>markup.italic, punctuation.definition.italic</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Code</string> + <key>scope</key> + <string>markup.raw.inline</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#9acc76</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Link Text</string> + <key>scope</key> + <string>string.other.link, punctuation.definition.string.end.markdown</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Link Url</string> + <key>scope</key> + <string>meta.link</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Lists</string> + <key>scope</key> + <string>markup.list</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Quotes</string> + <key>scope</key> + <string>markup.quote</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Separator</string> + <key>scope</key> + <string>meta.separator</string> + <key>settings</key> + <dict> + <key>background</key> + <string>#515151</string> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Inserted</string> + <key>scope</key> + <string>markup.inserted</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#9acc76</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Deleted</string> + <key>scope</key> + <string>markup.deleted</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Changed</string> + <key>scope</key> + <string>markup.changed</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Colors</string> + <key>scope</key> + <string>constant.other.color</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5ebfcc</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Regular Expressions</string> + <key>scope</key> + <string>string.regexp</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5ebfcc</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Escape Characters</string> + <key>scope</key> + <string>constant.character.escape</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5ebfcc</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Embedded</string> + <key>scope</key> + <string>punctuation.section.embedded, variable.interpolation</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#c94e42</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Illegal</string> + <key>scope</key> + <string>invalid.illegal</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#ffffff</string> + <key>background</key> + <string>#e05252</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Broken</string> + <key>scope</key> + <string>invalid.broken</string> + <key>settings</key> + <dict> + <key>background</key> + <string>#f99157</string> + <key>foreground</key> + <string>#2d2d2d</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Deprecated</string> + <key>scope</key> + <string>invalid.deprecated</string> + <key>settings</key> + <dict> + <key>background</key> + <string>#d27b53</string> + <key>foreground</key> + <string>#2c323d</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Unimplemented</string> + <key>scope</key> + <string>invalid.unimplemented</string> + <key>settings</key> + <dict> + <key>background</key> + <string>#747369</string> + <key>foreground</key> + <string>#2c323d</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Json key</string> + <key>scope</key> + <string>source.json meta.structure.dictionary.json string.quoted.double.json</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Json value</string> + <key>scope</key> + <string>source.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#9acc76</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>json sub key</string> + <key>scope</key> + <string>source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.quoted.double.json</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#eb6772</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>Json sub value</string> + <key>scope</key> + <string>source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#9acc76</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>laravel blade tag</string> + <key>scope</key> + <string>text.html.laravel-blade source.php.embedded.line.html entity.name.tag.laravel-blade</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>laravel blade @</string> + <key>scope</key> + <string>text.html.laravel-blade source.php.embedded.line.html support.constant.laravel-blade</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>python function parameter</string> + <key>scope</key> + <string>source.python meta.function.python meta.function.parameters.python variable.parameter.function.python</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>python meta function</string> + <key>scope</key> + <string>source.python meta.function-call.python support.type.python</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#5ebfcc</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>python logical keyword</string> + <key>scope</key> + <string>source.python keyword.operator.logical.python</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>python class ( begin</string> + <key>scope</key> + <string>source.python meta.class.python punctuation.definition.inheritance.begin.python</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#f0c678</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>python class ) end</string> + <key>scope</key> + <string>source.python meta.class.python punctuation.definition.inheritance.end.python</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#f0c678</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>python function call parameter name</string> + <key>scope</key> + <string>source.python meta.function-call.python meta.function-call.arguments.python variable.parameter.function.python</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>php fcuntion constants</string> + <key>scope</key> + <string>text.html.basic source.php.embedded.block.html support.constant.std.php</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>php namespace name</string> + <key>scope</key> + <string>text.html.basic source.php.embedded.block.html meta.namespace.php entity.name.type.namespace.php</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#f0c678</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>javascript meta constant</string> + <key>scope</key> + <string>source.js meta.function.js support.constant.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>php namespace in top</string> + <key>scope</key> + <string>text.html.basic` source.php.embedded.block.html constant.other.php</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>php namespace name in top</string> + <key>scope</key> + <string>text.html.basic source.php.embedded.block.html support.other.namespace.php</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#db9d63</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>latex label names</string> + <key>scope</key> + <string>text.tex.latex meta.function.environment.math.latex string.other.math.block.environment.latex meta.definition.label.latex variable.parameter.definition.label.latex</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>latex italic emph</string> + <key>scope</key> + <string>text.tex.latex meta.function.emph.latex markup.italic.emph.latex</string> + <key>settings</key> + <dict> + <key>fontStyle</key> + <string> italic</string> + <key>foreground</key> + <string>#cd74e8</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>subl_new js vars</string> + <key>scope</key> + <string>source.js variable.other.readwrite.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl js $</string> + <key>scope</key> + <string>source.js meta.function-call.with-arguments.js variable.function.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl js call method</string> + <key>scope</key> + <string>source.js meta.group.braces.round meta.group.braces.curly meta.function-call.method.without-arguments.js variable.function.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl e js</string> + <key>scope</key> + <string>source.js meta.group.braces.round meta.group.braces.curly variable.other.object.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl js key</string> + <key>scope</key> + <string>source.js meta.group.braces.round meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl obejct key</string> + <key>scope</key> + <string>source.js meta.group.braces.round meta.group.braces.curly constant.other.object.key.js punctuation.separator.key-value.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl js method with args</string> + <key>scope</key> + <string>source.js meta.group.braces.round meta.group.braces.curly meta.function-call.method.with-arguments.js variable.function.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl js variable function</string> + <key>scope</key> + <string>source.js meta.function-call.method.with-arguments.js variable.function.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + <dict> + <key>name</key> + <string>new_subl variabel function method</string> + <key>scope</key> + <string>source.js meta.function-call.method.without-arguments.js variable.function.js</string> + <key>settings</key> + <dict> + <key>foreground</key> + <string>#adb7c9</string> + </dict> + </dict> + </array> +</dict> +</plist>
--- a/dot_config/ripgrep/ripgreprc Tue Feb 01 15:22:08 2022 +0100 +++ b/dot_config/ripgrep/ripgreprc Tue Feb 01 19:03:03 2022 +0100 @@ -1,9 +1,6 @@ # Only be case sensitive if a case is present --smart-case -# include .hgignore in ignores ---ignore-file=.hgignore - # Limit output --max-columns=150 --max-columns-preview
--- a/dot_zshrc Tue Feb 01 15:22:08 2022 +0100 +++ b/dot_zshrc Tue Feb 01 19:03:03 2022 +0100 @@ -211,6 +211,20 @@ export RIPGREP_CONFIG_PATH=$HOME/.config/ripgrep/ripgreprc export BAT_CONFIG_PATH=$HOME/.config/bat/config +# # source: https://gist.github.com/gnanderson/d74079d16714bb8b2822a7a07cc883d4 +function fif() { + rg \ + --column \ + --no-heading \ + --fixed-strings \ + --ignore-case \ + --hidden \ + --follow \ + --glob '!.git/*' "$1" \ + | awk -F ":" '/1/ {start = $2<5 ? 0 : $2 - 5; end = $2 + 5; print $1 " " $2 " " start ":" end " " $3}' \ + | fzf --preview 'bat --wrap character --color always {1} --highlight-line {2} --line-range {3}' \ + --bind 'ctrl-o:execute(nvim {1}:{2}:{4})+cancel' +} [ -f ~/.zshrc.local ] && source ~/.zshrc.local