diff --git a/flake.lock b/flake.lock index 009bb432..6a582c84 100644 --- a/flake.lock +++ b/flake.lock @@ -1123,16 +1123,16 @@ "phono3py": { "flake": false, "locked": { - "lastModified": 1746016609, - "narHash": "sha256-Rcy611E8oLJQ/YtK7t1qaAeLllfJMgF6GwF58mZioNg=", + "lastModified": 1761222649, + "narHash": "sha256-UokZVrvXs39itenMXpHis7AaTzEM78D1Pm2/EnYrCn0=", "owner": "phonopy", "repo": "phono3py", - "rev": "f0c26cec8a98f08d2e7d48dda6467008744c48c9", + "rev": "2cce73cd2405f63a7d70f3bc25de94ee9561e134", "type": "github" }, "original": { "owner": "phonopy", - "ref": "v3.15.1", + "ref": "v3.19.4", "repo": "phono3py", "type": "github" } diff --git a/flake.nix b/flake.nix index 28520d18..a2308029 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; }; fancy-motd = { url = "github:CHN-beta/fancy-motd"; flake = false; }; mac-style = { url = "github:SergioRibera/s4rchiso-plymouth-theme?lfs=1"; flake = false; }; - phono3py = { url = "github:phonopy/phono3py/v3.15.1"; flake = false; }; + phono3py = { url = "github:phonopy/phono3py/v3.19.4"; flake = false; }; sticker = { url = "git+https://git.chn.moe/chn/sticker.git?lfs=1"; flake = false; }; speedtest = { url = "github:librespeed/speedtest"; flake = false; }; pybinding = { url = "git+https://github.com/dean0x7d/pybinding?submodules=1"; flake = false; }; diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 03e4becf..a5002209 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -127,6 +127,11 @@ in platformConfig // ) // (inputs.lib.optionalAttrs (prev.stdenv.hostPlatform.avx512Support) { gsl = prev.gsl.overrideAttrs { doCheck = false; }; }) + // (inputs.lib.optionalAttrs (prev.stdenv.hostPlatform.sse4_1Support) + { + frei0r = final.genericPackages.frei0r; + valkey = final.genericPackages.valkey; + }) // (inputs.lib.optionalAttrs (nixpkgs.march != null) { assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; }; @@ -150,7 +155,7 @@ in platformConfig // })]; ctranslate2 = prev.ctranslate2.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags or [] ++ [ "-DENABLE_CPU_DISPATCH=OFF" ]; }); - valkey = final.redis; + # valkey = final.redis; }) )]; } diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 820fc008..3d367509 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -29,9 +29,9 @@ inputs: # networking remmina putty mtr-gui # media - mpv nomacs simplescreenrecorder imagemagick gimp-with-plugins netease-cloud-music-gtk qcm + mpv nomacs simplescreenrecorder imagemagick gimp-with-plugins netease-cloud-music-gtk # qcm waifu2x-converter-cpp blender paraview vlc whalebird spotify obs-studio subtitlecomposer - (inkscape-with-extensions.override { inkscapeExtensions = null; }) + (inkscape-with-extensions.override { inkscapeExtensions = [ inkscape-extensions.textext ]; }) # development adb-sync scrcpy dbeaver-bin cling aircrack-ng kitty weston cage openbox krita fprettify # jetbrains.clion @@ -72,7 +72,7 @@ inputs: ] ++ (builtins.filter (p: (inputs.lib.isDerivation p) && !(p.meta.broken or false) - && !(builtins.elem p.pname or null [ "falkon" "kalzium" "calligra" ])) + && !(builtins.elem p.pname or null [ "falkon" "kalzium" "calligra" "kamoso" ])) (builtins.attrValues kdePackages.kdeGear)) ++ (inputs.lib.optionals (inputs.config.nixos.system.gui.implementation == "kde") [ inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix ]); diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 0818ecb6..21db85b4 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -68,7 +68,7 @@ inputs: programs.niri.enable = true; nixos.user.sharedModules = [(hmInputs: { - config.programs.dankMaterialShell = { enable = true; niri.enableKeybinds = true; enableSystemd = true; }; + config.programs.dankMaterialShell = { enable = true; niri.enableKeybinds = true; systemd.enable = true; }; })]; # niri module will auto enable this, disable it to avoid conflict with system ssh-agent and kwallet services.gnome = { gcr-ssh-agent.enable = false; gnome-keyring.enable = inputs.lib.mkForce false; }; diff --git a/modules/user/chn/default.nix b/modules/user/chn/default.nix index d79971a1..43e3e750 100644 --- a/modules/user/chn/default.nix +++ b/modules/user/chn/default.nix @@ -24,7 +24,7 @@ inputs: }; config = { - programs.git = { userName = "chn"; userEmail = "chn@chn.moe"; }; + programs.git.settings.user = { name = "chn"; email = "chn@chn.moe"; }; home = { file.groupshare.enable = false; diff --git a/modules/user/chn/git.nix b/modules/user/chn/git.nix index 31710e06..9d7b813d 100644 --- a/modules/user/chn/git.nix +++ b/modules/user/chn/git.nix @@ -2,29 +2,33 @@ inputs: { config = inputs.lib.mkIf (inputs.config.nixos.packages.git != null) { - home-manager.users.chn.config.programs.git = + home-manager.users.chn.config.programs = { - enable = true; - extraConfig = + git = { - core.editor = if inputs.config.nixos.model.type == "desktop" then "code --wait" else "hx"; - http.postBuffer = 624288000; - advice.detachedHead = false; - merge.conflictstyle = "diff3"; - diff.colorMoved = "default"; - lfs = + enable = true; + settings = { - concurrenttransfers = 10; - activitytimeout = 3600; - dialtimeout = 3600; - keepalive = 3600; - tlstimeout = 3600; - transfer.maxretries = 1; + core.editor = if inputs.config.nixos.model.type == "desktop" then "code --wait" else "hx"; + http.postBuffer = 624288000; + advice.detachedHead = false; + merge.conflictstyle = "diff3"; + diff.colorMoved = "default"; + lfs = + { + concurrenttransfers = 10; + activitytimeout = 3600; + dialtimeout = 3600; + keepalive = 3600; + tlstimeout = 3600; + transfer.maxretries = 1; + }; }; }; delta = { enable = true; + enableGitIntegration = true; options = { side-by-side = true; diff --git a/modules/user/default.nix b/modules/user/default.nix index 55e29fda..10e34eb6 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -130,12 +130,11 @@ inputs: imports = user.sharedModules; config = { - programs.git = + programs.git.settings = { - userName = "chn"; - userEmail = "chn@chn.moe"; + user = { name = "chn"; email = "chn@chn.moe"; }; # allow root operate on git repositories owned by others - extraConfig.safe.directory = "*"; + safe.directory = "*"; }; home.file = inputs.lib.mkIf inputs.config.nixos.model.private {