1

Reformat using alejandra

This commit is contained in:
2023-05-24 14:55:07 +02:00
parent c46b68b7dc
commit 76d13c61ba
7 changed files with 64 additions and 59 deletions

View File

@ -6,7 +6,7 @@
... ...
}: let }: let
# create a module that only contains the options # create a module that only contains the options
toModule = name: {options.modules.${name} = (import ../../home/modules/${name}/options.nix {inherit lib mylib;});}; toModule = name: {options.modules.${name} = import ../../home/modules/${name}/options.nix {inherit lib mylib;};};
# evaluate a single module # evaluate a single module
evalModule = name: (lib.evalModules {modules = [(toModule name)];}); evalModule = name: (lib.evalModules {modules = [(toModule name)];});
@ -15,7 +15,8 @@
optionsDoc = name: pkgs.nixosOptionsDoc {options = (evalModule name).options;}; optionsDoc = name: pkgs.nixosOptionsDoc {options = (evalModule name).options;};
# copy the markdown for a single generated optionsDoc # copy the markdown for a single generated optionsDoc
optionsMD = name: stdenv.mkDerivation { optionsMD = name:
stdenv.mkDerivation {
src = ./.; src = ./.;
name = "options-doc-${name}"; name = "options-doc-${name}";
buildPhase = '' buildPhase = ''
@ -35,7 +36,8 @@
''; '';
}; };
in in
names: pkgs.symlinkJoin { names:
pkgs.symlinkJoin {
name = "modules-options-doc-md"; name = "modules-options-doc-md";
paths = (map optionsMD names) ++ [index]; paths = (map optionsMD names) ++ [index];
}; };

View File

@ -5,23 +5,19 @@
fetchurl, fetchurl,
fetchFromGitHub, fetchFromGitHub,
gsettings-desktop-schemas, gsettings-desktop-schemas,
gtk3 gtk3,
}: }:
# TODO: This doesn't run. Why does it work like this (APPIMAGE_DEBUG_EXEC=bash appimage-run WiiUDownloader-Linux-x86_64.AppImage) though? # TODO: This doesn't run. Why does it work like this (APPIMAGE_DEBUG_EXEC=bash appimage-run WiiUDownloader-Linux-x86_64.AppImage) though?
# pkgs.appimageTools.wrapType2 rec { # pkgs.appimageTools.wrapType2 rec {
# name = "WiiUDownloader"; # name = "WiiUDownloader";
# version = "v1.32"; # version = "v1.32";
# src = fetchurl { # src = fetchurl {
# url = "https://github.com/Xpl0itU/WiiUDownloader/releases/download/${version}/WiiUDownloader-Linux-x86_64.AppImage"; # url = "https://github.com/Xpl0itU/WiiUDownloader/releases/download/${version}/WiiUDownloader-Linux-x86_64.AppImage";
# sha256 = "sha256-YWLQd/Wmz5BDyc+oe6JQkT849DaPc5HtJXIDZKUdHNE="; # sha256 = "sha256-YWLQd/Wmz5BDyc+oe6JQkT849DaPc5HtJXIDZKUdHNE=";
# }; # };
# profile = '' # profile = ''
# export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS # export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
# ''; # '';
# # extraPkgs = pkgs: with pkgs; [ # # extraPkgs = pkgs: with pkgs; [
# # ]; # # ];
# } # }
@ -83,6 +79,7 @@ let
runHook postInstall runHook postInstall
''; '';
}; };
in pkgs.writeShellScriptBin "wiiu-downloader-wrapped" '' in
pkgs.writeShellScriptBin "wiiu-downloader-wrapped" ''
XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" ${wiiu-downloader}/bin/WiiUDownloader XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" ${wiiu-downloader}/bin/WiiUDownloader
'' ''

View File

@ -77,8 +77,7 @@ with mylib.modules;
linkFontDir = linkFontDir =
lib.hm.dag.entryAfter ["writeBoundary"] lib.hm.dag.entryAfter ["writeBoundary"]
(mkLink "/run/current-system/sw/share/X11/fonts" "${config.home.homeDirectory}/.local/share/fonts/fonts"); (mkLink "/run/current-system/sw/share/X11/fonts" "${config.home.homeDirectory}/.local/share/fonts/fonts");
copyBaseFonts = copyBaseFonts = lib.hm.dag.entryAfter ["writeBoundary"] ''
lib.hm.dag.entryAfter ["writeBoundary"] ''
cp -f ${pkgs.lxgw-wenkai}/share/fonts/truetype/LXGWWenKaiMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/ cp -f ${pkgs.lxgw-wenkai}/share/fonts/truetype/LXGWWenKaiMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
cp -f ${pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/ cp -f ${pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
cp -f ${pkgs.noto-fonts}/share/fonts/noto/NotoSans[wdth,wght].ttf ${config.home.homeDirectory}/.local/share/fonts/ cp -f ${pkgs.noto-fonts}/share/fonts/noto/NotoSans[wdth,wght].ttf ${config.home.homeDirectory}/.local/share/fonts/
@ -89,8 +88,7 @@ with mylib.modules;
unlinkFontDir = unlinkFontDir =
lib.hm.dag.entryAfter ["writeBoundary"] lib.hm.dag.entryAfter ["writeBoundary"]
(mkUnlink "${config.home.homeDirectory}/.local/share/fonts/fonts"); (mkUnlink "${config.home.homeDirectory}/.local/share/fonts/fonts");
deleteBaseFonts = deleteBaseFonts = lib.hm.dag.entryAfter ["writeBoundary"] ''
lib.hm.dag.entryAfter ["writeBoundary"] ''
rm ${config.home.homeDirectory}/.local/share/fonts/LXGWWenKaiMono-Regular.ttf rm ${config.home.homeDirectory}/.local/share/fonts/LXGWWenKaiMono-Regular.ttf
rm ${config.home.homeDirectory}/.local/share/fonts/JetBrainsMonoNerdFontMono-Regular.ttf rm ${config.home.homeDirectory}/.local/share/fonts/JetBrainsMonoNerdFontMono-Regular.ttf
rm ${config.home.homeDirectory}/.local/share/fonts/NotoSans[wdth,wght].ttf rm ${config.home.homeDirectory}/.local/share/fonts/NotoSans[wdth,wght].ttf

View File

@ -32,14 +32,16 @@ with mylib.networking; {
}; };
wireguard-tunnels = { wireguard-tunnels = {
wg0-de-115 = (mkWireguardService wg0-de-115 = (
mkWireguardService
"wg0-de-115" "wg0-de-115"
"proton-de-115.key" "proton-de-115.key"
"9+CorlxrTsQR7qjIOVKsEkk8Z7UUS5WT3R1ccF7a0ic=" "9+CorlxrTsQR7qjIOVKsEkk8Z7UUS5WT3R1ccF7a0ic="
"194.126.177.14" "194.126.177.14"
); );
wg0-lu-16 = (mkWireguardService wg0-lu-16 = (
mkWireguardService
"wg0-lu-16" "wg0-lu-16"
"proton-lu-16.key" "proton-lu-16.key"
"asu9KtQoZ3iKwELsDTgjPEiFNcD1XtgGgy3O4CZFg2w=" "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 # NOTE: Don't do this with HomeManager as I need the fonts in the fontdir for flatpak apps
fonts = with pkgs; [ fonts = with pkgs; [
# Monospace fonts # Monospace fonts
(nerdfonts.override {fonts = [ (nerdfonts.override {
fonts = [
"JetBrainsMono" "JetBrainsMono"
];}) ];
})
# Sans/Serif fonts # Sans/Serif fonts
noto-fonts noto-fonts

View File

@ -240,11 +240,15 @@
# NOTE: This doesn't work, since the cidfile is located in /run, which is not writable for regular users... # 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 # 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: !( system2user = attrs:
n == "confinement" || lib.mergeAttrs (lib.attrsets.filterAttrs (n: v:
n == "runner" || !(
n == "environment" n
)) attrs) { == "confinement"
|| n == "runner"
|| n == "environment"
))
attrs) {
startLimitIntervalSec = 1; startLimitIntervalSec = 1;
startLimitBurst = 5; startLimitBurst = 5;
}; };