Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration of transmission layer: Tor->Lokinet #76

Draft
wants to merge 1 commit into
base: central
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ We are using:
* [mission-control](https://github.comPlatonic-Systems/mission-control) to administrate this repository
* [lanzaboote](https://github.com/nix-community/lanzaboote) for declarative secure boot
* [nixos-generators](https://github.com/nix-community/nixos-generators) to generate filesystem images
* [LOKINET](https://lokinet.org) Low-latency Post-Quantum Safe (NTRU Prime) onion-router acting as a transmission layer between systems

Trusted community members are welcomed to commit their systems for collective administration and share of resources.

Expand Down Expand Up @@ -177,4 +178,4 @@ This can easily safe you few Gigabytes if you don't have set maximum number of g

Credit: [Samuel Sung](https://codeberg.org/samuelsung)

*Feel Free To Add Your Tips*
*Feel Free To Add Your Tips*
4 changes: 4 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@
inputs.nixpkgs.legacyPackages.${system}.sbctl # To set up secureboot
inputs.nixpkgs.legacyPackages.${system}.fira-code # For liquratures in code editors

# Networking
inputs.nixpkgs.legacyPackages.${system}.nmap
inputs.nixpkgs.legacyPackages.${system}.dig

inputs.nixos-generators.packages.${system}.nixos-generate

inputs.disko.packages.${system}.disko-install
Expand Down
8 changes: 4 additions & 4 deletions src/nixos/machines/mracek/config/security.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ in {
}

# Enforce to use the Tor Proxy
(mkIf config.services.tor.enable {
networking.proxy.default = mkDefault "socks5://127.0.0.1:9050";
networking.proxy.noProxy = mkDefault "127.0.0.1,localhost";
})
# (mkIf config.services.tor.enable {
# networking.proxy.default = mkDefault "socks5://127.0.0.1:9050";
# networking.proxy.noProxy = mkDefault "127.0.0.1,localhost";
# })
];
}
3 changes: 2 additions & 1 deletion src/nixos/machines/mracek/config/setup.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ in {
nix.distributedBuilds = true; # Perform distributed builds

services.gitea.enable = true;
services.lokinet.enable = true;
services.monero.enable = true;
services.murmur.enable = true;
services.navidrome.enable = true;
Expand All @@ -23,4 +24,4 @@ in {
users.users.root.openssh.authorizedKeys.keys = mkIf config.services.openssh.enable [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOzh6FRxWUemwVeIDsr681fgJ2Q2qCnwJbvFe4xD15ve [email protected]" # Allow root access for the Super Administrator (KREYREN)
];
}
}
1 change: 1 addition & 0 deletions src/nixos/machines/mracek/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ in {
./services/binfmt.nix
./services/distributedBuilds.nix
./services/gitea.nix
./services/lokinet.nix
./services/monero.nix
./services/murmur.nix
./services/navidrome.nix
Expand Down
13 changes: 13 additions & 0 deletions src/nixos/machines/mracek/services/lokinet.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{ config, ... }:

# Lokinet Management of MRACEK

{
networking.nameservers = [ config.services.lokinet.settings.dns.bind ]; # Use the Lokinet-provided DNS server to resolve .loki addresses

# WARNING(Krey): This Needs To Be Made Impermanent otherwise reboot will refresh the key
services.lokinet.settings.network.keyfile = "snappkey.private"; # Set the keyfile so that the loki URL remains the same after service restart

# FIXME(Krey): We need to set a URL alias for
# services.lokinet.settings.network.mapaddr = "somewhereInTheDark.loki:sinnenfreude.systems.nxl";
}
1 change: 1 addition & 0 deletions src/nixos/machines/sinnenfreude/config/setup.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

services.flatpak.enable = true;
services.openssh.enable = true;
services.lokinet.enable = true;
services.tor.enable = true;

# Desktop Environment
Expand Down
1 change: 1 addition & 0 deletions src/nixos/machines/sinnenfreude/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

./services/binfmt.nix
./services/distributedBuilds.nix
./services/lokinet.nix
./services/openssh.nix
./services/tor.nix
];
Expand Down
13 changes: 13 additions & 0 deletions src/nixos/machines/sinnenfreude/services/lokinet.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{ config, ... }:

# Lokinet Management of SINNENFREUDE

{
networking.nameservers = [ config.services.lokinet.settings.dns.bind ]; # Use the Lokinet-provided DNS server to resolve .loki addresses

# WARNING(Krey): This Needs To Be Made Impermanent otherwise reboot will refresh the key
services.lokinet.settings.network.keyfile = "snappkey.private"; # Set the keyfile so that the loki URL remains the same after service restart

# FIXME(Krey): We need to set a URL alias for
# services.lokinet.settings.network.mapaddr = "somewhereInTheDark.loki:sinnenfreude.systems.nxl";
}
16 changes: 8 additions & 8 deletions src/nixos/users/kreyren/home/modules/system/dconf/dconf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ in {
temperature-unit = "kelvin";
};

# Set up Proxy
"system/proxy" = {
mode = "manual";
};
"system/proxy/socks" = {
host = "127.0.0.1";
port = 9050;
};
# # Set up Proxy
# "system/proxy" = {
# mode = "manual";
# };
# "system/proxy/socks" = {
# host = "127.0.0.1";
# port = 9050;
# };

# Bottles
"com/usebottles/bottles" = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ in {
};
PromptForDownloadLocation = true;
Proxy = {
Mode = "system"; # none | system | manual | autoDetect | autoConfig;
Locked = true;
Mode = "manual"; # none | system | manual | autoDetect | autoConfig;
Locked = true; # Do not allow the user to change the proxy settings
# HTTPProxy = hostname;
# UseHTTPProxyForAllProtocols = true;
# SSLProxy = hostname;
Expand Down