Skip to content

Commit

Permalink
merge in all changes from summer-dev branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ipatch committed Sep 27, 2020
2 parents 9d3228c + ebc0808 commit b9df9de
Show file tree
Hide file tree
Showing 60 changed files with 1,985 additions and 172 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,10 @@ jobs/bin/inkview
**/PrusaSlicer/sla_print/**
**/PrusaSlicer/PrusaSlicer.ini
**/PrusaSlicer/print/cr10pro.prusa.mod.full.3top3btm.ini
# below file is being updated too often for my liking
# below file(s) is being updated too often for my liking
**/PrusaSlicer/PrusaSlicer.ini
**/PrusaSlicer/filament/**
**/PrusaSlicer/print/**

##############################
# GTK > gtk-mac-bundler
Expand Down
61 changes: 53 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

## Installation

>πŸ‘· The install script is not completed, do the good ol [StackOverflow](https://i.imgur.com/QZj4hxp.jpg) to expierment with settings from this repo. 🚧
>πŸ‘· install script is incomplete, do the good ol [StackOverflow](https://i.imgur.com/QZj4hxp.jpg) to expierment with repo files. 🚧
```sh
curl https://raw.githubusercontent.com/ipatch/dotfiles/master/install.sh | /bin/sh
Expand All @@ -37,7 +37,7 @@ curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.co

## File Structure

> Certain files and folders have been omitted for brevity and security, most notably the `pack` directory that was polluting the **File Structure** with plugin files.
> Certain files and folders are omitted for brevity & security, most notably the `pack` directory polluting the **File Structure** with vim plugin files.
<details>
<summary>File Structure</summary>
Expand Down Expand Up @@ -735,25 +735,70 @@ curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.co
- [**Github** wincent/wincent](https://github.com/wincent/wincent)
- [**Github** mathiasbynenes/dotfiles](https://github.com/mathiasbynens/dotfiles)
- [**Github** Awesome-dotfiles](https://github.com/webpro/awesome-dotfiles)

<a id="todos"></a>
- [cool looking **badges** for github readme's](https://github.com/ryanoasis/nerd-fonts)

## TODOs

- [ ] pack up `spring-dev` branch into a release and begin `summer-dev` branch
- [x] ~~[vim] figure out why _colorscheme_ or _syntax_ file is causing red block backgrounds~~
- [ ] [tmux] it'd be nice to have a quick double tap of either <kbd>shift</kbd>key then<kbd>shift</kbd> to toggle between remote and local tmux sessions [learn more](https://gist.github.com/samoshkin/05e65f7f1c9b55d3fc7690b59d678734) and [more](https://www.freecodecamp.org/news/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795/)
<a id="todos"></a>

<details>
<summary><strong>TODOs</strong></summary>

- [ ] [vim, tmux, or macos] some form of icon / notification of **caps lock** being enabled
- [ ] [tmux] add space at the end of window names to prevent moving of text in status bar
- [ ] [fish] detach fish shell instance from command history
- **Q** can tmux separate all panes within a window from the global command history _fish shell_
- [ ] [nvim] **references** text when working with JS files, toggle with _leader+h_ as other hidden chars are toggled
- [ ] [vim] jump to open curly brace then jump back to close curly brace
- [ ] [vim, json] adjust default conceal settings for json files
- [ ] [vim, javascript] **Q** how to make certain javascript lang _keywords_ appear in italics using color / font scheme
- **className, const, return, this.state, onClick, import**
- [ ] [vim, markdown] have basic code folding for certain HTML tags when editing markdown documents
- [ ] [macos] what is the procedure macos uses to mount a file system when a usb drive is plugged into a macos system
- [ ] [tmux] instead <kbd>prefix</kbd> then <kbd>control+l</kbd> to clear the screen, try using <kbd>control+l followed by l</kbd>, no good, try using <kbd>super + l</kbd>
- [ ] [tmux] possible binding for toggling max/min windows size <kbd>control+shift</kbd>
- [ ] [macos, wm, spectacle] <kbd>cmd,option,+</kbd> have to mash <kbd>+</kbd> multiple times to increase window size, would like _hold the key down to increase size_, looking at your karabiner-elements / hammerspoon
- [ ] [macos] look into creating a _lazy mouse hover_ function, if the mouse is hovering a application specific window for a certain period of time (threshold) bring that application to focus, ie. a pseudo auto hover.
- [x] [vim] update colorscheme to see if it solves the neovim gutter white colored pipes for code folds. [**neovim folding doc**](https://neovim.io/doc/user/usr_28.html)
- **did not** update the gutter symbol colors related to code folds. booo
- [ ] [vim] change commenting for `.gitignore` files from `/* wrong */` to `# right`
- [ ] [tmux] put short synopsis of current weather in tmux status bar, _right side_
- [ ] **vivaldi** / **voilentmonkey**
- youtube script, to switch view mode on viewer window hover with mouse.
- [ ] [fish] exp with using colors for `brew.fish` function to distingush misspelling of word
- [ ] [vim] navigating documents with line wraps makes jumping through buffer by line number inaccurate, wraped lines are displayed as one line, but the jump cmd treats them as multiple
- [ ] [tmux] **nope**, call a shell script using a double tap of <kbd>shift</kbd> that interacts with the current window of tmux, a karabiner, hammerspoon, shell script, worm hole πŸ›πŸ•³
- [ ] [tmux] it'd be nice to have a quick double tap of either <kbd>shift</kbd>key then<kbd>shift</kbd> to toggle between remote and local tmux sessions
- [learn more](https://gist.github.com/samoshkin/05e65f7f1c9b55d3fc7690b59d678734)
- [and more](https://www.freecodecamp.org/news/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795/)
- [even more](https://superuser.com/questions/238702/maximizing-a-pane-in-tmux)
- i think using karabiner-elements with hammerspoon via a shell script will allow a pseudo double tap like key binding for certain features of tmux, ie. double tap shift to zoom in and out.
- [ ] hammerspoon, possibly karabiner, toggle function keys on a macbook with double tap of <kbd>fn</kbd>
- [ ] [python] [fish] [virtualenv] setup keybinding <kbd>control</kbd>+<kbd>d</kbd> to exit virtualenv but not exit terminal / shell session, ie. make control+d local to the virtualenv
- [ ] [python] [fish] [neolambda] update prompt to remove ~Ξ»~ and put name of virtualenv instead
- [ ] see if there is a fish function of _omf_ or _fisher_ plugin that supports sharing command history between bash and fish
- [ ] make abe graphich more personal.
- [ ] spend an hour or two working on install script for aiding the process of setting up my dotfiles on fresh box πŸ“¦.

### Neovim
</details> <!-- end of uncompleted todo items -->


### TODOs completed

<details>
<summary><strong>TODOs completed</strong></summary>

- [x] ~~[vim] keybinding: use `ctrl+w, z` to maximize / minimize split~~
- [x] ~~[vim] remamp split command key bindings to use similar keys as tmux pane splitting, ie. <kbd>|</kbd> and <kbd>-</kbd>~~
- [x] ~~pack up `spring-dev` branch into a release and begin `summer-dev` branch~~
- [x] ~~[vim] figure out why _colorscheme_ or _syntax_ file is causing red block backgrounds~~
- [x] [tmux] ~~search and see if it supports key chord style shortcuts, tired of using <kbd>shift</kbd>+<kbd>arrow keys</kbd> to navigate between windows, prefer <kbd>ctrl</kbd>+<kbd>l</kbd> then <kbd>l</kbd>~~
- [x] ~~[fish] come up with sane way to check for misspelling of `brew cask outdated --greddy`~~
- [x] ~~Vim Sesssions, Folds, and Conceals will be the death of me~~ πŸ’€

</details>


<a id="contact"></a>

## Contact [πŸ”](#contents)
Expand Down
2 changes: 1 addition & 1 deletion asdf/tool-versions.rogue.capin
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby 2.6.5
ocaml 4.04.2
elixir 1.10.3-otp-22
elixir 1.10.4-otp-22
erlang 22.3.3
Binary file added config/Blender/2.83/config/userpref.blend
Binary file not shown.
16 changes: 16 additions & 0 deletions config/bash/bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,19 @@ if [ -f "${SSH_ENV}" ]; then
else
start_agent;
fi

# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/Users/capin/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/Users/capin/miniconda3/etc/profile.d/conda.sh" ]; then
. "/Users/capin/miniconda3/etc/profile.d/conda.sh"
else
export PATH="/Users/capin/miniconda3/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<

13 changes: 13 additions & 0 deletions config/bash/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,24 @@ if [ -d ~/.config/bash/functions ]; then
done
fi


# BASHRC FUNCTIONS

# read man specific entries for shell builtins
bashman () {
man bash | man bash | less -p "^ $1 "
}

brew() {
if [[ $@ == "cask outdated --greddy" ]]; then
command brew cask outdated --greedy
else
command brew "$@"
fi
}

# BASHRC FUNCTIONS end

# BASH history
## no dupes
HISTCONTROL=ignoredups:erasedups
Expand Down
5 changes: 3 additions & 2 deletions config/bitbar/fan-speed.5s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ for ((i = 0; i < ${#FANS[@]}; i++)) ; do
if [ "$FAN_SPEED" != "" ] ; then
if [ ! -z "${FAN_LABEL+x}" ]; then
# Add labels if FAN_LABEL is declared
FAN_SPEEDS="$FAN_SPEEDS${FAN_LABEL[$i]}: "
# FAN_SPEEDS="$FAN_SPEEDS${FAN_LABEL[$i]}: "
FAN_SPEEDS="$FAN_SPEEDS${FAN_LABEL[$i]}"
fi
FAN_SPEEDS="$FAN_SPEEDS$FAN_SPEED RPM "
FAN_SPEEDS="$FAN_SPEEDS$FAN_SPEED "
fi
done
echo "$FAN_SPEEDS| size=12"
Loading

0 comments on commit b9df9de

Please sign in to comment.