From 4b9a026a9e201fed776d49a197c4e169e6139282 Mon Sep 17 00:00:00 2001 From: js0ny Date: Wed, 12 Nov 2025 14:33:53 +0000 Subject: [PATCH] update flake.lock --- nixcfgs/flake.lock | 90 +++++++++++++-------------- nixcfgs/users/js0ny/packages/gui.nix | 6 ++ nixcfgs/users/js0ny/programs/rime.nix | 28 +++++++-- nixcfgs/users/js0ny/zephyrus.nix | 2 + 4 files changed, 75 insertions(+), 51 deletions(-) diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index d53c1a0..133d46b 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1761962468, - "narHash": "sha256-M+RNHviu4H7/iVzubX5NvBGP7mKIbvzQTaKIfv+10QM=", + "lastModified": 1762480719, + "narHash": "sha256-TjTMNmndJJIxP/N6owC/CoAPiRuM99fNaQbZqHDtwLw=", "owner": "caelestia-dots", "repo": "cli", - "rev": "1cea6fb42a533d29d42c2219e405e0b058b5bedc", + "rev": "9323fbf1b497204e17dff103cf412daf04a5c723", "type": "github" }, "original": { @@ -33,11 +33,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1762046656, - "narHash": "sha256-BxVttDz6M8ZukWWjvHuyyIUSKAeiWzhds/xKyfIoMHs=", + "lastModified": 1762651107, + "narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=", "owner": "caelestia-dots", "repo": "shell", - "rev": "9bc3f378d01497adcaa60afff22c0537f939d556", + "rev": "c0ea060ffecd3f38233652556d3085d094082400", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1762146130, - "narHash": "sha256-/XOEA0a61fZ45i/BpaSsyLNNbw/yKwjMbkB/IWSGLzU=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5ed4afc2277339bdf0e9edf59befff7350cf075", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762540449, - "narHash": "sha256-AZ/xrJ5JXvpRQYyiVf8Hx4lzFBQAaH9l0utOfvAA28I=", + "lastModified": 1762938849, + "narHash": "sha256-ltM04Wy+vMm/EAwhGTl2BYjCgF+Kq4lltpDH9NEh264=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "75bacb66302bca38fa6e0c180f1e5369a8115454", + "rev": "ea9b76cfa921d42a7502260b2d1296798089dfe6", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762492604, - "narHash": "sha256-cjXYF5+gGaapr6d1Jz70GZQVzK4qzwDUwU86p9+H2mM=", + "lastModified": 1762881062, + "narHash": "sha256-j0Gxopn4jGYQae/90V2v4u4+Ec+gFLq3UbSaGfczpOM=", "owner": "YaLTeR", "repo": "niri", - "rev": "2144f9a6ae7b675213f9bd86d0989c334baa1c00", + "rev": "5b77107161c504376b962107913bf74b575703e7", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1762039661, - "narHash": "sha256-oM5BwAGE78IBLZn+AqxwH/saqwq3e926rNq5HmOulkc=", + "lastModified": 1762627886, + "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c3c8c9f2a5ed43175ac4dc030308756620e6e4e4", + "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "nixOS", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1762604901, + "narHash": "sha256-Pr2jpryIaQr9Yx8p6QssS03wqB6UifnnLr3HJw9veDw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "f6b44b2401525650256b977063dbcf830f762369", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1762155241, - "narHash": "sha256-MqlSUPlmzoy9JNo4Dq8u+4XacmmptnEkLgFQfVWJ59k=", + "lastModified": 1762951833, + "narHash": "sha256-KX0OJGwGXupn0MQCYr5EEk+rRBR7KIeB4MheRhDSE7A=", "owner": "nix-community", "repo": "NUR", - "rev": "78b46cade89187b2bcd137a90533c0af36840468", + "rev": "98be2578da8f2ac7d4f6e404936dc45f1d83935d", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1762115864, - "narHash": "sha256-KREKZiBAkAnqJC+jvY+vSbLlrg8j6DFEU7Lv+tgOlHI=", + "lastModified": 1762784320, + "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "8e9e76efa3cc811c230512b40d8cfde06e40da5b", + "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1762812535, + "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762488100, - "narHash": "sha256-pD8YqwP0/irHWzJtVElnVljR+OaJPAVbJBwqix+uB5A=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3cd3edffe1be197326e9314816b16bb4e3d685b1", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index a812823..af42ba7 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -97,5 +97,11 @@ }; }; + # TODO: This is a dependency of `feishin` (EOL) + # Once the new version is published, delete this + nixpkgs.config.permittedInsecurePackages = [ + "electron-36.9.5" + ]; + services.protonmail-bridge.enable = true; } diff --git a/nixcfgs/users/js0ny/programs/rime.nix b/nixcfgs/users/js0ny/programs/rime.nix index 63c4835..2681909 100644 --- a/nixcfgs/users/js0ny/programs/rime.nix +++ b/nixcfgs/users/js0ny/programs/rime.nix @@ -1,10 +1,23 @@ -{pkgs, ...}: let - version = "v13.1.3"; +{ + pkgs, + lib, + ... +}: let + version = "v13.3.12"; rimeConfig = pkgs.fetchzip { url = "https://github.com/amzxyz/rime_wanxiang/releases/download/${version}/rime-wanxiang-zrm-fuzhu.zip"; - sha256 = "sha256-UokSOfGCt7C8/F13BEyy02+rJCqyZcYBWrP/m/Me4D4="; + # sha256 = lib.fakeHash; + sha256 = "sha256-vnhg+//ByZmQ2uxBZTn3cDYKrUFckLAuU8MfB8kSDVA="; stripRoot = false; }; + + # Create a modified version of rimeConfig without custom_phrase.txt + rimeConfigFiltered = pkgs.runCommand "rime-config-filtered" {} '' + cp -r ${rimeConfig} $out + chmod -R u+w $out + rm -f $out/custom_phrase.txt + ''; + rimePath = if pkgs.stdenv.isDarwin then "Library/Rime" @@ -24,8 +37,11 @@ in { ]; }; }; - home.file.${rimePath} = { - source = rimeConfig; - recursive = true; + home.file = { + ${rimePath} = { + source = rimeConfigFiltered; + recursive = true; + }; + "${rimePath}/custom_phrase.txt".text = ""; }; } diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index eb2f4d7..626e216 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -57,6 +57,8 @@ ../../modules/home/dev/nix.nix ]; + nixpkgs.config.allowUnfree = true; + currentUser.defaultTerminalRunner = "alacritty"; currentHost = {