From d57615d9646af291a9e3af31a84bccef235bc388 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Tue, 15 Jul 2025 14:06:48 -0700 Subject: [PATCH] updated inputs --- flake.lock | 70 ++++++++++++---------------------- modules/nixos/default.nix | 1 + modules/nixos/nvidia.nix | 4 +- test.ts | 20 ++++++++++ users/natalie/desktop/home.nix | 3 ++ users/natalie/packages.nix | 7 ++-- 6 files changed, 54 insertions(+), 51 deletions(-) create mode 100644 test.ts diff --git a/flake.lock b/flake.lock index a37f594..a0f2bdb 100644 --- a/flake.lock +++ b/flake.lock @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1751489990, - "narHash": "sha256-ENTd/sd4Vz/VJYn14SVqW1OH2m7WIAvsm9A9SrmDZRY=", + "lastModified": 1752093218, + "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", "owner": "nix-community", "repo": "home-manager", - "rev": "89af52d9a893af013f5f4c1d2d56912106827153", + "rev": "206ed3c71418b52e176f16f58805c96e84555320", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1750621684, - "narHash": "sha256-E8iHTYK9iUtIjYgBNj54Xeulj9WaxSGDbzOLLFhCSqA=", + "lastModified": 1752099881, + "narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "9398874e59f5e2b8485c489ce6c0f6c9c7d210a0", + "rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010", "type": "github" }, "original": { @@ -333,27 +333,6 @@ "type": "github" } }, - "nil": { - "inputs": { - "nixpkgs": [ - "nvf", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750047244, - "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", - "owner": "oxalica", - "repo": "nil", - "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -361,11 +340,11 @@ ] }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -427,11 +406,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -477,18 +456,17 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils_3", "mnw": "mnw", - "nil": "nil", "nixpkgs": [ "nixpkgs" ], "systems": "systems_4" }, "locked": { - "lastModified": 1751186226, - "narHash": "sha256-Bt7jtmCW72JUPxOIrV73qBTAUOy4qvJXsls2ERDUcGo=", + "lastModified": 1752075018, + "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=", "owner": "notashelf", "repo": "nvf", - "rev": "5bad5dd94ce5ea3b40b08d9e6802e69d02198d21", + "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2", "type": "github" }, "original": { @@ -533,11 +511,11 @@ ] }, "locked": { - "lastModified": 1751423951, - "narHash": "sha256-AowKhJGplXRkAngSvb+32598DTiI6LOzhAnzgvbCtYM=", + "lastModified": 1752028888, + "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1684ed5b15859b655caf41b467d046e29a994d04", + "rev": "a0f1c656e053463b47639234b151a05e4441bb19", "type": "github" }, "original": { @@ -742,11 +720,11 @@ ] }, "locked": { - "lastModified": 1751256876, - "narHash": "sha256-4A8LmE0Hd9RvQwSEPYdITJebpLt7J99VY76IphzqZKc=", + "lastModified": 1751688498, + "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "615b9244dc7ac777b8f0bc3a9cb7290936e4fcf9", + "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab", "type": "github" }, "original": { @@ -762,11 +740,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1751458413, - "narHash": "sha256-eyKdTzRaY4blNs/GVJODh4E+16wpEKmlnQUpGf9e9gc=", + "lastModified": 1752063248, + "narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "4f33e11d99060c5cb2bdc380a11a9b23858dcfde", + "rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848", "type": "github" }, "original": { diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index facf334..ae5c83f 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -8,6 +8,7 @@ ./boot.nix ./ld.nix ./services.nix + ./nvidia.nix ]; # make 'shared.darwin' not an error to define. options.shared.darwin = lib.mkOption { diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 2f107a1..3776fb5 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -42,14 +42,14 @@ in modesetting.enable = true; powerManagement = { - enable = true; # Power management + enable = false; # Power management # finegrained = true; # More precise power consumption control }; # Use the NVidia open source kernel module (not to be confused with the # independent third-party "nouveau" open source driver). # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = false; + open = true; # Environment variables for better compatibility diff --git a/test.ts b/test.ts new file mode 100644 index 0000000..77ad056 --- /dev/null +++ b/test.ts @@ -0,0 +1,20 @@ +const option = collectionDetails + .fields + .find( + (field): field is { type: "Option", slug: string, validations: WebflowValidations["Option"] } => + field.slug === fieldData.path + )! + .validations; + + if (fieldData.type +"Option" && typeof rawValue +"string") +return ( +( +collectionDetails.fields. find (predicate: (field) ⇒ field.slug +| WebflowValidations["Option"] +| undefined +fieldData.path) ?. validations as +)?. options.find(predicate: (option) ⇒ option.id +rawValue) ?. name ?? fullMatch +); diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index 10d4da9..6b220f0 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -31,6 +31,9 @@ winetricks (prismlauncher.override { gamemodeSupport = true; }) umu-launcher + limo + nexusmods-app-unfree + protontricks #window manager stuff wofi diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index 0768761..7fd7eeb 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -57,9 +57,10 @@ with pkgs; imagemagick #chatting apps - (discord.override { - withMoonlight = true; - }) + discord + # (discord.override { + # withMoonlight = true; + # }) vesktop #media