Compare commits
64 Commits
test-deplo
...
eaf515e178
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eaf515e178 | ||
|
|
2a73531342 | ||
| 637433e101 | |||
| 7173c81006 | |||
| b5c6c781c1 | |||
| fd20c8ff2d | |||
| 5c1dec5c27 | |||
| a194e1fb90 | |||
| 9a20f7846e | |||
| 5affde5fff | |||
| cf7bbca114 | |||
| 85aab484cf | |||
| 07926b877a | |||
| 01be899805 | |||
| 2d2ade7d45 | |||
| ef4344b962 | |||
| 4c1d0b06dc | |||
| daa7881658 | |||
| 5573970ac0 | |||
| 4278477cc9 | |||
| e60f7c9fc4 | |||
| 05d545d7a6 | |||
| 6bbcfe69e1 | |||
| 1158a8b5ef | |||
| 1704340180 | |||
| 8dd68054fa | |||
| 9bb345c061 | |||
| 228ac9214c | |||
| 84a5a8090d | |||
| de7dbd91b4 | |||
| 56ffeaf5a0 | |||
| 13b08066ce | |||
| 681ddb80f7 | |||
| 76b2b92840 | |||
| a6183e7d41 | |||
| 9f14c96f86 | |||
| f787cca05c | |||
| c2e99ff5ae | |||
| 263851f911 | |||
| bcab85f731 | |||
| 29b632a961 | |||
|
|
d068ea8c2d | ||
|
|
54443f177b | ||
|
|
c1470a7312 | ||
|
|
0032d65e18 | ||
|
|
45300e7a21 | ||
|
|
009dc9373f | ||
|
|
273066c74a | ||
|
|
d4b315e90e | ||
|
|
527a17a169 | ||
|
|
77b1bf9249 | ||
|
|
1e58fbe5f4 | ||
|
|
f06e325736 | ||
|
|
8ee5550803 | ||
|
|
db23c300fe | ||
|
|
24954e5367 | ||
|
|
1a80911b3f | ||
|
|
ddf12655bc | ||
|
|
e5207d10ab | ||
|
|
2f4c425c50 | ||
|
|
70d25c574d | ||
|
|
9a9cc67b1c | ||
|
|
0266841088 | ||
| 7bdb31c46c |
@@ -5,6 +5,9 @@ on:
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
container:
|
||||
volumes:
|
||||
- /nix/store:/var/nix/hosted-store
|
||||
permissions:
|
||||
contents: read
|
||||
id-token: write
|
||||
@@ -12,25 +15,23 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: DeterminateSystems/nix-installer-action@main
|
||||
- name: Restore and save Nix store
|
||||
uses: nix-community/cache-nix-action@v6
|
||||
- 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:
|
||||
# restore and save a cache using this key
|
||||
primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
|
||||
# if there's no cache hit, restore a cache by this prefix
|
||||
restore-prefixes-first-match: nix-${{ runner.os }}-
|
||||
# collect garbage until the Nix store size (in bytes) is at most this number
|
||||
# before trying to save a new cache
|
||||
# 1G = 1073741824
|
||||
gc-max-store-size-linux: 1G
|
||||
# do purge caches
|
||||
purge: true
|
||||
# purge all versions of the cache
|
||||
purge-prefixes: nix-${{ runner.os }}-
|
||||
# created more than this number of seconds ago
|
||||
purge-created: 60000
|
||||
purge-primary-key: never
|
||||
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:
|
||||
|
||||
189
flake.lock
generated
189
flake.lock
generated
@@ -49,11 +49,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762095388,
|
||||
"narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
|
||||
"lastModified": 1768336726,
|
||||
"narHash": "sha256-Os4qn0S0bv7MauXGz16ozyOYZuMrA2FJuXNjDnr5yps=",
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
|
||||
"rev": "c46cd7f57a8ae3b121866485c91ec078c4dd970e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -91,11 +91,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762276996,
|
||||
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
|
||||
"lastModified": 1766150702,
|
||||
"narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
|
||||
"rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -136,6 +136,22 @@
|
||||
"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,
|
||||
@@ -184,6 +200,24 @@
|
||||
"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": [
|
||||
@@ -233,11 +267,31 @@
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762826586,
|
||||
"narHash": "sha256-KlPcXOxxyv+KNcf7yNFQ4DGVFbOpITqHfvMcAUYrL7E=",
|
||||
"lastModified": 1767838769,
|
||||
"narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "1a4fa22ec6e9f2ece24fca273352463b75f6f7c0",
|
||||
"rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04",
|
||||
"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",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -311,11 +365,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1762756533,
|
||||
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -326,6 +380,36 @@
|
||||
}
|
||||
},
|
||||
"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=",
|
||||
@@ -339,7 +423,7 @@
|
||||
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1736549401,
|
||||
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
|
||||
@@ -355,6 +439,26 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"reclamation": {
|
||||
"inputs": {
|
||||
"nix-minecraft": "nix-minecraft_2",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"utils": "utils"
|
||||
},
|
||||
"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"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.shobu.fr/sin_serhao/reclamation"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
@@ -363,6 +467,7 @@
|
||||
"disko": "disko",
|
||||
"nix-minecraft": "nix-minecraft",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"reclamation": "reclamation",
|
||||
"shoblog-front": "shoblog-front",
|
||||
"testing-grounds": "testing-grounds",
|
||||
"unstable": "unstable"
|
||||
@@ -370,7 +475,7 @@
|
||||
},
|
||||
"shoblog-front": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752594581,
|
||||
@@ -432,9 +537,39 @@
|
||||
"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_7"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755527993,
|
||||
@@ -452,11 +587,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1762596750,
|
||||
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
|
||||
"lastModified": 1768127708,
|
||||
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
|
||||
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -465,6 +600,24 @@
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"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"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
164
flake.nix
164
flake.nix
@@ -17,6 +17,7 @@
|
||||
# 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";
|
||||
@@ -26,24 +27,26 @@
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
outputs = inputs@{
|
||||
self,
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
|
||||
nixpkgs,
|
||||
unstable,
|
||||
colmena,
|
||||
nixpkgs,
|
||||
unstable,
|
||||
colmena,
|
||||
|
||||
agenix,
|
||||
agenix,
|
||||
|
||||
disko,
|
||||
disko,
|
||||
|
||||
shoblog-front,
|
||||
# striped-front,
|
||||
# striped-back,
|
||||
nix-minecraft,
|
||||
testing-grounds,
|
||||
copyparty,
|
||||
...
|
||||
shoblog-front,
|
||||
# striped-front,
|
||||
# striped-back,
|
||||
nix-minecraft,
|
||||
testing-grounds,
|
||||
reclamation,
|
||||
copyparty,
|
||||
...
|
||||
}:
|
||||
let
|
||||
# The systems supported for this flake
|
||||
@@ -52,16 +55,41 @@
|
||||
];
|
||||
|
||||
# Helper to provide system-specific attributes
|
||||
forEachSupportedSystem = f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||
pkgs = import inputs.nixpkgs { inherit system; };
|
||||
});
|
||||
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 = {
|
||||
@@ -69,49 +97,75 @@
|
||||
};
|
||||
};
|
||||
|
||||
thea = {name, nodes, pkgs, ...}: {
|
||||
imports = [
|
||||
./hosts/${name}/configuration.nix
|
||||
./hosts/${name}/hardware-configuration.nix
|
||||
] ++ [
|
||||
# modules
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
thea =
|
||||
{
|
||||
name,
|
||||
nodes,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
agenix.nixosModules.default
|
||||
./hosts/${name}/configuration.nix
|
||||
./hosts/${name}/hardware-configuration.nix
|
||||
]
|
||||
++ [
|
||||
# modules
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
|
||||
deployment.targetHost = "192.168.1.12";
|
||||
};
|
||||
deployment.targetHost = "192.168.1.12";
|
||||
};
|
||||
|
||||
sin = {name, nodes, pkgs, ...}: {
|
||||
imports = [
|
||||
disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
./hosts/${name}/configuration.nix
|
||||
./hosts/${name}/hardware-configuration.nix
|
||||
] ++ [
|
||||
# modules
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
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.targetHost = "192.168.1.14";
|
||||
deployment.allowLocalDeployment = true;
|
||||
};
|
||||
};
|
||||
devShells = forEachSupportedSystem ({ pkgs }: {
|
||||
default = pkgs.mkShell {
|
||||
# The Nix packages provided in the environment
|
||||
# Add any you need here
|
||||
packages = with pkgs; [ colmena.packages.${pkgs.system}.colmena ];
|
||||
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
|
||||
];
|
||||
|
||||
# Set any environment variables for your dev shell
|
||||
env = { };
|
||||
# Set any environment variables for your dev shell
|
||||
env = { };
|
||||
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = ''
|
||||
'';
|
||||
};
|
||||
});
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = '''';
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
packages = forEachSupportedSystem ({pkgs}: {
|
||||
inherit (colmena.packages."${pkgs.system}") colmena;
|
||||
});
|
||||
packages = forEachSupportedSystem (
|
||||
{ pkgs }:
|
||||
{
|
||||
inherit (colmena.packages."${pkgs.system}") colmena;
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
modulesPath,
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -51,18 +52,25 @@
|
||||
|
||||
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"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -71,16 +79,18 @@
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsu+4S+BHmypQTq2IR9y+ihvbF7sXbBznKtIjVAeHJ1 shobu@nixos"
|
||||
];
|
||||
|
||||
environment.systemPackages = map lib.lowPrio [
|
||||
pkgs.curl
|
||||
pkgs.gitMinimal
|
||||
] ++ (with pkgs; [
|
||||
helix
|
||||
httpie
|
||||
btop
|
||||
tmux
|
||||
# firefox
|
||||
]);
|
||||
environment.systemPackages =
|
||||
map lib.lowPrio [
|
||||
pkgs.curl
|
||||
pkgs.gitMinimal
|
||||
]
|
||||
++ (with pkgs; [
|
||||
helix
|
||||
httpie
|
||||
btop
|
||||
tmux
|
||||
# firefox
|
||||
]);
|
||||
|
||||
services = {
|
||||
openssh = {
|
||||
|
||||
@@ -1,17 +1,27 @@
|
||||
{inputs, pkgs, ...}: {
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
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,4 +1,5 @@
|
||||
{...}: {
|
||||
{ ... }:
|
||||
{
|
||||
services.coredns = {
|
||||
enable = false;
|
||||
config = ''
|
||||
|
||||
@@ -14,7 +14,15 @@
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
outputs = inputs@{ self, nixpkgs, disko, unstable, agenix, ... }:
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
disko,
|
||||
unstable,
|
||||
agenix,
|
||||
...
|
||||
}:
|
||||
let
|
||||
# The systems supported for this flake
|
||||
supportedSystems = [
|
||||
@@ -22,9 +30,14 @@
|
||||
];
|
||||
|
||||
# Helper to provide system-specific attributes
|
||||
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
});
|
||||
forEachSupportedSystem =
|
||||
f:
|
||||
nixpkgs.lib.genAttrs supportedSystems (
|
||||
system:
|
||||
f {
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
nixosConfigurations.zimablade = nixpkgs.lib.nixosSystem {
|
||||
@@ -40,15 +53,21 @@
|
||||
};
|
||||
};
|
||||
|
||||
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 ];
|
||||
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
|
||||
];
|
||||
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = '''';
|
||||
};
|
||||
});
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = '''';
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{...}: {
|
||||
{ ... }:
|
||||
{
|
||||
services.glances = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
|
||||
@@ -1,14 +1,27 @@
|
||||
# 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 = [ ];
|
||||
|
||||
@@ -117,6 +117,15 @@
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"reclamation" = {
|
||||
description = "bring back your world to life";
|
||||
widget = {
|
||||
type = "minecraft";
|
||||
url = "udp://minecraft.shobu.fr:43001";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{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; };
|
||||
};
|
||||
@@ -27,16 +29,47 @@ 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.whisparr.extraGroups = [
|
||||
"jellyfin"
|
||||
"starr"
|
||||
"transmission"
|
||||
];
|
||||
|
||||
users.users.shobu.extraGroups = [
|
||||
"jellyfin"
|
||||
"starr"
|
||||
"transmission"
|
||||
"radarr"
|
||||
"sonarr"
|
||||
];
|
||||
|
||||
users.groups = {
|
||||
starr = {};
|
||||
starr = { };
|
||||
};
|
||||
|
||||
services = {
|
||||
@@ -66,7 +99,10 @@ in {
|
||||
lidarr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
package = unstable.lidarr;
|
||||
};
|
||||
whisparr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
jellyseerr = {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{...}: {
|
||||
{ ... }:
|
||||
{
|
||||
disko.devices = {
|
||||
disk = {
|
||||
# Devices will be mounted and formatted in alphabetical order, and btrfs can only mount raids
|
||||
@@ -49,18 +50,39 @@
|
||||
};
|
||||
};
|
||||
|
||||
data1 = {
|
||||
# data1 = {
|
||||
# type = "disk";
|
||||
# device = "/dev/sda";
|
||||
# content = {
|
||||
# type = "gpt";
|
||||
# partitions = {
|
||||
# crypt_p1 = {
|
||||
# size = "100%";
|
||||
# content = {
|
||||
# type = "luks";
|
||||
# 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;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
data = {
|
||||
type = "disk";
|
||||
device = "/dev/sda";
|
||||
device = "/dev/sdc";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
crypt_p1 = {
|
||||
crypt_p = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "p_data1"; # device-mapper name when decrypted
|
||||
# Remove settings.keyFile if you want to use interactive password entry
|
||||
name = "p_data";
|
||||
settings = {
|
||||
allowDiscards = true;
|
||||
keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00";
|
||||
@@ -71,17 +93,17 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
data2 = {
|
||||
data1 = {
|
||||
type = "disk";
|
||||
device = "/dev/sdb";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
crypt_p2 = {
|
||||
crypt_p = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "p_data2";
|
||||
name = "p_data1";
|
||||
# Remove settings.keyFile if you want to use interactive password entry
|
||||
settings = {
|
||||
allowDiscards = true;
|
||||
@@ -92,7 +114,7 @@
|
||||
type = "btrfs";
|
||||
extraArgs = [
|
||||
"-d raid0"
|
||||
"/dev/mapper/p_data1" # Use decrypted mapped device, same name as defined in disk1
|
||||
"/dev/mapper/p_data3" # Use decrypted mapped device, same name as defined in disk1
|
||||
];
|
||||
subvolumes = {
|
||||
"/" = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, config, ...}:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
users.users = {
|
||||
postgres = {
|
||||
@@ -26,7 +26,10 @@
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 8008 8448 ];
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
8008
|
||||
8448
|
||||
];
|
||||
|
||||
services.matrix-synapse = {
|
||||
enable = true;
|
||||
@@ -39,13 +42,16 @@
|
||||
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;
|
||||
}
|
||||
];
|
||||
|
||||
21
hosts/sin/ollama.nix
Normal file
21
hosts/sin/ollama.nix
Normal file
@@ -0,0 +1,21 @@
|
||||
{ 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,4 +1,5 @@
|
||||
{...}: {
|
||||
{ ... }:
|
||||
{
|
||||
age.secrets = {
|
||||
# captcha = {
|
||||
# file = ./secrets/matrix_captcha.age;
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{config, ...}: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
||||
users.users."starr" = {
|
||||
extraGroups = [ "transmission" ];
|
||||
@@ -14,56 +20,76 @@
|
||||
transmission.gid = 989;
|
||||
};
|
||||
|
||||
virtualisation.oci-containers = let
|
||||
peerport = "63369";
|
||||
in {
|
||||
backend = "docker";
|
||||
containers = {
|
||||
gluetun = {
|
||||
image = "qmcgaw/gluetun";
|
||||
environment = {
|
||||
VPN_SERVICE_PROVIDER = "airvpn";
|
||||
VPN_TYPE = "wireguard";
|
||||
# WIREGUARD_PRIVATE_KEY = "from agenix";
|
||||
# WIREGUARD_PRESHARED_KEY = "from agenix";
|
||||
# WIREGUARD_ADDRESSES = "from agenix";
|
||||
# SERVER_COUNTRIES = "from agenix";
|
||||
FIREWALL_VPN_INPUT_PORTS = "13277,${peerport}";
|
||||
# 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
|
||||
peerport = "63369";
|
||||
in
|
||||
{
|
||||
backend = "docker";
|
||||
containers = {
|
||||
gluetun = {
|
||||
image = "qmcgaw/gluetun";
|
||||
environment = {
|
||||
VPN_SERVICE_PROVIDER = "airvpn";
|
||||
VPN_TYPE = "wireguard";
|
||||
# WIREGUARD_PRIVATE_KEY = "from agenix";
|
||||
# WIREGUARD_PRESHARED_KEY = "from agenix";
|
||||
# WIREGUARD_ADDRESSES = "from agenix";
|
||||
# SERVER_COUNTRIES = "from agenix";
|
||||
FIREWALL_VPN_INPUT_PORTS = "13277,${peerport}";
|
||||
};
|
||||
environmentFiles = [
|
||||
config.age.secrets.airvpn-params.path
|
||||
];
|
||||
extraOptions = [
|
||||
"--cap-add=NET_ADMIN"
|
||||
"--device=/dev/net/tun"
|
||||
# "--network=docker-transmission"
|
||||
];
|
||||
ports = [
|
||||
"13277:13277"
|
||||
"9091:13277"
|
||||
"${peerport}:${peerport}"
|
||||
"${peerport}:${peerport}/udp"
|
||||
];
|
||||
};
|
||||
environmentFiles = [
|
||||
config.age.secrets.airvpn-params.path
|
||||
];
|
||||
extraOptions = [
|
||||
"--cap-add=NET_ADMIN"
|
||||
"--device=/dev/net/tun"
|
||||
];
|
||||
ports = [
|
||||
"13277:13277"
|
||||
"9091:13277"
|
||||
"${peerport}:${peerport}"
|
||||
"${peerport}:${peerport}/udp"
|
||||
];
|
||||
};
|
||||
transmission = {
|
||||
image = "docker.io/linuxserver/transmission:latest";
|
||||
volumes = [
|
||||
"/etc/transmission:/config"
|
||||
"/etc/localtime:/etc/localtime:ro"
|
||||
"/mnt/mediacenter/torrents:/mnt/mediacenter/torrents"
|
||||
"/mnt/data/transmission_downloads:/mnt/data/transmission_downloads"
|
||||
];
|
||||
dependsOn = [
|
||||
"gluetun"
|
||||
];
|
||||
extraOptions = [
|
||||
"--network=container:gluetun"
|
||||
];
|
||||
environment = {
|
||||
PUID = toString config.users.users.transmission.uid;
|
||||
GUID = toString config.users.groups.transmission.gid;
|
||||
PEERPORT = peerport;
|
||||
transmission = {
|
||||
image = "docker.io/linuxserver/transmission:latest";
|
||||
volumes = [
|
||||
"/etc/transmission:/config"
|
||||
"/etc/localtime:/etc/localtime:ro"
|
||||
"/mnt/mediacenter/torrents:/mnt/mediacenter/torrents"
|
||||
"/mnt/data/transmission_downloads:/mnt/data/transmission_downloads"
|
||||
];
|
||||
dependsOn = [
|
||||
"gluetun"
|
||||
];
|
||||
extraOptions = [
|
||||
"--network=container:gluetun"
|
||||
];
|
||||
environment = {
|
||||
PUID = toString config.users.users.transmission.uid;
|
||||
GUID = toString config.users.groups.transmission.gid;
|
||||
PEERPORT = peerport;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,20 +2,25 @@
|
||||
# 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 =
|
||||
[
|
||||
./nginx.nix
|
||||
# ./striped
|
||||
# ./cybercoffee
|
||||
./ollama.nix
|
||||
./minecraft.nix
|
||||
# ./shares.nix
|
||||
];
|
||||
imports = [
|
||||
./nginx.nix
|
||||
# ./striped
|
||||
# ./cybercoffee
|
||||
./ollama.nix
|
||||
./minecraft.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
@@ -37,18 +42,23 @@ in
|
||||
enable = true;
|
||||
internalInterfaces = [ "enp1s0" ];
|
||||
externalInterface = "enp1s0";
|
||||
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";
|
||||
} ];
|
||||
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 = {
|
||||
@@ -57,14 +67,17 @@ 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
|
||||
@@ -112,4 +125,3 @@ in
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./halflife.nix
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
|
||||
{...}: {}
|
||||
{ ... }: { }
|
||||
|
||||
@@ -12,23 +12,24 @@
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
outputs = inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nix-minecraft,
|
||||
shoblog-front,
|
||||
striped-front,
|
||||
striped-back,
|
||||
...
|
||||
}:
|
||||
{
|
||||
nixosConfigurations.n100 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nix-minecraft,
|
||||
shoblog-front,
|
||||
striped-front,
|
||||
striped-back,
|
||||
...
|
||||
}:
|
||||
{
|
||||
nixosConfigurations.n100 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,47 +1,61 @@
|
||||
# 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";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
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";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
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";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
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";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=swap" ];
|
||||
};
|
||||
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";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/D1B9-8019";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
{pkgs, inputs, ...}:
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
modpack = pkgs.fetchPackwizModpack {
|
||||
url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
|
||||
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 ];
|
||||
@@ -14,6 +20,28 @@ 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,11 +1,16 @@
|
||||
{inputs, ...}:
|
||||
{ inputs, ... }:
|
||||
let
|
||||
# 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;
|
||||
@@ -13,112 +18,116 @@ in {
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts =
|
||||
let
|
||||
mkStarr = host: port: {
|
||||
"${host}" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
let
|
||||
mkStarr = host: port: {
|
||||
"${host}" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:${port}";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
proxy_read_timeout 4800s;
|
||||
'';
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:${port}";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
proxy_read_timeout 4800s;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
(
|
||||
mkStarr "jellyfin.shobu.fr" "8096"
|
||||
// mkStarr "radarr.shobu.fr" "7878"
|
||||
// mkStarr "sonarr.shobu.fr" "8989"
|
||||
// mkStarr "prowlarr.shobu.fr" "9696"
|
||||
// mkStarr "bazarr.shobu.fr" "6767"
|
||||
// mkStarr "jellyseerr.shobu.fr" "5055"
|
||||
// mkStarr "fileshelter.shobu.fr" "5091"
|
||||
// mkStarr "lidarr.shobu.fr" "8686"
|
||||
// mkStarr "transmission.shobu.fr" "9091"
|
||||
// mkStarr "zimablade-admin.shobu.fr" "61208"
|
||||
// {
|
||||
"shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
in
|
||||
(
|
||||
mkStarr "jellyfin.shobu.fr" "8096"
|
||||
// mkStarr "radarr.shobu.fr" "7878"
|
||||
// mkStarr "sonarr.shobu.fr" "8989"
|
||||
// mkStarr "prowlarr.shobu.fr" "9696"
|
||||
// mkStarr "bazarr.shobu.fr" "6767"
|
||||
// mkStarr "jellyseerr.shobu.fr" "5055"
|
||||
// mkStarr "fileshelter.shobu.fr" "5091"
|
||||
// mkStarr "lidarr.shobu.fr" "8686"
|
||||
// mkStarr "whisparr.shobu.fr" "6969"
|
||||
// mkStarr "transmission.shobu.fr" "9091"
|
||||
// mkStarr "zimablade-admin.shobu.fr" "61208"
|
||||
// {
|
||||
"shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
root = "${inputs.shoblog-front.packages.x86_64-linux.default}/dist";
|
||||
};
|
||||
"data.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
root = "/mnt/shares/data";
|
||||
};
|
||||
"bddtrans.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8001";
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
'';
|
||||
root = "${inputs.shoblog-front.packages.x86_64-linux.default}/dist";
|
||||
};
|
||||
};
|
||||
"bddtrans-api.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
"data.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
root = "/mnt/shares/data";
|
||||
};
|
||||
"bddtrans.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8001";
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
'';
|
||||
};
|
||||
};
|
||||
"bddtrans-api.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8000";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
'';
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
# "striped.shobu.fr" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
# "striped.shobu.fr" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
|
||||
# root = "${striped-front.packages.x86_64-linux.default}/dist";
|
||||
# };
|
||||
"dashboard.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
# root = "${striped-front.packages.x86_64-linux.default}/dist";
|
||||
# };
|
||||
"dashboard.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8082";
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8082";
|
||||
};
|
||||
};
|
||||
};
|
||||
"git.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
"git.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:3000";
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:3000";
|
||||
};
|
||||
};
|
||||
};
|
||||
"files.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
"files.shobu.fr" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8086";
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:8086";
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
# "matrix.shobu.fr" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# locations."/".extraConfig = ''
|
||||
# return 404;
|
||||
# '';
|
||||
# locations."/_matrix".proxyPass = "http://${sin-address}:8008";
|
||||
# locations."/_synapse/client".proxyPass = "http://${sin-address}:8008";
|
||||
# locations."/.well-known/matrix/server".proxyPass = "http://${sin-address}:8008/.well-known/matrix/server";
|
||||
# };
|
||||
}
|
||||
);
|
||||
# "matrix.shobu.fr" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# locations."/".extraConfig = ''
|
||||
# return 404;
|
||||
# '';
|
||||
# locations."/_matrix".proxyPass = "http://${sin-address}:8008";
|
||||
# locations."/_synapse/client".proxyPass = "http://${sin-address}:8008";
|
||||
# locations."/.well-known/matrix/server".proxyPass = "http://${sin-address}:8008/.well-known/matrix/server";
|
||||
# };
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
security.acme = {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{inputs, ...}: {
|
||||
{ inputs, ... }:
|
||||
{
|
||||
# virtualisation.docker = {
|
||||
# enable = true;
|
||||
# storageDriver = "btrfs";
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{...}: let
|
||||
{ ... }:
|
||||
let
|
||||
sin-address = "192.168.1.14";
|
||||
in
|
||||
{
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{inputs, ...}:
|
||||
{ inputs, ... }:
|
||||
let
|
||||
striped-back = inputs.striped-back;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
striped-back.nixosModules.default
|
||||
];
|
||||
@@ -17,7 +18,7 @@ in {
|
||||
socket.enable = true;
|
||||
|
||||
settings.django = {
|
||||
allowed-hosts = ["striped-api.shobu.fr"];
|
||||
allowed-hosts = [ "striped-api.shobu.fr" ];
|
||||
debug = true;
|
||||
databases = {
|
||||
default = {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{striped-back, striped-front, ...}:{
|
||||
{ striped-back, striped-front, ... }:
|
||||
{
|
||||
imports = [
|
||||
./back.nix
|
||||
];
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{lib, ...}: let
|
||||
{ lib, ... }:
|
||||
let
|
||||
ssh_port = 24658;
|
||||
in {
|
||||
in
|
||||
{
|
||||
services = {
|
||||
gitea = {
|
||||
enable = true;
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
text = ''
|
||||
container:
|
||||
network: "host"
|
||||
valid_volumes:
|
||||
- "/var/nix/hosted-store"
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
11
scripts/upload-to-cache.sh
Normal file
11
scripts/upload-to-cache.sh
Normal file
@@ -0,0 +1,11 @@
|
||||
#!/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