legacy nix don't understand braced options and options outside it both
This commit is contained in:
parent
7c4b000810
commit
8aecf23593
1 changed files with 7 additions and 6 deletions
|
|
@ -454,7 +454,7 @@ in
|
||||||
qt6.wrapQtAppsHook
|
qt6.wrapQtAppsHook
|
||||||
qt6.qttools
|
qt6.qttools
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
qt6.qtbase
|
qt6.qtbase
|
||||||
qt6.qtsvg
|
qt6.qtsvg
|
||||||
|
|
@ -473,7 +473,7 @@ in
|
||||||
lrelease "$f" -qm "$out_path"
|
lrelease "$f" -qm "$out_path"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
cmake --install build --prefix $out
|
cmake --install build --prefix $out
|
||||||
|
|
@ -602,7 +602,7 @@ in
|
||||||
sha256 = "sha256-nKK8HRzeqDixpdKmgacjhNzanJaTsAnYLC6nCbmWXuU=";
|
sha256 = "sha256-nKK8HRzeqDixpdKmgacjhNzanJaTsAnYLC6nCbmWXuU=";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
qtcreator
|
qtcreator
|
||||||
|
|
@ -675,7 +675,7 @@ in
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
inputs.guardant.nixosModules.grdcontrol
|
inputs.guardant.nixosModules.grdcontrol
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -709,6 +709,7 @@ in
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
efiSupport = true;
|
efiSupport = true;
|
||||||
|
configurationLimit = 5;
|
||||||
device = "nodev";
|
device = "nodev";
|
||||||
useOSProber = true;
|
useOSProber = true;
|
||||||
theme = "${pkgs.sleek-grub-theme.override {
|
theme = "${pkgs.sleek-grub-theme.override {
|
||||||
|
|
@ -723,6 +724,7 @@ in
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
device = "/dev/sda";
|
device = "/dev/sda";
|
||||||
|
configurationLimit = 5;
|
||||||
theme = "${pkgs.sleek-grub-theme.override {
|
theme = "${pkgs.sleek-grub-theme.override {
|
||||||
withStyle = "orange";
|
withStyle = "orange";
|
||||||
withBanner = "Загрузчик Linux";
|
withBanner = "Загрузчик Linux";
|
||||||
|
|
@ -761,8 +763,7 @@ in
|
||||||
randomizedDelaySec = "45min"; # машины не запускают GC одновременно
|
randomizedDelaySec = "45min"; # машины не запускают GC одновременно
|
||||||
options = "--delete-older-than 14d";
|
options = "--delete-older-than 14d";
|
||||||
};
|
};
|
||||||
# Хранить не более 5 поколений в меню GRUB
|
|
||||||
boot.loader.grub.configurationLimit = 5;
|
|
||||||
# Периодический TRIM для SSD (безопасен и на HDD — просто no-op)
|
# Периодический TRIM для SSD (безопасен и на HDD — просто no-op)
|
||||||
services.fstrim.enable = true;
|
services.fstrim.enable = true;
|
||||||
# nix-daemon стартует только после Yggdrasil, иначе nixos.builds.node недостижим
|
# nix-daemon стартует только после Yggdrasil, иначе nixos.builds.node недостижим
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue