Massive nixfmt reformatting
This commit is contained in:
parent
fe4492f004
commit
b29ddd5e65
109 changed files with 4323 additions and 2368 deletions
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
@ -11,46 +16,76 @@ in
|
|||
{
|
||||
imports = [ ./mounting.nix ];
|
||||
# Fonts
|
||||
config.fonts = {
|
||||
packages = with pkgs; mkForce [
|
||||
noto-fonts-emoji-blob-bin
|
||||
ibm-plex
|
||||
nerd-fonts
|
||||
noto-fonts
|
||||
(pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk)
|
||||
merriweather
|
||||
corefonts
|
||||
font-awesome
|
||||
hack-font # for Plasma
|
||||
];
|
||||
} // (if pkgs.stdenv.isLinux then {
|
||||
enableDefaultPackages = false;
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
emoji = lib.mkBefore [ "Blobmoji" ];
|
||||
serif = lib.mkBefore [ "IBM Plex Serif" "IBM Plex Sans JP" "IBM Plex Sans KR" "Blobmoji" ];
|
||||
sansSerif = lib.mkBefore [ "IBM Plex Sans" "IBM Plex Sans JP" "IBM Plex Sans KR" "Blobmoji" ];
|
||||
monospace = lib.mkBefore [ "IBM Plex Mono" "Font Awesome 6 Free" "Symbols Nerd Font" "Blobmoji" "IBM Plex Sans JP" ];
|
||||
};
|
||||
localConf = ''
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
||||
<fontconfig>
|
||||
<alias binding="same">
|
||||
<family>system-ui</family>
|
||||
<prefer>
|
||||
<family>IBM Plex Sans</family>
|
||||
<family>IBM Plex Sans JP</family>
|
||||
<family>IBM Plex Sans KR</family>
|
||||
<family>Blobmoji</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
</fontconfig>
|
||||
'';
|
||||
};
|
||||
fontDir.enable = true;
|
||||
} else { }) // (if pkgs.stdenv.isDarwin then {
|
||||
fontDir.enable = true;
|
||||
} else { });
|
||||
config.fonts =
|
||||
{
|
||||
packages =
|
||||
with pkgs;
|
||||
mkForce [
|
||||
noto-fonts-emoji-blob-bin
|
||||
ibm-plex
|
||||
nerd-fonts
|
||||
noto-fonts
|
||||
(pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk)
|
||||
merriweather
|
||||
corefonts
|
||||
font-awesome
|
||||
hack-font # for Plasma
|
||||
];
|
||||
}
|
||||
// (
|
||||
if pkgs.stdenv.isLinux then
|
||||
{
|
||||
enableDefaultPackages = false;
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
emoji = lib.mkBefore [ "Blobmoji" ];
|
||||
serif = lib.mkBefore [
|
||||
"IBM Plex Serif"
|
||||
"IBM Plex Sans JP"
|
||||
"IBM Plex Sans KR"
|
||||
"Blobmoji"
|
||||
];
|
||||
sansSerif = lib.mkBefore [
|
||||
"IBM Plex Sans"
|
||||
"IBM Plex Sans JP"
|
||||
"IBM Plex Sans KR"
|
||||
"Blobmoji"
|
||||
];
|
||||
monospace = lib.mkBefore [
|
||||
"IBM Plex Mono"
|
||||
"Font Awesome 6 Free"
|
||||
"Symbols Nerd Font"
|
||||
"Blobmoji"
|
||||
"IBM Plex Sans JP"
|
||||
];
|
||||
};
|
||||
localConf = ''
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
||||
<fontconfig>
|
||||
<alias binding="same">
|
||||
<family>system-ui</family>
|
||||
<prefer>
|
||||
<family>IBM Plex Sans</family>
|
||||
<family>IBM Plex Sans JP</family>
|
||||
<family>IBM Plex Sans KR</family>
|
||||
<family>Blobmoji</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
</fontconfig>
|
||||
'';
|
||||
};
|
||||
fontDir.enable = true;
|
||||
}
|
||||
else
|
||||
{ }
|
||||
)
|
||||
// (
|
||||
if pkgs.stdenv.isDarwin then
|
||||
{
|
||||
fontDir.enable = true;
|
||||
}
|
||||
else
|
||||
{ }
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
lib.mkIf pkgs.stdenv.isLinux {
|
||||
system.fsPackages = [ pkgs.bindfs ];
|
||||
fileSystems =
|
||||
|
@ -6,7 +11,11 @@ lib.mkIf pkgs.stdenv.isLinux {
|
|||
mkRoSymBind = path: {
|
||||
device = path;
|
||||
fsType = "fuse.bindfs";
|
||||
options = [ "ro" "resolve-symlinks" "x-gvfs-hide" ];
|
||||
options = [
|
||||
"ro"
|
||||
"resolve-symlinks"
|
||||
"x-gvfs-hide"
|
||||
];
|
||||
};
|
||||
aggregatedIcons = pkgs.buildEnv {
|
||||
name = "system-icons";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue