Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma 2: use tinc-pre per default

Browse Source
This commit is contained in:
makefu 2016-03-15 13:20:14 +01:00
parent 4588c5a19b
commit 2e317bfe74
9 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krebs/3modules/makefu/default.nix
View File

@ -35,6 +35,7 @@ with config.krebs.lib;
addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128"]; addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128"];
aliases = [ aliases = [
"darth.retiolum" "darth.retiolum"
"darth.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

2
makefu/1systems/darth.nix
View File

@ -8,9 +8,7 @@ with config.krebs.lib;
../. ../.
]; ];
krebs.build.host = config.krebs.hosts.darth;
krebs.retiolum.enable = true; krebs.retiolum.enable = true;
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039"; boot.loader.grub.device = "/dev/disk/by-id/ata-ADATA_SSD_S599_64GB_10460000000000000039";
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [

1
makefu/1systems/gum.nix
View File

@ -24,7 +24,6 @@ in {
]; ];
services.smartd.devices = [ { device = "/dev/sda";} ]; services.smartd.devices = [ { device = "/dev/sda";} ];
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
###### stable ###### stable
krebs.build.host = config.krebs.hosts.gum; krebs.build.host = config.krebs.hosts.gum;

1
makefu/1systems/omo.nix
View File

@ -122,7 +122,6 @@ in {
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
zramSwap.enable = true; zramSwap.enable = true;
zramSwap.numDevices = 2;
krebs.build.host = config.krebs.hosts.omo; krebs.build.host = config.krebs.hosts.omo;
} }

4
makefu/1systems/pnp.nix
View File

@ -43,10 +43,8 @@
krebs.build.host = config.krebs.hosts.pnp; krebs.build.host = config.krebs.hosts.pnp;
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
25 25
]; ];
} }

3
makefu/1systems/pornocauster.nix
View File

@ -38,9 +38,6 @@
]; ];
krebs.retiolum.enable = true; krebs.retiolum.enable = true;
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
};
# steam # steam
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.pulseaudio.support32Bit = true; hardware.pulseaudio.support32Bit = true;

6
makefu/1systems/repunit.nix
View File

@ -41,7 +41,7 @@
}; };
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
jq jq
]; ];
} }

3
makefu/1systems/vbob.nix
View File

@ -14,9 +14,6 @@
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
};
krebs.build.source.upstream-nixpkgs = { krebs.build.source.upstream-nixpkgs = {
url = https://github.com/makefu/nixpkgs; url = https://github.com/makefu/nixpkgs;

1
makefu/1systems/wry.nix
View File

@ -52,7 +52,6 @@ in {
krebs.nginx.enable = true; krebs.nginx.enable = true;
krebs.retiolum-bootstrap.enable = true; krebs.retiolum-bootstrap.enable = true;
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
krebs.tinc_graphs = { krebs.tinc_graphs = {
enable = true; enable = true;
nginx = { nginx = {