整理一些设置

This commit is contained in:
陈浩南 2023-07-22 00:37:12 +08:00
parent 2a0c282b98
commit b9503264f9
5 changed files with 32 additions and 31 deletions

View File

@ -185,13 +185,13 @@
};
packages =
{
packages = [ "genshin-impact" "honkers-star-rail" ];
packages = [ "genshin-impact" "honkers-starrail" ];
};
boot.grub =
{
entries = localLib.stripeTabs
"
menuentry \"Windows\" {
''
menuentry "Windows" {
insmod part_gpt
insmod fat
insmod search_fs_uuid
@ -199,7 +199,7 @@
search --fs-uuid --set=root 7317-1DB6
chainloader /EFI/Microsoft/Boot/bootmgfw.efi
}
menuentry \"Windows for malware\" {
menuentry "Windows for malware" {
insmod part_gpt
insmod fat
insmod search_fs_uuid
@ -207,7 +207,7 @@
search --fs-uuid --set=root 7321-FA9C
chainloader /EFI/Microsoft/Boot/bootmgfw.efi
}
";
'';
installDevice = "efi";
};
system =

View File

@ -72,11 +72,6 @@ inputs:
};
# services
systemd.services =
{
nix-daemon = { environment = { TMPDIR = "/var/cache/nix"; }; serviceConfig = { CacheDirectory = "nix"; }; };
systemd-tmpfiles-setup = { environment = { SYSTEMD_TMPFILES_FORCE_SUBVOL = "0"; }; };
};
services =
{
snapper.configs.persistent =
@ -91,11 +86,6 @@ inputs:
TIMELINE_LIMIT_MONTHLY = "0";
TIMELINE_LIMIT_YEARLY = "0";
};
udev.extraRules =
''
ACTION=="add|change", KERNEL=="[sv]d[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
'';
};
};
}

View File

@ -5,21 +5,18 @@ inputs:
packages = mkOption { default = []; type = types.listOf (types.enum
[
# games
"genshin-impact" "honkers-star-rail"
"genshin-impact" "honkers-starrail"
]); };
};
config =
{
programs = {}
// (
if builtins.elem "genshin-impact" inputs.config.nixos.packages.packages
then { anime-game-launcher.enable = true; }
else {}
config = let inherit (inputs.lib) mkMerge mkIf; in mkMerge
[
(
mkIf (builtins.elem "genshin-impact" inputs.config.nixos.packages.packages)
{ programs.anime-game-launcher.enable = true; }
)
// (
if builtins.elem "honkers-star-rail" inputs.config.nixos.packages.packages
then { honkers-railway-launcher.enable = true; }
else {}
);
};
(
mkIf (builtins.elem "honkers-starrail" inputs.config.nixos.packages.packages)
{ programs.honkers-railway-launcher.enable = true; }
)
];
}

View File

@ -4,8 +4,22 @@ inputs:
{
hostname = mkOption { type = types.nonEmptyStr; };
};
config = let inherit (inputs.lib) mkMerge mkIf; inherit (inputs.localLib) mkConditional; in mkMerge
config = let inherit (inputs.lib) mkMerge mkIf; inherit (inputs.localLib) mkConditional stripeTabs; in mkMerge
[
# generic
{
systemd.services =
{
nix-daemon = { environment = { TMPDIR = "/var/cache/nix"; }; serviceConfig = { CacheDirectory = "nix"; }; };
systemd-tmpfiles-setup = { environment = { SYSTEMD_TMPFILES_FORCE_SUBVOL = "0"; }; };
};
services.udev.extraRules = stripeTabs
''
ACTION=="add|change", KERNEL=="[sv]d[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
'';
}
# hostname
{ networking.hostName = inputs.config.nixos.system.hostname; }
];
}

View File

@ -6,4 +6,4 @@
enableNvidia = true;
storageDriver = "overlay2";
};
}
}