Compare commits
4 Commits
updated-in
...
updated-in
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f85cc7524b | ||
| 7e30b6e408 | |||
| 91ee2cc15b | |||
| 9b3d9993f4 |
@@ -7,6 +7,9 @@
|
|||||||
gptfdisk
|
gptfdisk
|
||||||
parted
|
parted
|
||||||
grow-last-partition-and-filesystem
|
grow-last-partition-and-filesystem
|
||||||
|
pciutils
|
||||||
|
lshw
|
||||||
|
ethtool
|
||||||
|
|
||||||
# Normal usage
|
# Normal usage
|
||||||
htop
|
htop
|
||||||
|
|||||||
6
flake.lock
generated
6
flake.lock
generated
@@ -650,11 +650,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765186076,
|
"lastModified": 1765472234,
|
||||||
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
|
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
|
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
tunnelInterfaceName = "ds-lite-ncfttb";
|
tunnelInterfaceName = "ds-lite-ncfttb";
|
||||||
lanInterfaces = [
|
lanInterfaces = [
|
||||||
{
|
{
|
||||||
name = "net-heimnetz";
|
name = "enp2s0";
|
||||||
sla_id = 201;
|
sla_id = 201;
|
||||||
prefix_len = 64;
|
prefix_len = 64;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,17 +3,9 @@
|
|||||||
{
|
{
|
||||||
|
|
||||||
## DSL-Uplink
|
## DSL-Uplink
|
||||||
networking.vlans."enp1s0.10" = {
|
|
||||||
id = 10;
|
|
||||||
interface = "enp1s0";
|
|
||||||
};
|
|
||||||
networking.vlans."enp3s0.10" = {
|
networking.vlans."enp3s0.10" = {
|
||||||
id = 10;
|
id = 10;
|
||||||
interface = "enp3s0";
|
interface = "enp3s0";
|
||||||
};
|
};
|
||||||
networking.bridges."net-dsl".interfaces = [
|
|
||||||
"enp1s0.10"
|
|
||||||
"enp3s0.10"
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,24 +3,16 @@
|
|||||||
{
|
{
|
||||||
|
|
||||||
## Heimnetz
|
## Heimnetz
|
||||||
networking.vlans."enp1s0.201" = {
|
networking.interfaces."enp2s0".ipv6.addresses = [
|
||||||
id = 201;
|
|
||||||
interface = "enp1s0";
|
|
||||||
};
|
|
||||||
networking.bridges."net-heimnetz".interfaces = [
|
|
||||||
"enp1s0.201"
|
|
||||||
"enp2s0"
|
|
||||||
];
|
|
||||||
networking.interfaces."net-heimnetz".ipv6.addresses = [
|
|
||||||
{ address = "fe80::1"; prefixLength = 64; }
|
{ address = "fe80::1"; prefixLength = 64; }
|
||||||
{ address = "fd00:152:152:4::1"; prefixLength = 64; }
|
{ address = "fd00:152:152:4::1"; prefixLength = 64; }
|
||||||
];
|
];
|
||||||
networking.interfaces."net-heimnetz".ipv4.addresses = [
|
networking.interfaces."enp2s0".ipv4.addresses = [
|
||||||
{ address = "10.152.4.1"; prefixLength = 24; }
|
{ address = "10.152.4.1"; prefixLength = 24; }
|
||||||
];
|
];
|
||||||
|
|
||||||
services.radvd.config = ''
|
services.radvd.config = ''
|
||||||
interface net-heimnetz {
|
interface enp2s0 {
|
||||||
AdvSendAdvert on;
|
AdvSendAdvert on;
|
||||||
MaxRtrAdvInterval 30;
|
MaxRtrAdvInterval 30;
|
||||||
prefix ::/64 {
|
prefix ::/64 {
|
||||||
@@ -35,7 +27,7 @@
|
|||||||
services.kea.dhcp4 = {
|
services.kea.dhcp4 = {
|
||||||
settings = {
|
settings = {
|
||||||
interfaces-config = {
|
interfaces-config = {
|
||||||
interfaces = [ "net-heimnetz" ];
|
interfaces = [ "enp2s0" ];
|
||||||
};
|
};
|
||||||
subnet4 = [
|
subnet4 = [
|
||||||
# Heimnetz
|
# Heimnetz
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
peers.ncfttb = {
|
peers.ncfttb = {
|
||||||
config = ''
|
config = ''
|
||||||
plugin pppoe.so net-dsl
|
plugin pppoe.so enp3s0.10
|
||||||
user "''${PPPD_NETCOLOGNE_USERNAME}"
|
user "''${PPPD_NETCOLOGNE_USERNAME}"
|
||||||
ifname ppp-ncfttb
|
ifname ppp-ncfttb
|
||||||
persist
|
persist
|
||||||
|
|||||||
@@ -13,6 +13,10 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
profiles.clerie.desktop.enable = true;
|
profiles.clerie.desktop.enable = true;
|
||||||
|
profiles.clerie.desktop.users = [
|
||||||
|
"clerie"
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
|||||||
@@ -6,6 +6,11 @@ with lib;
|
|||||||
|
|
||||||
options.profiles.clerie.desktop = {
|
options.profiles.clerie.desktop = {
|
||||||
enable = mkEnableOption "clerie Desktop Config";
|
enable = mkEnableOption "clerie Desktop Config";
|
||||||
|
users = mkOption {
|
||||||
|
type = with types; listOf str;
|
||||||
|
default = [];
|
||||||
|
description = "Names of users that are considered desktop users and therefore get special permissions";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|||||||
@@ -2,9 +2,13 @@
|
|||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
{
|
let
|
||||||
|
|
||||||
config = mkIf config.profiles.clerie.desktop.enable {
|
cfg = config.profiles.clerie.desktop;
|
||||||
|
|
||||||
|
in {
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
networking.networkmanager.settings = {
|
networking.networkmanager.settings = {
|
||||||
connectivity = {
|
connectivity = {
|
||||||
@@ -15,6 +19,8 @@ with lib;
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.groups.networkmanager.members = cfg.users;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user