From 9bac097220dc9030d6deb4372c2a391b949d6a5b Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 12 Jun 2024 01:00:11 +0800 Subject: [PATCH] flake: update lock file --- flake.lock | 108 +++++++++++++------------- home/applications/firefox/default.nix | 4 +- home/applications/mpv/default.nix | 23 +++--- hosts/aristotle/anti-feature.nix | 1 + hosts/aristotle/default.nix | 12 +-- 5 files changed, 73 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index 37df747..43eb619 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1716664326, - "narHash": "sha256-L7MeDg9Q6Si2Rwxe++BoNdldX9Os/DzqoqGDJod0qyk=", + "lastModified": 1717970544, + "narHash": "sha256-YX43aaegfqjXaZ3S+z0JI7SKOEE1Afqm/I9FBIezJ7A=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "347a50c615c45b3c89c41e774736861b7b41cf71", + "rev": "85c380e4e80fbc21d25165626ad2897cbb11af4d", "type": "github" }, "original": { @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1717431297, - "narHash": "sha256-8u9WWLwgKkC/YKkaYFytRUAy3hRjc22FDYyKrSLdXB0=", + "lastModified": 1717949587, + "narHash": "sha256-KhLRsmEzycASmaqWnto0YzIbYs8J23jWGhyIkVGNdyE=", "owner": "berberman", "repo": "flakes", - "rev": "18d1c46ed58d67ef10d7c787096592c8099cdb47", + "rev": "e9b3df34b9727d94116bafb347f9cf10ea9126d7", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1718078026, + "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1717490821, - "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=", + "lastModified": 1718008439, + "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", "owner": "nix-community", "repo": "disko", - "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1", + "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1717931644, + "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "impermanence": { "locked": { - "lastModified": 1708968331, - "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", + "lastModified": 1717932370, + "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=", "owner": "nix-community", "repo": "impermanence", - "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", + "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1716805126, - "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=", + "lastModified": 1717943411, + "narHash": "sha256-43QN3+P7UjAz5ZjjUeYGKAyRfv6BLw7jjdc8Ric/6UQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2", + "rev": "56ed078dc92baf72813d55dcfe399715a632bc41", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1717976995, + "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "315aa649ba307704db0b16c92f097a08a65ec955", "type": "github" }, "original": { @@ -364,11 +364,11 @@ ] }, "locked": { - "lastModified": 1717537146, - "narHash": "sha256-5xNfN+n1Yhnv+H99zpYp1aRbXTbCNCYq/LIedG6rqgE=", + "lastModified": 1718055567, + "narHash": "sha256-5StP3bDRzSFu33v+KA587FQ3IGCTeW8thlJZa9Geq6w=", "owner": "jacekszymanski", "repo": "nixcasks", - "rev": "7da9e7d727ecb2550e03e8d184b4a26e53b2b3db", + "rev": "ff420cd0735bdc0312135bd4e444d00e70a24d83", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "lastModified": 1717995329, + "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717399147, - "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", + "lastModified": 1718089647, + "narHash": "sha256-COO4Xk2EzlZ3x9KCiJildlAA6cYDSPlnY8ms7pKl2Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", + "rev": "f7207adcc68d9cafa29e3cd252a18743ae512c6a", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717343407, - "narHash": "sha256-naOOAqDrOybqIU4EwBeasD3plM9qPS4WJvVcrx9AyNc=", + "lastModified": 1718060059, + "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03fca4cf6dd8838b4cdb8db35766b557e4c0fe00", + "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", "type": "github" }, "original": { @@ -496,11 +496,11 @@ }, "nur": { "locked": { - "lastModified": 1717569947, - "narHash": "sha256-Z08RxIMAeGbsDoQQbFO0NyY/aYDWfkyDG51El2tQLlQ=", + "lastModified": 1718120696, + "narHash": "sha256-zbRgHbpEoYOLoiiYWKk9It+AU0v1zxF65QfEzB4QSH8=", "owner": "nix-community", "repo": "NUR", - "rev": "a4c3bf21c528ff86154497203a1f72a75be90b3b", + "rev": "08af08b78b86c95b2771ff066d6dd4f3feb203c5", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1717553884, - "narHash": "sha256-+t3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU+pSE=", + "lastModified": 1718072316, + "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8795c817dfab19243a33387a16c98d2df4075bb3", + "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", "type": "github" }, "original": { @@ -649,11 +649,11 @@ ] }, "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", + "lastModified": 1718058322, + "narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", + "rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1717376170, - "narHash": "sha256-603uKDAsg8KKVvMzNxIgTrHvXu6vRYx32NO3tuQCIg4=", + "lastModified": 1718036376, + "narHash": "sha256-6hC1LrzXihZ/Tf7YNvICYUFHH+MvuXvpX8uV0hI5/6s=", "owner": "nix-community", "repo": "srvos", - "rev": "96998137e26a92debda49fc2a32d4852d754abb4", + "rev": "4098b95dde07ec1ef75cd2cba1ebdde0576b59f1", "type": "github" }, "original": { @@ -727,11 +727,11 @@ ] }, "locked": { - "lastModified": 1717278143, - "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { diff --git a/home/applications/firefox/default.nix b/home/applications/firefox/default.nix index 9516731..d21d8a7 100644 --- a/home/applications/firefox/default.nix +++ b/home/applications/firefox/default.nix @@ -4,8 +4,8 @@ profiles."default" = { extraConfig = '' ${builtins.readFile (pkgs.fetchurl { - url = "https://raw.githubusercontent.com/arkenfox/user.js/122.0/user.js"; - hash = "sha256-H3Nk5sDxSElGRgK+cyQpVyjtlMF2Okxbstu9A+eJtGk="; + url = "https://raw.githubusercontent.com/arkenfox/user.js/126.1/user.js"; + hash = "sha256-XRtG0iLKh8uqbeX7Rc2H6VJwZYJoNZPBlAfZEfrSCP4="; })} ${builtins.readFile ./user-overrides.js} ''; diff --git a/home/applications/mpv/default.nix b/home/applications/mpv/default.nix index ba5b257..1c1078c 100644 --- a/home/applications/mpv/default.nix +++ b/home/applications/mpv/default.nix @@ -16,14 +16,19 @@ alang = "jpn,ja"; slang = "eng,en"; }; - scripts = - (with pkgs.mpvScripts; [ - thumbfast - sponsorblock - modernx-zydezu - ]) - ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs.mpvScripts; [ - mpris - ]); + + # FIXME: https://github.com/nix-community/home-manager/pull/5524 + package = pkgs.mpv-unwrapped.wrapper { + mpv = pkgs.mpv-unwrapped; + scripts = + (with pkgs.mpvScripts; [ + thumbfast + sponsorblock + modernx-zydezu + ]) + ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs.mpvScripts; [ + mpris + ]); + }; }; } diff --git a/hosts/aristotle/anti-feature.nix b/hosts/aristotle/anti-feature.nix index f82c868..0a2222a 100644 --- a/hosts/aristotle/anti-feature.nix +++ b/hosts/aristotle/anti-feature.nix @@ -17,6 +17,7 @@ allowUnfree = false; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "libXNVCtrl" "nvidia-x11" "osu-lazer-bin" "spotify" diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix index 0f6c525..00e610d 100644 --- a/hosts/aristotle/default.nix +++ b/hosts/aristotle/default.nix @@ -2,7 +2,6 @@ pkgs, inputs, config, - lib, ... }: { imports = [ @@ -59,13 +58,6 @@ # fucking hell programs.anime-game-launcher.enable = true; - # FIXME: - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.42.02"; - sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; - sha256_aarch64 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; - openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; - settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; - persistencedSha256 = lib.fakeSha256; - }; + # novideo + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; }