From c09ca82a996934aa4a74d983ab9d7a2182e96dfc Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 14:43:42 +0800 Subject: [PATCH] flake: bump, use own fork --- flake.lock | 29 ++++++++++++++--------------- flake.nix | 7 +------ hosts/vultr/sin0/anti-feature.nix | 6 +----- nixos/profiles/core/networking.nix | 6 ++++++ 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 14e15d0..818b372 100644 --- a/flake.lock +++ b/flake.lock @@ -237,11 +237,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -252,16 +252,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", - "owner": "NixOS", + "lastModified": 1729406543, + "narHash": "sha256-vDMZdl6A74/eqoDKGHb/k0lAXVUBYoMyuwfS/ces/EI=", + "owner": "Guanran928", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "56e7f831b33c3a8c42e3ee44e91096bb8342eefd", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "Guanran928", "repo": "nixpkgs", "type": "github" } @@ -340,11 +339,11 @@ ] }, "locked": { - "lastModified": 1729304879, - "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", "type": "github" }, "original": { @@ -363,11 +362,11 @@ ] }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729394972, + "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a701a8e..67f146d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,7 @@ description = "Guanran928's Flake"; inputs = { - # INFO: `nixos-unstable` and `nixpkgs-unstable` contains the same set of packages, - # the difference between those channels is their jobsets, - # `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/nixpkgs-unstable"; + nixpkgs.url = "github:Guanran928/nixpkgs"; colmena = { url = "github:zhaofengli/colmena"; diff --git a/hosts/vultr/sin0/anti-feature.nix b/hosts/vultr/sin0/anti-feature.nix index e3e8d9d..5f01b3a 100644 --- a/hosts/vultr/sin0/anti-feature.nix +++ b/hosts/vultr/sin0/anti-feature.nix @@ -13,11 +13,7 @@ ]; allowUnfree = false; - allowUnfreePredicate = - pkg: - lib.elem (lib.getName pkg) [ - "clash-geoip" - ]; + allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [ "clash-geoip" ]; permittedInsecurePackages = [ ]; }; diff --git a/nixos/profiles/core/networking.nix b/nixos/profiles/core/networking.nix index 0f35e37..3e4f4e7 100644 --- a/nixos/profiles/core/networking.nix +++ b/nixos/profiles/core/networking.nix @@ -1,6 +1,12 @@ { services.resolved.enable = true; + # FIXME: for some reason nslookup is not working + networking.nameservers = [ + "223.5.5.5" + "223.6.6.6" + ]; + ### https://wiki.archlinux.org/title/Sysctl#Improving_performance boot.kernelModules = [ "tcp_bbr" ]; boot.kernel.sysctl = {