clerie/nixfiles
1
0
Fork 0
Code

Update from updated-inputs-2025-01-04-02-03

Browse Source
This commit is contained in:
Flake Update Bot 2025-01-04 03:04:58 +01:00
commit 20ceed8dae
8 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.lock generated
View File

@ -476,6 +476,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-0dc1c7": {
"locked": {
"lastModified": 1725718979,
"narHash": "sha256-TNj62uDY5ilnYu0Jne8/IIunfh1kf6kDPY9KdS+Eotw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0dc1c7294c13f5d1dd6eccab4f75d268d7296efe",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0dc1c7294c13f5d1dd6eccab4f75d268d7296efe",
"type": "github"
}
},
"nixpkgs-regression": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1643052045, "lastModified": 1643052045,
@ -526,11 +542,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1735834308,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -589,6 +605,7 @@
"nixos-exporter": "nixos-exporter", "nixos-exporter": "nixos-exporter",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-0dc1c7": "nixpkgs-0dc1c7",
"nurausstieg": "nurausstieg", "nurausstieg": "nurausstieg",
"scan-to-gpg": "scan-to-gpg", "scan-to-gpg": "scan-to-gpg",
"solid-xmpp-alarm": "solid-xmpp-alarm", "solid-xmpp-alarm": "solid-xmpp-alarm",

2
flake.nix
View File

@ -1,6 +1,8 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# for etesync-dav
nixpkgs-0dc1c7.url = "github:NixOS/nixpkgs/0dc1c7294c13f5d1dd6eccab4f75d268d7296efe";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
berlinerbaeder-exporter = { berlinerbaeder-exporter = {
url = "git+https://git.clerie.de/clerie/berlinerbaeder-exporter.git"; url = "git+https://git.clerie.de/clerie/berlinerbaeder-exporter.git";

3
flake/overlay.nix
View File

@ -1,4 +1,5 @@
{ self { self
, nixpkgs-0dc1c7
, berlinerbaeder-exporter , berlinerbaeder-exporter
, bij , bij
, chaosevents , chaosevents
@ -10,6 +11,8 @@
, ... , ...
}@inputs: }@inputs:
final: prev: { final: prev: {
inherit (nixpkgs-0dc1c7.legacyPackages.${final.system})
etesync-dav;
inherit (berlinerbaeder-exporter.packages.${final.system}) inherit (berlinerbaeder-exporter.packages.${final.system})
berlinerbaeder-exporter; berlinerbaeder-exporter;
inherit (bij.packages.${final.system}) inherit (bij.packages.${final.system})

1
hosts/krypton/configuration.nix
View File

@ -9,6 +9,7 @@
./android.nix ./android.nix
./backup.nix ./backup.nix
./etesync-dav.nix
#./initrd.nix #./initrd.nix
./network.nix ./network.nix
./programs.nix ./programs.nix

10
hosts/krypton/etesync-dav.nix Normal file
View File

@ -0,0 +1,10 @@
{ ... }:
{
services.etesync-dav = {
enable = true;
apiUrl = "https://etebase.clerie.de";
};
}

1
hosts/web-2/configuration.nix
View File

@ -9,6 +9,7 @@
./chaosevents.nix ./chaosevents.nix
./clerie.nix ./clerie.nix
./drop.nix ./drop.nix
./etebase.nix
./fieldpoc.nix ./fieldpoc.nix
./gitea.nix ./gitea.nix
./ip.nix ./ip.nix

21
hosts/web-2/etebase.nix Normal file
View File

@ -0,0 +1,21 @@
{ ... }:
{
services.etebase-server = {
enable = true;
port = 8001;
settings.allowed_hosts.allowed_host1 = "etebase.clerie.de";
};
services.nginx.virtualHosts = {
"etebase.clerie.de" = {
enableACME = true;
forceSSL = true;
locations = {
"/" = {
proxyPass = "http://127.0.0.1:8001";
};
};
};
};
}

2
pkgs/clerie-update-nixfiles/clerie-update-nixfiles.sh
View File

@ -56,7 +56,7 @@ echo "[!] Create branch ${UPDATE_BRANCH}"
xgit checkout -b "${UPDATE_BRANCH}" xgit checkout -b "${UPDATE_BRANCH}"
echo "[!] Update nixpkgs" echo "[!] Update nixpkgs"
nix flake lock --update-input nixpkgs nix flake update nixpkgs
echo "[!] Commit changes" echo "[!] Commit changes"
xgit add flake.lock xgit add flake.lock