From ad6b113e59a4b509d145d165465eb1bf2d7d7a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Mon, 3 Feb 2025 21:44:48 +0100 Subject: [PATCH] Update Kell config --- flake.lock | 4 ++-- home/nvim/files/lua/settings.lua | 1 - home/utils/python.nix | 4 ++++ hosts/Kell/default.nix | 31 ++++++++++++++++++++++--------- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4495e31..b1e70a2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-DuhR3y0gPZG0AJ2FDd+nUKzQMwT+c/DFIUWNDQ5Uyx4=", - "path": "/nix/store/csvrf75irirx4myzbb5bf9sif67g4h9q-source/home/ags", + "path": "/nix/store/qjak07fyqvppk5cvhsjp0a8bbf9wh6l9-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/csvrf75irirx4myzbb5bf9sif67g4h9q-source/home/ags", + "path": "/nix/store/qjak07fyqvppk5cvhsjp0a8bbf9wh6l9-source/home/ags", "type": "path" } }, diff --git a/home/nvim/files/lua/settings.lua b/home/nvim/files/lua/settings.lua index 9c8a41c..d90eee9 100644 --- a/home/nvim/files/lua/settings.lua +++ b/home/nvim/files/lua/settings.lua @@ -45,7 +45,6 @@ vim.opt.foldmethod = "expr" vim.opt.foldlevel = 0 vim.opt.foldexpr = "getline(v:lnum)=~'^X-ExtEditorR'?1:0" vim.opt.wrap = true -vim.opt.textwidth = 120 -- Vimtex vim.g.tex_flavor = 'latex' diff --git a/home/utils/python.nix b/home/utils/python.nix index 5ddbd34..fb4f3ba 100644 --- a/home/utils/python.nix +++ b/home/utils/python.nix @@ -20,6 +20,10 @@ let ]); # Darwin requires a different library path prefix wrapPrefix = if (!pkgs.stdenv.isDarwin) then "LD_LIBRARY_PATH" else "DYLD_LIBRARY_PATH"; + # pythonOverlay = (pkgs.python312.withPackages (ps: [ + # (ps.torch.override { rocmSupport = true; }) + # ])); + patchedpython = (pkgs.symlinkJoin { name = "python"; paths = [ pkgs.python312 ]; diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index a35080a..6dc67fd 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -4,25 +4,38 @@ let in { imports = [ (import ../Common/default.nix { inherit inputs pkgs; }) - (import ../Common/nvidia.nix { inherit inputs pkgs config; }) + # (import ../Common/nvidia.nix { inherit inputs pkgs config; }) (import ../Common/desktop.nix { inherit inputs pkgs config; }) (import ../Common/nfs.nix { inherit pkgs serverIP; }) (import ../Common/android.nix { inherit pkgs; }) ]; # Kernel - # boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_latest; # AMD CPU boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ]; boot.kernelModules = [ "zenpower amd_pstate=active" ]; - # boot.kernelParams = ["amd_pstate=active"]; - # boot.initrd.kernelModules = [ "amdgpu" ]; - - nixpkgs.config.cudaSupport = true; - services.ollama = { - enable = true; - }; + boot.kernelParams = ["amd_pstate=active"]; + boot.initrd.kernelModules = [ "amdgpu" ]; + # hardware.graphics.extraPackages = with pkgs; [ + # rocmPackages.clr.icd + # ]; + # systemd.tmpfiles.rules = [ + # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + # ]; + # environment.systemPackages = with pkgs; [ + # clinfo + # rocmPackages.rpp + # rocmPackages.clr + # rocmPackages.hipcc + # rocmPackages.rocm-smi + # ]; + # nixpkgs.config.rocmSupport = true; + # services.ollama = { + # enable = true; + # }; + # nixpkgs.config.cudaSupport = true; services.logind.extraConfig = ''HandlePowerKey=suspend''; # Virtualization