Skip to content

Commit 27fb86b

Browse files
committed
mergein binary secret file from dev.fall into release branch, and merge in all dev.fall branch changes into release branch
2 parents 66b61f1 + 697f8ed commit 27fb86b

69 files changed

Lines changed: 2035 additions & 896 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,17 @@ jobs/bin/inkview
153153
##
154154
**/FreeCAD/AddonManager/**
155155
**/FreeCAD/Mod/**
156+
!**/FreeCAD/Gui/Stylesheets/README.md
157+
**/FreeCAD/Gui/Stylesheets/*.qss
158+
**/FreeCAD/Gui/Stylesheets/*.orig
159+
**/FreeCAD/Macro/**
160+
!**/FreeCAD/Macro/.gitkeep
156161

157162

158163
##############################
159164
# PrusaSlicer / Prusa Slicer
165+
# NOTE: app setting files on macos are located within...
166+
# $HOME/Library/Application Support/PrusaSlicer/
160167
##
161168

162169
**/PrusaSlicer/cache/**
@@ -170,6 +177,7 @@ jobs/bin/inkview
170177
**/PrusaSlicer/PrusaSlicer.ini
171178
**/PrusaSlicer/filament/**
172179
**/PrusaSlicer/print/**
180+
**/PrusaSlicer/printer/**
173181

174182
##############################
175183
# GTK > gtk-mac-bundler
@@ -203,15 +211,22 @@ config/Blender/2.83/scripts/addons/**
203211
config/Blender/2.83/scripts/presets/operator/**
204212
!config/Blender/2.83/scripts/presets/operator/.gitkeep
205213
!config/Blender/2.83/config/.gitkeep
214+
# Blender 2.9x config files
215+
config/Blender/2.90/config/recent-files.txt
216+
config/Blender/2.90/config/bookmarks.txt
217+
config/Blender/2.90/scripts/addons/**
218+
!config/Blender/2.90/scripts/addons/.gitkeep
219+
config/Blender/2.90/scripts/presets/operator/**
220+
!config/Blender/2.90/scripts/presets/operator/.gitkeep
221+
!config/Blender/2.90/config/.gitkeep
222+
config/Blender/2.90/config/userpref.blend
206223

207-
##############################
208224
# Python - pyenv
209225
##
210226
lang/python/pyenv/**
211227
# airpy tools for working with AirPort devices
212228
jobs/bin/acp
213229

214-
215230
##############################
216231
# r2 a.k.a radare radare2
217232
##
@@ -257,3 +272,6 @@ jobs/macOS/Users/mr-fancy/hammerspoon/.cli.history
257272
.gitsecret/keys/random_seed
258273
!*.secret
259274
config/fish/interactive/private-env-vars.fish
275+
jobs/macOS/Users/mr-fancy/Library/Preferences/FreeCAD/user.cfg
276+
add
277+
.git/**

.wiki

Submodule .wiki updated from 8149206 to 45aea7c

README.md

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,17 @@
2020

2121
</div>
2222

23-
<a id="installation"></a>
23+
<!-- first day of winter 2020 is dec 21 -->
2424

2525
## Installation
2626

27-
>👷 install script is incomplete, do the good ol [StackOverflow](https://i.imgur.com/QZj4hxp.jpg) to expierment with repo files. 🚧
27+
<a id="installation"></a>
28+
29+
<!-- github flavored markdown presently doesnot support `target="_blank"` -->
30+
31+
<blockquote>
32+
👷 install script is incomplete, do the good ol <a href="https://i.imgur.com/QZj4hxp.jpg" target="_blank" "rel="noopener noreferrer">StackOverflow <img src="https://raw.githubusercontent.com/wiki/ipatch/dotfiles/lib/nearr.svg"></a> to experiment with repo files. 🚧
33+
</blockquote>
2834

2935
```sh
3036
curl https://raw.githubusercontent.com/ipatch/dotfiles/master/install.sh | /bin/sh
@@ -33,10 +39,11 @@ echo "quickly add tmux configuration file, in a pinch"
3339
curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.conf > ~/.tmux.conf
3440
```
3541

36-
<a id="file-structure"></a>
3742

3843
## File Structure
3944

45+
<a id="file-structure"></a>
46+
4047
> Certain files and folders are omitted for brevity & security, most notably the `pack` directory polluting the **File Structure** with vim plugin files.
4148
4249
<details>
@@ -728,22 +735,44 @@ curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.co
728735
</pre>
729736
</details>
730737

731-
<a id="useful-links"></a>
732738

733739
## Useful Links ___no particular order___
734740

741+
<a id="useful-links"></a>
742+
735743
- [**Github** wincent/wincent](https://github.com/wincent/wincent)
736744
- [**Github** mathiasbynenes/dotfiles](https://github.com/mathiasbynens/dotfiles)
737745
- [**Github** Awesome-dotfiles](https://github.com/webpro/awesome-dotfiles)
738746
- [cool looking **badges** for github readme's](https://github.com/ryanoasis/nerd-fonts)
739747

740-
## TODOs
748+
<!-- <h3>TODOs</h3> -->
749+
750+
##
741751

742752
<a id="todos"></a>
743753

754+
744755
<details>
745756
<summary><strong>TODOs</strong></summary>
746757

758+
- [ ] [vim] [neovim] keep the `lcd` / `pwd` to the directory nvim was launched from **especially** if nvim was launched with no args
759+
- [ ] [alacritty] [fish] [tmux] [karabiner] [hammerspoon] _double tap esc_, ie. esc², to run the keyboard shortcut of clearing the scree, ie. prefix (tmux), then control+l
760+
- [ ] [vim] [nvim] [coc] [eslint] gutter warn glyph appeares to be `>>` in the color red, would much prefer to keep warning color consistent with the color of the warning text, and same with error text, keep that the color red.
761+
- [ ] [tmux] [hammerspoon] [ke] left double tap shift, toggle max/min pane within window
762+
- [ ] [macos] [afloat] [ke] [hammerspoon] double tap right shift, toggle keep window atop
763+
- [ ] [fish] followup on my reddit question about suggestions / completions when writing fish scripts
764+
- [ ] [vim] device func / stript to decrypt / encrypt GPG files
765+
- [ ] [phys] reapply liquid metal to local cpu and gpu, run geekbench test before after, and exp with copper shims for gpu + cpu
766+
- [ ] [macos] [homebrew] howto search for homebrew taps
767+
- [ ] [neovim] review the below highlight settings, obviously time permitting of course
768+
- Folded
769+
- GitGutterAdd
770+
- GitGutterChange
771+
- GitGutterDelete
772+
- LineNr
773+
- Number
774+
- [ ] [fish] add a keyboard shortcut to toggle the right prompt **on** / **off**
775+
- [ ] [fish, dots] # TODO: migrate all `mac, mac-` related abbrs, alias, shell scripts to use `apl` prefix
747776
- [ ] [vim, tmux, or macos] some form of icon / notification of **caps lock** being enabled
748777
- [ ] [tmux] add space at the end of window names to prevent moving of text in status bar
749778
- [ ] [fish] detach fish shell instance from command history
@@ -759,14 +788,11 @@ curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.co
759788
- [ ] [tmux] possible binding for toggling max/min windows size <kbd>control+shift</kbd>
760789
- [ ] [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
761790
- [ ] [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.
762-
- [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)
763-
- **did not** update the gutter symbol colors related to code folds. booo
764-
- [ ] [vim] change commenting for `.gitignore` files from `/* wrong */` to `# right`
765791
- [ ] [tmux] put short synopsis of current weather in tmux status bar, _right side_
766792
- [ ] **vivaldi** / **voilentmonkey**
767-
- youtube script, to switch view mode on viewer window hover with mouse.
768-
- [ ] [fish] exp with using colors for `brew.fish` function to distingush misspelling of word
769-
- [ ] [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
793+
- youtube script, to switch view mode on viewer window hover with mouse or mash a key to bring focus to viewer window so playback shortcuts become active.
794+
- [ ] [fish] exp with using colors for `brew.fish` function to distinguish misspelling of word
795+
- [ ] [vim] navigating documents with line wraps makes jumping through buffer by line number inaccurate, wrapped lines are displayed as one line, but the jump cmd treats them as multiple
770796
- [ ] [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 🐛🕳
771797
- [ ] [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
772798
- [learn more](https://gist.github.com/samoshkin/05e65f7f1c9b55d3fc7690b59d678734)
@@ -777,17 +803,21 @@ curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.co
777803
- [ ] [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
778804
- [ ] [python] [fish] [neolambda] update prompt to remove ~λ~ and put name of virtualenv instead
779805
- [ ] see if there is a fish function of _omf_ or _fisher_ plugin that supports sharing command history between bash and fish
780-
- [ ] make abe graphich more personal.
806+
- [ ] make abe graphic more personal.
781807
- [ ] spend an hour or two working on install script for aiding the process of setting up my dotfiles on fresh box 📦.
782808

783809
</details> <!-- end of uncompleted todo items -->
784810

811+
<!-- <h3>TODOs completed</h3> -->
785812

786-
### TODOs completed
813+
##
787814

788815
<details>
789816
<summary><strong>TODOs completed</strong></summary>
790817

818+
- [x] ~~[vim] change commenting for `.gitignore` files from `/* wrong */` to `# right`~~
819+
- [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)
820+
- **did not** update the gutter symbol colors related to code folds. booo
791821
- [x] ~~[vim] keybinding: use `ctrl+w, z` to maximize / minimize split~~
792822
- [x] ~~[vim] remamp split command key bindings to use similar keys as tmux pane splitting, ie. <kbd>|</kbd> and <kbd>-</kbd>~~
793823
- [x] ~~pack up `spring-dev` branch into a release and begin `summer-dev` branch~~
@@ -799,11 +829,11 @@ curl https://raw.githubusercontent.com/ipatch/dotfiles/master/terms/tmux/tmux.co
799829
</details>
800830

801831

802-
<a id="contact"></a>
832+
<div align="center">
803833

804834
## Contact [🔝](#contents)
805835

806-
<div align="center">
836+
<a id="contact"></a>
807837

808838
[**GithHub**](https://github.com/ipatch)[**Twitter**](https://twitter.com/truckmonth)[**GitLab**](https://gitlab.com/truckmonth)
809839

asdf/tool-versions.rogue.capin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ruby 2.6.5
22
ocaml 4.04.2
3-
elixir 1.10.4-otp-22
4-
erlang 22.3.3
3+
elixir 1.11.2-otp-23
4+
erlang 23.2
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{NVIDIA Corporation/NVIDIA GeForce GT 750M OpenGL Engine/4.1 NVIDIA-10.33.0 387.10.10.10.40.138}=SUPPORTED
2+
{NVIDIA Corporation/NVIDIA GeForce GT 750M OpenGL Engine/4.1 NVIDIA-10.33.0 387.10.10.10.40.139}=SUPPORTED
717 KB
Binary file not shown.

config/FreeCAD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/opt/code/dotfiles/jobs/macoS/Users/mr-fancy/Library/Preferences/FreeCAD

config/bash/bashrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ alias l='/bin/ls -lahF'
5151
alias ls='ls --color=auto'
5252
alias lr='ls -lrth'
5353

54+
##
55+
alias pp='echo $PATH'
56+
alias br='exec bash'
57+
5458

5559

5660
alias cp='cp -iv'

0 commit comments

Comments
 (0)