From 73ad7933106d7dcb72317ad3336fb3f6df4deff8 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 19 Oct 2024 12:54:41 +0800 Subject: [PATCH] flake: bump --- flake.lock | 105 +++++++++++++++++------------- flake.nix | 20 ++++-- home/applications/eza/default.nix | 2 +- home/applications/gpg/default.nix | 9 +-- hosts/aws/tyo0/anti-feature.nix | 4 +- hosts/dust/anti-feature.nix | 1 + hosts/dust/default.nix | 1 + overlays/default.nix | 14 ---- 8 files changed, 81 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index e76524c..768e482 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ }, "crane": { "locked": { - "lastModified": 1727974419, - "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "lastModified": 1729273024, + "narHash": "sha256-Mb5SemVsootkn4Q2IiY0rr9vrXdCCpQ9HnZeD/J3uXs=", "owner": "ipetkov", "repo": "crane", - "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "rev": "fa8b7445ddadc37850ed222718ca86622be01967", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -146,11 +146,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -159,6 +159,35 @@ "type": "github" } }, + "ip-checker": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ], + "treefmt-nix": [ + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1729312090, + "narHash": "sha256-Xw4rhHlVQBTa2PkzF+bjvgxSop0i46oY/zPBxlykveo=", + "ref": "refs/heads/master", + "rev": "24b6477ef84041093ec88c4719368f05297052d0", + "revCount": 11, + "type": "git", + "url": "https://git.ny4.dev/nyancat/ip-checker" + }, + "original": { + "type": "git", + "url": "https://git.ny4.dev/nyancat/ip-checker" + } + }, "lanzaboote": { "inputs": { "crane": [ @@ -181,11 +210,11 @@ ] }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -195,20 +224,7 @@ } }, "neovim": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ], - "treefmt-nix": [ - "treefmt-nix" - ] - }, + "flake": false, "locked": { "lastModified": 1726316254, "narHash": "sha256-82snaLYq0U2Wt5Vy+gFUmOTrjKEHOhm0uqaT6ycLKXc=", @@ -225,11 +241,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -240,11 +256,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728249353, - "narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -270,11 +286,11 @@ ] }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -308,6 +324,7 @@ "flake-utils": "flake-utils", "gitignore": "gitignore", "home-manager": "home-manager", + "ip-checker": "ip-checker", "lanzaboote": "lanzaboote", "neovim": "neovim", "nixos-hardware": "nixos-hardware", @@ -327,11 +344,11 @@ ] }, "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "lastModified": 1729304879, + "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", "type": "github" }, "original": { @@ -350,11 +367,11 @@ ] }, "locked": { - "lastModified": 1728230538, - "narHash": "sha256-sbsMJOZgykaSdFbxLKghc0QMtolzl4P5nqpttBA3d5M=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2750ed784e93e745a33fb55be7c2657adfb57c00", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -385,11 +402,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dbe74f4..a0b72b8 100644 --- a/flake.nix +++ b/flake.nix @@ -37,13 +37,6 @@ inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks-nix"; inputs.rust-overlay.follows = "rust-overlay"; }; - neovim = { - url = "git+https://git.ny4.dev/nyancat/nvim"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.treefmt-nix.follows = "treefmt-nix"; - inputs.systems.follows = "systems"; - }; nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; @@ -63,6 +56,19 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + ### Resources used for auto update + neovim = { + url = "git+https://git.ny4.dev/nyancat/nvim"; + flake = false; + }; + ip-checker = { + url = "git+https://git.ny4.dev/nyancat/ip-checker"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + inputs.systems.follows = "systems"; + inputs.treefmt-nix.follows = "treefmt-nix"; + }; + ### De-dupe flake dependencies crane = { url = "github:ipetkov/crane"; diff --git a/home/applications/eza/default.nix b/home/applications/eza/default.nix index 4bb9c78..1a14858 100644 --- a/home/applications/eza/default.nix +++ b/home/applications/eza/default.nix @@ -1,7 +1,7 @@ { programs.eza = { enable = true; - icons = true; + icons = "auto"; }; home.shellAliases = { diff --git a/home/applications/gpg/default.nix b/home/applications/gpg/default.nix index 3336549..5d464f6 100644 --- a/home/applications/gpg/default.nix +++ b/home/applications/gpg/default.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, pkgs, ... }: { programs.gpg = { enable = true; @@ -11,7 +6,7 @@ }; services.gpg-agent = { - enable = lib.mkIf pkgs.stdenv.hostPlatform.isLinux true; + enable = pkgs.stdenv.hostPlatform.isLinux; pinentryPackage = pkgs.pinentry-gnome3; }; } diff --git a/hosts/aws/tyo0/anti-feature.nix b/hosts/aws/tyo0/anti-feature.nix index 6240ebf..2c3d1df 100644 --- a/hosts/aws/tyo0/anti-feature.nix +++ b/hosts/aws/tyo0/anti-feature.nix @@ -17,8 +17,8 @@ allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [ ]; permittedInsecurePackages = [ - "cinny-4.2.1" - "cinny-unwrapped-4.2.1" + "cinny-4.2.2" + "cinny-unwrapped-4.2.2" ]; }; } diff --git a/hosts/dust/anti-feature.nix b/hosts/dust/anti-feature.nix index 7eddc6a..97e6bf7 100644 --- a/hosts/dust/anti-feature.nix +++ b/hosts/dust/anti-feature.nix @@ -27,6 +27,7 @@ "osu-lazer-bin" "steam" "steam-original" + "steam-unwrapped" "steam-run" ]; }; diff --git a/hosts/dust/default.nix b/hosts/dust/default.nix index b4e7004..2ad99fd 100644 --- a/hosts/dust/default.nix +++ b/hosts/dust/default.nix @@ -253,6 +253,7 @@ external_controller = "127.0.0.1:9090"; external_ui = pkgs.metacubexd; secret = "hunter2"; + # https://www.v2ex.com/t/1076579 access_control_allow_origin = [ "http://${external_controller}" ]; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 5f044f2..ad2967b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -22,20 +22,6 @@ _final: prev: { ''; }; - # https://www.v2ex.com/t/1076579 - sing-box = prev.sing-box.overrideAttrs rec { - version = "1.10.0-beta.11"; - - src = prev.fetchFromGitHub { - owner = "SagerNet"; - repo = "sing-box"; - rev = "v${version}"; - hash = "sha256-hxOQdrNQB/3KbI1ULDLPfMzFB1JmZb49iPEOtGzWajY="; - }; - - vendorHash = "sha256-rsgrcVkIMUIobuGFBlDDQM05sljZXShsa1+10xxzmlA="; - }; - qt6Packages = prev.qt6Packages.overrideScope ( _final': prev': { # HACK: no more qt5