Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

loptland: cleanup

Browse source
This commit is contained in:
Christoph Hollizeck 2026-01-20 23:14:27 +01:00
parent be4b6cbbe4
commit d26311f457
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
7 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
assets/firewatch_background.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
assets/nebula_background.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 959 KiB

24
flake.lock generated
View file

@ -1465,33 +1465,33 @@
}, },
"nixpkgs-latest-factorio": { "nixpkgs-latest-factorio": {
"locked": { "locked": {
"lastModified": 1757278553, "lastModified": 1768319201,
"narHash": "sha256-NlXNDOQtUo9ed0DNKgoSRcfe1D0aQRenVhgcbPBXf44=", "narHash": "sha256-mKJw6+HKC66g7yztoSMvcQo/sV7XkXWnxdEcFHqIQm8=",
"owner": "Daholli", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e880129391be2f558d6c205cfd931be338b3b707", "rev": "0ec0edf1d56a143488c61c1853531534b128a882",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Daholli", "owner": "nixos",
"ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e880129391be2f558d6c205cfd931be338b3b707",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-latest-minecraft": { "nixpkgs-latest-minecraft": {
"locked": { "locked": {
"lastModified": 1765340982, "lastModified": 1768319201,
"narHash": "sha256-ScoKn82baWwHH3BwUGUwFO71N3RdKWaEjWwQHT6sesE=", "narHash": "sha256-mKJw6+HKC66g7yztoSMvcQo/sV7XkXWnxdEcFHqIQm8=",
"owner": "ChandlerSwift", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "487be302ead911dc24db3068f6d9631f2db7585d", "rev": "0ec0edf1d56a143488c61c1853531534b128a882",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ChandlerSwift", "owner": "nixos",
"ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "487be302ead911dc24db3068f6d9631f2db7585d",
"type": "github" "type": "github"
} }
}, },

6
flake.nix
View file

@ -3,7 +3,7 @@
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
inputs = { inputs = rec {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default-linux"; systems.url = "github:nix-systems/default-linux";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@ -16,8 +16,8 @@
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/e880129391be2f558d6c205cfd931be338b3b707"; nixpkgs-latest-factorio = nixpkgs-master;
nixpkgs-latest-minecraft.url = "github:ChandlerSwift/nixpkgs/487be302ead911dc24db3068f6d9631f2db7585d"; nixpkgs-latest-minecraft = nixpkgs-master;
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";

3
modules/hosts/loptland/default.nix
View file

@ -48,7 +48,8 @@ topLevel: {
services.resolved = { services.resolved = {
enable = true; enable = true;
domains = [ "~." ];
settings.Resolve.Domains = [ "~." ];
}; };
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [

13
modules/server/factorio-server.nix
View file

@ -1,7 +1,16 @@
{ {
flake.modules.nixos.factorio-server = flake.modules.nixos.factorio-server =
{ config, ... }: {
config,
inputs,
pkgs,
...
}:
let let
latest-factorio = import inputs.nixpkgs-latest-factorio {
system = pkgs.stdenv.hostPlatform.system;
config.allowUnfree = true;
};
sopsFile = ../../secrets/secrets-loptland.yaml; sopsFile = ../../secrets/secrets-loptland.yaml;
in in
{ {
@ -46,6 +55,8 @@
services.factorio = { services.factorio = {
enable = true; enable = true;
package = latest-factorio.factorio-headless;
openFirewall = true; openFirewall = true;
public = true; public = true;
lan = true; lan = true;

2
modules/server/hydra.nix
View file

@ -30,6 +30,8 @@
services.hydra = { services.hydra = {
enable = true; enable = true;
package = pkgs.hydra.overrideAttrs { stdenv = pkgs.gcc14Stdenv; };
hydraURL = "http://localhost:${toString httpPort}"; hydraURL = "http://localhost:${toString httpPort}";
port = httpPort; port = httpPort;
notificationSender = "hydra@localhost"; notificationSender = "hydra@localhost";