primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-17 08:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

carbon: refactor carbon modules

Browse source
This commit is contained in:
Primrose 2024-11-18 21:43:51 +01:00
parent f03b3e8c22
commit 03bf3d121a
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
8 changed files with 110 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nix/nixosModules/named/carbon/bluetooth.nix
View file

@ -1,15 +0,0 @@
{
hardware.bluetooth.enable = true;
services.blueman.enable = true;
# FIXME: this breaks the handsfree microphone mode for XM4
# environment.etc = {
# "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
# bluez_monitor.properties = {
# ["bluez5.enable-sbc-xq"] = true,
# ["bluez5.enable-msbc"] = true,
# ["bluez5.enable-hw-volume"] = true,
# ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
# }
# '';
# };
}

69
nix/nixosModules/named/carbon/connectivity.nix Normal file
View file

@ -0,0 +1,69 @@
{ config, lib, ... }:
{
networking = {
networkmanager.enable = lib.mkForce false;
firewall.allowedTCPPorts = [ 8080 ];
wireless = {
enable = true;
userControlled.enable = true;
secretsFile = config.age.secrets.wpa_password.path;
networks =
let
ordered =
nss:
lib.pipe nss [
lib.lists.reverseList
(lib.lists.imap0 (i: lib.mapAttrs (_: n: n // { priority = i; })))
lib.mergeAttrsList
];
in
ordered [
# first in list is tried first
{
"HiddenParadize@Earth2077".pskRaw = "ext:HOME";
"Pei’s Wifi".pskRaw = "ext:PEI";
}
{
"_SNCF_WIFI_INOUI" = { };
"EurostarTrainsWiFi" = { };
}
{
eduroam = {
authProtocols = [ "WPA-EAP" ];
auth = ''
pairwise=CCMP
group=CCMP TKIP
eap=PEAP
ca_cert="${./certs/universite_de_rennes.pem}"
identity="ychiang@etudiant.univ-rennes.fr"
altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr"
phase2="auth=MSCHAPV2"
password=ext:EDUROAM
anonymous_identity="anonymous@univ-rennes.fr"
'';
};
}
{ "iPhone de Léana 江".pskRaw = "ext:PHONE"; }
];
};
};
hardware.bluetooth.enable = true;
services.blueman.enable = true;
# FIXME: this breaks the handsfree microphone mode for XM4
# environment.etc = {
# "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
# bluez_monitor.properties = {
# ["bluez5.enable-sbc-xq"] = true,
# ["bluez5.enable-msbc"] = true,
# ["bluez5.enable-hw-volume"] = true,
# ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
# }
# '';
# };
}

13
nix/nixosModules/named/carbon/default.nix
View file

@ -3,19 +3,18 @@
./hardware-configuration.nix # generated
./battery.nix
./audio.nix
./networking.nix
./bluetooth.nix
./connectivity.nix
./input.nix
./display.nix
./scanner.nix
./gui.nix
./restic.nix
./fs.nix
./packages.nix
./gui.nix
./db.nix # M1 BDD course
];
@ -66,7 +65,5 @@
restic_backblaze_env.file = ../../../secrets/restic_backblaze_env.age;
};
hardware.keyboard.zsa.enable = true;
services.fwupd.enable = true;
}

11
nix/nixosModules/named/carbon/gui.nix
View file

@ -53,15 +53,4 @@ in
"class_i = 'fcitx'"
];
};
services.libinput = {
mouse = {
naturalScrolling = true;
accelSpeed = "-0.5";
};
touchpad = {
naturalScrolling = true;
tapping = false;
};
};
}

22
nix/nixosModules/named/carbon/input.nix Normal file
View file

@ -0,0 +1,22 @@
{
hardware.keyboard.zsa.enable = true;
services.libinput = {
mouse = {
naturalScrolling = true;
accelSpeed = "-0.5";
};
touchpad = {
naturalScrolling = true;
tapping = false;
};
};
users.users.leana.extraGroups = [ "scanner" ];
hardware.sane = {
enable = true;
brscan5.enable = true;
};
}

51
nix/nixosModules/named/carbon/networking.nix
View file

@ -1,51 +0,0 @@
{ config, lib, ... }:
{
networking.networkmanager.enable = lib.mkForce false;
networking.firewall.allowedTCPPorts = [ 8080 ];
networking.wireless = {
enable = true;
userControlled.enable = true;
secretsFile = config.age.secrets.wpa_password.path;
networks =
let
ordered =
nss:
lib.pipe nss [
lib.lists.reverseList
(lib.lists.imap0 (i: lib.mapAttrs (_: n: n // { priority = i; })))
lib.mergeAttrsList
];
in
ordered [
# first in list is tried first
{
"HiddenParadize@Earth2077".pskRaw = "ext:HOME";
"Pei’s Wifi".pskRaw = "ext:PEI_PASSWORD";
}
{
"_SNCF_WIFI_INOUI" = { };
"EurostarTrainsWiFi" = { };
}
{
eduroam = {
authProtocols = [ "WPA-EAP" ];
auth = ''
pairwise=CCMP
group=CCMP TKIP
eap=PEAP
ca_cert="${./certs/universite_de_rennes.pem}"
identity="@EDUROAM_ID@"
altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr"
phase2="auth=MSCHAPV2"
password=ext:EDUROAM_PSK
anonymous_identity="anonymous@univ-rennes.fr"
'';
};
}
{ "iPhone de Léana 江".pskRaw = "ext:PHONE"; }
];
};
}

8
nix/nixosModules/named/carbon/scanner.nix
View file

@ -1,8 +0,0 @@
{
users.users.leana.extraGroups = [ "scanner" ];
hardware.sane = {
enable = true;
brscan5.enable = true;
};
}