From 4f486f099a28872bf740a1457e2d2b555dbbee29 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 30 Jan 2024 07:22:20 +0800 Subject: [PATCH] flake: update lock file --- flake.lock | 120 +++++++++++++++++--------------------- flake.nix | 2 +- home/modules/terminal.nix | 5 +- 3 files changed, 55 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 932fe2c..185ee8f 100755 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1705974079, - "narHash": "sha256-HyC3C2esW57j6bG0MKwX4kQi25ltslRnr6z2uvpadJo=", + "lastModified": 1706473964, + "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", "owner": "ipetkov", "repo": "crane", - "rev": "0b4e511fe6e346381e31d355e03de52aa43e8cb2", + "rev": "c798790eabec3e3da48190ae3698ac227aab770c", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1706302763, - "narHash": "sha256-Le1wk75qlzOSfzDk8vqYxSdoEyr/ORIbMhziltVNGYw=", + "lastModified": 1706491084, + "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", "owner": "nix-community", "repo": "disko", - "rev": "f7424625dc1f2e4eceac3009cbd1203d566feebc", + "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706569497, + "narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "60c614008eed1d0383d21daac177a3e036192ed8", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1706306660, - "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=", + "lastModified": 1706473109, + "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2f56952074cb46e93902ecaabfb04dd93733434", + "rev": "d634c3abafa454551f2083b054cd95c3f287be61", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1706308236, - "narHash": "sha256-fI+XrLBfDyRZGjvL+uJbrGc0q/Rc8kIAbok1IICprLo=", + "lastModified": 1706569860, + "narHash": "sha256-1o0np9XkujPwa7TbMVSNSqwJwN98SP3weX6017t6GFc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "12d79d63421e2ed3f31130755c7a37f0e4fb5cb1", + "rev": "2e3f0d5991874edb01f1bfe4ffc75701f8b398dc", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1706142741, - "narHash": "sha256-gGAp3BF5cthUtzlxdF3GU3zgU/xLodvH+nVUJvUnhFQ=", + "lastModified": 1706478736, + "narHash": "sha256-V1T0x16p4r+/fdWR5RU2lV0tTW0YrA8K9+GIibsZAeQ=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "8ce5e6ebccb5444b2cbc98dc8664abac432476fc", + "rev": "24e33780589f5c15132fc86c97ea033e56b06f59", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1705918090, - "narHash": "sha256-FkErVXz4XDeLzhjuNjMhDBz7SF2lVKWhdpm5dITrUpY=", + "lastModified": 1706522979, + "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3c3f6d1b0f13a0e30d192838e233107182dec032", + "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1705915768, - "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", + "lastModified": 1706497381, + "narHash": "sha256-VzzLBvm4ejehe42yKlCUjG3op3NLXq78MKS8u/W3NLQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", + "rev": "00538eecf2d1a8f98a53a71c9c84f913003ec5e8", "type": "github" }, "original": { @@ -369,14 +369,16 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1706145483, - "narHash": "sha256-omDJXQPBNCFGjSSP4X3mlITdmgfkJ3wrlLN1RhR6ld0=", + "lastModified": 1706482802, + "narHash": "sha256-KXwKTfqFkoPpV8QqaVlpmO8w8rD/jHZL2315RL5QQ8w=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b9f77409aad6976efdae3b05523a07b328920c97", + "rev": "8f354ef64cd18898b8980ecf7fe90118808b514b", "type": "github" }, "original": { @@ -477,27 +479,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705697961, - "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", + "lastModified": 1706371002, + "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", + "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1706373441, + "narHash": "sha256-S1hbgNbVYhuY2L05OANWqmRzj4cElcbLuIkXTb69xkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "56911ef3403a9318b7621ce745f5452fb9ef6867", "type": "github" }, "original": { @@ -507,22 +509,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvfetcher": { "inputs": { "flake-compat": [ @@ -568,11 +554,11 @@ ] }, "locked": { - "lastModified": 1705757126, - "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", "type": "github" }, "original": { @@ -605,7 +591,7 @@ "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", "nixpak-pkgs": "nixpak-pkgs", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nvfetcher": "nvfetcher", "pre-commit-hooks-nix": "pre-commit-hooks-nix", @@ -628,11 +614,11 @@ ] }, "locked": { - "lastModified": 1706235145, - "narHash": "sha256-3jh5nahTlcsX6QFcMPqxtLn9p9CgT9RSce5GLqjcpi4=", + "lastModified": 1706494265, + "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3a57c4e29cb2beb777b2e6ae7309a680585b8b2f", + "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", "type": "github" }, "original": { @@ -651,11 +637,11 @@ ] }, "locked": { - "lastModified": 1706130372, - "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=", + "lastModified": 1706410821, + "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68", + "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", "type": "github" }, "original": { @@ -721,11 +707,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706277055, - "narHash": "sha256-aTYjDqjfQZpcJIhNpUy6B0IRnEsQxd+4vF+CVO3STqQ=", + "lastModified": 1706555859, + "narHash": "sha256-3tv7WCDA7Sqb6+N3b4nMoYHwIWgqEE6Pe5D2YcZFdG8=", "owner": "wlroots", "repo": "wlroots", - "rev": "5ae8ce807abbf6eab1113a36e190df50ffc2f9c1", + "rev": "8dff1bb9bdbb2d785ddb5d330934166d359b3d78", "type": "gitlab" }, "original": { @@ -751,11 +737,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b0800a3..06c03d0 100755 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ }; nix-gaming = { url = "github:fufexan/nix-gaming"; - #inputs.nixpkgs.follows = "nixpkgs"; # NOTE: I have to build wine-osu... + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; nix-monitored = { diff --git a/home/modules/terminal.nix b/home/modules/terminal.nix index 4ea883e..c0bd3db 100644 --- a/home/modules/terminal.nix +++ b/home/modules/terminal.nix @@ -56,10 +56,7 @@ in { programs = { alacritty.settings = { import = [ - # Workaround until pkgs.vimPlugins.tokyonight-nvim switch to .toml formats - (lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") (pkgs.runCommandNoCC "tokyonight_night.toml" {} '' - ${lib.getExe pkgs.yj} -yt < "${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml" > $out - '')) + "${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.toml" ]; cursor.style = cfg.cursorStyle; font.size = cfg.fontSize;