diff --git a/local/bin/dots b/local/bin/dots index 44aa561..27364b5 100755 --- a/local/bin/dots +++ b/local/bin/dots @@ -1,7 +1,6 @@ #!/usr/bin/env zsh # WHAT IS THIS -{ # Wrap the entire program in a braced block so it won't run at all if you do curl | zsh and the connection drops. global_ignore=( '\.git.*' 'README\.md' @@ -11,7 +10,7 @@ global_ignore=( '\..*\.swp' ) -bootstrap() { +'bootstrap'() { echo 'Bootstrapping your dotfiles...' >&2 mkdir -p $DOTFILES touch $DOTFILES/.stow @@ -25,14 +24,14 @@ bootstrap() { link } -clone() { +'clone'() { echo "Requested packages: $argv" >&2 for package in $argv; do clone-one $package || return $? done } -clone-one() { +'clone-one'() { local url=$1 local package=${${url##*/}%.git} # Simple package names are fetched from the configured source prefix. @@ -47,7 +46,7 @@ clone-one() { git clone $url $DOTFILES/$package } -link() { +'link'() { local -a packages packages=($argv) if (( $#packages == 0 )); then @@ -66,7 +65,7 @@ link() { $STOW -d $DOTFILES -t ~ --ignore=${^global_ignore} $packages } -process-stow-no-folding() { +'process-stow-no-folding'() { zmodload zsh/mapfile for file in ${(f)mapfile[$1]}; do file=~/$file @@ -76,7 +75,7 @@ process-stow-no-folding() { done } -fetch() { +'fetch'() { local -a packages packages=($argv) (( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) ) @@ -86,7 +85,7 @@ fetch() { done } -pull() { +'pull'() { local -a packages packages=($argv) (( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) ) @@ -97,7 +96,7 @@ pull() { } -status() { +'status'() { local -a packages packages=($argv) (( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) ) @@ -138,7 +137,7 @@ status() { done } -main() { +'main'() { : ${DOTFILES:=~/dotfiles} ${STOW:=stow} ${DOTS_SOURCE_PREFIX:=https://git.00dani.me/dot} comm=$1 @@ -160,5 +159,4 @@ main() { esac } -main "$@" -} # Wrap the entire program in a braced block so it won't run at all if you do curl | zsh and the connection drops. +{'main' "$@"} diff --git a/site/.ruby-version b/site/.ruby-version deleted file mode 100644 index be94e6f..0000000 --- a/site/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.2.2 diff --git a/site/Gemfile b/site/Gemfile index a4d4e37..d610b4f 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -11,10 +11,10 @@ gem "webrick" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "4.3.2" +gem "jekyll", "4.2.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", github: "jekyll/minima" +gem "minima" # Syntax highlighter! gem "rouge" diff --git a/site/Gemfile.lock b/site/Gemfile.lock index 3316939..15602a9 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -1,91 +1,82 @@ -GIT - remote: https://github.com/jekyll/minima.git - revision: 85374864e0311f544f49139078927b41ecbe8792 - specs: - minima (3.0.0.dev) - jekyll (>= 3.5, < 5.0) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.2.2) - em-websocket (0.5.3) + concurrent-ruby (1.1.9) + em-websocket (0.5.2) eventmachine (>= 0.12.9) - http_parser.rb (~> 0) + http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.16.3) + ffi (1.15.3) forwardable-extended (2.6.0) - google-protobuf (3.24.4) - http_parser.rb (0.8.0) - i18n (1.14.1) + http_parser.rb (0.6.0) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (>= 2.0, < 4.0) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3, >= 2.3.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (>= 0.3.6, < 0.5) + mercenary (~> 0.4.0) pathutil (~> 0.9) - rouge (>= 3.0, < 5.0) + rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (>= 1.8, < 4.0) - webrick (~> 1.7) - jekyll-feed (0.17.0) + terminal-table (~> 2.0) + jekyll-feed (0.15.1) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) - jekyll-seo-tag (2.8.0) + jekyll-sass-converter (2.1.0) + sassc (> 2.0.1, < 3.0) + jekyll-seo-tag (2.7.1) jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.4.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.4) - listen (3.8.0) + liquid (4.0.3) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.3) - rake (13.0.6) - rb-fsevent (0.11.2) + public_suffix (4.0.6) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.6) - rouge (4.1.3) + rexml (3.2.5) + rouge (3.26.0) safe_yaml (1.0.5) - sass-embedded (1.69.3) - google-protobuf (~> 3.23) - rake (>= 13.0.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.5.0) - webrick (1.8.1) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) + webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - jekyll (= 4.3.2) - minima! + jekyll (= 4.2.0) + minima rouge webrick RUBY VERSION - ruby 3.2.2p53 + ruby 3.0.1p64 BUNDLED WITH - 2.4.10 + 2.2.15 diff --git a/site/_config.yml b/site/_config.yml index f554e98..50d9ffe 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -1,21 +1,12 @@ ---- title: dot/dots -author: - name: Danielle McLean - email: dani@00dani.me +email: dani@00dani.me description: "Bootstrap and simple management script for my dotfiles" +github_username: 00dani +mastodon: + - username: 00dani + instance: elekk.club url: 'https://dots.00dani.me' # Build settings theme: minima -minima: - skin: auto - social_links: - - platform: github - user_url: 'https://github.com/00dani' - title: 'GitHub' - - platform: mastodon - user_url: 'https://elekk.xyz/@00dani' - title: '@00dani@elekk.xyz' - highlighter: rouge diff --git a/site/_includes/footer.html b/site/_includes/footer.html deleted file mode 100644 index f4a8002..0000000 --- a/site/_includes/footer.html +++ /dev/null @@ -1,30 +0,0 @@ - diff --git a/site/index.html b/site/index.html index 9d07e1b..f7e6ae7 100644 --- a/site/index.html +++ b/site/index.html @@ -1,4 +1,4 @@ --- --- {% include_relative local/bin/dots %} -# +#