mirror of
https://github.com/mikaela/mikaela.github.io/
synced 2025-08-17 02:17:35 +02:00
Compare commits
9 Commits
5eb2363db8
...
eafdac74a5
Author | SHA1 | Date | |
---|---|---|---|
eafdac74a5 | |||
34adda1498 | |||
dda75342c9 | |||
12c7abf641 | |||
e0ee01ae12 | |||
8098816f5f | |||
635e769b06 | |||
d3827879ab | |||
![]() |
12ec59afdd |
40
.github/dependabot.yml
vendored
40
.github/dependabot.yml
vendored
@ -1,40 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: "bundler"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
timezone: "Europe/Helsinki"
|
|
||||||
groups:
|
|
||||||
bundler:
|
|
||||||
patterns:
|
|
||||||
- "*"
|
|
||||||
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
timezone: "Europe/Helsinki"
|
|
||||||
groups:
|
|
||||||
github-actions:
|
|
||||||
patterns:
|
|
||||||
- "*"
|
|
||||||
|
|
||||||
- package-ecosystem: "gitsubmodule"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
timezone: "Europe/Helsinki"
|
|
||||||
groups:
|
|
||||||
gitsubmodule:
|
|
||||||
patterns:
|
|
||||||
- "*"
|
|
||||||
|
|
||||||
- package-ecosystem: "npm"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
groups:
|
|
||||||
npm:
|
|
||||||
patterns:
|
|
||||||
- "*"
|
|
3
.github/workflows/jekyll.yml
vendored
3
.github/workflows/jekyll.yml
vendored
@ -36,9 +36,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
submodules: "true"
|
submodules: "true"
|
||||||
- name: Setup Ruby
|
- name: Setup Ruby
|
||||||
uses: ruby/setup-ruby@97e35c5302afcf3f5ac1df3fca9343d32536b286 # v1.184.0
|
uses: ruby/setup-ruby@3a77c29278ae80936b4cb030fefc7d21c96c786f # v1.185.0
|
||||||
with:
|
with:
|
||||||
ruby-version: ".ruby-version" # Not needed with a .ruby-version file
|
|
||||||
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
||||||
cache-version: 0 # Increment this number if you need to re-download cached gems
|
cache-version: 0 # Increment this number if you need to re-download cached gems
|
||||||
- name: Setup Pages
|
- name: Setup Pages
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"insertPragma": false,
|
|
||||||
"proseWrap": "always",
|
|
||||||
"singleAttributePerLine": true,
|
|
||||||
"plugins": ["@prettier/plugin-xml", "prettier-plugin-sh"],
|
|
||||||
"overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }]
|
|
||||||
}
|
|
11
.prettierrc.json
Normal file
11
.prettierrc.json
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"bracketSameLine": true,
|
||||||
|
"endOfLine": "auto",
|
||||||
|
"plugins": [
|
||||||
|
"@prettier/plugin-xml",
|
||||||
|
"prettier-plugin-sh"
|
||||||
|
],
|
||||||
|
"proseWrap": "always",
|
||||||
|
"quoteProps": "consistent",
|
||||||
|
"singleAttributePerLine": true
|
||||||
|
}
|
@ -57,12 +57,14 @@ Or directories that generally aren't encountered in other similar projects.
|
|||||||
|
|
||||||
## Building
|
## Building
|
||||||
|
|
||||||
1. Install `bundler` onto your system.
|
1. Install `rbenv` and its `ruby-build` plugins. Refer to
|
||||||
|
[rbenv/rbenv README.md for more information](https://github.com/rbenv/rbenv/blob/master/README.md#basic-git-checkout)
|
||||||
1. `cd` to root of this repository, if you didn't already.
|
1. `cd` to root of this repository, if you didn't already.
|
||||||
1. _Optionally_ configure where you wish bundler to install everything. This
|
1. Install the required Ruby version by `rbenv install`
|
||||||
repository already specifies `bundle config set --local path 'vendor/bundle'`
|
1. _Optionally_ configure where you wish bundler to install everything by e.g.
|
||||||
in the gitignored `.bundle/config` file.
|
`bundle config set --local path 'vendor/bundle'`, but the rbenv default
|
||||||
|
should work just fine
|
||||||
1. Run `bundle install`
|
1. Run `bundle install`
|
||||||
1. You are done, `bundle exec jekyll <build|serve>` and similar commands should
|
1. You are done, `bundle exec jekyll <build|serve>` and similar commands should
|
||||||
work, just remember `bundle exec` in front of the command so the system wide
|
work. I suggest `bundle exec jekyll serve -lo` which will livereload and open
|
||||||
installation doesn't unintentionally get used.
|
the web browser for you.
|
||||||
|
@ -94,6 +94,7 @@ may think about my body parts which aren't their business. I haven't yet visited
|
|||||||
any of those, but as I said whatever people think isn't my problem. I actually
|
any of those, but as I said whatever people think isn't my problem. I actually
|
||||||
even have a temptation to visit such areas, just because my body is "sinful" and
|
even have a temptation to visit such areas, just because my body is "sinful" and
|
||||||
everything, according to whatever you wish to call cis beauty standards.
|
everything, according to whatever you wish to call cis beauty standards.
|
||||||
|
|
||||||
<!-- This is possibly a little kinky. -->
|
<!-- This is possibly a little kinky. -->
|
||||||
|
|
||||||
How do I know that I don't need the full genital surgery? I haven't even thought
|
How do I know that I don't need the full genital surgery? I haven't even thought
|
||||||
|
@ -10,12 +10,10 @@ robots: noai, nofollow
|
|||||||
<p id="avatar">
|
<p id="avatar">
|
||||||
<a
|
<a
|
||||||
class="h-card"
|
class="h-card"
|
||||||
href="https://aminda.eu/"
|
href="https://aminda.eu/">
|
||||||
>
|
|
||||||
<img
|
<img
|
||||||
src="{{site.avatar}}"
|
src="{{site.avatar}}"
|
||||||
alt="Photo of me"
|
alt="Photo of me" /><br />Aminda Suomalainen</a
|
||||||
/><br />Aminda Suomalainen</a
|
|
||||||
><br />
|
><br />
|
||||||
<small
|
<small
|
||||||
><a
|
><a
|
||||||
@ -192,8 +190,7 @@ robots: noai, nofollow
|
|||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
class="monospaced"
|
class="monospaced"
|
||||||
id="ssh"
|
id="ssh">
|
||||||
>
|
|
||||||
SSH:
|
SSH:
|
||||||
<a
|
<a
|
||||||
href="https://gitea.blesmrt.net/mikaela/ssh-allowed_signers/src/branch/cxefa/aminda/aminda.pub"
|
href="https://gitea.blesmrt.net/mikaela/ssh-allowed_signers/src/branch/cxefa/aminda/aminda.pub"
|
||||||
|
@ -22,7 +22,6 @@ _{{ page.excerpt }}_
|
|||||||
- [Configuration](#configuration)
|
- [Configuration](#configuration)
|
||||||
- [`.pre-commit-config.yaml`](#pre-commit-configyaml)
|
- [`.pre-commit-config.yaml`](#pre-commit-configyaml)
|
||||||
- [Offline](#offline)
|
- [Offline](#offline)
|
||||||
- [Online](#online)
|
|
||||||
- [Further information](#further-information)
|
- [Further information](#further-information)
|
||||||
|
|
||||||
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
|
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
|
||||||
@ -50,14 +49,35 @@ _{{ page.excerpt }}_
|
|||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
I do with `.editorconfig` what I can, but for example my template `.prettierrc`
|
I do with `.editorconfig` what I can, but for example my template
|
||||||
looks like:
|
`.prettierrc.json` looks like this. I use pre-commit's pretty-format-json, while
|
||||||
|
the one included on this page gets managed by prettier.
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
"bracketSameLine": true,
|
||||||
|
"endOfLine": "auto",
|
||||||
"insertPragma": true,
|
"insertPragma": true,
|
||||||
"proseWrap": "always",
|
"overrides": [
|
||||||
"singleAttributePerLine": true,
|
{
|
||||||
|
"files": ".prettierrc",
|
||||||
|
"options": {
|
||||||
|
"parser": "json"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"files": "conf/librewolf.overrides.cfg",
|
||||||
|
"options": {
|
||||||
|
"parser": "babel"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"files": "conf/autoconfig.js.online",
|
||||||
|
"options": {
|
||||||
|
"parser": "babel"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"@prettier/plugin-ruby",
|
"@prettier/plugin-ruby",
|
||||||
"@prettier/plugin-xml",
|
"@prettier/plugin-xml",
|
||||||
@ -65,22 +85,32 @@ looks like:
|
|||||||
"prettier-plugin-sh",
|
"prettier-plugin-sh",
|
||||||
"prettier-plugin-toml"
|
"prettier-plugin-toml"
|
||||||
],
|
],
|
||||||
"overrides": [
|
"proseWrap": "always",
|
||||||
{ "files": ".prettierrc", "options": { "parser": "json" } },
|
"quoteProps": "consistent",
|
||||||
{
|
"requirePragma": false,
|
||||||
"files": "conf/librewolf.overrides.cfg",
|
"singleAttributePerLine": true
|
||||||
"options": { "parser": "babel" }
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"files": "conf/autoconfig.js.online",
|
|
||||||
"options": { "parser": "babel" }
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
at the time of writing. It's directly from documentation excluding the plugin
|
See the documentation linked on the bottom, but here are some explanations
|
||||||
names, but I will want it everywhere.
|
anyway:
|
||||||
|
|
||||||
|
- `bracketSameLine: true` - HTML tags closing on the same line as something else
|
||||||
|
just looks so much better for my eyes.
|
||||||
|
- `endOfLine: auto` - The default is `lf` line-endings, which I support in
|
||||||
|
general, but I think `prettier` is the wrong place to configure it. I have it
|
||||||
|
in `.gitattributes` which will take priority on check-in and `.editorconfig`.
|
||||||
|
- `insertPragma: true` - adds a comment on files formatted
|
||||||
|
- `overrides` and `plugins` - self-explanatory, but if not see the documentation
|
||||||
|
(bottom of the page). I know I don't actually have `.prettierrc` as it's
|
||||||
|
`.prettierrc.json`, but it doesn't seem to hurt and `babel` seems to be used
|
||||||
|
for JavaScript by default, which those two are regardless of the name.
|
||||||
|
- `proseWrap: always` - wraps long markdown lines as individual newlines don't
|
||||||
|
matter (two begin a new paragraph).
|
||||||
|
- `quoteProps: consistent` - quotes things if anything is quoted.
|
||||||
|
- `requirePragma: false` - the other side of `insertPragma: true`, it's here as
|
||||||
|
a note to self.
|
||||||
|
- `singleAttributePerLine: true` - I just think it looks better.
|
||||||
|
|
||||||
## `.pre-commit-config.yaml`
|
## `.pre-commit-config.yaml`
|
||||||
|
|
||||||
@ -117,9 +147,11 @@ repos:
|
|||||||
language: system
|
language: system
|
||||||
# Better handled by pretty-format-json from pre-commit-hooks.
|
# Better handled by pretty-format-json from pre-commit-hooks.
|
||||||
# Remember to have *.json in .prettierignore!
|
# Remember to have *.json in .prettierignore!
|
||||||
exclude_types: [json]
|
#exclude_types: [json]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
<!--
|
||||||
|
|
||||||
### Online
|
### Online
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
@ -142,6 +174,8 @@ repos:
|
|||||||
]
|
]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
## Further information
|
## Further information
|
||||||
|
|
||||||
- [prettier docs install](https://prettier.io/docs/en/install)
|
- [prettier docs install](https://prettier.io/docs/en/install)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user