Skip to content

Commit 8fff25b

Browse files
tscholaktscholak
committed
revamp
1 parent 15b3f8b commit 8fff25b

Some content is hidden

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

47 files changed

+1709
-1541
lines changed

‎.claude/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/n8qa35yg21ldq6f31pzdjz9vipk5xpm2-claude-settings.json

‎.devcontainer/Dockerfile‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎.envrc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
use_nix
1+
export DIRENV_WARN_TIMEOUT=20s
2+
3+
eval "$(devenv direnvrc)"
4+
5+
# The use_devenv function supports passing flags to the devenv command
6+
# For example: use devenv --impure --option services.postgres.enable:bool true
7+
use devenv

‎.github/workflows/deploy.yaml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: Deploy
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
build:
16+
name: Build
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Free Disk Space (Ubuntu)
20+
uses: jlumbroso/free-disk-space@main
21+
with:
22+
# this might remove tools that are actually needed,
23+
# if set to "true" but frees about 6 GB
24+
tool-cache: false
25+
26+
# all of these default to true, but feel free to set to
27+
# "false" if necessary for your workflow
28+
android: true
29+
dotnet: true
30+
haskell: true
31+
large-packages: true
32+
docker-images: true
33+
swap-storage: true
34+
- uses: actions/checkout@v4
35+
with:
36+
fetch-depth: 0
37+
- run: |
38+
git log --pretty=format:"%h %ci %an %s" -n 1 -- site/
39+
- uses: actions/cache@v4
40+
with:
41+
path: |
42+
~/.stack
43+
.stack-work
44+
key: stack-${{ runner.os }}-${{ hashFiles('**/stack.yaml.lock') }}
45+
restore-keys: |
46+
stack-${{ runner.os }}-
47+
- uses: cachix/install-nix-action@v31
48+
- uses: cachix/cachix-action@v10
49+
with:
50+
name: tscholak
51+
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
52+
extraPullNames: devenv,nix-community
53+
- run: nix profile add nixpkgs#devenv
54+
- run: devenv shell devenv-generate-build
55+
env:
56+
CACHIX_AUTH_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}"
57+
- uses: actions/upload-artifact@v4
58+
with:
59+
name: build
60+
path: ./build
61+
62+
deploy:
63+
if: github.event_name == 'push'
64+
name: "Deploy"
65+
needs: build
66+
runs-on: ubuntu-latest
67+
steps:
68+
- uses: actions/download-artifact@v4
69+
with:
70+
name: build
71+
path: ./build
72+
- uses: crazy-max/[email protected]
73+
with:
74+
repo: tscholak/tscholak.github.io
75+
target_branch: main
76+
build_dir: ./build
77+
keep_history: false
78+
jekyll: false
79+
env:
80+
GH_PAT: ${{ secrets.GH_PAT }}

‎.github/workflows/main.yaml‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎.github/workflows/tests.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
11+
jobs:
12+
tests:
13+
name: "Tests"
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Free Disk Space (Ubuntu)
17+
uses: jlumbroso/free-disk-space@main
18+
with:
19+
# this might remove tools that are actually needed,
20+
# if set to "true" but frees about 6 GB
21+
tool-cache: false
22+
23+
# all of these default to true, but feel free to set to
24+
# "false" if necessary for your workflow
25+
android: true
26+
dotnet: true
27+
haskell: true
28+
large-packages: true
29+
docker-images: true
30+
swap-storage: true
31+
- uses: actions/checkout@v4
32+
with:
33+
fetch-depth: 0
34+
- run: |
35+
git log --pretty=format:"%h %ci %an %s" -n 1 -- site/
36+
- uses: actions/cache@v4
37+
with:
38+
path: |
39+
~/.stack
40+
.stack-work
41+
key: stack-${{ runner.os }}-${{ hashFiles('**/stack.yaml.lock') }}
42+
restore-keys: |
43+
stack-${{ runner.os }}-
44+
- uses: cachix/install-nix-action@v31
45+
- uses: cachix/cachix-action@v10
46+
with:
47+
name: tscholak
48+
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
49+
extraPullNames: devenv,nix-community
50+
- run: nix profile add nixpkgs#devenv
51+
- run: devenv shell devenv-test
52+
env:
53+
CACHIX_AUTH_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}"

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,13 @@ cabal.project.local~
2525
.shake
2626
build/
2727
result*
28+
29+
# Devenv
30+
.devenv*
31+
devenv.local.nix
32+
33+
# direnv
34+
.direnv
35+
36+
# pre-commit
37+
.pre-commit-config.yaml

‎.vscode/settings.json‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
11
{
2-
"nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix",
32
"nix.enableLanguageServer": true,
4-
"runItOn": {
5-
"commands": [
6-
{
7-
"match": "shell.nix",
8-
"isShellCommand": false,
9-
"cmd": "nixEnvSelector.hitEnv"
10-
}
11-
]
12-
}
13-
}
3+
}

0 commit comments

Comments
 (0)