From 823904c37c8dfdaf5d8980635d5f9ff9f8d397cd Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 24 Jan 2023 13:00:48 +0100 Subject: [PATCH] Update lock, separate blender from blender with cuda and switch kernel on thor --- flake.lock | 24 ++++++++++++------------ hm_modules/blender.nix | 4 +--- hm_modules/blender_nvidia.nix | 4 ++++ thor/configuration.nix | 2 +- thor/hm.nix | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 hm_modules/blender_nvidia.nix diff --git a/flake.lock b/flake.lock index 8a7f894..789b5cb 100644 --- a/flake.lock +++ b/flake.lock @@ -263,11 +263,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1673803274, - "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", + "lastModified": 1674498916, + "narHash": "sha256-rKacwgM76ymSu496esvcNPMCV4QX4n+7RvVSBB0zwCg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", + "rev": "4cff4f40b9db3baddff811ca00bf1aac2c4879cb", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1673796341, - "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", + "lastModified": 1674211260, + "narHash": "sha256-xU6Rv9sgnwaWK7tgCPadV6HhI2Y/fl4lKxJoG2+m9qs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", + "rev": "5ed481943351e9fd354aeb557679624224de38d5", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1674127694, - "narHash": "sha256-K1NM4KA+tJHKVtZpIu2tgtLBGAsMqNFaRijUq2kx7oo=", + "lastModified": 1674521750, + "narHash": "sha256-P5oyo3H2JF8VKt36iGCs6q5/iT/eYkdDHduTsg5FK/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "247bcfdaa39c87b7b88bbcdeb7e51bc10ae5ddc4", + "rev": "d7c1b2e0a106b92f013a951a8d6556cd65608359", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1674122161, - "narHash": "sha256-9QM4rvgUSEwO8DWtJN9sR/afEqrH1s3b6ACsZT5wiAM=", + "lastModified": 1674487663, + "narHash": "sha256-wuDr8rfBLcY7EIsFrFEj2dKYvsKjGib42Q2X3ZaDVf4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "53e766957b73298fa68b47478c48cbcc005cc18a", + "rev": "3a12b647bc6da39b69bffcc7aaa31cdbc9b7ff7c", "type": "github" }, "original": { diff --git a/hm_modules/blender.nix b/hm_modules/blender.nix index bf191f3..28da2b6 100644 --- a/hm_modules/blender.nix +++ b/hm_modules/blender.nix @@ -1,3 +1 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ (blender.override { cudaSupport = true; }) ]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ blender ]; } diff --git a/hm_modules/blender_nvidia.nix b/hm_modules/blender_nvidia.nix new file mode 100644 index 0000000..a789632 --- /dev/null +++ b/hm_modules/blender_nvidia.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ (blender.override { cudaSupport = true; }) ]; +} + diff --git a/thor/configuration.nix b/thor/configuration.nix index 926a677..09359f5 100644 --- a/thor/configuration.nix +++ b/thor/configuration.nix @@ -2,7 +2,7 @@ with lib; { boot = { binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; - # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; loader = { systemd-boot.enable = true; diff --git a/thor/hm.nix b/thor/hm.nix index 23558d3..47de362 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -93,7 +93,7 @@ ../hm_modules/alacritty.nix ../hm_modules/autorandr.nix ../hm_modules/biblio.nix - ../hm_modules/blender.nix + ../hm_modules/blender_nvidia.nix ../hm_modules/bspwm.nix ../hm_modules/cava.nix ../hm_modules/dunst.nix