From dea7e4859f0c4bd7d0cfcffb5da4aeed9dd5662c Mon Sep 17 00:00:00 2001 From: Kate Adkins Date: Tue, 31 Dec 2024 15:02:05 -0700 Subject: [PATCH] capture latest --- flake.lock | 90 ++++++++++++++--------------- nixos/configuration.linux.nix | 2 +- nixos/hosts/trailblazer/default.nix | 4 +- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 8dd4546..eeb07ec 100644 --- a/flake.lock +++ b/flake.lock @@ -418,11 +418,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -462,11 +462,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1733448312, - "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=", + "lastModified": 1733932114, + "narHash": "sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw=", "ref": "refs/heads/main", - "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b", - "revCount": 16575, + "rev": "92ed9fee7d169febf53ea85961174fc0a22c2115", + "revCount": 16599, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -505,11 +505,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1733661607, - "narHash": "sha256-qqzyc2jCvzSAsXPfit4PoYAkOn+jLpb+iV7cF/d4qFs=", + "lastModified": 1734749715, + "narHash": "sha256-YHUevU8Y6dchCUGsDxJzkzNZnBcNQjAIxMdQJ1NMIek=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e1f7c6de199eb63df0c12017c0e07179e040cce2", + "rev": "4165fa3e7070c1252254ca61f8efeafdd2113293", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733639139, - "narHash": "sha256-oQ7YwoK/Hhpal6URjypm+BEB3n2S8GAJQVG8sVLC0/I=", + "lastModified": 1734270275, + "narHash": "sha256-FfpxEVDPQ1qSDoLOqnSK2laM6oPklgZhd2YWzxOB8Ns=", "owner": "YaLTeR", "repo": "niri", - "rev": "9824321fc9499b9987f344308a5c5c69cb9b7a77", + "rev": "d35ad73e3572b0ac704b0c08928f53d0cfd1951f", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nix-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", "type": "github" }, "original": { @@ -693,11 +693,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", "type": "github" }, "original": { @@ -787,11 +787,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1733384649, - "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", + "lastModified": 1734529975, + "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", + "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", "type": "github" }, "original": { @@ -818,16 +818,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727184566, - "narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=", + "lastModified": 1733348545, + "narHash": "sha256-b4JrUmqT0vFNx42aEN9LTWOHomkTKL/ayLopflVf81U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48c3030083c46042584531bc9d931020f1975677", + "rev": "9ecb50d2fae8680be74c08bb0a995c5383747f89", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05-small", + "ref": "nixos-24.11-small", "repo": "nixpkgs", "type": "github" } @@ -850,11 +850,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -866,11 +866,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -897,10 +897,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", - "path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "path": "/nix/store/avxvalb7xf8x4avmrbcvn1vr5yy46kxs-source", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "path" }, "original": { @@ -984,11 +984,11 @@ "pre-commit-hooks": { "flake": false, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -1075,11 +1075,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733510476, - "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=", + "lastModified": 1734531336, + "narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=", "owner": "danth", "repo": "stylix", - "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122", + "rev": "a2d66f25478103ac9b4adc6d6713794f7005221e", "type": "github" }, "original": { @@ -1288,11 +1288,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1732233710, - "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { diff --git a/nixos/configuration.linux.nix b/nixos/configuration.linux.nix index 13c77e9..0ab4323 100644 --- a/nixos/configuration.linux.nix +++ b/nixos/configuration.linux.nix @@ -91,7 +91,7 @@ services.udev.packages = [ pkgs.minipro ] ++ (if pkgs.stdenv.isAarch64 then [] else [ - talon.default + #talon.default ]); services.fwupd.enable = true; diff --git a/nixos/hosts/trailblazer/default.nix b/nixos/hosts/trailblazer/default.nix index 75dd5eb..40a3a79 100644 --- a/nixos/hosts/trailblazer/default.nix +++ b/nixos/hosts/trailblazer/default.nix @@ -125,7 +125,7 @@ in programs.fuse.userAllowOther = true; # Optimize our system for virtualisation. - boot.kernelPackages = pkgs.linuxPackages_zen; + #boot.kernelPackages = pkgs.linuxPackages_zen; # Disallow nouveau so the NVIDIA device is available for VFIO. boot.blacklistedKernelModules = [ "nouveau" ]; @@ -134,7 +134,7 @@ in boot.kernelParams = [ "iommu=on" "amd_iommu=on" - "pcie_acs_override=downstream,multifunction" + #"pcie_acs_override=downstream,multifunction" ]; # Enable fingerprint reader.