diff --git a/flake.lock b/flake.lock index 88463b8a..e5532863 100644 --- a/flake.lock +++ b/flake.lock @@ -779,16 +779,16 @@ }, "nixpkgs-patched": { "locked": { - "lastModified": 1767514635, - "narHash": "sha256-uIZvxuyjwKJkcGFD/DEdmHuwjyjwkk6SkkR/5Z/cpdw=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "ryan4yin", "repo": "nixpkgs", - "rev": "fd9662e1991b624a72e5e545963136906c5c1adf", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { "owner": "ryan4yin", - "ref": "nixos-unstable-patched", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4ec4d7eb..f5799bd5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ nixpkgs-2505.url = "github:nixos/nixpkgs/nixos-25.05"; # nixpkgs with some custom patches - nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched"; + nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable"; # get some latest packages from the master branch nixpkgs-master.url = "github:nixos/nixpkgs/master"; diff --git a/hardening/bwraps/wechat.nix b/hardening/bwraps/wechat.nix index 27d7a72b..eb76bc04 100644 --- a/hardening/bwraps/wechat.nix +++ b/hardening/bwraps/wechat.nix @@ -18,17 +18,15 @@ let aarch64-linux = { version = "4.1.0.13"; src = fetchurl { - # url = "https://web.archive.org/web/20251209092116if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; url = "https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; - hash = "sha256-/d5crM6IGd0k0fSlBSQx4TpIVX/8iib+an0VMkWMNdw="; + hash = ""; }; }; x86_64-linux = { version = "4.1.0.13"; src = fetchurl { - # url = "https://web.archive.org/web/20251219062558if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; url = "https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; - hash = "sha256-+r5Ebu40GVGG2m2lmCFQ/JkiDsN/u7XEtnLrB98602w="; + hash = "sha256-Pfl81lNVlMJWyPqFli1Af2q8pRLujcKCjYoILCKDx8U="; }; }; }; diff --git a/home/base/core/yazi.nix b/home/base/core/yazi.nix index 3e49e4cb..e8b5a63e 100644 --- a/home/base/core/yazi.nix +++ b/home/base/core/yazi.nix @@ -7,6 +7,7 @@ # Changing working directory when exiting Yazi enableBashIntegration = true; enableNushellIntegration = true; + shellWrapperName = "yy"; settings = { mgr = { show_hidden = true; diff --git a/home/base/tui/container.nix b/home/base/tui/container.nix index 67ae0f3c..615449d6 100644 --- a/home/base/tui/container.nix +++ b/home/base/tui/container.nix @@ -27,7 +27,7 @@ kubevirt # virtctl pkgs-2505.kubernetes-helm fluxcd - argocd + # argocd ko # build go project to container image ]; diff --git a/modules/nixos/desktop/xdg.nix b/modules/nixos/desktop/xdg.nix index 561135f5..f2415bdc 100644 --- a/modules/nixos/desktop/xdg.nix +++ b/modules/nixos/desktop/xdg.nix @@ -2,7 +2,7 @@ { xdg.terminal-exec = { enable = true; - package = pkgs.xdg-terminal-exec-mkhl; + package = pkgs.xdg-terminal-exec; settings = let my_terminal_desktop = [ diff --git a/templates/bevy/flake.nix b/templates/bevy/flake.nix index 4c8946c7..c486cf9b 100644 --- a/templates/bevy/flake.nix +++ b/templates/bevy/flake.nix @@ -63,10 +63,10 @@ udev alsa-lib vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr # To use the x11 feature + libX11 + libXcursor + libXi + libXrandr # To use the x11 feature libxkbcommon wayland # To use the wayland feature ])