From 67c757ff67f765f27ce27f0f80c4454e69a8b973 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 29 Aug 2024 09:24:00 +0200 Subject: [PATCH] Flake update --- flake.lock | 36 ++++++++++++------------- flake.nix | 11 ++++++++ instances/odin/configuration-nvidia.nix | 12 +-------- instances/odin/hm.nix | 7 +++-- instances/thor/hm.nix | 3 ++- modules/hm/research.nix | 2 +- 6 files changed, 38 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 01f5519..861fdae 100644 --- a/flake.lock +++ b/flake.lock @@ -306,11 +306,11 @@ }, "nixlib": { "locked": { - "lastModified": 1723942470, - "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=", + "lastModified": 1724547350, + "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "531a2e8416a6d8200a53eddfbdb8f2c8dc4a1251", + "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1724028932, - "narHash": "sha256-U11ZiQPrpIBdv7oS23bNdX9GCxe/hPf/ARr64P2Wj1Y=", + "lastModified": 1724633759, + "narHash": "sha256-CwZPEHqIxyEcHlrQ2Rb8pnpj1OWZkxUJBRjmeh0OQ34=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "5fd22603892e4ec5ac6085058ed658243143aacd", + "rev": "3f4c041744a1dbfbef426580a31d07e19dba6a3c", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1724575805, + "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", "type": "github" }, "original": { @@ -420,11 +420,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -436,11 +436,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724139824, - "narHash": "sha256-ya2P68yRLzutFGcl0CuB6siqP0McLFM92A78NTmNtK0=", + "lastModified": 1724665095, + "narHash": "sha256-lA2yhruDKdJpI5jnFlzdy3n/A5ZqjC7hZJJbDNmLe8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f07d0e47777d09e719f6f6ebe550f53b240c4d10", + "rev": "14bda74c9d031e0a5301d923181dfd78be999575", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1723803910, - "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", + "lastModified": 1724440431, + "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", + "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2e709cf..825e30c 100644 --- a/flake.nix +++ b/flake.nix @@ -151,6 +151,17 @@ nix = { inherit (config) extraOptions; registry = { + nixpkgs = { + from = { + id = "nixpkgs"; + type = "indirect"; + }; + to = { + owner = "nixos"; + repo = "nixpkgs"; + type = "github"; + }; + }; stable = { from = { id = "stable"; diff --git a/instances/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix index f36129b..9fbd749 100644 --- a/instances/odin/configuration-nvidia.nix +++ b/instances/odin/configuration-nvidia.nix @@ -2,28 +2,18 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). { pkgs -, lib -, config , ... }: { boot = { initrd.kernelModules = [ "i915" ]; + kernelPackages = pkgs.unstable_pkgs.linuxPackages; }; hardware.nvidia = { # modesetting.enable = true; # package = pkgs.linuxPackages.nvidia_x11; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.58.02"; - - sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; - sha256_aarch64 = lib.fakeSha256; - openSha256 = lib.fakeSha256; - settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; - persistencedSha256 = lib.fakeSha256; - }; prime = { offload.enable = false; diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index 2fe04d7..6b2da36 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -16,6 +16,7 @@ authenticator brave cava + discord droidcam # element-desktop # matrix client evince @@ -62,7 +63,9 @@ gnome-system-monitor totem ; - inherit (pkgs.unstable_pkgs) heroic proton-pass; + inherit (pkgs.unstable_pkgs) + # heroic + proton-pass; }; }; @@ -101,7 +104,7 @@ # ../../modules/hm/alacritty.nix ../../modules/hm/autorandr.nix ../../modules/hm/biblio.nix - ../../modules/hm/bitwarden.nix + # ../../modules/hm/bitwarden.nix # ../../modules/hm/blender.nix # ../../modules/hm/bspwm.nix ../../modules/hm/cava.nix diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index 6a9f77e..577cb72 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -15,6 +15,7 @@ inherit (pkgs) authenticator brave + discord droidcam # electrum # element-desktop # matrix client @@ -90,7 +91,7 @@ # ../../modules/hm/alacritty.nix ../../modules/hm/autorandr.nix ../../modules/hm/biblio.nix - ../../modules/hm/bitwarden.nix + # ../../modules/hm/bitwarden.nix ../../modules/hm/blender_nvidia.nix # ../../modules/hm/bspwm.nix ../../modules/hm/cava.nix diff --git a/modules/hm/research.nix b/modules/hm/research.nix index a2bfdea..bc68571 100644 --- a/modules/hm/research.nix +++ b/modules/hm/research.nix @@ -4,7 +4,7 @@ inherit (pkgs) # mendeley # Reference manager # logseq - drawio + # drawio obsidian# Note manager # zettlr zotero