nyanloutre/nixos-config
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nyanloutre:e3fb937c8af0fa2575a760121de2de72360837ca
Branches Tags
nyanloutre:master
..
compare: nyanloutre:7de8b4703b72e40240c53515f565bc03b6aa11fd
Branches Tags
nyanloutre:master

No commits in common. "e3fb937c8af0fa2575a760121de2de72360837ca" and "7de8b4703b72e40240c53515f565bc03b6aa11fd" have entirely different histories.
e3fb937c8a ... 7de8b4703b

4 changed files with 14 additions and 56 deletions
Show Stats Expand all files Collapse all files

56
flake.lock generated
View File

@ -1,21 +1,5 @@
{ {
"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"
}
},
"dogetipbot-telegram": { "dogetipbot-telegram": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -75,11 +59,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1640077788, "lastModified": 1639891440,
"narHash": "sha256-YMSDk3hlucJTTARaHNOeQEF6zEW3A/x4sXgrz94VbS0=", "narHash": "sha256-FJxa6ObwOQKZy3VhwN5bJRzX+MV/Yq9WLHK/4jlPKrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77", "rev": "e6377ff35544226392b49fa2cf05590f9f0c4b43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,28 +72,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-21_05": {
"locked": {
"lastModified": 1625692408,
"narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c06613c25df3fe1dd26243847a3c105cf6770627",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-21.05",
"type": "indirect"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1640139330, "lastModified": 1639876010,
"narHash": "sha256-Nkp3wUOGwtoQ7EH28RLVJ7EqB/e0TU7VcsM7GLy+SdY=", "narHash": "sha256-naGsoUfsY92NaIGiFI8XFXBnesw8BQGe694xcfaLMDI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d", "rev": "395879c28386e1abf20c7ecacd45880759548391",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,27 +99,22 @@
}, },
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable"
],
"nixpkgs-21_05": "nixpkgs-21_05",
"nixpkgs-21_11": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1638911354, "lastModified": 1622967674,
"narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=", "narHash": "sha256-8RLe6Rqy2rKR/PGDMg/EVsWihsO+DQe/RYmlXdRZkLs=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303", "rev": "5675b122a947b40e551438df6a623efad19fd2e7",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-21.11", "ref": "nixos-21.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }

7
flake.nix
View File

@ -4,11 +4,8 @@
nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
simple-nixos-mailserver = { simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.05";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-21_11.follows = "nixpkgs";
};
}; };
dogetipbot-telegram = { dogetipbot-telegram = {
url = "gitlab:nyanloutre/dogetipbot-telegram/master"; url = "gitlab:nyanloutre/dogetipbot-telegram/master";

5
systems/LoutreOS/configuration.nix
View File

@ -112,10 +112,7 @@
}; };
systemd.network.networks = { systemd.network.networks = {
"40-bouygues" = { "40-bouygues".dhcpV4Config.RouteMetric = 1;
dhcpV4Config.RouteMetric = 1;
networkConfig.KeepConfiguration = "dhcp-on-stop";
};
"40-enp0s21u2".dhcpV4Config.RouteMetric = 1024; "40-enp0s21u2".dhcpV4Config.RouteMetric = 1024;
}; };

2
systems/LoutreOS/services.nix
View File

@ -87,7 +87,7 @@ in
}; };
rspamd.workers.controller.extraConfig = '' rspamd.workers.controller.extraConfig = ''
secure_ip = ["0.0.0.0/0"]; secure_ip = ["127.0.0.1", "10.30.135.71"];
''; '';
redis.enable = true; redis.enable = true;