Compare commits
9 Commits
859feb0b61
...
wip
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2619b4344 | ||
|
|
f2bde9ffea
|
||
|
|
0d6001d655
|
||
|
|
a0e8a74906
|
||
|
|
e719948a3e
|
||
|
|
3f281f1980
|
||
|
|
6ed4aa08f6
|
||
|
|
9bfa21368b
|
||
|
|
4eb7749967
|
@@ -64,6 +64,7 @@ in
|
|||||||
./roles/media
|
./roles/media
|
||||||
./roles/memtest86
|
./roles/memtest86
|
||||||
./roles/minimal_base
|
./roles/minimal_base
|
||||||
|
./roles/mitmproxy
|
||||||
./roles/network
|
./roles/network
|
||||||
./roles/nix_index
|
./roles/nix_index
|
||||||
./roles/nix_repl
|
./roles/nix_repl
|
||||||
|
|||||||
14
nix/configuration/flake.lock
generated
14
nix/configuration/flake.lock
generated
@@ -170,11 +170,11 @@
|
|||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785893730,
|
"lastModified": 1788488145,
|
||||||
"narHash": "sha256-K3pjEDafWrpfC1dc14icLxx9tWx4c/dfKTeiDYoZU7Q=",
|
"narHash": "sha256-s1UY+kbLtb+5ye4GnE/HKh0idUQ0iiIkMMtGI7cDRHk=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "83f05b36778dd90d4e15e0d020685d9388cbaea1",
|
"rev": "8b28dfb583e094f52fd6ab70c709cc1981d8853d",
|
||||||
"revCount": 39,
|
"revCount": 46,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://code.fizz.buzz/talexander/nix_builder.git"
|
"url": "https://code.fizz.buzz/talexander/nix_builder.git"
|
||||||
},
|
},
|
||||||
@@ -185,11 +185,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787498568,
|
"lastModified": 1788752844,
|
||||||
"narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
|
"narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
|
"rev": "dc5d91f840324650bac8c379428c7037a416959a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -118,6 +118,7 @@
|
|||||||
me.lvfs.enable = true;
|
me.lvfs.enable = true;
|
||||||
me.media.enable = true;
|
me.media.enable = true;
|
||||||
me.memtest.enable = true;
|
me.memtest.enable = true;
|
||||||
|
me.mitmproxy.enable = true;
|
||||||
me.network.enable = true;
|
me.network.enable = true;
|
||||||
me.nix_index.enable = true;
|
me.nix_index.enable = true;
|
||||||
me.nix_repl.enable = true;
|
me.nix_repl.enable = true;
|
||||||
|
|||||||
@@ -111,6 +111,7 @@
|
|||||||
me.lvfs.enable = true;
|
me.lvfs.enable = true;
|
||||||
me.media.enable = true;
|
me.media.enable = true;
|
||||||
me.memtest.enable = true;
|
me.memtest.enable = true;
|
||||||
|
me.mitmproxy.enable = true;
|
||||||
me.network.enable = true;
|
me.network.enable = true;
|
||||||
me.nix_index.enable = true;
|
me.nix_index.enable = true;
|
||||||
me.nix_repl.enable = true;
|
me.nix_repl.enable = true;
|
||||||
|
|||||||
@@ -72,5 +72,9 @@ in
|
|||||||
git_fix_author
|
git_fix_author
|
||||||
rsync_clone
|
rsync_clone
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Disable installing documentation.
|
||||||
|
documentation.doc.enable = false;
|
||||||
|
documentation.nixos.enable = false;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
config = lib.mkIf (config.me.firefox.enable && config.me.graphical) {
|
config = lib.mkIf (config.me.firefox.enable && config.me.graphical) {
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { });
|
package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { withPipewire = true; }) { });
|
||||||
languagePacks = [ "en-US" ];
|
languagePacks = [ "en-US" ];
|
||||||
preferences = {
|
preferences = {
|
||||||
# "identity.sync.tokenserver.uri": "https://ffsync.fizz.buzz/token/1.0/sync/1.5";
|
# "identity.sync.tokenserver.uri": "https://ffsync.fizz.buzz/token/1.0/sync/1.5";
|
||||||
@@ -134,7 +134,7 @@
|
|||||||
users.talexander = {
|
users.talexander = {
|
||||||
directories = [
|
directories = [
|
||||||
{
|
{
|
||||||
directory = ".mozilla";
|
directory = ".config/mozilla";
|
||||||
user = "talexander";
|
user = "talexander";
|
||||||
group = "talexander";
|
group = "talexander";
|
||||||
mode = "0700";
|
mode = "0700";
|
||||||
|
|||||||
@@ -100,6 +100,7 @@
|
|||||||
IFS=$'\n\t'
|
IFS=$'\n\t'
|
||||||
DIR="$( cd "$( dirname "''${BASH_SOURCE[0]}" )" && pwd )"
|
DIR="$( cd "$( dirname "''${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
NIX_REMOTE='local?root=/.disk/root' RUST_BACKTRACE=1 RUST_LOG=nix_builder=DEBUG ${nix_builder.packages.x86_64-linux.default}/bin/nix-builder clean --config ${./files/nix_builder.toml}
|
||||||
NIX_REMOTE='local?root=/.disk/root' RUST_BACKTRACE=1 RUST_LOG=nix_builder=DEBUG ${nix_builder.packages.x86_64-linux.default}/bin/nix-builder build --config ${./files/nix_builder.toml} ${builtins.concatStringsSep " " build_flags}
|
NIX_REMOTE='local?root=/.disk/root' RUST_BACKTRACE=1 RUST_LOG=nix_builder=DEBUG ${nix_builder.packages.x86_64-linux.default}/bin/nix-builder build --config ${./files/nix_builder.toml} ${builtins.concatStringsSep " " build_flags}
|
||||||
'';
|
'';
|
||||||
restartIfChanged = false;
|
restartIfChanged = false;
|
||||||
|
|||||||
25
nix/configuration/roles/mitmproxy/default.nix
Normal file
25
nix/configuration/roles/mitmproxy/default.nix
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [ ];
|
||||||
|
|
||||||
|
options.me = {
|
||||||
|
mitmproxy.enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
example = true;
|
||||||
|
description = "Whether we want to install mitmproxy.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.me.mitmproxy.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
mitmproxy
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -6,6 +6,8 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
# Alternative DNS servers:
|
# Alternative DNS servers:
|
||||||
|
# "194.242.2.2#doh.mullvad.net"
|
||||||
|
# "2a07:e340::2#doh.mullvad.net"
|
||||||
# "1.0.0.1#cloudflare-dns.com"
|
# "1.0.0.1#cloudflare-dns.com"
|
||||||
# "1.1.1.1#cloudflare-dns.com"
|
# "1.1.1.1#cloudflare-dns.com"
|
||||||
# "2606:4700:4700::1001#cloudflare-dns.com"
|
# "2606:4700:4700::1001#cloudflare-dns.com"
|
||||||
@@ -14,6 +16,10 @@
|
|||||||
# "8.8.8.8#dns.google"
|
# "8.8.8.8#dns.google"
|
||||||
# "2001:4860:4860::8844#dns.google"
|
# "2001:4860:4860::8844#dns.google"
|
||||||
# "2001:4860:4860::8888#dns.google"
|
# "2001:4860:4860::8888#dns.google"
|
||||||
|
# "9.9.9.10#dns10.quad9.net"
|
||||||
|
# "149.112.112.10#dns10.quad9.net"
|
||||||
|
# "2620:fe::10#dns10.quad9.net"
|
||||||
|
# "2620:fe::fe:10#dns10.quad9.net"
|
||||||
|
|
||||||
let
|
let
|
||||||
patchScriptBin =
|
patchScriptBin =
|
||||||
@@ -39,8 +45,10 @@ in
|
|||||||
networking.dhcpcd.enable = lib.mkDefault false;
|
networking.dhcpcd.enable = lib.mkDefault false;
|
||||||
networking.useDHCP = lib.mkDefault false;
|
networking.useDHCP = lib.mkDefault false;
|
||||||
networking.nameservers = [
|
networking.nameservers = [
|
||||||
"194.242.2.2#doh.mullvad.net"
|
"9.9.9.10#dns10.quad9.net"
|
||||||
"2a07:e340::2#doh.mullvad.net"
|
"149.112.112.10#dns10.quad9.net"
|
||||||
|
"2620:fe::10#dns10.quad9.net"
|
||||||
|
"2620:fe::fe:10#dns10.quad9.net"
|
||||||
];
|
];
|
||||||
services.resolved = {
|
services.resolved = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -64,6 +64,10 @@
|
|||||||
};
|
};
|
||||||
nix.settings.auto-optimise-store = !config.me.buildingPortable;
|
nix.settings.auto-optimise-store = !config.me.buildingPortable;
|
||||||
|
|
||||||
|
# Disable installing documentation.
|
||||||
|
documentation.doc.enable = false;
|
||||||
|
documentation.nixos.enable = false;
|
||||||
|
|
||||||
environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
|
environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
|
||||||
hideMounts = true;
|
hideMounts = true;
|
||||||
directories = [
|
directories = [
|
||||||
|
|||||||
6
nix/kubernetes/flake.lock
generated
6
nix/kubernetes/flake.lock
generated
@@ -164,11 +164,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1784120854,
|
"lastModified": 1788752844,
|
||||||
"narHash": "sha256-KesHgItiZPgGX740axSiQLcIQ8D24MDqNpkKYWIek8k=",
|
"narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "753cc8a3a87467296ddd1fa93f0cc3e81120ee46",
|
"rev": "dc5d91f840324650bac8c379428c7037a416959a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
gptfdisk # cgdisk
|
gptfdisk # cgdisk
|
||||||
arp-scan # To find devices on the network
|
arp-scan # To find devices on the network
|
||||||
ldns # for drill
|
ldns # for drill
|
||||||
|
parted
|
||||||
];
|
];
|
||||||
|
|
||||||
# This can make debugging easier by rejecting packets instead of dropping them:
|
# This can make debugging easier by rejecting packets instead of dropping them:
|
||||||
|
|||||||
Reference in New Issue
Block a user