Compare commits
5 commits
2b806582b5
...
f27ed627ff
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f27ed627ff | ||
|
|
2e7866d816 | ||
|
|
d541dbc854 | ||
| ce3aadf4f0 | |||
|
|
ad97f8329a |
7 changed files with 62 additions and 6 deletions
11
flake.nix
11
flake.nix
|
|
@ -43,7 +43,7 @@
|
|||
inherit modules;
|
||||
};
|
||||
in
|
||||
{
|
||||
rec {
|
||||
homeConfigurations."anvaure@Allegro23-12" = homeConfig [
|
||||
{ home.username = "anvaure"; }
|
||||
./home/more-software.nix
|
||||
|
|
@ -54,6 +54,15 @@
|
|||
{ targets.genericLinux.enable = true; }
|
||||
];
|
||||
|
||||
homeConfigurations."anvaure@msm-lnx-ipva-01" = homeConfig [
|
||||
{ home.username = "anvaure"; }
|
||||
./home/base.nix
|
||||
({pkgs, ...}: {
|
||||
programs.fish.loginShellInit = "source ${pkgs.nix}/etc/profile.d/nix.fish";
|
||||
})
|
||||
];
|
||||
homeConfigurations."anvaure@msm-lnx-demo-01" = homeConfigurations."anvaure@msm-lnx-ipva-01";
|
||||
|
||||
homeConfigurations."ant@hs" = homeConfig [
|
||||
{ home.username = "ant"; }
|
||||
./home/more-software.nix
|
||||
|
|
|
|||
|
|
@ -5,11 +5,9 @@
|
|||
./fish.nix
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
nix.package = pkgs.nixVersions.latest;
|
||||
home.homeDirectory = "/home/${config.home.username}";
|
||||
|
||||
|
||||
home.stateVersion = "23.05"; # Please read the comment before changing.
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
@ -30,6 +28,7 @@
|
|||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
GOPATH = "${config.home.homeDirectory}/.local/share/go";
|
||||
GOMODCACHE = "${config.home.homeDirectory}/.cache/go/pkg/mod";
|
||||
CCACHE_MAXSIZE = "100Gi";
|
||||
|
|
|
|||
26
os/3proxy.nix
Normal file
26
os/3proxy.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
services._3proxy = {
|
||||
enable = true;
|
||||
services = [
|
||||
{
|
||||
type = "socks";
|
||||
auth = [ "strong" ];
|
||||
acl = [ {
|
||||
rule = "allow";
|
||||
users = [ "user1" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
usersFile = "/etc/3proxy.passwd";
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"3proxy.passwd".text = ''
|
||||
user1:CR:$1$TqAb0wvc$e.O2GhdhXaMYSxNdNBmzh/
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 1080 ];
|
||||
networking.firewall.allowedUDPPorts = [ 1080 ];
|
||||
}
|
||||
|
|
@ -107,4 +107,17 @@ in
|
|||
services.udev.packages = [
|
||||
pkgs.android-udev-rules
|
||||
];
|
||||
|
||||
nix.distributedBuilds = true;
|
||||
nix.settings.builders-use-substitutes = true;
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "192.168.1.5";
|
||||
protocol = "ssh-ng";
|
||||
sshUser = "remotebuild";
|
||||
sshKey = "/home/ant/.ssh/id_ed25519";
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
let sshKeys = with (import ../sshKeys.nix); [
|
||||
hs
|
||||
basado
|
||||
];
|
||||
in
|
||||
{
|
||||
|
|
@ -16,4 +17,9 @@ in
|
|||
users.groups.remotebuild = {};
|
||||
|
||||
nix.settings.extra-trusted-users = [ "remotebuild" ];
|
||||
nix.settings.extra-system-features = [
|
||||
"gccarch-x86-64-v2"
|
||||
"gccarch-x86-64-v3"
|
||||
"gccarch-znver2"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ in {
|
|||
../common.nix
|
||||
../forgejo.nix
|
||||
(import ../remote-disk-unlock.nix ["r8169"] sshKeys)
|
||||
../builder.nix
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
|
@ -146,7 +147,6 @@ in {
|
|||
|
||||
nix.distributedBuilds = true;
|
||||
nix.settings.builders-use-substitutes = true;
|
||||
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "192.168.1.2";
|
||||
|
|
@ -154,7 +154,9 @@ in {
|
|||
sshUser = "remotebuild";
|
||||
sshKey = "/home/ant/.ssh/id_ed25519";
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" ];
|
||||
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
|
||||
}
|
||||
];
|
||||
|
||||
nix.settings.store-auto-optimise = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ in {
|
|||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../common.nix
|
||||
../3proxy.nix
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue