diff --git a/flake.lock b/flake.lock index 33f5bd7..48a6210 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1743235797, - "narHash": "sha256-tdIknwrnTSLBetEL4XpV5DvdnzZ+QmJCtjnFIlhaRMA=", + "lastModified": 1742890212, + "narHash": "sha256-VvIO75OmcERTwHaFjeOoAqUToPVJGGiLytxraCUN8mk=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "9a61fa0e67c4c475024def6baf35fbe0fb9eae4d", + "rev": "fccf19116032fbf31e31d9d720c2359477af1e48", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1743191728, - "narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=", + "lastModified": 1742838227, + "narHash": "sha256-LSmn3lGFH4WWeDDMR01c+bgGXwbSN+cl//58PtP6IKg=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941", + "rev": "5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1743169896, - "narHash": "sha256-cygagLb9KR6pZtKMzHUNCgfCn47aHrfTBe+FdH5Exdw=", + "lastModified": 1742895806, + "narHash": "sha256-YUcOlvm126wR8IaGZRsAQkpVoTYqCD1vsX99/I5kAuo=", "owner": "helix-editor", "repo": "helix", - "rev": "01fce51c45529fad2283716d81d7bb35f6182c73", + "rev": "5adb4b7413e294d80494a1dea6294e68dd0cd49c", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1743224558, - "narHash": "sha256-LPglk7LB2Tn5otyh+c40XbQ+I61xAV5DLHT/jHu0m3c=", + "lastModified": 1742893123, + "narHash": "sha256-yea0Pw8NWab/VixNMJeGwKg8CkvfUDalbivl8j4Xq8c=", "owner": "jj-vcs", "repo": "jj", - "rev": "0cd352e16ac4d2fd6b94c61e968feff77a43328b", + "rev": "60ce0b87d8e256e68d631d3ff34b3a003ca64b93", "type": "github" }, "original": { @@ -505,11 +505,11 @@ ] }, "locked": { - "lastModified": 1742945498, - "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", + "lastModified": 1742709496, + "narHash": "sha256-6rWA8QlVe3HTCVHyI/gJ5IULyvHkT9d8fMpYC0Kyeh8=", "ref": "refs/heads/main", - "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", - "revCount": 138, + "rev": "d8e4fee796342636f345e358f33583c8b2fa496e", + "revCount": 137, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743186084, - "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", + "lastModified": 1742832363, + "narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", + "rev": "8720365191e3931cefd3fc9484dccba5e219b73d", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743017820, - "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", + "lastModified": 1742719554, + "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", "owner": "YaLTeR", "repo": "niri", - "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", + "rev": "c709696237f3e963225b8df248538cc691ccba3d", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1743160145, - "narHash": "sha256-9DYlhUx9YS2JNkZzUJvVk/qt0n4W+pJtd29od0olwmg=", + "lastModified": 1742863891, + "narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "977ebffd4a29f341139e2a80a7b1a9938fdfc2ba", + "rev": "366999efebcad2165f472ef93e9c996693bda75d", "type": "github" }, "original": { @@ -599,11 +599,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -615,11 +615,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -629,6 +629,22 @@ "type": "github" } }, + "nixpkgs-d056063028f6cbe9b99c3a4b52fdad99573db3ab": { + "locked": { + "lastModified": 1742723610, + "narHash": "sha256-WTG4KXZ0i9A+ffHVO7adBS/TgwAFcHU0PoZtlJuBpTk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d056063028f6cbe9b99c3a4b52fdad99573db3ab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d056063028f6cbe9b99c3a4b52fdad99573db3ab", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1740877520, @@ -662,11 +678,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -678,11 +694,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -694,11 +710,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -734,11 +750,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1743119709, - "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=", + "lastModified": 1742773104, + "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65", + "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", "type": "gitlab" }, "original": { @@ -782,6 +798,7 @@ "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", + "nixpkgs-d056063028f6cbe9b99c3a4b52fdad99573db3ab": "nixpkgs-d056063028f6cbe9b99c3a4b52fdad99573db3ab", "nur-rycee": "nur-rycee", "oskars-dotfiles": "oskars-dotfiles", "sops-nix": "sops-nix", @@ -817,11 +834,11 @@ ] }, "locked": { - "lastModified": 1742783666, - "narHash": "sha256-IwdSl51NL6V0f+mYXZR0UTKaGleOsk9zV3l6kt5SUWw=", + "lastModified": 1737685583, + "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "60766d63c227d576510ecfb5edd3a687d56f6bc7", + "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", "type": "github" }, "original": { @@ -838,11 +855,11 @@ ] }, "locked": { - "lastModified": 1743129211, - "narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=", + "lastModified": 1742437918, + "narHash": "sha256-Vflb6KJVDikFcM9E231mRN88uk4+jo7BWtaaQMifthI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f93da1d26ba9963f34f94a6872b67a7939699543", + "rev": "f03085549609e49c7bcbbee86a1949057d087199", "type": "github" }, "original": { @@ -899,11 +916,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743075971, - "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", + "lastModified": 1742856759, + "narHash": "sha256-IiHFsSC2xXD/RT4CW5ThaBybFQ+xha7HOTGbdD+TiXQ=", "owner": "danth", "repo": "stylix", - "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", + "rev": "b4feb69fd2c1b6ef02a6a81761a62af62ac7bf1b", "type": "github" }, "original": { @@ -1066,11 +1083,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742773235, - "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", + "lastModified": 1742671548, + "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", + "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b08915..ad470ea 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,13 @@ # nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.follows = "nixos-cosmic/nixpkgs"; + nixpkgs-d056063028f6cbe9b99c3a4b52fdad99573db3ab = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + rev = "d056063028f6cbe9b99c3a4b52fdad99573db3ab"; + }; + lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs = { diff --git a/home/modules/programs/obs.nix b/home/modules/programs/obs.nix index b86cfdb..83089c9 100644 --- a/home/modules/programs/obs.nix +++ b/home/modules/programs/obs.nix @@ -20,7 +20,6 @@ in obs-source-record obs-vaapi obs-vkcapture - obs-webkitgtk ]; }; }; diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index 51b8383..15ffca7 100644 --- a/nixos/modules/programs/dae/config.dae +++ b/nixos/modules/programs/dae/config.dae @@ -71,7 +71,7 @@ routing { domain(suffix: "hit.edu.cn") -> must_direct domain(geosite: microsoft) -> proxy # domain(geosite: onedrive) -> must_direct - domain(geosite: "category-ai-!cn") -> us + domain(geosite: "category-ai-chat-!cn") -> us domain(geosite: google) -> us domain(geosite: google-play) -> proxy domain(geosite: apple) -> us diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 82bba99..e879a4c 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -10,6 +10,7 @@ in ./juicity.nix ./dae.nix ./jujutsu.nix + ./fix-zed-editor.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/modifications/fix-zed-editor.nix b/overlays/modifications/fix-zed-editor.nix new file mode 100644 index 0000000..9e885a1 --- /dev/null +++ b/overlays/modifications/fix-zed-editor.nix @@ -0,0 +1,10 @@ +{ inputs, ... }: +final: prev: +let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in +{ + zed-editor = + inputs.nixpkgs-d056063028f6cbe9b99c3a4b52fdad99573db3ab.legacyPackages."${system}".zed-editor; +} diff --git a/secrets/general.yaml b/secrets/general.yaml index 9318ce3..2bed962 100644 --- a/secrets/general.yaml +++ b/secrets/general.yaml @@ -3,7 +3,7 @@ rustypaste: delete: ENC[AES256_GCM,data:fbhJiJhh4YSMZQ6/dfquesJE0sNSn2PUkbjtJmisj5qHtsM=,iv:M1R7giNyLhbj98iiCPENQy44Ixqnie1PHlNcsVs5TLs=,tag:zdBbZ4NR7D4HxsxCizTliw==,type:str] miniflux: ENC[AES256_GCM,data:8u9ElF2LAsIZmq7U8oZJM367y6EAy0si4ZXhpdisYa/PjV70SybUWhrahBft86QB71l8KtLUVuF3Ins=,iv:q7vJzxZICGNv/IaHKDpV50Pc9P4rIwcvfz2+uS1AnyI=,tag:ycwVU3RqfBoXRZQMv653xQ==,type:str] atuin-key: ENC[AES256_GCM,data:e3K7/7BaeXuR+vHJdtO79UQp3XRvROcD8ISkuCp3KGCSlBKUM3GuCwhIeFoIl0fOUqVYOzcCAcjsH2nBRqcXhtS8jhM=,iv:Mh3jsu6mdj0VOLSIoNz/0awyydVf7q3/E7iB7CJi+UA=,tag:xuHhUmK/J2stdjRrtbhQSw==,type:str] -access-tokens: ENC[AES256_GCM,data:Y1qJQaOYHIednHAYpcMVWk+5j5E27QDXrlTAfu/jt7prCxucrQHV7GR2xp7TrXPENDD/lkx9IrRsEKCF7FKIwMDSsfXu5mHt5iRv1dI5itXSlxs4R+r11/rj8S7CHWG/ajOlOwxGyQKHf8O6Q2pHxnDsI7aP7qlC,iv:yrkY/Bb4+ZiLXaTNQ5VD+UO1jf8HfoqEloBCoSRR7l0=,tag:U53qyWVbrKI5tZVagyJSxQ==,type:str] +access-tokens: ENC[AES256_GCM,data:TBg9y2xdVmLNQV3JzGRSbYSrqtYQxakWNPF+OBShqCP6Z/M9H8of6zbgevOudfAPXUbcDv55tBo58U/Z2VIMJysYuUDbbmO9WoqEB2AQNjFgbxBbSwGOEVz8fwKItj01f15r3gAfQVQl0T8Vaf5+VIVXpzG1h7O7,iv:IQw7ddpTuj5vzT6MEvqUiHEsd/Sekl8wVe+A8uibsEw=,tag:I4oyeM1j2LJ++5omk4Ao2A==,type:str] matrix-telegram-bot: ENC[AES256_GCM,data:4G9JSR4l3043SM63gvJr0xBFuS11eoesi9rrobTxN9HpEGNklYDWHH/+Bm7P/2Bxnye3CiO/Z8KffvbjH8slRHLtbSpo8lRsfi9uRAbeMl7aXe/nTjpN078QSN3WXXc9XqYq0sxwNKPrnW3bmPQsHUiykZ3Go5A9Qw1iIPvPpXITyNbeD0gA+2CBB7PIURI7X0PIgSfUtMFZvl2J9znqCnlfC41bj6aC3sywsEkpuFJiMEojrwl+XmVS/u4eNMq8KiofVn9QlGx5gdGZ9LfZZdc+8E6u5GovqP2JTwwfaeZPzdwdZ2YsdoAvmgAusMfjCNZvHF7msLsOyNJW4592ZC7+fHhRbkKnVKc3OwA4ILWd9Jl0p0BoS0Ckn3V5nUQFgxVJ2O0yd/FLFaEqbeBLHNqC6u9CTYk82Uy23ilXQYKIc9h2wQkM329E6j9Mk0f9uavoYVPkpz6ahLzcni2W26FUkeaZ7PkrHmHWfJvvvi32GB4+q1m0phPmcd3cKVhXhbhLXiBcx2Rj7Q==,iv:Br0w0SiYajFr8p5CZEg47x3KpJ+AOleHthsEc3ho4YI=,tag:k+wptcSnNzfefF66Ug824Q==,type:str] matrix-reg-token: ENC[AES256_GCM,data:Cr5560L9gQo/tKUz1sQOAg5dckI6SyDxeNyrjW4oI6qkV8bxUrMaAGnVkkeF9TF9FgAnRb+7Lm+axd2SmkPWnqrLll2NzLC01zXht9Mq9RroAPXFraEV1X1Ge1qAAtkr,iv:42r93HLVDKuDCOYlfem7oi3gcHfhDYiNbFKOCHxim+o=,tag:9hWGQrWHsv2eYNgFlHtfeA==,type:str] ssh-private-key: @@ -55,8 +55,8 @@ sops: a1Y1NU9CK2h1SS83VW42bzBMa01yMXMKI1DBtgNlkNCrxUQvnD6a45mQKNfg5gM4 Zb5buo9Jofj4dn/HFwng3T3gxKTrP2Dh74CAH4L0M5yrF9fzk5TCcQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-29T10:41:29Z" - mac: ENC[AES256_GCM,data:IJLHubb9q/SScJnquvQupAGp7+Rh1queS0EknIIWo+Swd8iQGseuWbYvUP133nP4PwQ6+ZeAUVO6hrerw7d6qqOgAkSx4xmaUYUckvmbHSVyfwIYRVb72edHgJfQrNBq0EF6qsBZ7O2yakj4YjSgM/EoKzJCBOZ8eqUVLA4tw/4=,iv:k3R/tz1FzBBvODOn3s9+Aa7E3RTTX7CgzaYvZJUU9NY=,tag:KBB8szZEr/TVThsdhneD2Q==,type:str] + lastmodified: "2025-03-05T19:37:15Z" + mac: ENC[AES256_GCM,data:jrQ3yMHnligZLO4+4i2FWOEZQ/Lnv9EwZQ8WLeNup+gTrOtcU6pjD/Pg3V0xp1Xe/HZCB9+8DRUWxAOjaD1lx7PYkktSJY9dhdF93JulP1G7gm1eG1LMVU3KqWXMzyJ1UwoUd1xrF/9Z7z8FK21CSo7RF9s9S5FmT0uP/1xZJU8=,iv:BIwUiKqrBCOJiE4uOg+vqd94lC+YxbCb7SeomddtB5o=,tag:MFexMkHKQmrI112l4O13jg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4