diff --git a/flake.lock b/flake.lock index cee15f2..26a070c 100644 --- a/flake.lock +++ b/flake.lock @@ -146,11 +146,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1741502651, + "narHash": "sha256-7u8FF20WRvQsmfTuNuCerRzstuZ0XgkwWPkq+GoRfiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "1fd39a105575ea997b32a043a0dd2c49294add5b", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1740563087, - "narHash": "sha256-ILEarFQp89V6RWr5GRU/ip9dB1SEqUFQGs1QMPrk9TQ=", + "lastModified": 1741336922, + "narHash": "sha256-ahECQuhpwRKp0TcBsE1rsHlm6t+mUllMojORXmgBcC4=", "owner": "viperML", "repo": "nh", - "rev": "1b25d633376f50139f7b8fe314c8914711d44b42", + "rev": "509dd6c96eefa11e7324f475a86ff4ea447987b7", "type": "github" }, "original": { @@ -535,11 +535,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741235303, - "narHash": "sha256-IfRYF0rW6L3qK8U3jSBXtRE/l3ahVkn/lAz8xZMIqbU=", + "lastModified": 1741503147, + "narHash": "sha256-RmJclgPZrqAh/u1fgSrUHnj1+pxzqYdkzwuTdfUXNnk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dbbd4c750d8d786e80e12459180369d7d4fb02de", + "rev": "24de5fb664bcc1ff93e1541f80c6387d1b3e932e", "type": "github" }, "original": { @@ -568,11 +568,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741001804, - "narHash": "sha256-rMc6olQE1pT8M9wxapgDLLROBgUUX11SmAcPMRSivsA=", + "lastModified": 1741498028, + "narHash": "sha256-6qcHEdtkksI+/VuEcfllvs/alQrkG+ZblkpZj3k3nlY=", "owner": "YaLTeR", "repo": "niri", - "rev": "26618f8d50dffda41791a211fd2aa02479a6d6a9", + "rev": "593241d2f01f1c2c9b0e14fb618facdd9413936b", "type": "github" }, "original": { @@ -622,14 +622,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740872140, - "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-lib_2": { @@ -646,11 +649,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -678,11 +681,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -694,11 +697,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -710,11 +713,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -769,11 +772,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1741243386, - "narHash": "sha256-oUxTzcEQ6qyBjQXHGEl5IPAs2JlO9s01nwz+aHs6TL0=", + "lastModified": 1741505158, + "narHash": "sha256-YvXVjv2ri/jxPFnYWIxKXSKvr8kEfiFkxDOh8zFmdXA=", "owner": "nix-community", "repo": "NUR", - "rev": "40f88079a46afdca02bf5116909478690cf2eaea", + "rev": "3ce84aa694da48341364b976645eed16546d1989", "type": "github" }, "original": { @@ -889,11 +892,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741112087, - "narHash": "sha256-dBGwN4aHmX2QUXolZDhV+p06+WM5ZykL4wd9BD6bT7k=", + "lastModified": 1741392477, + "narHash": "sha256-6ySHuduGhlZBv1uxEOlOeHWDEkKuLQ/O63DI+ZRfAmg=", "owner": "danth", "repo": "stylix", - "rev": "11780517948f214b9f93d1bf5a2d29bc181d3a33", + "rev": "6eea250b10386be0fc23496d1039d76b3147680e", "type": "github" }, "original": { diff --git a/home/lib/default.nix b/home/lib/default.nix index 3d14b29..4d54ce8 100644 --- a/home/lib/default.nix +++ b/home/lib/default.nix @@ -4,5 +4,6 @@ ./wallpaper ./monitors.nix ./swhkd.nix + ./fixChromeIME.nix ]; } diff --git a/home/lib/fixChromeIME.nix b/home/lib/fixChromeIME.nix new file mode 100644 index 0000000..6a2f96c --- /dev/null +++ b/home/lib/fixChromeIME.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + config.lib.misc.fixChromeIME = + package: + pkgs.symlinkJoin { + name = "${package}-wrapped"; + paths = [ pkgs.${package} ]; + buildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/${package} --add-flags "--wayland-text-input-version=3" + ''; + }; +} diff --git a/home/programs/browser/chromium.nix b/home/programs/browser/chromium.nix index 299b8ee..a545979 100644 --- a/home/programs/browser/chromium.nix +++ b/home/programs/browser/chromium.nix @@ -1,6 +1,6 @@ { programs.chromium = { enable = true; - commandLineArgs = [ "--enable-features=UseOzonePlatform --ozone-platform=wayland" ]; + commandLineArgs = [ "--wayland-text-input-version=3" ]; }; } diff --git a/home/programs/browser/firefox.nix b/home/programs/browser/firefox.nix index 9a3460e..fac6742 100644 --- a/home/programs/browser/firefox.nix +++ b/home/programs/browser/firefox.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: let in # firefox-gnome-theme = builtins.fetchGit { diff --git a/home/programs/social/default.nix b/home/programs/social/default.nix index b296a74..4a63c5e 100644 --- a/home/programs/social/default.nix +++ b/home/programs/social/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { home.packages = with pkgs; [ - element-desktop telegram-desktop ]; } diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index 96aa8d5..15d24e0 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -1,5 +1,6 @@ { pkgs, + config, ... }: { @@ -40,7 +41,7 @@ nurl wl-color-picker matugen - cherry-studio + (config.lib.misc.fixChromeIME "cherry-studio") ]; imports = [ ./eye-candy.nix diff --git a/overlays/cherry-studio.nix b/overlays/cherry-studio.nix deleted file mode 100644 index 7c27819..0000000 --- a/overlays/cherry-studio.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nixpkgs.overlays = [ - (final: prev: { - cherry-studio = prev.cherry-studio.override { - commandLineArgs = "--wayland-text-input-version=3"; - }; - }) - ]; -} diff --git a/overlays/default.nix b/overlays/default.nix index acf50f8..be91eee 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,6 @@ { imports = [ ./qutebrowser.nix - ./cherry-studio.nix ./customColorSchemes ]; nixpkgs.overlays = [