Grimmauld/grimm-nix-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

f@h, some misc fixes because updates

Browse source
This commit is contained in:
Grimmauld 2024-01-28 09:34:03 +00:00
parent 848b0f3d5c
commit f9bc07c8ff
6 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configuration.nix
View file

@ -78,10 +78,10 @@ in {
}; };
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "unstable";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
system.stateVersion = "unstable";
zramSwap.enable = true; zramSwap.enable = true;
networking.hostName = "grimmauld-nixos-server"; networking.hostName = "grimmauld-nixos-server";
networking.domain = ""; networking.domain = "";

25
flake.lock
View file

@ -200,6 +200,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1706098335,
"narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705856552, "lastModified": 1705856552,
@ -217,11 +233,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1705856552, "lastModified": 1706191920,
"narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,7 +252,8 @@
"agenix": "agenix", "agenix": "agenix",
"nixos-mailserver": "nixos-mailserver", "nixos-mailserver": "nixos-mailserver",
"nixos-matrix-modules": "nixos-matrix-modules", "nixos-matrix-modules": "nixos-matrix-modules",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
} }
}, },
"systems": { "systems": {

6
flake.nix
View file

@ -7,6 +7,7 @@
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
nixos-matrix-modules = { nixos-matrix-modules = {
url = "git+https://github.com/dali99/nixos-matrix-modules?submodules=1"; url = "git+https://github.com/dali99/nixos-matrix-modules?submodules=1";
flake = true; flake = true;
@ -17,12 +18,14 @@
}; };
}; };
outputs = { nixos-mailserver, nixos-matrix-modules, self, nixpkgs, agenix }: let outputs = { nixos-mailserver, nixos-matrix-modules, self, nixpkgs-stable, nixpkgs, agenix, ... } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
stable = import nixpkgs-stable { inherit system; config.allowUnfree = true; };
in { in {
nixosConfigurations = { nixosConfigurations = {
grimmauld-nixos-server = nixpkgs.lib.nixosSystem { grimmauld-nixos-server = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs stable; };
modules = [ modules = [
./configuration.nix ./configuration.nix
./modules/matrix.nix ./modules/matrix.nix
@ -37,6 +40,7 @@
./modules/email.nix ./modules/email.nix
./modules/discord-matrix-bridge.nix ./modules/discord-matrix-bridge.nix
./modules/mastodon.nix ./modules/mastodon.nix
./modules/folding.nix
agenix.nixosModules.default agenix.nixosModules.default
nixos-mailserver.nixosModules.default nixos-mailserver.nixosModules.default
nixos-matrix-modules.nixosModules.default nixos-matrix-modules.nixosModules.default

2
modules/email.nix
View file

@ -5,7 +5,7 @@ let
in { in {
security.acme.certs."${root_host}".extraDomainNames = [ mail_host ]; security.acme.certs."${root_host}".extraDomainNames = [ mail_host ];
services.dovecot2.sieve.extensions = [ "fileinto" ]; # sives break without this for some reason
mailserver = { mailserver = {
enable = true; enable = true;
fqdn = mail_host; fqdn = mail_host;

17
modules/folding.nix Normal file
View file

@ -0,0 +1,17 @@
{ pkgs, stable, ... }: let
inherit (pkgs) fetchurl;
in {
nixpkgs.overlays = [ (final: prev: {
fahclient = prev.pkgs.callPackage (fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/e655eb33b2e83aebf39b30535e8990e45e27588b/pkgs/applications/science/misc/foldingathome/client.nix";
hash = "sha256-LPFWAubPvmCuO25DE3MZ1JCk4MtHA7uhEKdpsAtkbsI=";
}) {};
})];
services.foldingathome = {
enable = true;
daemonNiceLevel = 19;
user = "Grimmauld";
package = pkgs.fahclient;
};
environment.systemPackages = with pkgs; [ fahclient ];
}

2
modules/puffer.nix
View file

@ -27,7 +27,7 @@ in {
}; };
}; };
security.acme.certs."${root_host}".extraDomainNames = [ puffer_host ]; security.acme.certs."${root_host}".extraDomainNames = [ puffer_host ];
networking.firewall.allowedTCPPorts = [ puffer_sftp_port 25565 25566 ]; networking.firewall.allowedTCPPorts = [ puffer_sftp_port 25565 25566 25567 25568];
# virtualisation.podman.enable = true; # virtualisation.podman.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;