fixes for updates
This commit is contained in:
parent
1e0a1710f9
commit
edee9e5b1d
12
common.nix
12
common.nix
@ -17,12 +17,11 @@
|
|||||||
|
|
||||||
services.earlyoom.enable = lib.mkDefault true;
|
services.earlyoom.enable = lib.mkDefault true;
|
||||||
|
|
||||||
# based mosh
|
|
||||||
programs.mosh.enable = lib.mkDefault true;
|
programs.mosh.enable = lib.mkDefault true;
|
||||||
|
|
||||||
# Make Nix things not ruin my life when using a HDD
|
systemd.services.nix-gc.serviceConfig.IOSchedulingPriority = lib.mkDefault 7;
|
||||||
systemd.services.nix-daemon.serviceConfig.IOSchedulingClass = lib.mkDefault 3;
|
systemd.services.nix-gc.serviceConfig.IOSchedulingClass = lib.mkDefault "idle";
|
||||||
systemd.services.nix-gc.serviceConfig.IOSchedulingClass = lib.mkDefault 3;
|
systemd.services.nix-gc.serviceConfig.CPUSchedulingPolicy = lib.mkDefault "idle";
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
package = lib.mkDefault pkgs.nixUnstable;
|
package = lib.mkDefault pkgs.nixUnstable;
|
||||||
@ -33,8 +32,9 @@
|
|||||||
options = lib.mkDefault "--delete-older-than 40d";
|
options = lib.mkDefault "--delete-older-than 40d";
|
||||||
};
|
};
|
||||||
|
|
||||||
daemonIONiceLevel = lib.mkDefault 7;
|
daemonIOSchedPriority = lib.mkDefault 7;
|
||||||
daemonNiceLevel = lib.mkDefault 19;
|
daemonIOSchedClass = lib.mkDefault "idle";
|
||||||
|
daemonCPUSchedPolicy = lib.mkDefault "idle";
|
||||||
trustedUsers = [ "root" "builder" "@wheel" ];
|
trustedUsers = [ "root" "builder" "@wheel" ];
|
||||||
|
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
|
@ -572,10 +572,7 @@ in
|
|||||||
|
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
nix-direnv = {
|
nix-direnv.enable = lib.mkDefault true;
|
||||||
enable = lib.mkDefault true;
|
|
||||||
enableFlakes = lib.mkDefault true;
|
|
||||||
};
|
|
||||||
stdlib = ''
|
stdlib = ''
|
||||||
: ''${XDG_CACHE_HOME:=$HOME/.cache}
|
: ''${XDG_CACHE_HOME:=$HOME/.cache}
|
||||||
declare -A direnv_layout_dirs
|
declare -A direnv_layout_dirs
|
||||||
|
@ -76,10 +76,24 @@ in
|
|||||||
home.packages =
|
home.packages =
|
||||||
let
|
let
|
||||||
newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
|
newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
|
||||||
newwinetricks = pkgs.winetricks.override { wine = newwine; };
|
newwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
|
||||||
|
pathAdd = "${newwine}/bin:" + old.pathAdd;
|
||||||
|
postInstall = ''
|
||||||
|
sed -i \
|
||||||
|
-e '2i PATH="${pathAdd}"' \
|
||||||
|
"$out/bin/winetricks"
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
|
||||||
oldwine = pkgs.wineWowPackages.full;
|
oldwine = pkgs.wineWowPackages.full;
|
||||||
oldwinetricks = pkgs.winetricks.override { wine = oldwine; };
|
oldwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
|
||||||
|
pathAdd = "${oldwine}/bin:" + old.pathAdd;
|
||||||
|
postInstall = ''
|
||||||
|
sed -i \
|
||||||
|
-e '2i PATH="${pathAdd}"' \
|
||||||
|
"$out/bin/winetricks"
|
||||||
|
'';
|
||||||
|
});
|
||||||
in
|
in
|
||||||
with pkgs; [
|
with pkgs; [
|
||||||
oldwine
|
oldwine
|
||||||
|
Loading…
Reference in New Issue
Block a user