christoph/flake-nixinator
1
Fork 0
Code Activity

Reformat using alejandra

Browse Source
This commit is contained in:
Christoph Urlacher
2023-05-24 14:55:07 +02:00
parent c46b68b7dc
commit 76d13c61ba
7 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
system/default.nix
View File

@ -9,7 +9,7 @@
config,
pkgs,
...
}:
}:
with mylib.networking; {
imports = [
# Import my system modules
@ -32,14 +32,16 @@ with mylib.networking; {
};
wireguard-tunnels = {
wg0-de-115 = (mkWireguardService
wg0-de-115 = (
mkWireguardService
"wg0-de-115"
"proton-de-115.key"
"9+CorlxrTsQR7qjIOVKsEkk8Z7UUS5WT3R1ccF7a0ic="
"194.126.177.14"
);
wg0-lu-16 = (mkWireguardService
wg0-lu-16 = (
mkWireguardService
"wg0-lu-16"
"proton-lu-16.key"
"asu9KtQoZ3iKwELsDTgjPEiFNcD1XtgGgy3O4CZFg2w="
@ -302,9 +304,11 @@ with mylib.networking; {
# NOTE: Don't do this with HomeManager as I need the fonts in the fontdir for flatpak apps
fonts = with pkgs; [
# Monospace fonts
(nerdfonts.override {fonts = [
"JetBrainsMono"
];})
(nerdfonts.override {
fonts = [
"JetBrainsMono"
];
})
# Sans/Serif fonts
noto-fonts
@ -318,9 +322,9 @@ with mylib.networking; {
fontconfig = {
enable = true;
defaultFonts = {
serif = [ "Noto Serif CJK SC" ];
sansSerif = [ "Noto Sans CJK SC" ];
monospace = [ "JetBrainsMono Nerd Font Mono" ];
serif = ["Noto Serif CJK SC"];
sansSerif = ["Noto Sans CJK SC"];
monospace = ["JetBrainsMono Nerd Font Mono"];
};
};
};

26
system/nixinator/default.nix
View File

@ -135,7 +135,7 @@
hydra = {
image = "linuxserver/nzbhydra2:5.1.8";
autoStart = false;
extraOptions = [
"--network=ns:/var/run/netns/vpn"
"--dns=10.2.0.1"
@ -238,17 +238,21 @@
# Make the system services available to the user
# NOTE: This doesn't work, since the cidfile is located in /run, which is not writable for regular users...
systemd.user.services = let
systemd.user.services = let
# Filter all system service attributes that the user units don't have and add some required attributes
system2user = attrs: lib.mergeAttrs (lib.attrsets.filterAttrs (n: v: !(
n == "confinement" ||
n == "runner" ||
n == "environment"
)) attrs) {
startLimitIntervalSec = 1;
startLimitBurst = 5;
};
system2user = attrs:
lib.mergeAttrs (lib.attrsets.filterAttrs (n: v:
!(
n
== "confinement"
|| n == "runner"
|| n == "environment"
))
attrs) {
startLimitIntervalSec = 1;
startLimitBurst = 5;
};
in {
# podman-stablediffusion = system2user config.systemd.services.podman-stablediffusion;
# podman-stablediffusion = system2user config.systemd.services.podman-stablediffusion;
};
}