Merge github.com:satchlj/satch.xyz
This commit is contained in:
Satya L. Johnson
commit
1ead36794d
|
|
@ -1,7 +1,2 @@
|
|||
# Funding links
|
||||
github:
|
||||
- timvisee
|
||||
custom:
|
||||
- "https://timvisee.com/donate"
|
||||
patreon: timvisee
|
||||
ko_fi: timvisee
|
||||
- "https://satch.xyz/donate"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,5 @@
|
|||
public/
|
||||
static/processed_images/
|
||||
.DS_Store
|
||||
content/.DS_Store
|
||||
static/.DS_Store
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
variables:
|
||||
GIT_SUBMODULE_STRATEGY: recursive
|
||||
ZOLA_VERSION: "v0.14.0"
|
||||
|
||||
stages:
|
||||
- build
|
||||
- deploy
|
||||
|
||||
build:
|
||||
stage: build
|
||||
script:
|
||||
- curl -L https://github.com/getzola/zola/releases/download/$ZOLA_VERSION/zola-$ZOLA_VERSION-x86_64-unknown-linux-gnu.tar.gz > zola.tar.gz
|
||||
- tar -xzf zola.tar.gz
|
||||
- ./zola build
|
||||
artifacts:
|
||||
paths:
|
||||
- public
|
||||
|
||||
deploy:
|
||||
image: alpine:latest
|
||||
stage: deploy
|
||||
script:
|
||||
- apk add openssh sshpass
|
||||
- "sshpass -p $DEPLOY_SSH_PASS ssh -oStrictHostKeyChecking=no $DEPLOY_SSH_USER@$DEPLOY_SSH_HOST 'rm -rf /var/customers/webs/timvisee/timvisee.com/old; mkdir -p /var/customers/webs/timvisee/timvisee.com/new'"
|
||||
- "sshpass -p $DEPLOY_SSH_PASS scp -oStrictHostKeyChecking=no -r public/* $DEPLOY_SSH_USER@$DEPLOY_SSH_HOST:/var/customers/webs/timvisee/timvisee.com/new/"
|
||||
- "sshpass -p $DEPLOY_SSH_PASS ssh -oStrictHostKeyChecking=no $DEPLOY_SSH_USER@$DEPLOY_SSH_HOST 'mv /var/customers/webs/timvisee/timvisee.com/live /var/customers/webs/timvisee/timvisee.com/old; mv /var/customers/webs/timvisee/timvisee.com/new /var/customers/webs/timvisee/timvisee.com/live; rm -rf /var/customers/webs/timvisee/timvisee.com/old'"
|
||||
- "echo Site is now deployed and live at https://timvisee.com/"
|
||||
dependencies:
|
||||
- build
|
||||
environment:
|
||||
name: production
|
||||
url: https://timvisee.com/
|
||||
only:
|
||||
- deploy
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
# satch.xyz
|
||||
My new website is mostly a complete copy of [Tim Visée's site](https://timvisee.com). But that is slowly (slowly) changing as I add my own content and remove his.
|
||||
## Content
|
||||
The majority of the content is formatted in Markdown, located in the
|
||||
[`./content`](./content/) directory.
|
||||
It includes a custom theme as well ([zenn][zenn]) for the visuals, by Tim Visée.
|
||||
|
||||
This website is built with [Zola][zola], a static website generator.
|
||||
See its documentation for more information on how this project is structured.
|
||||
|
||||
Any pull requests for changes on the website are welcome.
|
||||
|
||||
## Usage
|
||||
To run a local instance of this website, be sure to install [`zola`][zola] first.
|
||||
Then run:
|
||||
|
||||
```bash
|
||||
# Clone the repository
|
||||
git clone https://github.com/satchlj/satch.xyz
|
||||
cd satch.xyz
|
||||
|
||||
# Build and serve a local instance
|
||||
zola serve --open
|
||||
|
||||
# Open: 127.0.0.1:1111
|
||||
# Edit files in ./content, view live changes your browser
|
||||
|
||||
# Build and deploy
|
||||
zola build
|
||||
|
||||
# serve static files in public directory to web
|
||||
```
|
||||
## License
|
||||
This project is released under the GNU AGPL-3.0 license.
|
||||
Check out the [LICENSE][license] file for more information.
|
||||
|
||||
[site]: https://satch.xyz/
|
||||
[zola]: https://getzola.org/
|
||||
[zenn]: ./themes/zenn/
|
||||
[license]: ./LICENSE
|
||||
|
|
@ -42,7 +42,7 @@ zenn_menu = [
|
|||
{url = "$BASE_URL/donate/", name = "Donate"},
|
||||
{url = "$BASE_URL/contact/", name = "Contact"},
|
||||
]
|
||||
zenn_source = "https://gitlab.com/timvisee/timvisee.com/"
|
||||
zenn_source = "https://github.com/satchlj/satch.xyz"
|
||||
|
||||
# Random string, used in URLs to force update resources
|
||||
# Change this value when stylesheets or scripts are updated
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ also for humans.
|
|||
- _and much more_
|
||||
|
||||
## Me on the web
|
||||
I have an old website on Google Sites (I know, it's shameful) [here][othersite]
|
||||
Most of my [work](@/projects.md) are available on my git profiles:
|
||||
|
||||
- [GitHub][github] <span class="muted">([projects](https://github.com/timvisee?tab=repositories))</span>
|
||||
|
|
@ -98,17 +99,11 @@ didn't list above are:
|
|||
- Gaming, [oh yes][steam-games]
|
||||
- Scouting and other activities, outside, in-nature, such as camping or hiking
|
||||
|
||||
[github]: https://github.com/timvisee
|
||||
[gitlab]: https://gitlab.com/timvisee
|
||||
[hackernews]: https://news.ycombinator.com/user?id=timvisee
|
||||
[linkedin]: https://linkedin.com/in/timvisee
|
||||
[lobsters]: https://lobste.rs/u/timvisee/
|
||||
[mastodon]: https://mastodon.social/@timvisee
|
||||
[mixcloud]: https://www.mixcloud.com/timvisee/
|
||||
[reddit]: https://reddit.com/u/timvisee
|
||||
[sr.ht]: https://sr.ht/~timvisee
|
||||
[stackexchange]: https://stackexchange.com/users/980236?tab=accounts
|
||||
[stackoverflow]: https://stackoverflow.com/users/1000145
|
||||
[steam-games]: https://steamcommunity.com/id/timvisee/games/?tab=all
|
||||
[steam]: https://steamcommunity.com/id/timvisee
|
||||
[twitter]: https://twitter.com/likecaffeinated
|
||||
[github]: https://github.com/satchlj
|
||||
[gitlab]: https://gitlab.com/satchlj
|
||||
[hackernews]: https://news.ycombinator.com/user?id=satchlj
|
||||
[reddit]: https://reddit.com/u/satchlj
|
||||
[stackexchange]: https://stackexchange.com/users/22677564/
|
||||
[stackoverflow]: https://stackoverflow.com/users/16692375
|
||||
[twitter]: https://twitter.com/satchlj
|
||||
[othersite]: https://www.satyajohnson.com
|
||||
|
|
@ -8,36 +8,12 @@ on awesome open projects."""
|
|||
zenn_hide_header_meta = true
|
||||
+++
|
||||
|
||||
Awesome to see that you are willing to sponsor my [work](@/projects.md).
|
||||
I'm not actually asking for money. Someone I don't know who lives in Holland wrote most of the code that made this website a thing. If you donate to anyone, [donate to him](https://timvisee.com/donate).
|
||||
|
||||
By sponsoring me, you'll help me pay the bills. This allows me to allocate more
|
||||
time to work on amazing open projects, for everyone. This is what I truly
|
||||
[love](@/about.md) to do, but it needs support from some enthusiastic and
|
||||
generous followers.
|
||||
### But if you really want to give _me_ money...
|
||||
- [Paypal](https://paypal.me/satchxyz)
|
||||
- Google Pay: sj@satch.xyz
|
||||
- Monero: [OpenAlias](https://openalias.org) `donate.satchlj.com` or go to [`xmr.txt`](https://satchlj.com/xmr.txt)
|
||||
- [Common Good](https://new.commongood.earth/dashboard): sj@satch.xyz or Satya Johnson or (413) 225-1533
|
||||
|
||||
As I'm still a student, I must set aside most of my free time to work on a job.
|
||||
I hope to be able to work full-time on open-source projects in the future. You
|
||||
could help kick-start this goal and begin to make this a reality.
|
||||
|
||||
Any amount is helpful, and everything is appreciated.
|
||||
|
||||
A **big** thanks to all awesome supporters!
|
||||
|
||||
~ Tim
|
||||
|
||||
### Recurring sponsoring
|
||||
|
||||
- [GitHub](https://github.com/users/timvisee/sponsorship)
|
||||
- [Liberapay](https://liberapay.com/timvisee/)
|
||||
- [Patreon](https://patreon.com/timvisee)
|
||||
|
||||
### One-time donation
|
||||
- [Ko-fi](https://ko-fi.com/timvisee)<span class="muted">: buy me a coffee</span>
|
||||
- [PayPal](https://paypal.me/timvisee)
|
||||
- [GitHub](https://github.com/sponsors/timvisee?frequency=one-time)
|
||||
- [bunq.me](https://bunq.me/timvisee/0/Sponsor)<span class="muted">: support via an iDeal or SOFORT payment</span>
|
||||
|
||||
### Cryptocurrency donation
|
||||
- Bitcoin: `3B1mBcqobSrgDFMhoQDtcVoWHRuwTjwMLZ`
|
||||
- Etherium: `0x956E4443A050bC5626c272D86AA0Ee213509E22c`
|
||||
- BAT: `0x00dD84d3D82aa1e0c0E2A67a726302607EF87b6f`
|
||||
_This info will be changing rapidly, espcially once I turn 18._
|
||||
|
|
@ -13,5 +13,5 @@ To download an editable version of the script, click [here][script]. For a pdf s
|
|||
That's our only document for now; casting will be here soon.
|
||||
|
||||
[chat]: https://blube.club/chat
|
||||
[script]: docs/script.odt
|
||||
[pdfscript]: docs/script.pdf
|
||||
[script]: script.odt
|
||||
[pdfscript]: script.pdf
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
49gK15v3XtKiYK4kqdBfKDTeXvhCQUHFDKWkGv7thzzRMBqShJsUQJWaY7GDFg5yqh8jEq63HX4LJCdVbRjaVZ2m897TqYx
|
||||
|
|
@ -112,6 +112,10 @@ content {
|
|||
transition: border 0.2s ease;
|
||||
}
|
||||
|
||||
details > summary {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#toc-container {
|
||||
margin-top: 1em;
|
||||
padding: 1em;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ $color-text-muted: darken($color-text, 25%);
|
|||
$color-main-bg: #141516;
|
||||
$color-main-bg-alt: darken($color-main-bg, 2%);
|
||||
$color-main-border: darken($color-main-bg, 5%);
|
||||
$color-header: #FF6F33;
|
||||
$color-header: #CF2B07;
|
||||
$color-link: #6699cc;
|
||||
$color-link-hover: lighten($color-link, 15%);
|
||||
$color-code-bg: $color-main-bg-alt;
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@
|
|||
<em class="color-header">Hey, I'm Satch</em>
|
||||
<div class="delimiter"></div>
|
||||
<em>I live at the <a href="https://bensonplace.org">Benson Place</a></em>
|
||||
<em>I've just begun work on this site</em>
|
||||
<em>It's freshly copied from <a href="https://vis.ee">Tim Visee</a></em>
|
||||
<em>Thank you, Tim!</em>
|
||||
<em>I've just begun work on this site</em>
|
||||
<em>Thank you, <a href="https://vis.ee">Tim</a>!</em>
|
||||
<div class="nav">
|
||||
<div class="delimiter"></div>
|
||||
<div class="links">
|
||||
|
|
|
|||
Loading…
Reference in New Issue