summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrisha Shipunov2025-08-15 21:50:18 +0200
committerGrisha Shipunov2025-08-15 21:50:18 +0200
commit2e6e12741e0f1f3dc1d3a90ac9e691e3900e3b88 (patch)
treec3b638a45eda610d94e8716630049a1a5a9b8ef7
parenta17f4c1910550ee2fdb799f4a178ce9d29d02208 (diff)
reformat
-rw-r--r--hosts/auth/default.nix22
-rw-r--r--hosts/conduwuit/default.nix22
-rw-r--r--hosts/forgejo/default.nix22
-rw-r--r--hosts/immich/default.nix22
-rw-r--r--hosts/miniflux/default.nix22
-rw-r--r--hosts/radicale/default.nix22
-rw-r--r--hosts/stream/default.nix20
-rw-r--r--hosts/toaster/network/mullvad.nix34
-rw-r--r--modules/emacs.nix2
-rw-r--r--modules/wg/module.nix27
10 files changed, 107 insertions, 108 deletions
diff --git a/hosts/auth/default.nix b/hosts/auth/default.nix
index 05ca8c3..c0b4791 100644
--- a/hosts/auth/default.nix
+++ b/hosts/auth/default.nix
@@ -26,17 +26,17 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- socket = "store.socket";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ socket = "store.socket";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/conduwuit/default.nix b/hosts/conduwuit/default.nix
index 59beed8..a8ce1fb 100644
--- a/hosts/conduwuit/default.nix
+++ b/hosts/conduwuit/default.nix
@@ -26,17 +26,17 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- socket = "store.socket";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ socket = "store.socket";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/forgejo/default.nix b/hosts/forgejo/default.nix
index f6de473..37466b2 100644
--- a/hosts/forgejo/default.nix
+++ b/hosts/forgejo/default.nix
@@ -27,17 +27,17 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- socket = "store.socket";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ socket = "store.socket";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/immich/default.nix b/hosts/immich/default.nix
index 337984f..e097bf5 100644
--- a/hosts/immich/default.nix
+++ b/hosts/immich/default.nix
@@ -26,17 +26,17 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- socket = "store.socket";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ socket = "store.socket";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/miniflux/default.nix b/hosts/miniflux/default.nix
index d80f5b2..f5c5102 100644
--- a/hosts/miniflux/default.nix
+++ b/hosts/miniflux/default.nix
@@ -26,17 +26,17 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- socket = "store.socket";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ socket = "store.socket";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/radicale/default.nix b/hosts/radicale/default.nix
index 5b918b2..1f10f43 100644
--- a/hosts/radicale/default.nix
+++ b/hosts/radicale/default.nix
@@ -26,17 +26,17 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- socket = "store.socket";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ socket = "store.socket";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/stream/default.nix b/hosts/stream/default.nix
index 4543466..04e10a1 100644
--- a/hosts/stream/default.nix
+++ b/hosts/stream/default.nix
@@ -27,16 +27,16 @@ in
mac = mac;
}
];
- shares =
- [
- {
- source = "/nix/store";
- mountPoint = "/nix/.ro-store";
- tag = "store";
- proto = "virtiofs";
- }
- ]
- ++ map
+ shares = [
+ {
+ source = "/nix/store";
+ mountPoint = "/nix/.ro-store";
+ tag = "store";
+ proto = "virtiofs";
+ }
+ ]
+ ++
+ map
(dir: {
source = dir;
mountPoint = "/${dir}";
diff --git a/hosts/toaster/network/mullvad.nix b/hosts/toaster/network/mullvad.nix
index 54fec8d..85cca77 100644
--- a/hosts/toaster/network/mullvad.nix
+++ b/hosts/toaster/network/mullvad.nix
@@ -54,23 +54,23 @@
"::"
];
- routingPolicyRules =
- [
- {
- Family = "both";
- FirewallMark = 34952; # 0x8888
- InvertRule = true;
- Table = "1000";
- Priority = 100;
- }
- {
- Family = "both";
- SuppressPrefixLength = 0;
- Table = "main";
- Priority = 90;
- }
- ]
- ++ map
+ routingPolicyRules = [
+ {
+ Family = "both";
+ FirewallMark = 34952; # 0x8888
+ InvertRule = true;
+ Table = "1000";
+ Priority = 100;
+ }
+ {
+ Family = "both";
+ SuppressPrefixLength = 0;
+ Table = "main";
+ Priority = 90;
+ }
+ ]
+ ++
+ map
(net: {
# only route global addresses over VPN
Priority = 80;
diff --git a/modules/emacs.nix b/modules/emacs.nix
index 39c2db8..13ce0ee 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -55,6 +55,6 @@
]
)
);
- defaultEditor = lib.mkForce true;
+ defaultEditor = lib.mkForce false;
};
}
diff --git a/modules/wg/module.nix b/modules/wg/module.nix
index 1bb6f41..53ed2bb 100644
--- a/modules/wg/module.nix
+++ b/modules/wg/module.nix
@@ -18,20 +18,19 @@
name = "30-wg-${net.networkName}";
value = {
matchConfig.Name = "wg-${net.networkName}";
- networkConfig =
- {
- Address = net.hosts.${currenthost}.address;
- IPv6AcceptRA = false; # for now static IPv6
- }
- // (
- if net.hosts.${currenthost}.endpoint.enable then
- {
- IPv4Forwarding = true;
- IPv6Forwarding = true;
- }
- else
- { }
- );
+ networkConfig = {
+ Address = net.hosts.${currenthost}.address;
+ IPv6AcceptRA = false; # for now static IPv6
+ }
+ // (
+ if net.hosts.${currenthost}.endpoint.enable then
+ {
+ IPv4Forwarding = true;
+ IPv6Forwarding = true;
+ }
+ else
+ { }
+ );
};
}) networks;