Jaculabilis
/
nixos-configs
1
1
Fork 0
Code Releases Activity

Compare commits

base: Jaculabilis:6587d700661904b12374ab59100b5b3aec697164
Branches Tags
Jaculabilis:master
Jaculabilis:guesshtbook
Jaculabilis:syncthings
Jaculabilis:backyard
Jaculabilis:machine/workeric
Jaculabilis:machine/serveric
..
compare: Jaculabilis:b3a1f104ffcea9808c80123fa99e3323a3f2ec75
Branches Tags
Jaculabilis:master
Jaculabilis:guesshtbook
Jaculabilis:syncthings
Jaculabilis:backyard
Jaculabilis:machine/workeric
Jaculabilis:machine/serveric

No commits in common. "6587d700661904b12374ab59100b5b3aec697164" and "b3a1f104ffcea9808c80123fa99e3323a3f2ec75" have entirely different histories.
6587d70066 ... b3a1f104ff

3 changed files with 8 additions and 108 deletions
Show Stats Expand all files Collapse all files

78
flake.lock
View File

@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@ -31,76 +31,9 @@
"type": "github"
}
},
"intake": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"nixos-shell": "nixos-shell",
"nixpkgs": [
"nixpkgs-next"
]
},
"locked": {
"lastModified": 1687319998,
"narHash": "sha256-hF0vdFqyss2cHDVdPmf7IiHGz9V+Hoj6RY4pQmWxfGw=",
"ref": "refs/heads/master",
"rev": "f9611d598a5d2bff4f3ca025e1b6df51b01bd0b2",
"revCount": 65,
"type": "git",
"url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"
}
},
"intake-sources": {
"inputs": {
"nixpkgs": [
"nixpkgs-next"
]
},
"locked": {
"lastModified": 1687286801,
"narHash": "sha256-QoazlG8YZGaOdswfyy9mlllYzhILPLPrnDD2UorN9Dg=",
"ref": "refs/heads/master",
"rev": "a4883480ae278c874a9a16782bf233bf70b87243",
"revCount": 14,
"type": "git",
"url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git"
}
},
"nixos-shell": {
"inputs": {
"nixpkgs": [
"intake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1686216465,
"narHash": "sha256-0A4K6xVIyxUi2YZu4+156WwzAO1GDWGcKiMvsXpBQDQ=",
"owner": "Mic92",
"repo": "nixos-shell",
"rev": "65489e7eeef8eeea43e1e4218ad1b99d58852c7c",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nixos-shell",
"type": "github"
}
},
"nixos-wsl": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
@ -154,9 +87,6 @@
},
"root": {
"inputs": {
"flake-compat": "flake-compat",
"intake": "intake",
"intake-sources": "intake-sources",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs",
"nixpkgs-next": "nixpkgs-next"

31
flake.nix
View File

@ -2,34 +2,15 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/22.11";
nixpkgs-next.url = "github:NixOS/nixpkgs/23.05";
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
nixos-wsl = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
};
intake = {
url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git";
inputs.nixpkgs.follows = "nixpkgs-next";
inputs.flake-compat.follows = "flake-compat";
};
intake-sources = {
url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git";
inputs.nixpkgs.follows = "nixpkgs-next";
};
nixos-wsl.url = "github:nix-community/NixOS-WSL";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = {
self,
nixpkgs,
nixpkgs-next,
flake-compat,
nixos-wsl,
intake,
intake-sources,
nixos-wsl
}: {
nixosConfigurations = {
catacomb = nixpkgs.lib.nixosSystem {
@ -38,11 +19,7 @@
};
empyrean = nixpkgs-next.lib.nixosSystem {
system = "x86_64-linux";
modules = [
intake.nixosModules.default
intake-sources.nixosModules.default
./machine/empyrean
];
modules = [ ./machine/empyrean ];
};
stagirite = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";

7
machine/empyrean/default.nix
View File

@ -143,12 +143,6 @@
};
};
services.intake = {
listen = { addr = "10.22.20.1"; port = 5234; };
users.tvb.enable = true;
users.tvb.extraPackages = [ pkgs.intakeSources ];
};
networking.firewall = {
enable = true;
allowPing = true;
@ -157,7 +151,6 @@
80 # http
443 # https
655 # tinc
5234# intake
];
allowedUDPPorts = [
655 # tinc