pederbs/config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

nord gnome dbus stuff

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2023-03-11 00:30:24 +01:00
parent dfd4e54fcc
commit 1abe47b0c2
25 changed files with 756 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
profiles/graphical/gnome/default.nix → profiles/desktop/gnome/default.nix
View File

@@ -1,3 +1,4 @@
{ pkgs, ... }:
{
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;

6
profiles/desktop/sound/alsa.nix Normal file
View File

@@ -0,0 +1,6 @@
{
sound.enable = true; # alsa sound?
#sound.mediaKeys.enable = true # only enable if headless
security.rtkit.enable = true; # optional
}

9
profiles/graphical/pipewire/default.nix → profiles/desktop/sound/pipewire.nix
View File

@@ -1,7 +1,8 @@
{
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
hardware.pulseaudio.enable = false; # gnome defaults it to true
#sound.enable = true # alsa? likely conflicts with pipewire
#sound.mediaKeys.enable = true # alsa? only enable if headless
services.pipewire.enable = true;
services.pipewire.alsa.enable = true;
services.pipewire.alsa.support32Bit = true;
@@ -10,4 +11,6 @@
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#services.pipewire.media-session.enable = true;
security.rtkit.enable = true; # optional
}

11
profiles/desktop/sound/pulseaudio.nix Normal file
View File

@@ -0,0 +1,11 @@
{ pkgs, ... }:
{
sound.enable = true; # alsa, needed?
#sound.mediaKeys.enable = true # only enable if headless
hardware.pulseaudio.enable = true;
hardware.pulseaudio.package = pkgs.pulseaudioFull; # optional
#hardware.pulseaudio.support32Bit = true;
nixpkgs.config.pulseaudio = true;
security.rtkit.enable = true; # optional
}

77
profiles/domeneshop-dyndns/default.nix
View File

@@ -1,40 +1,55 @@
{ config, pkgs, lib, ... }:
let
cfg = config.services.domeneshop-updater;
in
{
# auto domain update
systemd.services.domeneshop-updater = {
description = "domene.shop domain updater";
after = [ "network-online.target" ]; # TODO: multi-user ?
wants = [ "network-online.target" ]; # TODO: multi-user ?
serviceConfig = let
prog = pkgs.writeShellApplication {
name = "domeneshop-dyndns-updater.sh";
runtimeInputs = with pkgs; [ curl yq ];
text = ''
test -s /var/lib/secrets/domeneshop.toml || {
>&2 echo "ERROR: /var/lib/secrets/domeneshop.toml not found!"
exit 1
}
DOMENESHOP_TOKEN="$( tomlq </var/lib/secrets/domeneshop.toml .secrets.DOMENESHOP_TOKEN --raw-output)"
DOMENESHOP_SECRET="$(tomlq </var/lib/secrets/domeneshop.toml .secrets.DOMENESHOP_SECRET --raw-output)"
curl https://"$DOMENESHOP_TOKEN":"$DOMENESHOP_SECRET"@api.domeneshop.no/v0/dyndns/update?hostname=olavtr.pbsds.net
'';
};
in {
User = "domeneshop";
Group = "domeneshop";
DynamicUser = true;
ExecStart = "${prog}/bin/domeneshop-dyndns-updater.sh";
PrivateTmp = true;
options = with lib; {
services.domeneshop-updater.target = mkOption {
type = types.string;
#default = config.networking.fqdn;
};
};
systemd.timers.domeneshop-updater = let interval = "5h"; in {
description = "Update domene.shop every ${interval}";
wantedBy = [ "timers.target" ];
timerConfig = {
OnBootSec = "5m";
OnUnitInactiveSec = interval;
Unit = "domeneshop-updater.service";
config = {
systemd.services.domeneshop-updater = {
description = "domene.shop dyndns domain updater";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = let
prog = pkgs.writeShellApplication {
name = "domeneshop-dyndns-updater.sh";
runtimeInputs = with pkgs; [ curl yq ];
text = ''
test -s /var/lib/secrets/domeneshop.toml || {
>&2 echo "ERROR: /var/lib/secrets/domeneshop.toml not found!"
exit 1
}
DOMENESHOP_TOKEN="$( tomlq </var/lib/secrets/domeneshop.toml .secrets.DOMENESHOP_TOKEN --raw-output)"
DOMENESHOP_SECRET="$(tomlq </var/lib/secrets/domeneshop.toml .secrets.DOMENESHOP_SECRET --raw-output)"
curl https://"$DOMENESHOP_TOKEN":"$DOMENESHOP_SECRET"@api.domeneshop.no/v0/dyndns/update?hostname=${cfg.target}
'';
};
in {
User = "domeneshop";
Group = "domeneshop";
DynamicUser = true;
ExecStart = "${prog}/bin/domeneshop-dyndns-updater.sh";
PrivateTmp = true;
};
};
systemd.timers.domeneshop-updater = let interval = "2h"; in {
description = "Update domene.shop every ${interval}";
wantedBy = [ "timers.target" ];
timerConfig = {
OnBootSec = "5m";
OnUnitInactiveSec = interval;
Unit = "domeneshop-updater.service";
};
};
};
}

26
profiles/remote-builders/default.nix
View File

@@ -9,12 +9,24 @@ let
# find 'publicKey' with `ssh-keyscan`
remotes = [
/** /
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "nord.pbsds.net"; # TODO: port 24
sshUser = "pbsds";
maxJobs = 2; # 4 cores
#maxJobs = 1; # at least for big-parallel
speedFactor = 2;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
#mandatoryFeatures = [ ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBSdIUtUfAxnVbPDmDDFdP2S3Wd3+CC8IfZAANJ76oh";
}
/**/
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "bolle.pbsds.net";
sshUser = "pbsds";
maxJobs = 16;
maxJobs = 12; # 12 cores
#maxJobs = 1; # at least for big-parallel
speedFactor = 2;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
@@ -27,9 +39,9 @@ let
/**/
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "noximilien.pbsds.net";
hostName = "noximilien.pbsds.net"; # TODO: port 23
sshUser = "pbsds";
maxJobs = 4;
maxJobs = 4; # 8 cores
#maxJobs = 1; # at least for big-parallel
speedFactor = 1;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
@@ -41,7 +53,7 @@ let
systems = ["x86_64-linux"];
hostName = "rocm.pbsds.net";
sshUser = "pbsds";
maxJobs = 8;
maxJobs = 8; # 16 cores
#maxJobs = 4;
#maxJobs = 1; # at least for big-parallel
speedFactor = 2;
@@ -57,7 +69,7 @@ let
systems = ["x86_64-linux"];
hostName = "isvegg.pvv.ntnu.no";
sshUser = "pederbs";
maxJobs = 2;
maxJobs = 2; # 4 cores
speedFactor = 0;
publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU=";
}
@@ -65,7 +77,7 @@ let
systems = ["x86_64-linux"];
hostName = "eirin.pvv.ntnu.no";
sshUser = "pederbs";
maxJobs = 2;
maxJobs = 2; # 8 cores
speedFactor = 0;
publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBILGULKEzYe5kPorM0rWATv10qq6debfCuYUYqw3HWZm4Y5Pi7mVKcf8lKFNPc1DxT/dStfxxtHj/2fbezaxElk=";
}
@@ -73,7 +85,7 @@ let
systems = ["x86_64-linux"];
hostName = "demiurgen.pvv.ntnu.no";
sshUser = "pederbs";
maxJobs = 2;
maxJobs = 2; # 8 cores
speedFactor = 0;
publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKw92q3eB5HZbKJN3p+80MtirqcXPu01USE9LnoGYJuDvko1udjIy4UR0wAwELqgs+r7mJyuQPeXmOZKwjHP6tM=";
}