From adca871f9239393ceea3c57b1ac6f8f7ac1757ad Mon Sep 17 00:00:00 2001 From: Harry Ying Date: Wed, 18 Dec 2024 14:27:08 +0800 Subject: [PATCH] tb14: hardware tweak - also update vimrc deps --- cfgs/tb14/default.nix | 44 +++++++++++++++++++++--------------------- cfgs/tb14/hardware.nix | 17 ++++++---------- flake.lock | 6 +++--- 3 files changed, 31 insertions(+), 36 deletions(-) diff --git a/cfgs/tb14/default.nix b/cfgs/tb14/default.nix index c47b663..38ebcdd 100644 --- a/cfgs/tb14/default.nix +++ b/cfgs/tb14/default.nix @@ -93,28 +93,28 @@ steam # obsidian # We fix installer version so don't get updated automatically when Wolfram releases new version - (import inputs.nixpkgs-mathematica { - system = pkgs.system; - config.allowUnfree = true; - overlays = [ - (final: prev: { - # Patch mathematica to solve "libdbus not found" error. - # Also pin it to a specific commit to prevent from rebuilding. - mathematica_13_3_1 = - (prev.mathematica.overrideAttrs ( - _: prevAttrs: { - wrapProgramFlags = prevAttrs.wrapProgramFlags ++ [ - "--prefix LD_LIBRARY_PATH : ${prev.lib.makeLibraryPath [ prev.dbus.lib ]}" - ]; - } - )).override - { - version = "13.3.1"; - }; - }) - ]; - }).mathematica_13_3_1 - coyim + # (import inputs.nixpkgs-mathematica { + # system = pkgs.system; + # config.allowUnfree = true; + # overlays = [ + # (final: prev: { + # # Patch mathematica to solve "libdbus not found" error. + # # Also pin it to a specific commit to prevent from rebuilding. + # mathematica_13_3_1 = + # (prev.mathematica.overrideAttrs ( + # _: prevAttrs: { + # wrapProgramFlags = prevAttrs.wrapProgramFlags ++ [ + # "--prefix LD_LIBRARY_PATH : ${prev.lib.makeLibraryPath [ prev.dbus.lib ]}" + # ]; + # } + # )).override + # { + # version = "13.3.1"; + # }; + # }) + # ]; + # }).mathematica_13_3_1 + # coyim zotero ]; extraDconf = { diff --git a/cfgs/tb14/hardware.nix b/cfgs/tb14/hardware.nix index a152e7c..ba84455 100644 --- a/cfgs/tb14/hardware.nix +++ b/cfgs/tb14/hardware.nix @@ -1,4 +1,4 @@ -{ pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -8,24 +8,19 @@ "nvme" "usb_storage" "sd_mod" + "thunderbolt" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; hardware.enableRedistributableFirmware = true; - # Update Intel CPU Microcode - hardware.cpu.intel.updateMicrocode = true; + # Update AMD CPU Microcode + hardware.cpu.amd.updateMicrocode = true; - # Intel UHD 620 Hardware Acceleration hardware.graphics = { enable = true; - extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver # only available starting nixos-19.03 or the current nixos-unstable - ]; + enable32Bit = true; }; } diff --git a/flake.lock b/flake.lock index 8a866b5..52b1424 100644 --- a/flake.lock +++ b/flake.lock @@ -1591,11 +1591,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734454113, - "narHash": "sha256-+F9kb5zh40gcZ8qxydUAFHipYwK9kw6ZUqelyREgedA=", + "lastModified": 1734502601, + "narHash": "sha256-k1F57Ltf/C0Gh4roEFkMErtbwwqsiJSAGxIltUP494o=", "owner": "LEXUGE", "repo": "vimrc", - "rev": "430b0d84c6c7c4230f0e2fdcc1acd4b83438cf1c", + "rev": "610bbfc9727a41078702114c3881118a874a5839", "type": "github" }, "original": {