Compare commits
11 Commits
disk
...
27862a3be1
| Author | SHA1 | Date | |
|---|---|---|---|
|
27862a3be1 | ||
|
|
41e5077f7d | ||
|
|
cda4de62b6 | ||
|
|
d6e8d81ef0 | ||
|
|
e1d2f10b6a | ||
|
|
668c8de2e7 | ||
|
|
82e03ed59b | ||
|
|
d41b153dbb | ||
|
|
c901116678 | ||
|
|
26ac144938 | ||
|
|
10bcea2d77 |
@@ -1,15 +0,0 @@
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
analysis:
|
||||
permissions:
|
||||
contents: read
|
||||
id-token: write
|
||||
name: perform flake analysis
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: DeterminateSystems/nix-installer-action@main
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||
- name: Check Nix flake inputs
|
||||
uses: http://github.com/DeterminateSystems/flake-checker-action@main
|
||||
14
.gitea/workflows/analysis.yml
Normal file
14
.gitea/workflows/analysis.yml
Normal file
@@ -0,0 +1,14 @@
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build Nix targets
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: http://github.com/cachix/install-nix-action@v18
|
||||
- uses: http://github.com/cachix/cachix-action@v12
|
||||
with:
|
||||
name: statix
|
||||
- name: Check Nix flake inputs
|
||||
uses: http://github.com/DeterminateSystems/flake-checker-action@main
|
||||
@@ -1,43 +0,0 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
container:
|
||||
volumes:
|
||||
- /nix/store:/var/nix/hosted-store
|
||||
permissions:
|
||||
contents: read
|
||||
id-token: write
|
||||
name: build hive configuration
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: setup
|
||||
env:
|
||||
CACHE_PRIVKEY: ${{secrets.CACHE_PRIVKEY}}
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir -p /var/secrets/
|
||||
echo "$CACHE_PRIVKEY" >> /var/secrets/cache_privkey
|
||||
mkdir -p /etc/nix
|
||||
cp ./scripts/upload-to-cache.sh /etc/nix/
|
||||
chmod +x /etc/nix/upload-to-cache.sh
|
||||
- uses: cachix/install-nix-action@v31
|
||||
with:
|
||||
extra_nix_config: |
|
||||
extra-trusted-public-keys = localhost:TiRpr2LzamX/MCKBUmFlZ8inWz94QWGL88fMEHg9Kgc=
|
||||
extra-substituters = "local?store=/var/nix/hosted-store&priority=20"
|
||||
secret-key-files = /var/secrets/cache_privkey
|
||||
post-build-hook = /etc/nix/upload-to-cache.sh
|
||||
- name: Install SSH key
|
||||
uses: shimataro/ssh-key-action@v2
|
||||
with:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
known_hosts: ${{ secrets.KNOWN_HOSTS }}
|
||||
- uses: http://github.com/cachix/cachix-action@v16
|
||||
with:
|
||||
name: colmena
|
||||
- run: nix run .#colmena apply
|
||||
13
.gitea/workflows/deploy.yml
Normal file
13
.gitea/workflows/deploy.yml
Normal file
@@ -0,0 +1,13 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- test-deploy
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: build hive configuration
|
||||
runs-on: nix-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- run: nix run nixpkgs#colmena apply
|
||||
299
flake.lock
generated
299
flake.lock
generated
@@ -49,11 +49,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767637959,
|
||||
"narHash": "sha256-+gBU5Cj9QNpHLQ5PHJoWNQft7TMsBM6X+tDQg+/B2P0=",
|
||||
"lastModified": 1762095388,
|
||||
"narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"rev": "038af507772593b904b5c3efc306f89cbdf2b6fb",
|
||||
"rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -91,11 +91,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766150702,
|
||||
"narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
|
||||
"lastModified": 1762276996,
|
||||
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
|
||||
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -136,22 +136,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
@@ -200,24 +184,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -267,31 +233,11 @@
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767147099,
|
||||
"narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
|
||||
"lastModified": 1762826586,
|
||||
"narHash": "sha256-KlPcXOxxyv+KNcf7yNFQ4DGVFbOpITqHfvMcAUYrL7E=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "01f571579edd64433f97c4294137fbc366deef4b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-minecraft_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767147099,
|
||||
"narHash": "sha256-395ehjdAtaqCbKmx+PhKAqnkYLvTtAzq2qzFG9qaGDw=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "01f571579edd64433f97c4294137fbc366deef4b",
|
||||
"rev": "1a4fa22ec6e9f2ece24fca273352463b75f6f7c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -365,11 +311,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"lastModified": 1762756533,
|
||||
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -380,36 +326,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1748929857,
|
||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1767364772,
|
||||
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1737062831,
|
||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
||||
@@ -423,6 +339,36 @@
|
||||
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1744440957,
|
||||
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1744463964,
|
||||
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
||||
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
||||
"revCount": 782401,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.782401%2Brev-2631b0b7abcea6e640ce31cd78ea58910d31e650/01962c8a-63c4-7abd-a3df-63a17b548cc7/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1736549401,
|
||||
@@ -439,24 +385,54 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"reclamation": {
|
||||
"pyproject-build-systems": {
|
||||
"inputs": {
|
||||
"nix-minecraft": "nix-minecraft_2",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"utils": "utils"
|
||||
"nixpkgs": [
|
||||
"striped-back",
|
||||
"nixpkgs"
|
||||
],
|
||||
"pyproject-nix": [
|
||||
"striped-back",
|
||||
"pyproject-nix"
|
||||
],
|
||||
"uv2nix": [
|
||||
"striped-back",
|
||||
"uv2nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767786101,
|
||||
"narHash": "sha256-ENlpYr2V5u0/Enq07nIHfzetqmS95aydQYIM6sISVUc=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "b71acff364b7b5eb3e1b68915aeb379053b86c94",
|
||||
"revCount": 10,
|
||||
"type": "git",
|
||||
"url": "https://git.shobu.fr/sin_serhao/reclamation"
|
||||
"lastModified": 1744599653,
|
||||
"narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "build-system-pkgs",
|
||||
"rev": "7dba6dbc73120e15b558754c26024f6c93015dd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.shobu.fr/sin_serhao/reclamation"
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "build-system-pkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pyproject-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"striped-back",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743438845,
|
||||
"narHash": "sha256-1GSaoubGtvsLRwoYwHjeKYq40tLwvuFFVhGrG8J9Oek=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "pyproject.nix",
|
||||
"rev": "8063ec98edc459571d042a640b1c5e334ecfca1e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "pyproject.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
@@ -467,15 +443,16 @@
|
||||
"disko": "disko",
|
||||
"nix-minecraft": "nix-minecraft",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"reclamation": "reclamation",
|
||||
"shoblog-front": "shoblog-front",
|
||||
"striped-back": "striped-back",
|
||||
"striped-front": "striped-front",
|
||||
"testing-grounds": "testing-grounds",
|
||||
"unstable": "unstable"
|
||||
}
|
||||
},
|
||||
"shoblog-front": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752594581,
|
||||
@@ -507,6 +484,45 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"striped-back": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"pyproject-build-systems": "pyproject-build-systems",
|
||||
"pyproject-nix": "pyproject-nix",
|
||||
"uv2nix": "uv2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748719386,
|
||||
"narHash": "sha256-nyXHemXPEKnqIVIYIorSbt64zRwMvijyGQGCW3zUUkc=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "bdfd6f1f4aac6a00ae4509f14b3a63c84d169edf",
|
||||
"revCount": 8,
|
||||
"type": "git",
|
||||
"url": "ssh://git@gitlab.com/striped1/striped-back"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://git@gitlab.com/striped1/striped-back"
|
||||
}
|
||||
},
|
||||
"striped-front": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748718798,
|
||||
"narHash": "sha256-KUxbrUjRfuKjkJZLzKr11WEXLfPs38YrW/CMG6XbnbY=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "a553f10147dad9e41829f67b247817a079f6f671",
|
||||
"revCount": 11,
|
||||
"type": "git",
|
||||
"url": "ssh://git@gitlab.com/striped1/striped-front"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://git@gitlab.com/striped1/striped-front"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
@@ -537,36 +553,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"testing-grounds": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
@@ -587,11 +573,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1767640445,
|
||||
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
|
||||
"lastModified": 1762596750,
|
||||
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
|
||||
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -601,21 +587,28 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"uv2nix": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
"nixpkgs": [
|
||||
"striped-back",
|
||||
"nixpkgs"
|
||||
],
|
||||
"pyproject-nix": [
|
||||
"striped-back",
|
||||
"pyproject-nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"lastModified": 1744797880,
|
||||
"narHash": "sha256-gt9JBkYjZAEvGwCG7RMAAAr0j2RsaRmOMj/vV0briXk=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "uv2nix",
|
||||
"rev": "3583e037163491ecd833f1d5d3eedf3869543c5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "uv2nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
|
||||
92
flake.nix
92
flake.nix
@@ -17,18 +17,16 @@
|
||||
# sin inputs
|
||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||
testing-grounds.url = "gitlab:shobu13/testing-grounds";
|
||||
reclamation.url = "git+https://git.shobu.fr/sin_serhao/reclamation";
|
||||
shoblog-front.url = "gitlab:shobu13/shoblog";
|
||||
# striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front";
|
||||
# striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back";
|
||||
striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front";
|
||||
striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back";
|
||||
|
||||
copyparty.url = "github:9001/copyparty";
|
||||
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
outputs =
|
||||
inputs@{
|
||||
outputs = inputs@{
|
||||
self,
|
||||
|
||||
nixpkgs,
|
||||
@@ -40,11 +38,10 @@
|
||||
disko,
|
||||
|
||||
shoblog-front,
|
||||
# striped-front,
|
||||
# striped-back,
|
||||
striped-front,
|
||||
striped-back,
|
||||
nix-minecraft,
|
||||
testing-grounds,
|
||||
reclamation,
|
||||
copyparty,
|
||||
...
|
||||
}:
|
||||
@@ -55,41 +52,16 @@
|
||||
];
|
||||
|
||||
# Helper to provide system-specific attributes
|
||||
forEachSupportedSystem =
|
||||
f:
|
||||
inputs.nixpkgs.lib.genAttrs supportedSystems (
|
||||
system:
|
||||
f {
|
||||
forEachSupportedSystem = f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||
pkgs = import inputs.nixpkgs { inherit system; };
|
||||
}
|
||||
);
|
||||
});
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
sin = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
|
||||
modules = [
|
||||
disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
./hosts/sin/configuration.nix
|
||||
./hosts/sin/hardware-configuration.nix
|
||||
]
|
||||
++ [
|
||||
# modules
|
||||
./modules/gitea/sin
|
||||
];
|
||||
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
};
|
||||
};
|
||||
colmenaHive = colmena.lib.makeHive {
|
||||
meta = {
|
||||
nixpkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
overlays = [ ];
|
||||
overlays = [];
|
||||
};
|
||||
|
||||
specialArgs = {
|
||||
@@ -97,20 +69,11 @@
|
||||
};
|
||||
};
|
||||
|
||||
thea =
|
||||
{
|
||||
name,
|
||||
nodes,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
thea = {name, nodes, pkgs, ...}: {
|
||||
imports = [
|
||||
agenix.nixosModules.default
|
||||
./hosts/${name}/configuration.nix
|
||||
./hosts/${name}/hardware-configuration.nix
|
||||
]
|
||||
++ [
|
||||
] ++ [
|
||||
# modules
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
@@ -118,54 +81,33 @@
|
||||
deployment.targetHost = "192.168.1.12";
|
||||
};
|
||||
|
||||
sin =
|
||||
{
|
||||
name,
|
||||
nodes,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
sin = {name, nodes, pkgs, ...}: {
|
||||
imports = [
|
||||
disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
./hosts/${name}/configuration.nix
|
||||
./hosts/${name}/hardware-configuration.nix
|
||||
]
|
||||
++ [
|
||||
] ++ [
|
||||
# modules
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
|
||||
deployment.targetHost = "192.168.1.14";
|
||||
deployment.allowLocalDeployment = true;
|
||||
};
|
||||
};
|
||||
devShells = forEachSupportedSystem (
|
||||
{ pkgs }:
|
||||
{
|
||||
devShells = forEachSupportedSystem ({ pkgs }: {
|
||||
default = pkgs.mkShell {
|
||||
# The Nix packages provided in the environment
|
||||
# Add any you need here
|
||||
packages = with pkgs; [
|
||||
colmena.packages.${pkgs.stdenv.system}.colmena
|
||||
agenix.packages.${pkgs.stdenv.system}.agenix
|
||||
];
|
||||
packages = with pkgs; [ colmena.packages.${pkgs.system}.colmena ];
|
||||
|
||||
# Set any environment variables for your dev shell
|
||||
env = { };
|
||||
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = '''';
|
||||
shellHook = ''
|
||||
'';
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
packages = forEachSupportedSystem (
|
||||
{ pkgs }:
|
||||
{
|
||||
inherit (colmena.packages."${pkgs.system}") colmena;
|
||||
}
|
||||
);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
modulesPath,
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -52,25 +51,18 @@
|
||||
|
||||
time.timeZone = "Europe/Paris";
|
||||
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
users.users = {
|
||||
zimablade = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
|
||||
];
|
||||
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
|
||||
};
|
||||
shobu = {
|
||||
isNormalUser = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
|
||||
];
|
||||
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -79,12 +71,10 @@
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
|
||||
];
|
||||
|
||||
environment.systemPackages =
|
||||
map lib.lowPrio [
|
||||
environment.systemPackages = map lib.lowPrio [
|
||||
pkgs.curl
|
||||
pkgs.gitMinimal
|
||||
]
|
||||
++ (with pkgs; [
|
||||
] ++ (with pkgs; [
|
||||
helix
|
||||
httpie
|
||||
btop
|
||||
|
||||
@@ -1,27 +1,17 @@
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{inputs, pkgs, ...}: {
|
||||
imports = [ inputs.copyparty.nixosModules.default ];
|
||||
nixpkgs.overlays = [ inputs.copyparty.overlays.default ];
|
||||
environment.systemPackages = [ pkgs.copyparty ];
|
||||
services.copyparty = {
|
||||
enable = true;
|
||||
|
||||
group = "starr";
|
||||
|
||||
settings = {
|
||||
p = [ 8086 ];
|
||||
e2dsa = true;
|
||||
e2ts = true;
|
||||
z = true;
|
||||
qr = true;
|
||||
xff-hdr = "X-Real-IP";
|
||||
xff-src = "lan";
|
||||
rproxy = 1;
|
||||
http-only = true;
|
||||
og = true;
|
||||
shr = "/shares";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.coredns = {
|
||||
enable = false;
|
||||
config = ''
|
||||
|
||||
@@ -14,15 +14,7 @@
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
disko,
|
||||
unstable,
|
||||
agenix,
|
||||
...
|
||||
}:
|
||||
outputs = inputs@{ self, nixpkgs, disko, unstable, agenix, ... }:
|
||||
let
|
||||
# The systems supported for this flake
|
||||
supportedSystems = [
|
||||
@@ -30,14 +22,9 @@
|
||||
];
|
||||
|
||||
# Helper to provide system-specific attributes
|
||||
forEachSupportedSystem =
|
||||
f:
|
||||
nixpkgs.lib.genAttrs supportedSystems (
|
||||
system:
|
||||
f {
|
||||
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
}
|
||||
);
|
||||
});
|
||||
in
|
||||
{
|
||||
nixosConfigurations.zimablade = nixpkgs.lib.nixosSystem {
|
||||
@@ -53,21 +40,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
devShells = forEachSupportedSystem (
|
||||
{ pkgs }:
|
||||
{
|
||||
devShells = forEachSupportedSystem ({ pkgs }: {
|
||||
default = pkgs.mkShell {
|
||||
# The Nix packages provided in the environment
|
||||
# Add any you need here
|
||||
packages = with pkgs; [
|
||||
pkgs.disko
|
||||
nixos-anywhere
|
||||
];
|
||||
packages = with pkgs; [ pkgs.disko nixos-anywhere ];
|
||||
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = '''';
|
||||
};
|
||||
}
|
||||
);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.glances = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
|
||||
@@ -1,27 +1,14 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ahci"
|
||||
"xhci_pci"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
"sdhci_pci"
|
||||
];
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
|
||||
{inputs, pkgs, ...}: {
|
||||
services.homepage-dashboard = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
allowedHosts = "dashboard.shobu.fr";
|
||||
settings = {
|
||||
title = "Shobu's homelab dashboard";
|
||||
description = "a dashboard of free and awesome bullshit";
|
||||
description = "a dashboard of free and wesome bullshit";
|
||||
startUrl = "https://dashboard.shobu.fr";
|
||||
base = "https://dashboard.shobu.fr";
|
||||
headerStyle = "boxed";
|
||||
@@ -16,7 +16,7 @@
|
||||
};
|
||||
|
||||
layout = [
|
||||
{ "resources" = { }; }
|
||||
{"resources" = {};}
|
||||
{
|
||||
"about me stuff" = {
|
||||
tab = "Public";
|
||||
@@ -44,7 +44,7 @@
|
||||
widgets = [
|
||||
{
|
||||
greeting = {
|
||||
text = "Welcome on my services and links dashboard, make yourself home. :3";
|
||||
text = "Welcome on my services and links dashboard, make yourself home.";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -117,15 +117,6 @@
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"reclamation" = {
|
||||
description = "bring back your world to life";
|
||||
widget = {
|
||||
type = "minecraft";
|
||||
url = "udp://minecraft.shobu.fr:43001";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{ pkgs, inputs, ... }:
|
||||
let
|
||||
{pkgs, inputs, ...}: let
|
||||
unstable = import inputs.unstable { system = pkgs.system; };
|
||||
in
|
||||
{
|
||||
in {
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
};
|
||||
@@ -29,41 +27,16 @@ in
|
||||
extraGroups = [ "jellyfin" ];
|
||||
};
|
||||
|
||||
users.users.sonarr.extraGroups = [
|
||||
"jellyfin"
|
||||
"radarr"
|
||||
"transmission"
|
||||
"starr"
|
||||
];
|
||||
users.users.radarr.extraGroups = [
|
||||
"jellyfin"
|
||||
"sonarr"
|
||||
"transmission"
|
||||
"starr"
|
||||
];
|
||||
users.users.bazarr.extraGroups = [
|
||||
"jellyfin"
|
||||
"sonarr"
|
||||
"transmission"
|
||||
"starr"
|
||||
"radarr"
|
||||
];
|
||||
users.users.lidarr.extraGroups = [
|
||||
"jellyfin"
|
||||
"starr"
|
||||
"transmission"
|
||||
];
|
||||
users.users.sonarr.extraGroups = ["jellyfin" "radarr" "transmission" "starr"];
|
||||
users.users.radarr.extraGroups = ["jellyfin" "sonarr" "transmission" "starr"];
|
||||
users.users.bazarr.extraGroups = ["jellyfin" "sonarr" "transmission" "starr" "radarr"];
|
||||
users.users.lidarr.extraGroups = ["jellyfin" "starr" "transmission"];
|
||||
|
||||
users.users.shobu.extraGroups = [ "jellyfin" "starr" "transmission" "radarr" "sonarr" ];
|
||||
|
||||
users.users.shobu.extraGroups = [
|
||||
"jellyfin"
|
||||
"starr"
|
||||
"transmission"
|
||||
"radarr"
|
||||
"sonarr"
|
||||
];
|
||||
|
||||
users.groups = {
|
||||
starr = { };
|
||||
starr = {};
|
||||
};
|
||||
|
||||
services = {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
disko.devices = {
|
||||
disk = {
|
||||
# Devices will be mounted and formatted in alphabetical order, and btrfs can only mount raids
|
||||
@@ -50,17 +49,39 @@
|
||||
};
|
||||
};
|
||||
|
||||
data = {
|
||||
data1 = {
|
||||
type = "disk";
|
||||
device = "/dev/sda";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
crypt_p = {
|
||||
crypt_p1 = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "p_data";
|
||||
name = "p_data1"; # device-mapper name when decrypted
|
||||
# Remove settings.keyFile if you want to use interactive password entry
|
||||
settings = {
|
||||
allowDiscards = true;
|
||||
keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
|
||||
keyFileSize = 4096;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
data2 = {
|
||||
type = "disk";
|
||||
device = "/dev/sdb";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
crypt_p2 = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "p_data2";
|
||||
# Remove settings.keyFile if you want to use interactive password entry
|
||||
settings = {
|
||||
allowDiscards = true;
|
||||
@@ -69,6 +90,10 @@
|
||||
};
|
||||
content = {
|
||||
type = "btrfs";
|
||||
extraArgs = [
|
||||
"-d raid0"
|
||||
"/dev/mapper/p_data1" # Use decrypted mapped device, same name as defined in disk1
|
||||
];
|
||||
subvolumes = {
|
||||
"/" = {
|
||||
mountpoint = "/mnt/fs";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, config, ... }:
|
||||
{pkgs, config, ...}:
|
||||
{
|
||||
users.users = {
|
||||
postgres = {
|
||||
@@ -26,10 +26,7 @@
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
8008
|
||||
8448
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ 8008 8448 ];
|
||||
|
||||
services.matrix-synapse = {
|
||||
enable = true;
|
||||
@@ -42,16 +39,13 @@
|
||||
listeners = [
|
||||
{
|
||||
port = 8008;
|
||||
bind_addresses = [ "0.0.0.0" ];
|
||||
bind_addresses = ["0.0.0.0"];
|
||||
type = "http";
|
||||
tls = false;
|
||||
x_forwarded = true;
|
||||
resources = [
|
||||
{
|
||||
names = [
|
||||
"client"
|
||||
"federation"
|
||||
];
|
||||
names = [ "client" "federation" ];
|
||||
compress = true;
|
||||
}
|
||||
];
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
# virtualisation.docker = {
|
||||
# enable = true;
|
||||
# storageDriver = "btrfs";
|
||||
# };
|
||||
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
loadModels = [ ];
|
||||
acceleration = "cuda";
|
||||
};
|
||||
|
||||
services.open-webui = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
host = "0.0.0.0";
|
||||
port = 8050;
|
||||
};
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
age.secrets = {
|
||||
# captcha = {
|
||||
# file = ./secrets/matrix_captcha.age;
|
||||
|
||||
@@ -1,10 +1,4 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{config, ...}: {
|
||||
|
||||
users.users."starr" = {
|
||||
extraGroups = [ "transmission" ];
|
||||
@@ -20,28 +14,9 @@
|
||||
transmission.gid = 989;
|
||||
};
|
||||
|
||||
# systemd.services = {
|
||||
# docker-transmission-network = {
|
||||
# after = [
|
||||
# "network.target"
|
||||
# "docker-gluetun.service"
|
||||
# "docker-transmission.service"
|
||||
# ];
|
||||
# wantedBy = [
|
||||
# "docker-gluetun.service"
|
||||
# "docker-transmission.service"
|
||||
# ];
|
||||
# serviceConfig = {
|
||||
# ExecStart = "${lib.getExe pkgs.docker} network create docker-transmission; exit 0";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
virtualisation.oci-containers =
|
||||
let
|
||||
virtualisation.oci-containers = let
|
||||
peerport = "63369";
|
||||
in
|
||||
{
|
||||
in {
|
||||
backend = "docker";
|
||||
containers = {
|
||||
gluetun = {
|
||||
@@ -61,7 +36,6 @@
|
||||
extraOptions = [
|
||||
"--cap-add=NET_ADMIN"
|
||||
"--device=/dev/net/tun"
|
||||
# "--network=docker-transmission"
|
||||
];
|
||||
ports = [
|
||||
"13277:13277"
|
||||
|
||||
@@ -2,25 +2,19 @@
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
nodes,
|
||||
...
|
||||
}:
|
||||
let
|
||||
{ config, lib, pkgs, nodes, ... }:let
|
||||
sin-address = "192.168.1.14";
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
imports =
|
||||
[
|
||||
./nginx.nix
|
||||
# ./striped
|
||||
# ./cybercoffee
|
||||
./ollama.nix
|
||||
./minecraft.nix
|
||||
./nix-serve.nix
|
||||
# ./shares.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
@@ -43,23 +37,18 @@ in
|
||||
enable = true;
|
||||
internalInterfaces = [ "enp1s0" ];
|
||||
externalInterface = "enp1s0";
|
||||
forwardPorts = [
|
||||
{
|
||||
forwardPorts = [ {
|
||||
# TODO refactor this in the gitea/n100 module
|
||||
sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT;
|
||||
proto = "tcp";
|
||||
destination = "${sin-address}:22";
|
||||
}
|
||||
];
|
||||
} ];
|
||||
};
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Paris";
|
||||
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
users.users.n100 = {
|
||||
@@ -68,17 +57,14 @@ in
|
||||
packages = with pkgs; [
|
||||
];
|
||||
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
|
||||
];
|
||||
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
|
||||
};
|
||||
|
||||
users.users.root = {
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
|
||||
];
|
||||
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos" ];
|
||||
};
|
||||
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
lunarvim
|
||||
wget
|
||||
@@ -126,3 +112,4 @@ in
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{pkgs, ...}:
|
||||
{
|
||||
imports = [
|
||||
./halflife.nix
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
{ ... }: { }
|
||||
|
||||
{...}: {}
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
outputs =
|
||||
inputs@{
|
||||
outputs = inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nix-minecraft,
|
||||
|
||||
@@ -1,60 +1,46 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"sd_mod"
|
||||
"sdhci_pci"
|
||||
];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fileSystems."/swap" =
|
||||
{ device = "/dev/disk/by-uuid/09c733e4-b0df-4416-977b-50d9feb225fc";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=swap" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/D1B9-8019";
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/D1B9-8019";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{pkgs, inputs, ...}:
|
||||
let
|
||||
modpack = pkgs.fetchPackwizModpack {
|
||||
url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
|
||||
packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU=";
|
||||
};
|
||||
reclamation = inputs.reclamation.packages.${pkgs.stdenv.system};
|
||||
in
|
||||
{
|
||||
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
||||
@@ -20,28 +14,6 @@ in
|
||||
eula = true;
|
||||
openFirewall = true;
|
||||
|
||||
servers.reclamation = {
|
||||
enable = false;
|
||||
package = pkgs.fabricServers.fabric;
|
||||
|
||||
symlinks = {
|
||||
"mods" = "${reclamation.modpack}/mods";
|
||||
"FTBLang" = "${reclamation.modpack}/FTBLang";
|
||||
"defaultconfigs" = "${reclamation.modpack}/defaultconfigs";
|
||||
"ressourcepacks" = "${reclamation.modpack}/ressourcepacks";
|
||||
"config" = "${reclamation.modpack}/config";
|
||||
"kubejs" = "${reclamation.modpack}/kubejs";
|
||||
"patchouli_books" = "${reclamation.modpack}/patchouli_books";
|
||||
"server.dat" = "${reclamation.modpack}/server.dat";
|
||||
};
|
||||
|
||||
serverProperties = {
|
||||
server-port = 43001;
|
||||
motd = "all hail the gorgon v3.14";
|
||||
allow-flight = true;
|
||||
};
|
||||
};
|
||||
|
||||
servers.testing-grounds = {
|
||||
enable = true;
|
||||
|
||||
|
||||
@@ -1,16 +1,11 @@
|
||||
{ inputs, ... }:
|
||||
{inputs, ...}:
|
||||
let
|
||||
# striped-front = inputs.striped-front;
|
||||
striped-front = inputs.striped-front;
|
||||
|
||||
sin-address = "192.168.1.14";
|
||||
in
|
||||
{
|
||||
in {
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
8448
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
@@ -82,12 +77,12 @@ in
|
||||
'';
|
||||
};
|
||||
};
|
||||
# "striped.shobu.fr" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
"striped.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
# root = "${striped-front.packages.x86_64-linux.default}/dist";
|
||||
# };
|
||||
root = "${striped-front.packages.x86_64-linux.default}/dist";
|
||||
};
|
||||
"dashboard.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
@@ -110,9 +105,6 @@ in
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8086";
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
'';
|
||||
};
|
||||
};
|
||||
# "matrix.shobu.fr" = {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
# virtualisation.docker = {
|
||||
# enable = true;
|
||||
# storageDriver = "btrfs";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ ... }:
|
||||
let
|
||||
{...}: let
|
||||
sin-address = "192.168.1.14";
|
||||
in
|
||||
{
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ inputs, ... }:
|
||||
{inputs, ...}:
|
||||
let
|
||||
striped-back = inputs.striped-back;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
striped-back.nixosModules.default
|
||||
];
|
||||
@@ -18,7 +17,7 @@ in
|
||||
socket.enable = true;
|
||||
|
||||
settings.django = {
|
||||
allowed-hosts = [ "striped-api.shobu.fr" ];
|
||||
allowed-hosts = ["striped-api.shobu.fr"];
|
||||
debug = true;
|
||||
databases = {
|
||||
default = {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ striped-back, striped-front, ... }:
|
||||
{
|
||||
{striped-back, striped-front, ...}:{
|
||||
imports = [
|
||||
./back.nix
|
||||
];
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{ lib, ... }:
|
||||
let
|
||||
{lib, ...}: let
|
||||
ssh_port = 24658;
|
||||
in
|
||||
{
|
||||
in {
|
||||
services = {
|
||||
gitea = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,56 +1,29 @@
|
||||
{
|
||||
nodes,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
{nodes, ...}:let
|
||||
sin-address = "192.168.1.14";
|
||||
unstable = import inputs.unstable { system = pkgs.system; };
|
||||
in
|
||||
{
|
||||
in{
|
||||
imports = [
|
||||
./virtualisation.nix
|
||||
];
|
||||
networking.nat.forwardPorts = [
|
||||
{
|
||||
networking.nat.forwardPorts = [{
|
||||
sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT;
|
||||
proto = "tcp";
|
||||
destination = "${sin-address}:22";
|
||||
}
|
||||
}];
|
||||
|
||||
services.gitea-actions-runner.instances = {
|
||||
"gitea.shobu.fr-runner" = {
|
||||
enable = true;
|
||||
name = "gitea.shobu.fr-runner";
|
||||
url = nodes.sin.config.services.gitea.settings.server.ROOT_URL;
|
||||
token = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW";
|
||||
labels = [
|
||||
"debian-latest:docker://debian:latest"
|
||||
"ubuntu-latest:docker://ubuntu:latest"
|
||||
"nix-latest:docker://nixos/nix:latest"
|
||||
"debian-latest:docker://node:18-bullseye"
|
||||
"ubuntu-latest:docker://node:18-bullseye"
|
||||
#"native:host"
|
||||
];
|
||||
|
||||
services.gitea-actions-runner.package = unstable.gitea-actions-runner;
|
||||
|
||||
# services.gitea-actions-runner.instances = {
|
||||
# "gitea.shobu.fr-runner" = {
|
||||
# enable = true;
|
||||
# name = "gitea.shobu.fr-runner";
|
||||
# url = nodes.sin.config.services.gitea.settings.server.ROOT_URL;
|
||||
# token = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW";
|
||||
# labels = [
|
||||
# "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04"
|
||||
# ];
|
||||
# settings = {
|
||||
# cache = {
|
||||
# # Enable cache server to use actions/cache.
|
||||
# enabled = true;
|
||||
# # The directory to store the cache data.
|
||||
# # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
|
||||
# dir = "";
|
||||
# # The host of the cache server.
|
||||
# # It's not for the address to listen, but the address to connect from job containers.
|
||||
# # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
|
||||
# host = "";
|
||||
# # The port of the cache server.
|
||||
# # 0 means to use a random available port.
|
||||
# port = 0;
|
||||
# # The external cache server URL. Valid only when enable is true.
|
||||
# # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
|
||||
# # The URL should generally end with "/".
|
||||
# external_server = "";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ nodes, pkgs, ... }:
|
||||
{
|
||||
{nodes, pkgs, ...}: {
|
||||
systemd.sockets.podman.socketConfig.Symlinks = [
|
||||
"/run/docker.sock"
|
||||
];
|
||||
@@ -16,36 +15,32 @@
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.oci-containers.containers =
|
||||
let
|
||||
runner_config = pkgs.writeTextFile {
|
||||
name = "config.yml";
|
||||
text = ''
|
||||
container:
|
||||
network: "host"
|
||||
valid_volumes:
|
||||
- "/var/nix/hosted-store"
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
gitea-runner = {
|
||||
image = "gitea/act_runner@sha256:8477d5b61b655caad4449888bae39f1f34bebd27db56cb15a62dccb3dcf3a944";
|
||||
autoStart = true;
|
||||
|
||||
# capabilities = {
|
||||
# NET_RAW = true;
|
||||
# virtualisation.oci-containers.containers = let
|
||||
# runner_config = pkgs.writeTextFile {
|
||||
# name = "config.yml";
|
||||
# text = ''
|
||||
# container:
|
||||
# network: "host"
|
||||
# '';
|
||||
# };
|
||||
# in {
|
||||
# gitea-runner = {
|
||||
# image = "gitea/act_runner@sha256:8477d5b61b655caad4449888bae39f1f34bebd27db56cb15a62dccb3dcf3a944";
|
||||
# autoStart = true;
|
||||
|
||||
environment = {
|
||||
GITEA_INSTANCE_URL = nodes.sin.config.services.gitea.settings.server.ROOT_URL;
|
||||
GITEA_RUNNER_REGISTRATION_TOKEN = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW";
|
||||
CONFIG_FILE = "/config.yml";
|
||||
};
|
||||
volumes = [
|
||||
"/var/run/docker.sock:/var/run/docker.sock"
|
||||
"${runner_config}:/config.yml:ro"
|
||||
];
|
||||
};
|
||||
};
|
||||
# # capabilities = {
|
||||
# # NET_RAW = true;
|
||||
# # };
|
||||
|
||||
# environment = {
|
||||
# GITEA_INSTANCE_URL = nodes.sin.config.services.gitea.settings.server.ROOT_URL;
|
||||
# GITEA_RUNNER_REGISTRATION_TOKEN = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW";
|
||||
# CONFIG_FILE = "/config.yml";
|
||||
# };
|
||||
# volumes = [
|
||||
# "/var/run/docker.sock:/var/run/docker.sock"
|
||||
# "${runner_config}:/config.yml:ro"
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
set -f
|
||||
|
||||
if ! nix --version; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
export IFS=' '
|
||||
echo "Uploading paths" $OUT_PATHS
|
||||
exec nix copy --to "ssh://root@localhost" $OUT_PATHS
|
||||
Reference in New Issue
Block a user