idek, random commit

This commit is contained in:
mtgmonkey
2025-12-11 19:40:50 +00:00
parent 6e30000ce5
commit 8e1895f1b1
6 changed files with 197 additions and 16 deletions

View File

@@ -12,8 +12,8 @@
networking.domain = ""; networking.domain = "";
networking.firewall = { networking.firewall = {
enable = true; enable = true;
allowedTCPPorts = [80 443 9418]; allowedTCPPorts = [80 443 9418 25565];
allowedUDPPorts = [80 443 9418]; allowedUDPPorts = [80 443 9418 25565];
}; };
boot.loader.grub.devices = ["nodev"]; boot.loader.grub.devices = ["nodev"];

164
flake.lock generated
View File

@@ -1,15 +1,31 @@
{ {
"nodes": { "nodes": {
"blobs": {
"flake": false,
"locked": {
"lastModified": 1604995301,
"narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
"owner": "simple-nixos-mailserver",
"repo": "blobs",
"rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"repo": "blobs",
"type": "gitlab"
}
},
"blog": { "blog": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1756357572, "lastModified": 1761290086,
"narHash": "sha256-P6T94sif/tjPXdA6MISmnwot57+4FzJ0iHe83KAdOlI=", "narHash": "sha256-MUmldwnP65Iu9A2fPdyMcsJnKLtltw3pGWVaBeYNfto=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "c1b05feb4a851d2d8ea57ccac8d6482c850ccc6e", "rev": "d3b971ee3291e0d88bdd729efba88b74e9d5b378",
"revCount": 48, "revCount": 57,
"type": "git", "type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/blog.git" "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
}, },
@@ -18,6 +34,22 @@
"url": "https://git.mtgmonkey.net/Andromeda/blog.git" "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
} }
}, },
"flake-compat": {
"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": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@@ -36,6 +68,54 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"simple-nixos-mailserver",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"simple-nixos-mailserver",
"nixpkgs"
]
},
"locked": {
"lastModified": 1758108966,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"simple-nixos-mailserver",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"jank-client": { "jank-client": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
@@ -87,6 +167,22 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-25_05": {
"locked": {
"lastModified": 1759143472,
"narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749285348, "lastModified": 1749285348,
@@ -119,11 +215,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1754214453, "lastModified": 1761907660,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -150,11 +246,27 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1746141548, "lastModified": 1759036355,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1760524057,
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -189,20 +301,44 @@
"math-project": "math-project", "math-project": "math-project",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"noshell": "noshell", "noshell": "noshell",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"spacebar-server": "spacebar-server" "spacebar-server": "spacebar-server"
} }
}, },
"simple-nixos-mailserver": {
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat",
"git-hooks": "git-hooks",
"nixpkgs": "nixpkgs_6",
"nixpkgs-25_05": "nixpkgs-25_05"
},
"locked": {
"lastModified": 1759489698,
"narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"ref": "master",
"repo": "nixos-mailserver",
"type": "gitlab"
}
},
"spacebar-server": { "spacebar-server": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1748414795, "lastModified": 1761916341,
"narHash": "sha256-nClmjajuaMVV02Rn7xqZWy5pwLmGw7/MF3RDGkYDuYQ=", "narHash": "sha256-NalvODcjJq3MutPu5nyiXqnYmz2m8yiQ6dJ8s/i+9aA=",
"owner": "spacebarchat", "owner": "spacebarchat",
"repo": "server", "repo": "server",
"rev": "f03c6209a42ae3e922bdb86954de04f1ae6daaa8", "rev": "c8fab8e8ff4c689b025c8b140135e9ae406229d9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -4,6 +4,7 @@
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
noshell.url = "github:viperML/noshell"; noshell.url = "github:viperML/noshell";
spacebar-server.url = "github:spacebarchat/server"; spacebar-server.url = "github:spacebarchat/server";
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog.git"; blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog.git";
jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"; jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork.git";
@@ -15,6 +16,7 @@
nixpkgs, nixpkgs,
noshell, noshell,
spacebar-server, spacebar-server,
simple-nixos-mailserver,
jank-client, jank-client,
math-project, math-project,
blog, blog,
@@ -28,6 +30,7 @@
inherit self; inherit self;
inherit system; inherit system;
inherit spacebar-server; inherit spacebar-server;
inherit simple-nixos-mailserver;
inherit math-project; inherit math-project;
inherit blog; inherit blog;
ssh-pub-keys = import ./ssh-pub-keys.nix; ssh-pub-keys = import ./ssh-pub-keys.nix;
@@ -39,6 +42,8 @@
./services/elmskell.nix ./services/elmskell.nix
./services/ferron.nix ./services/ferron.nix
./services/gitea.nix ./services/gitea.nix
# ./services/mailserver.nix
# ./services/minecraft-server.nix
# ./services/rgit.nix # ./services/rgit.nix
./services/math-project.nix ./services/math-project.nix
./services/spacebar.nix ./services/spacebar.nix
@@ -47,6 +52,7 @@
jank-client.nixosModules.x86_64-linux.default jank-client.nixosModules.x86_64-linux.default
math-project.nixosModules.x86_64-linux.default math-project.nixosModules.x86_64-linux.default
noshell.nixosModules.default noshell.nixosModules.default
simple-nixos-mailserver.nixosModule
{ {
programs.noshell.enable = true; programs.noshell.enable = true;
services.math-project.enable = true; services.math-project.enable = true;

View File

@@ -41,6 +41,10 @@
domain = "translate.mtgmonkey.net"; domain = "translate.mtgmonkey.net";
proxyTo = "http://localhost:9109/"; proxyTo = "http://localhost:9109/";
} }
{
domain = "mail.mtgmonkey.net";
proxyTo = "http://localhost:6942/";
}
]; ];
}; };
in { in {

27
services/mailserver.nix Normal file
View File

@@ -0,0 +1,27 @@
{config, ...}: {
mailserver = {
enable = true;
stateVersion = 3;
fqdn = "mail.mtgmonkey.net";
domains = ["mtgmonkey.net"];
loginAccounts = {
"example@mtgmonkey.net" = {
hashedPasswordFile = "/home/mtgmonkey/secrets/example_passhash";
aliases = ["postmaster@mtgmonkey.net"];
};
};
certificateScheme = "manual";
};
services.roundcube = {
enable = true;
hostName = "localhost:6942";
extraConfig = ''
$config['smtp_server'] = tls://${config.mailserver.fqdn}";
$config['smtp_user'] = "%u";
$config['stmp_pass'] = "%p";
'';
};
}

View File

@@ -0,0 +1,8 @@
{
nixpkgs.config.allowUnfree = true;
services.minecraft-server = {
enable = true;
eula = true;
jvmOpts = "-Xms512M -Xmx1024M";
};
}