From 10051bd92e4659f51d44dcf89f5278228400ec13 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 14 Aug 2024 17:06:01 +0800 Subject: [PATCH] flake: bump --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- home/applications/nix/default.nix | 21 +++++++++------------ nixos/profiles/core/default.nix | 1 - nixos/profiles/opt-in/mihomo/default.nix | 2 +- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index f463c65..30e4e42 100644 --- a/flake.lock +++ b/flake.lock @@ -251,16 +251,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723468242, - "narHash": "sha256-RrP+zSgCK6zW/wS/dM/DjFmSfpfboHD4TFsPPDL3szM=", + "lastModified": 1723603349, + "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef23c7da7a9aa7be229d1a7d041d3079ee998607", + "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1723429325, - "narHash": "sha256-4x/32xTCd+xCwFoI/kKSiCr5LQA2ZlyTRYXKEni5HR8=", + "lastModified": 1723602049, + "narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "65e3dc0fe079fe8df087cd38f1fe6836a0373aad", + "rev": "ea0bf33a11a26a62c60123c49d96011da396602c", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1723454404, - "narHash": "sha256-Zhcf1TMDYb0BxDHKhEKCKFb1qi2vwlX0BgJPwk9Gd3E=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab2d1ffeb5b85da2f6537beb2fe05da54276c261", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c49f1af..97df329 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # `nixpkgs-unstable` contains less(?) jobs, and usually updates faster. # # REFERENCE: https://discourse.nixos.org/t/differences-between-nix-channels/13998/5 - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; disko = { url = "github:nix-community/disko"; diff --git a/home/applications/nix/default.nix b/home/applications/nix/default.nix index 1105ab8..774a8b4 100644 --- a/home/applications/nix/default.nix +++ b/home/applications/nix/default.nix @@ -1,25 +1,22 @@ {pkgs, ...}: { home.packages = with pkgs; [ - # lsp alejandra + colmena + comma deadnix + nh nil - statix - - # nixpkgs PRs + nix-diff + nix-index nix-init + nix-output-monitor + nix-tree nix-update nixfmt-rfc-style nixpkgs-review - - # misc - colmena - comma - nh - nix-index - nix-output-monitor - nix-tree + nurl sops + statix ]; # nh diff --git a/nixos/profiles/core/default.nix b/nixos/profiles/core/default.nix index 6f0fcbb..443148a 100644 --- a/nixos/profiles/core/default.nix +++ b/nixos/profiles/core/default.nix @@ -36,7 +36,6 @@ environment.systemPackages = with pkgs; [ unzip - wget tree file htop diff --git a/nixos/profiles/opt-in/mihomo/default.nix b/nixos/profiles/opt-in/mihomo/default.nix index d168845..d019ace 100644 --- a/nixos/profiles/opt-in/mihomo/default.nix +++ b/nixos/profiles/opt-in/mihomo/default.nix @@ -10,7 +10,7 @@ webui = pkgs.metacubexd; }; - systemd.services.mihomo.serviceConfig.preStart = '' + systemd.services.mihomo.preStart = '' ${pkgs.coreutils}/bin/ln -sf ${pkgs.v2ray-geoip}/share/v2ray/geoip.dat /var/lib/private/mihomo/GeoIP.dat ${pkgs.coreutils}/bin/ln -sf ${pkgs.v2ray-domain-list-community}/share/v2ray/geosite.dat /var/lib/private/mihomo/GeoSite.dat '';