From 0892872e77cb87d319bbcb52444cdaa12ce2c61e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 2 Nov 2023 08:20:26 +0100 Subject: [PATCH] Recompile for my specific cpu --- flake.nix | 4 +-- modules/users/jopejoe1/default.nix | 2 +- overlays/default.nix | 42 +++++++++++++++++++++++++++++- systems/kami/default.nix | 12 ++++++--- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 79919d6..67f8ee4 100644 --- a/flake.nix +++ b/flake.nix @@ -114,8 +114,8 @@ ./modules/minecraft-server ./modules/kate ./modules/theming - ./modules/auto-update - ./modules/services/repo-sync + #./modules/auto-update + #./modules/services/repo-sync ./modules/users/jopejoe1 ./modules/users/root ./overlays diff --git a/modules/users/jopejoe1/default.nix b/modules/users/jopejoe1/default.nix index 318774a..499385b 100644 --- a/modules/users/jopejoe1/default.nix +++ b/modules/users/jopejoe1/default.nix @@ -14,7 +14,7 @@ packages = with pkgs; [ libsForQt5.kate libsForQt5.ark - libreoffice-qt + #libreoffice-qt texlive.combined.scheme-full ] ++ lib.optionals (config.system == "x86_64-linux") [ discord diff --git a/overlays/default.nix b/overlays/default.nix index c47cae6..6804739 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,12 +8,52 @@ prismlauncher.overlays.default nur.overlay - (_self: super: { + (_self: super: rec { tela-icon-theme = super.tela-icon-theme.overrideAttrs (_old: { src = self.inputs.tela-icon-theme; }); + libreoffice-fresh-unwrapped = super.libreoffice-fresh-unwrapped.overrideAttrs (_old: { + doCheck = false; + }); + + haskellPackages = super.haskellPackages.override { + overrides = hsSelf: hsSuper: { + crypton = super.haskell.lib.overrideCabal hsSuper.crypton (oa: { + doCheck = false; + }); + crypton-x509-validation = super.haskell.lib.overrideCabal hsSuper.crypton-x509-validation (oa: { + doCheck = false; + }); + tls = super.haskell.lib.overrideCabal hsSuper.tls (oa: { + doCheck = false; + }); + tls_1_9_0 = super.haskell.lib.overrideCabal hsSuper.tls_1_9_0 (oa: { + doCheck = false; + }); + typst = super.haskell.lib.overrideCabal hsSuper.typst (oa: { + doCheck = false; + }); + }; + }; + + python311 = super.python311.override { + packageOverrides = py-self: py-super: { + numpy = py-super.numpy.overridePythonAttrs(old: { + disabledTests = [ "test_umath_accuracy" ] ++ (old.disabledTests or []); + doCheck = false; + doInstallCheck = false; + doPytestCheck = false; + }); + pandas = py-super.pandas.overridePythonAttrs(old: { + disabledTests = [ "test_rolling" ] ++ (old.disabledTests or []); + }); + }; + }; + + python11Packages = python311.pkgs; + prismlauncher = super.prismlauncher.overrideAttrs (old: { patches = (old.patches or []) ++ [ self.inputs.prism-game-options-patch diff --git a/systems/kami/default.nix b/systems/kami/default.nix index 729d126..2b84f68 100644 --- a/systems/kami/default.nix +++ b/systems/kami/default.nix @@ -106,11 +106,11 @@ layout = "de"; }; - boot.plymouth = { - enable = true; + #boot.plymouth = { + # enable = true; #themePackages = [ pkgs.catppuccin-plymouth ]; #theme = "catppuccin-frappe"; - }; + # }; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -124,5 +124,9 @@ # Re-Compile everything for my specific cpu nix.settings.system-features = ["gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test"]; systemd.services.nix-daemon.serviceConfig.LimitNOFILE = lib.mkForce 1048576000; - + nixpkgs.hostPlatform = { + system = "x86_64-linux"; + config = "x86_64-unknown-linux-gnu"; + gcc.arch = "alderlake"; + }; }