Compare commits
4 commits
f27ed627ff
...
2b806582b5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b806582b5 | ||
|
|
ff6f15d2e3 | ||
| 572d2f09ae | |||
|
|
2bb91dff9b |
7 changed files with 64 additions and 6 deletions
11
flake.nix
11
flake.nix
|
|
@ -43,7 +43,7 @@
|
||||||
inherit modules;
|
inherit modules;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
rec {
|
||||||
homeConfigurations."anvaure@Allegro23-12" = homeConfig [
|
homeConfigurations."anvaure@Allegro23-12" = homeConfig [
|
||||||
{ home.username = "anvaure"; }
|
{ home.username = "anvaure"; }
|
||||||
./home/more-software.nix
|
./home/more-software.nix
|
||||||
|
|
@ -54,6 +54,15 @@
|
||||||
{ targets.genericLinux.enable = true; }
|
{ 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 [
|
homeConfigurations."ant@hs" = homeConfig [
|
||||||
{ home.username = "ant"; }
|
{ home.username = "ant"; }
|
||||||
./home/more-software.nix
|
./home/more-software.nix
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,9 @@
|
||||||
./fish.nix
|
./fish.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager needs a bit of information about you and the paths it should
|
nix.package = pkgs.nixVersions.latest;
|
||||||
# manage.
|
|
||||||
home.homeDirectory = "/home/${config.home.username}";
|
home.homeDirectory = "/home/${config.home.username}";
|
||||||
|
|
||||||
|
|
||||||
home.stateVersion = "23.05"; # Please read the comment before changing.
|
home.stateVersion = "23.05"; # Please read the comment before changing.
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -30,6 +28,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
|
EDITOR = "nvim";
|
||||||
GOPATH = "${config.home.homeDirectory}/.local/share/go";
|
GOPATH = "${config.home.homeDirectory}/.local/share/go";
|
||||||
GOMODCACHE = "${config.home.homeDirectory}/.cache/go/pkg/mod";
|
GOMODCACHE = "${config.home.homeDirectory}/.cache/go/pkg/mod";
|
||||||
CCACHE_MAXSIZE = "100Gi";
|
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 = [
|
services.udev.packages = [
|
||||||
pkgs.android-udev-rules
|
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, ... }:
|
{ config, pkgs, ... }:
|
||||||
let sshKeys = with (import ../sshKeys.nix); [
|
let sshKeys = with (import ../sshKeys.nix); [
|
||||||
hs
|
hs
|
||||||
|
basado
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -16,4 +17,13 @@ in
|
||||||
users.groups.remotebuild = {};
|
users.groups.remotebuild = {};
|
||||||
|
|
||||||
nix.settings.extra-trusted-users = [ "remotebuild" ];
|
nix.settings.extra-trusted-users = [ "remotebuild" ];
|
||||||
|
nix.settings.system-features = [
|
||||||
|
"benchmark"
|
||||||
|
"big-parallel"
|
||||||
|
"ca-derivations"
|
||||||
|
"kvm"
|
||||||
|
"nixos-test"
|
||||||
|
"gccarch-x86-64-v2"
|
||||||
|
"gccarch-x86-64-v3"
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ in {
|
||||||
../common.nix
|
../common.nix
|
||||||
../forgejo.nix
|
../forgejo.nix
|
||||||
(import ../remote-disk-unlock.nix ["r8169"] sshKeys)
|
(import ../remote-disk-unlock.nix ["r8169"] sshKeys)
|
||||||
|
../builder.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
|
@ -146,7 +147,6 @@ in {
|
||||||
|
|
||||||
nix.distributedBuilds = true;
|
nix.distributedBuilds = true;
|
||||||
nix.settings.builders-use-substitutes = true;
|
nix.settings.builders-use-substitutes = true;
|
||||||
|
|
||||||
nix.buildMachines = [
|
nix.buildMachines = [
|
||||||
{
|
{
|
||||||
hostName = "192.168.1.2";
|
hostName = "192.168.1.2";
|
||||||
|
|
@ -154,7 +154,7 @@ in {
|
||||||
sshUser = "remotebuild";
|
sshUser = "remotebuild";
|
||||||
sshKey = "/home/ant/.ssh/id_ed25519";
|
sshKey = "/home/ant/.ssh/id_ed25519";
|
||||||
system = pkgs.stdenv.hostPlatform.system;
|
system = pkgs.stdenv.hostPlatform.system;
|
||||||
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" ];
|
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../common.nix
|
../common.nix
|
||||||
|
../3proxy.nix
|
||||||
inputs.simple-nixos-mailserver.nixosModule
|
inputs.simple-nixos-mailserver.nixosModule
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue