diff --git a/flake.lock b/flake.lock index fce5f0d..c364b49 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1748830238, - "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -394,15 +394,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1747597901, - "narHash": "sha256-jS+P57tXZEl+zvPfEIHFbd1j3xfuWcrcMrcnbm9wWbE=", - "rev": "33eaaf02fd3f380e99032b25e741eeeb10573cad", + "lastModified": 1746827286, + "narHash": "sha256-qCRBy8Bbh5XhPalPkhonxNgfsbw3lP0UIXBLSrhxAvI=", + "rev": "dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/33eaaf02fd3f380e99032b25e741eeeb10573cad.tar.gz?rev=33eaaf02fd3f380e99032b25e741eeeb10573cad" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a.tar.gz?rev=dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, "lix-module": { @@ -417,11 +417,11 @@ ] }, "locked": { - "lastModified": 1748803223, - "narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=", + "lastModified": 1748254718, + "narHash": "sha256-Uf6HNA0JctJH4ZdrZ/xb185mT0/XusLxnric9Xhg7Es=", "ref": "release-2.93", - "rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62", - "revCount": 145, + "rev": "3855614ceafe562393472cca5fb2005297889a75", + "revCount": 143, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -443,11 +443,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748797644, - "narHash": "sha256-zLkSMDE/4kEK+1q0Ep0fmSO7PJ/3ZxovvYNIA5TuN4I=", + "lastModified": 1748764887, + "narHash": "sha256-PSVK8ufm8I61OlTpWzsphaHDUCwMJoGKG1f5aUhYOnk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2036ef9e1bfac9d50d96c0771a412226b6998ba5", + "rev": "f4fa77397ffc70ecc3c19f935a967136c13b17bc", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1748794937, - "narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=", + "lastModified": 1748760988, + "narHash": "sha256-8oQh8Rw0bYwaEcEDc6bMlzOU38TEDJOpfJkGjngqGFo=", "owner": "YaLTeR", "repo": "niri", - "rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba", + "rev": "09da884cd86d343c50c449f6ab8ba5d775bdd380", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1748776124, - "narHash": "sha256-vs2cMCHX9wnWJutXhQyWkWOpMF/Xbw0ZAUAFGsKLifA=", + "lastModified": 1748697856, + "narHash": "sha256-RiPbZm8NbbCXVPi6WZDWabGpOA6X98nSk0GPTaPlmVA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e989a41092f6f0375e7afb789bc97cb30d01fdb8", + "rev": "a0b5cb4cf16f0a5f90e3b683b6be50f39ea407bf", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -544,11 +544,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -618,11 +618,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -697,11 +697,11 @@ ] }, "locked": { - "lastModified": 1748746145, - "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=", + "lastModified": 1748658947, + "narHash": "sha256-F+nGITu6D7RswJlm8qCuU1PCuOSgDeAqaDKWW1n1jmQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c", + "rev": "fc82ce758cc5df6a6d5d24e75710321cdbdc787a", "type": "github" }, "original": { @@ -758,11 +758,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748803004, - "narHash": "sha256-dLGywKYxge3rzD6AqtVP0UmMHONdQNCWXj6i0lfm/UM=", + "lastModified": 1748717073, + "narHash": "sha256-Yxo8A7BgNpRXTrB359LyfQ0NjJuiaLIS6sTTUCulEX0=", "owner": "danth", "repo": "stylix", - "rev": "5f841056ca60bea7312aeade957da084cd95b26e", + "rev": "64b9f2c2df31bb87bdd2360a2feb58c817b4d16c", "type": "github" }, "original": { @@ -837,11 +837,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -853,11 +853,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 5252132..d06522d 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -507,10 +507,6 @@ in app-id = "^org\\.telegram\\.desktop$"; title = "Media viewer"; }) - (match { - app-id = "^QQ$"; - title = "图片查看器"; - }) (leaf "open-floating" true) (leaf "open-fullscreen" false) ]) diff --git a/overlays/modifications/QQ.nix b/overlays/modifications/QQ.nix deleted file mode 100644 index 823e01e..0000000 --- a/overlays/modifications/QQ.nix +++ /dev/null @@ -1,5 +0,0 @@ -{outputs, ...}: final: prev: let - inherit (prev.stdenv.hostPlatform) system; -in { - qq = outputs.packages."${system}".QQ; -} diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 90f00a6..c7b2aba 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -8,7 +8,6 @@ in ./spotifyx.nix ./radicle-explorer.nix ./wshowkeys.nix - ./QQ.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/pkgs/QQ.nix b/pkgs/QQ.nix deleted file mode 100644 index 55ee75e..0000000 --- a/pkgs/QQ.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - symlinkJoin, - makeWrapper, - qq, - ... -}: -symlinkJoin { - name = "QQ"; - paths = [qq]; - inherit (qq) meta; - buildInputs = [ - makeWrapper - ]; - postBuild = '' - rm $out/share/applications/qq.desktop - cp ${qq}/share/applications/qq.desktop $out/share/applications/qq.desktop - substituteInPlace $out/share/applications/qq.desktop \ - --replace-fail "${qq}" $out - wrapProgram $out/bin/qq \ - --set NIXOS_OZONE_WL 1 \ - --add-flags '--wayland-text-input-version=3' - ''; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index c899ec2..bff4832 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -17,7 +17,6 @@ in TrackersListCollection = callPackage ./TrackersListCollection.nix {}; wshowkeys-mao = callPackage ./wshowkeys-mao.nix {}; OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {}; - QQ = callPackage ./QQ.nix {}; noto-serif-cjk = callPackage ./noto-serif-cjk.nix {}; noto-sans-cjk = callPackage ./noto-sans-cjk.nix {}; diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index 38b8b15..5af9619 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -1,94 +1,58 @@ { lib, + pkgs, inputs, - system, callPackage, - symlinkJoin, - makeWrapper, - nixfmt-rfc-style, - idris2Packages, - lua-language-server, - bash-language-server, - shfmt, - hurl, - cmake-language-server, - kdlfmt, - rustfmt, - clang-tools, - libxml2, - typstyle, - pyright, - ruff, - gotools, - yaml-language-server, - taplo, - markdown-oxide, - marksman, - nixd, - deno, - alejandra, - vscode-langservers-extracted, - fish-lsp, - tailwindcss-language-server, - gopls, - golangci-lint-langserver, - tinymist, - delve, - lldb, - rust-analyzer, - # nil, - haskell-language-server, - neocmakelsp, - jdt-language-server, - zls, }: let - inherit (inputs.helix.packages."${system}") helix; + inherit (inputs.helix.packages."${pkgs.system}") helix; runtime = callPackage ./runtime.nix {}; - runtimeInputs = [ - nixfmt-rfc-style - idris2Packages.idris2Lsp - lua-language-server - bash-language-server - shfmt - hurl - cmake-language-server - kdlfmt - rustfmt - clang-tools - libxml2 - typstyle - pyright - ruff - gotools - yaml-language-server - taplo - markdown-oxide - marksman - nixd - deno - alejandra - vscode-langservers-extracted - fish-lsp - tailwindcss-language-server - gopls - golangci-lint-langserver - tinymist - delve - lldb - rust-analyzer - # nil - haskell-language-server - neocmakelsp - jdt-language-server - zls - ]; + runtimeInputs = ( + with pkgs; [ + nixfmt-rfc-style + idris2Packages.idris2Lsp + lua-language-server + bash-language-server + shfmt + hurl + cmake-language-server + kdlfmt + rustfmt + clang-tools + libxml2 + typstyle + pyright + ruff + gotools + yaml-language-server + taplo + markdown-oxide + marksman + nixd + deno + alejandra + vscode-langservers-extracted + fish-lsp + tailwindcss-language-server + gopls + golangci-lint-langserver + tinymist + delve + lldb + rust-analyzer + # nil + haskell-language-server + neocmakelsp + jdt-language-server + zls + ] + ); in - symlinkJoin { + pkgs.symlinkJoin { name = "helix-wrapped"; paths = [helix]; inherit (helix) meta; buildInputs = [ - makeWrapper + pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/hx \