1
0
mirror of https://github.com/aquatix/dotfiles.git synced 2025-12-07 08:05:10 +01:00

73 Commits

Author SHA1 Message Date
d4625dd8e2 Words 2023-05-11 16:11:02 +02:00
9cef24836b mc without the mouse 2023-03-11 21:29:39 +01:00
58084b41ea Word 2023-03-10 21:43:58 +01:00
01274819e9 Merge branch 'master' of github.com:aquatix/dotfiles 2023-03-10 21:43:42 +01:00
3ef6363915 Trust those repo paths 2023-03-08 16:14:47 +01:00
3bb1890b81 Trying to optimise download by shallow cloning 2023-02-28 13:30:35 +01:00
32e3d1bf89 20230125: words 2023-02-20 16:54:21 +01:00
b32537ca36 Words 2023-01-12 16:11:16 +01:00
52ed5b6558 Do not do the scree-256color thing, it breaks ssh prompt 2023-01-10 16:44:20 +01:00
a1c2b3c692 Moved work notes to their own repo 2023-01-08 12:39:12 +01:00
c420e20e56 It's 2023 baby! 2023-01-02 14:01:20 +01:00
72d55c14ce Merge branch 'master' of github.com:aquatix/dotfiles 2022-12-22 09:41:23 +01:00
2e1bff51ea 20220922: words 2022-12-22 09:40:56 +01:00
e7e344b6ad Words, names 2022-12-11 22:14:03 +01:00
13b5a8eac0 Words 2022-11-13 22:22:38 +01:00
b6553f2771 Merge branch 'master' of github.com:aquatix/dotfiles 2022-08-28 19:55:27 +02:00
bee15e099e Good band 2022-08-28 19:54:12 +02:00
ec654b26a6 Word 2022-08-23 09:17:52 +02:00
89d3acc10a Cool duo 2022-08-19 11:58:56 +02:00
b8c811bce7 Be more conservative with which files are indexed 2022-08-08 19:33:58 +02:00
525f2e06be Fun 2022-07-24 10:43:39 +02:00
b89f39b335 A good word 2022-06-25 21:41:12 +02:00
1d70c460e3 Remove old and conflicting pgadmin4 command 2022-06-10 11:45:09 +02:00
838aa1df81 Auto-download on demand and give warning if file is old 2022-04-11 16:35:56 +02:00
d9bbe483ba Nifty little MAC-address lookup script 2022-04-11 16:20:53 +02:00
e9957332e5 Word, and a good one 2022-03-19 10:54:19 +01:00
d47442b87c Food words 2022-01-22 18:43:43 +01:00
4c56ee025c exa is an interesting ls alternative 2022-01-21 07:20:19 +01:00
a525440918 Updated font sources 2022-01-14 18:48:19 +01:00
96e9320f89 Words 2022-01-14 09:05:30 +01:00
92306f8125 After regenerating ssh config, make sure permissions are correct 2022-01-11 11:21:48 +01:00
a39e8e6e9e Word 2022-01-09 17:14:37 +01:00
ad33a56d7b 2022 has arrived 2022-01-04 17:03:00 +01:00
06de4bad70 Words 2022-01-03 13:08:34 +01:00
ea30a5fd0a Do not wait for a linefeed after each zip 2022-01-03 09:58:00 +01:00
43fd8e34f5 Words 2021-12-17 22:22:32 +01:00
bb3363ae79 Words 2021-11-20 19:59:02 +01:00
8a36201565 Words 2021-11-09 20:02:40 +01:00
b4305f1131 Original mdnav repo is unmaintained, remove mention 2021-10-27 12:56:06 +02:00
4839507e05 Word 2021-10-13 21:45:51 +02:00
f8ea1fe55f The product 2021-09-22 20:45:24 +02:00
00c670d0e1 Word 2021-09-19 21:26:55 +02:00
b0b09d49c8 Word 2021-09-19 21:11:13 +02:00
8111aaf0ad Med 2021-09-19 16:32:08 +02:00
f8f695ac64 Word 2021-09-13 20:12:18 +02:00
1508e83271 Support rust apps installed locally with cargo 2021-09-05 14:09:50 +02:00
a9d443755a Moved wiki.vim config to outside the load part 2021-09-02 11:11:55 +02:00
1b52b1ed7f Parse tags: line 2021-09-01 18:52:16 +02:00
28cdfe7d3a whoa 2021-09-01 12:50:57 +02:00
8a147d485a Moar DiVault phren 2021-08-31 16:57:06 +02:00
92b7cbf3d8 Use new DiVault phren 2021-08-31 07:10:00 +02:00
fed1dc4d8e Words 2021-08-30 15:57:58 +02:00
3aa07b28c2 DiVault phren 2021-08-30 15:57:54 +02:00
009557beb4 Wiiiiii 2021-08-30 15:56:18 +02:00
5e91c7d6af Spelling file for English is also auto-generated 2021-08-23 16:07:01 +02:00
c844099484 Ignore vim generated spelling files 2021-08-23 11:06:24 +02:00
5d374082e9 Words 2021-08-23 11:05:57 +02:00
44540b79a2 Autogenerate .spl files from .add spelling files 2021-08-23 11:05:19 +02:00
5d4d5a0bfa Word 2021-08-23 10:56:16 +02:00
ab722b28df Adjusted the fisher install notes 2021-07-10 10:47:21 +02:00
d601327458 Word 2021-07-09 10:40:11 +02:00
18b9e5c8ec Current fisher cannot be installed automatically 2021-07-08 10:32:17 +02:00
eaa4bb7d05 Fisher 4.x has a new plugin file 2021-07-07 10:24:11 +02:00
8e7af76123 Latest fisher has a different config file, of course 2021-06-27 09:08:22 +02:00
28234cd6a7 Bandcamp support, block Musicbrainz by not running a local instance 2021-06-19 21:28:24 +02:00
4f12b0ab9e Singles belong to their artist 2021-06-18 21:48:28 +02:00
358dd8e6d1 If there's multiple discs, prepend tracks with the disc number 2021-06-18 15:30:48 +02:00
a00697759c This stuff is big 2021-06-18 14:29:18 +02:00
eb33471478 More logical layout 2021-06-18 14:04:32 +02:00
2158c887cc Beets has its own dir now 2021-06-18 13:37:58 +02:00
e0861ac757 Playing around with beets music manager 2021-06-18 13:29:33 +02:00
Michiel Scholten
4648ba6ff6 Merge pull request #2 from aquatix/vim-todo
Vim todo
2021-05-04 17:53:58 +02:00
570bfcceb2 Python requirements.txt syntax highlighting 2021-05-04 17:52:50 +02:00
17 changed files with 327 additions and 98 deletions

View File

@@ -109,11 +109,6 @@ alias pip_upgrade="pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xargs
# 20140908 reload tmux config # 20140908 reload tmux config
alias tmux_reload="tmux source-file ~/.tmux.conf" alias tmux_reload="tmux source-file ~/.tmux.conf"
# project-oriented aliases
alias dcpvag='workon dcp; cd ~/workspace/sanoma/content-library/; vagrant ssh'
alias dcpsrc='cd ~/development/current/content-library/src/content_library/; . ~/development/env/bin/activate'
alias dcpcelery='python manage.py celery worker -Q celery -l info'
# update/install Calibre ebook manager # update/install Calibre ebook manager
alias updatecalibre='sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('"'"'Download failed\n'"'"'); exec(sys.stdin.read()); main()"' alias updatecalibre='sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('"'"'Download failed\n'"'"'); exec(sys.stdin.read()); main()"'
@@ -126,6 +121,9 @@ alias weather='ansiweather'
alias pypi_up='python setup.py register sdist --formats=zip upload' alias pypi_up='python setup.py register sdist --formats=zip upload'
# Use midnight commander without mouse being annoying
alias mc='mc -d'
# if you're really annoyed with a runaway process # if you're really annoyed with a runaway process
function fuck() { function fuck() {
if killall -9 "$2"; then if killall -9 "$2"; then

View File

@@ -177,6 +177,7 @@ if [ -e ~/.ssh/config.d ]; then
[ -e ~/.ssh/config ] && mv ~/.ssh/config ~/.ssh/config.bak.$(date -Is) [ -e ~/.ssh/config ] && mv ~/.ssh/config ~/.ssh/config.bak.$(date -Is)
# Lets preserve order, so you can have 00_generic 10_homestuff 20_work1 21_work2 and such # Lets preserve order, so you can have 00_generic 10_homestuff 20_work1 21_work2 and such
find ~/.ssh/config.d/* -type f -print0 | sort -z | xargs -0 -n1 cat > ~/.ssh/config find ~/.ssh/config.d/* -type f -print0 | sort -z | xargs -0 -n1 cat > ~/.ssh/config
chmod 600 ~/.ssh/config
fi fi
fi fi
fi fi

60
.config/beets/config.yaml Normal file
View File

@@ -0,0 +1,60 @@
directory: /stuff/beets/music
library: /stuff/beets/musiclibrary.db
art_filename: cover
asciify_paths: yes
per_disc_numbering: yes
threaded: yes
paths:
# default: $albumartist/$year - $album/$track $artist - $title
default: %the{$albumartist}/$year - $album%aunique{}/%if{$multidisc,$disc-}$track $artist - $title
#singleton: Singletons/$artist - $title
singleton: %the{$albumartist}/single - $artist - $title/$artist - $title
comp: Compilations/$album%aunique{}/%if{$multidisc,$disc-}$track $artist - $title
albumtype:soundtrack: Soundtracks/$album%aunique{}/%if{$multidisc,$disc-}$track $artist - $title
import:
write: yes
copy: yes
move: no
resume: ask
#incremental: yes
log: beetslog.log
ignore: .AppleDouble ._* *~ .DS_Store
plugins: [
bandcamp, # pip install beets-bandcamp
discogs,
duplicates,
embedart,
fetchart,
ftintitle,
importadded,
inline,
the,
]
discogs:
# pip install discogs-client
# Useful for classical music:
index_tracks: yes
fetchart:
# pip install requests
cautious: true
ftintitle:
auto: yes
format: (feat. {0})
importadded:
preserve_mtimes: yes
preserve_write_mtimes: yes
item_fields:
multidisc: 1 if disctotal > 1 else 0
musicbrainz:
host: localhost:5000

View File

@@ -3,12 +3,11 @@ set EDITOR vim
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
if not functions -q fisher #if not functions -q fisher
echo "Installing fisher for the first time..." >&2 # DO NOT ENABLE, it is a fork bomb :)
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config # echo "Installing fisher for the first time..." >&2
curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish # curl -sL https://git.io/fisher | source && fisher update
fish -c fisher #end
end
# Theme options for bobthefish # Theme options for bobthefish
set -g theme_nerd_fonts yes set -g theme_nerd_fonts yes
@@ -28,6 +27,11 @@ set -U grcplugin_ls --color
if test -x ~/.local/bin if test -x ~/.local/bin
set PATH $PATH ~/.local/bin set PATH $PATH ~/.local/bin
end end
# Local Rust apps installed through cargo
if test -x ~/.cargo/bin
set PATH $PATH ~/.cargo/bin
end
# Scripts from my dotfiles repo
if test -x ~/.dot/dotfiles/bin if test -x ~/.dot/dotfiles/bin
set PATH $PATH ~/.dot/dotfiles/bin set PATH $PATH ~/.dot/dotfiles/bin
end end
@@ -65,6 +69,9 @@ alias la 'ls -A'
alias l 'ls -CF' alias l 'ls -CF'
alias lll 'ls --color=always -alF | less -R' alias lll 'ls --color=always -alF | less -R'
alias exa 'exa --icons --header --group-directories-first'
alias exatree 'exa --icons --header --group-directories-first --long --tree'
## Git ## Git
alias gu "git pull --all" alias gu "git pull --all"
alias gp "git push; git push --tags" alias gp "git push; git push --tags"
@@ -85,9 +92,9 @@ alias ffnightly 'env MOZ_USE_XINPUT2=1 /usr/local/bin/firefoxnightly/firefox'
## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux ## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux
#alias ssh 'env TERM=xterm-256color ssh' #alias ssh 'env TERM=xterm-256color ssh'
function ssh #function ssh
env TERM=screen-256color ssh $argv # env TERM=screen-256color ssh $argv
end #end
## Grepping ## Grepping
alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep' alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep'

View File

@@ -0,0 +1,9 @@
jorgebucaran/fisher
edc/bass
oh-my-fish/theme-bobthefish
fisherman/fzf
fisherman/getopts
fisherman/nvm
oh-my-fish/plugin-grc
fisherman/shark
fisherman/z

View File

@@ -65,3 +65,12 @@
insteadOf = "bitbucket:" insteadOf = "bitbucket:"
[pull] [pull]
rebase = false rebase = false
[safe]
directory = /storage/emulated/0/Git/phren
directory = /storage/emulated/0/Git/divaultphren
directory = /storage/emulated/0/Git/mydocs
directory = /data/data/com.termux/files/home/.dot/dotfiles/
directory = /storage/emulated/0/Git/dammit.nl
directory = /mnt/chromeos/PlayFiles/Documents/phren
directory = /mnt/chromeos/PlayFiles/Documents/divaultphren
directory = /mnt/chromeos/PlayFiles/Documents/mydocs

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
# Vim # Vim
.vim/bundle .vim/bundle
*.spl
*.swp *.swp
*.swo *.swo

Binary file not shown.

View File

@@ -159,3 +159,79 @@ Efteling
wokgerecht wokgerecht
rundersaucijs rundersaucijs
Loïs Loïs
Pfizer
gehaktsaus
aardappelkroketjes
AMD
Assetto
Corsa
Wii
gymkleding
kutweer
whoa
bistrokrieltjes
dumbbells
naproxen
nerden
E-depot
Carcassonne
groepsles
kennismakingsdag
Jira
chippies
Battlefield
webinar
phren
farfalle
streamen
ieuw
kattenpoep
kerstontbijt
ThinkPad
spelavond
comics
refinement
datacentrum
zometeen
hyper
inductieplaat
level
Europaplein
Blendle
prutten
mirai
kernel
VPN
schrapend
wastafelkraan
cracottes
cracotte
Picard
nerdcave
Röyksopp
Linnaeushof
recruiter
Decathlon
aqua
Cineworld
Panta
Rhei
hey
Zoë
voilà
Daan's
Pinkeltje
awesome
webhaak
klassendienst
rewrite
Plex
automagiseren
slaapmasker
puntpaprika
Roblox
Samsung
Galaxy
iPad
Matt
powernap

Binary file not shown.

69
.vimrc
View File

@@ -271,6 +271,15 @@ endif
" https://castel.dev/post/lecture-notes-1/ " https://castel.dev/post/lecture-notes-1/
inoremap <C-l> <c-g>u<Esc>[s1z=`]a<c-g>u inoremap <C-l> <c-g>u<Esc>[s1z=`]a<c-g>u
" Make sure .add.spl spelling files are up-to-date with their .add
" counterparts
" https://vi.stackexchange.com/questions/5050/how-to-share-vim-spellchecking-additions-between-multiple-machines
for d in glob('~/.vim/spell/*.add', 1, 1)
if filereadable(d) && (!filereadable(d . '.spl') || getftime(d) > getftime(d . '.spl'))
exec 'mkspell! ' . fnameescape(d)
endif
endfor
" Word completion from dictionary (on ctrl+space) " Word completion from dictionary (on ctrl+space)
set complete+=kspell set complete+=kspell
@@ -376,6 +385,9 @@ endif
" Improved Django handling " Improved Django handling
Plug 'tweekmonster/django-plus.vim' Plug 'tweekmonster/django-plus.vim'
" requirements.txt highlighter
Plug 'raimon49/requirements.txt.vim', {'for': 'requirements'}
" Code checker. For python, install flake8 or pylint, preferably in the " Code checker. For python, install flake8 or pylint, preferably in the
" virtualenv. For Django support, install pylint-django " virtualenv. For Django support, install pylint-django
@@ -420,36 +432,21 @@ Plug 'skanehira/preview-markdown.vim'
let g:preview_markdown_vertical = 1 let g:preview_markdown_vertical = 1
" Navigate through and from markdown files " Navigate through and from markdown files
"Plug 'chmp/mdnav'
Plug 'aquatix/mdnav', { 'branch': 'fixes' } Plug 'aquatix/mdnav', { 'branch': 'fixes' }
" Only open these local files in vim, use pyfile for all others: " Only open these local files in vim, use pyfile for all others:
let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst' let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
" let g:mdnav#DebugMode = 'true'
" wiki.vim " wiki.vim
Plug 'lervag/wiki.vim' Plug 'lervag/wiki.vim'
" let g:wiki_root = '~/wiki' " Config below, after plug#end()
let g:wiki_root = '~/phren'
let g:wiki_filetypes = ['md']
let g:wiki_link_extension = '.md'
let g:wiki_link_target_type = 'md'
" let g:wiki_mappings_use_defaults = 1
"support for #tag style tags instead of :tag:
let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
" number of lines from the top to scan for tags
let g:wiki_tags_scan_num_lines = 500
" search through the tags in the wiki
nmap <leader>wf :WikiFzfTags <CR>
" find backlinks to this document
nmap <leader>wb :WikiGraphFindBacklinks <CR>
" find in ToC/structure of the (markdown) file
nmap <leader>ft :WikiFzfToc <CR>
if $USER != 'root' if $USER != 'root'
" notational velocity with fzf: quickly search and open notes " notational velocity with fzf: quickly search and open notes
Plug 'https://github.com/alok/notational-fzf-vim' Plug 'https://github.com/alok/notational-fzf-vim'
let g:nv_search_paths = ['~/phren', '~/mydocs', '~/.dot/caplog'] let g:nv_search_paths = ['~/phren', '~/mydocs', '~/.dot/caplog', '~/divaultphren']
let g:nv_ignore_pattern = ['*.xml', '*.svg'] let g:nv_ignore_pattern = ['*.xml', '*.svg']
" Quickly open the search with this shortcut " Quickly open the search with this shortcut
nmap <leader>n :NV <CR> nmap <leader>n :NV <CR>
@@ -489,7 +486,10 @@ au BufNewFile,BufRead *.j2,*.jinja2 set ft=jinja
Plug 'ludovicchabant/vim-gutentags' Plug 'ludovicchabant/vim-gutentags'
" know when Gutentags is generating tags (prints 'TAGS' in status-line) " know when Gutentags is generating tags (prints 'TAGS' in status-line)
set statusline+=%{gutentags#statusline()} set statusline+=%{gutentags#statusline()}
let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", "tmp", "vendor", "*.vim/bundle/*", "*.vim/plugged/*"] let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", ".obsidian/*", "tmp", "vendor", "*.vim/bundle/*", "*.vim/plugged/*"]
" use ripgrep to create list of files to index, which should help with
" ignoring non-versioned files, for example with .gitignore
let g:gutentags_file_list_command = 'rg --files'
"let g:gutentags_trace = 1 "let g:gutentags_trace = 1
@@ -521,6 +521,37 @@ nmap <leader>V :Goyo <bar> :Limelight!! <bar> :TogglePencil <CR>
" All of the plugins must be added before the following line " All of the plugins must be added before the following line
call plug#end() call plug#end()
" wiki.vim config
let g:wiki_root = '~/phren'
let g:wiki_filetypes = ['md']
let g:wiki_link_extension = '.md'
let g:wiki_link_target_type = 'md'
" let g:wiki_mappings_use_defaults = 1
"support for #tag style tags instead of :tag: (hashes instead of colons)
runtime autoload/wiki/tags.vim
let s:tag_parser = deepcopy(g:wiki#tags#default_parser)
let s:tag_parser.re_match = '\v%(^|\s)#\zs[^# ]+'
let s:tag_parser.re_findstart = '\v%(^|\s)#\zs[^# ]+'
"let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
" parse tags in lines that match "tags: keyword1, keyword2" in addition to the default parser:
let g:wiki_tag_parsers = [
\ s:tag_parser,
\ {'match': {x -> x =~# '^tags: '},
\ 'parse': {x -> split(matchstr(x, '^tags:\zs.*'), '[ ,]\+')}}
\ ]
" number of lines from the top to scan for tags
let g:wiki_tag_scan_num_lines = 500
" search through the tags in the wiki
nmap <leader>wf :WikiFzfTags <CR>
" find backlinks to this document
nmap <leader>wb :WikiGraphFindBacklinks <CR>
" find in ToC/structure of the (markdown) file
nmap <leader>ft :WikiFzfToc <CR>
" == End of plugins ============================================================ " == End of plugins ============================================================

View File

@@ -29,29 +29,31 @@ Futura-Std-Bold-Oblique_19041.ttf
Futura-Std-Book_19044.ttf Futura-Std-Book_19044.ttf
Futura-Std-Book-Oblique_19043.ttf' Futura-Std-Book-Oblique_19043.ttf'
FONTS_OVERPASS=$'overpass-bold-italic.otf FONTS_OVERPASS=$'Overpass-BlackItalic.ttf
overpass-bold.otf Overpass-Black.ttf
overpass-extrabold-italic.otf Overpass-BoldItalic.ttf
overpass-extrabold.otf Overpass-Bold.ttf
overpass-extralight-italic.otf Overpass-ExtraBoldItalic.ttf
overpass-extralight.otf Overpass-ExtraBold.ttf
overpass-heavy-italic.otf Overpass-ExtraLightItalic.ttf
overpass-heavy.otf Overpass-ExtraLight.ttf
overpass-italic.otf Overpass-Italic.ttf
overpass-light-italic.otf Overpass-LightItalic.ttf
overpass-light.otf Overpass-Light.ttf
overpass-regular.otf Overpass-MediumItalic.ttf
overpass-semibold-italic.otf Overpass-Medium.ttf
overpass-semibold.otf Overpass-Regular.ttf
overpass-thin-italic.otf Overpass-SemiBoldItalic.ttf
overpass-thin.otf' Overpass-SemiBold.ttf
Overpass-ThinItalic.ttf
Overpass-Thin.ttf'
FONTS_JETBRAINS=$'JetBrainsMono-Bold-Italic.ttf FONTS_JETBRAINS=$'JetBrainsMono-BoldItalic.ttf
JetBrainsMono-Bold.ttf JetBrainsMono-Bold.ttf
JetBrainsMono-ExtraBold-Italic.ttf JetBrainsMono-ExtraBoldItalic.ttf
JetBrainsMono-ExtraBold.ttf JetBrainsMono-ExtraBold.ttf
JetBrainsMono-Italic.ttf JetBrainsMono-Italic.ttf
JetBrainsMono-Medium-Italic.ttf JetBrainsMono-MediumItalic.ttf
JetBrainsMono-Medium.ttf JetBrainsMono-Medium.ttf
JetBrainsMono-Regular.ttf' JetBrainsMono-Regular.ttf'
@@ -88,27 +90,47 @@ Knack RegularOblique Plus Nerd File Types Plus Font Awesome Plus Octicons Plus P
Knack Bold Nerd Font Complete Mono.ttf Knack Bold Nerd Font Complete Mono.ttf
Knack Regular Nerd Font Complete Mono.ttf Knack Regular Nerd Font Complete Mono.ttf
Knack Bold Italic Nerd Font Complete Mono.ttf Knack Bold Italic Nerd Font Complete Mono.ttf
Knack Italic Nerd Font Complete Mono.ttf' Knack Italic Nerd Font Complete Mono.ttf
overpass-bold-italic.otf
overpass-bold.otf
overpass-extrabold-italic.otf
overpass-extrabold.otf
overpass-extralight-italic.otf
overpass-extralight.otf
overpass-heavy-italic.otf
overpass-heavy.otf
overpass-italic.otf
overpass-light-italic.otf
overpass-light.otf
overpass-regular.otf
overpass-semibold-italic.otf
overpass-semibold.otf
overpass-thin-italic.otf
overpass-thin.otf'
if [ -e ~/.dot_is_server ]; then if [ -e ~/.dot_is_server ]; then
# Update from the repo # Update from the repo
echo "== Nerd fonts ======" echo "== Nerd fonts ======"
PARENT_DIR="/stuff/system/fonts"
SOURCE_DIR="/stuff/system/fonts/nerd-fonts/patched-fonts" SOURCE_DIR="/stuff/system/fonts/nerd-fonts/patched-fonts"
DEST_DIR="/stuff/system/sync/fonts/active" DEST_DIR="/stuff/system/sync/fonts/active"
if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then #if [ -d "$PARENT_DIR" ] && [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
if [ -d "$PARENT_DIR" ] && [ -d "$DEST_DIR" ]; then
cd "$PARENT_DIR"
# git pull --all
#git clone --depth=1 https://github.com/ryanoasis/nerd-fonts.git
cd "$SOURCE_DIR" cd "$SOURCE_DIR"
git pull --all
while read -r FONT; do while read -r FONT; do
echo "Copied font: $FONT" echo "Copied font: $FONT"
cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR" cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
done <<< "$FONTS_CODING" done <<< "$FONTS_CODING"
else else
echo "$SOURCE_DIR or $DEST_DIR not found, aborting" echo "$PARENT_DIR, $SOURCE_DIR or $DEST_DIR not found, aborting"
fi fi
# Update from the repo # Update from the repo
echo "== Jetbrains Mono ======" echo "== Jetbrains Mono ======"
SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/ttf" SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/fonts/ttf"
DEST_DIR="/stuff/system/sync/fonts/active" DEST_DIR="/stuff/system/sync/fonts/active"
if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
cd "$SOURCE_DIR" cd "$SOURCE_DIR"
@@ -123,7 +145,7 @@ if [ -e ~/.dot_is_server ]; then
# Update from the repo # Update from the repo
echo "== Overpass ======" echo "== Overpass ======"
SOURCE_DIR="/stuff/system/fonts/Overpass/desktop-fonts/overpass" SOURCE_DIR="/stuff/system/fonts/Overpass/fonts/ttf"
DEST_DIR="/stuff/system/sync/fonts/active" DEST_DIR="/stuff/system/sync/fonts/active"
if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
cd "$SOURCE_DIR" cd "$SOURCE_DIR"

48
bin/mac.sh Executable file
View File

@@ -0,0 +1,48 @@
#!/bin/bash
# Stolen from https://raw.githubusercontent.com/Cybertinus/macvendor_extractor/master/mac.sh
##########
# CONFIG #
##########
# Download from http://standards-oui.ieee.org/oui/oui.txt
ouilocation="${HOME}/.dot/oui.txt"
#################
# ACTUAL SCRIPT #
#################
if [ ! -f "${ouilocation}" ] ; then
echo "OUI location can not be found at ${ouilocation}. Have you updated the config?" 1>&2
read -p "Do you want to download it now [y/N]? " -n 1 -r
echo # (optional) move to a new line
if [[ $REPLY =~ ^[Yy]$ ]]
then
wget https://standards-oui.ieee.org/oui/oui.txt -O "${ouilocation}"
else
echo "Aborted"
exit 1
fi
fi
if [[ $(find "${ouilocation}" -mtime +30 -print) ]]; then
echo "File ${ouilocation} is older than 30 days"
fi
if [ -z "${1}" ] ; then
echo 'No mac address specified, please do so as first argument' 1>&2
exit 2
fi
macaddress="$(echo "${1}" | sed -e 's/[-.:]//g' | tr '[:lower:]' '[:upper:]')"
macaddress="${macaddress:0:6}"
echo -n "${1} = "
vendor="$(awk "/^${macaddress}/ {print substr(\$0,index(\$0,\$4))}" "${ouilocation}")"
if [ -z "${vendor}" ] ; then
echo "Not specified in ${ouilocation}"
else
echo "${vendor}"
fi

View File

@@ -1,33 +0,0 @@
#!/bin/bash
PGADMINVENV="pgadmin4"
VENVDIR="$HOME/.virtualenvs/${PGADMINVENV}"
if [ ! -d "$VENVDIR" ] || [ ! -e "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/pgAdmin4.py" ] || [ ! -e "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py" ]; then
if [[ -z "$VIRTUAL_ENV" ]]; then
# Only activate the virtualenv if we aren't in one already
source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
mkvirtualenv "${PGADMINVENV}"
echo "Downloading the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/ ..."
pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v1.6/pip/pgadmin4-1.6-py2.py3-none-any.whl
echo "SERVER_MODE = False" >> "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py"
fi
# Install
#echo
#echo "Download the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/"
#echo
#echo "Install with:"
#echo "workon pgadmin4"
#echo "pip install ./pgadmin4-1.6-py2.py3-none-any.whl"
#echo "echo "SERVER_MODE = False" >> ${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py"
else
if [[ -z "$VIRTUAL_ENV" ]]; then
# Only activate the virtualenv if we aren't in one already
source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
workon "${PGADMINVENV}"
fi
# Start
python "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/pgAdmin4.py"
fi

View File

@@ -6,6 +6,5 @@ find . -type f -name '*.zip' -exec sh -c '
zipdir=$(basename "$file" .zip) zipdir=$(basename "$file" .zip)
#echo "$zipdir $file" #echo "$zipdir $file"
unzip -d "$zipdir" "$file" unzip -d "$zipdir" "$file"
read line </dev/tty
done done
' sh {} + ' sh {} +

View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
cd ~/mydocs/work/divault cd ~/divaultplan
git pull
cd ~/divaultphren
git pull git pull
#vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md #vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md
vim -c "set nofoldenable" planning_2021.todo notes.md vim -c "set nofoldenable" ~/divaultplan/planning_2023.todo ~/divaultphren/index.md

View File

@@ -30,15 +30,14 @@ install_fish()
mkdir -p "${HOME}/.config/fish/completions" mkdir -p "${HOME}/.config/fish/completions"
curl -sL get.fisherman.sh | fish curl -sL get.fisherman.sh | fish
ln -s "${HOME}/.dot/dotfiles/.config/fish/config.fish" "${HOME}/.config/fish/" ln -s "${HOME}/.dot/dotfiles/.config/fish/config.fish" "${HOME}/.config/fish/"
ln -s "${HOME}/.dot/dotfiles/.config/fish/fishfile" "${HOME}/.config/fish/" ln -s "${HOME}/.dot/dotfiles/.config/fish/fish_plugins" "${HOME}/.config/fish/"
ln -s "${HOME}/.dot/dotfiles/.config/fish/completions/terrible_job.fish" "${HOME}/.config/fish/completions"
ln -s "${HOME}/workspace/application_addons/cli/git-flow-completion/git.fish" "${HOME}/.config/fish/completions" ln -s "${HOME}/workspace/application_addons/cli/git-flow-completion/git.fish" "${HOME}/.config/fish/completions"
ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/mux.fish" "${HOME}/.config/fish/completions" ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/mux.fish" "${HOME}/.config/fish/completions"
ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/tmuxinator.fish" "${HOME}/.config/fish/completions" ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/tmuxinator.fish" "${HOME}/.config/fish/completions"
echo echo
echo "You might want to install Fisher:" echo "You might want to install Fisher:"
echo "curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish" echo "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"
echo "And some plugins: fisher" echo "fisher update"
echo echo
} }