diff --git a/assets/wallpaper/01.png b/assets/wallpaper/01.png index a0b739a..5eacc54 100644 Binary files a/assets/wallpaper/01.png and b/assets/wallpaper/01.png differ diff --git a/flake.lock b/flake.lock index 2f4dacc..33f5bd7 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1743783051, - "narHash": "sha256-i9UI/2fkk/fL1eAH+Q8fhUEkEDR0LAxCNhM/LkMJNXw=", + "lastModified": 1743235797, + "narHash": "sha256-tdIknwrnTSLBetEL4XpV5DvdnzZ+QmJCtjnFIlhaRMA=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "1b3eba3c0ce9fcabd26d1f7250530cbe68d4ef70", + "rev": "9a61fa0e67c4c475024def6baf35fbe0fb9eae4d", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1743598667, - "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1743730265, - "narHash": "sha256-j2bJGWJ3c9pne0/2npA47J7i+Ka1JUIQ0ixxDq19ygw=", + "lastModified": 1743191728, + "narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "17a19e4837d631e0b0496aac625f95f519195212", + "rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1743483316, - "narHash": "sha256-yFT2zkL0S8ouuF8AyY+RxKI11V6juWcUPuhQn8qeZHQ=", + "lastModified": 1743169896, + "narHash": "sha256-cygagLb9KR6pZtKMzHUNCgfCn47aHrfTBe+FdH5Exdw=", "owner": "helix-editor", "repo": "helix", - "rev": "7ebf65002940d0ce8d6e59c3ec22c736f7d57d9c", + "rev": "01fce51c45529fad2283716d81d7bb35f6182c73", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1743788974, - "narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1743784028, - "narHash": "sha256-fl9K43x77XbR+dfSLDz8TmZJj6KuOq/WnZ0uPvvkjM0=", + "lastModified": 1743224558, + "narHash": "sha256-LPglk7LB2Tn5otyh+c40XbQ+I61xAV5DLHT/jHu0m3c=", "owner": "jj-vcs", "repo": "jj", - "rev": "a31c811265b5d6a44589498c5db088a643d526f5", + "rev": "0cd352e16ac4d2fd6b94c61e968feff77a43328b", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743791363, - "narHash": "sha256-hGETu0Ilugf0f7S5fFETUP+sS0ATrKcm+7YHs7GBwx4=", + "lastModified": 1743186084, + "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f160e322673614c928e1187c268add9ef038a513", + "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743774669, - "narHash": "sha256-xrg3m1RP7mvBi0sLPJjnn9UiCqN+NKqU94DZJMoaXZU=", + "lastModified": 1743017820, + "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", "owner": "YaLTeR", "repo": "niri", - "rev": "e8da89a430f4af0accfe80efe286b2cffd20a4aa", + "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1743774400, - "narHash": "sha256-QZ6cjUrxoQbqB4CY5ogP/bJW1c73yVpCehKEfUS/0g8=", + "lastModified": 1743160145, + "narHash": "sha256-9DYlhUx9YS2JNkZzUJvVk/qt0n4W+pJtd29od0olwmg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "061a22595ad5dc0385436d0903d31d880b12c8d3", + "rev": "977ebffd4a29f341139e2a80a7b1a9938fdfc2ba", "type": "github" }, "original": { @@ -599,11 +599,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": { @@ -615,11 +615,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -631,11 +631,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -694,11 +694,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -734,11 +734,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1743790892, - "narHash": "sha256-Mb84ZhnqbErvQbOe+tbjU/7tqqczzKXGo3Jnv1/HGMw=", + "lastModified": 1743119709, + "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "29cbb2f7747d463424499d39da7308fa8ade093b", + "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65", "type": "gitlab" }, "original": { @@ -751,11 +751,11 @@ "oskars-dotfiles": { "flake": false, "locked": { - "lastModified": 1743338345, - "narHash": "sha256-7eOm26Y7nybMFe6uNbw4yPFgMd+CLyZyByXvpAvqmUo=", + "lastModified": 1740768686, + "narHash": "sha256-82VUIEalmL1yY5OW6+FsY+r4RKtfJWuEMkqqUDjXGrY=", "owner": "oskardotglobal", "repo": ".dotfiles", - "rev": "182de5a67cd6fd30a9450d6bb7d5dd4d41272c5f", + "rev": "2743d9f1ac93d2daf6579d225fbb36e190dcc2e6", "type": "github" }, "original": { @@ -838,11 +838,11 @@ ] }, "locked": { - "lastModified": 1743682350, - "narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=", + "lastModified": 1743129211, + "narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382", + "rev": "f93da1d26ba9963f34f94a6872b67a7939699543", "type": "github" }, "original": { @@ -858,11 +858,11 @@ ] }, "locked": { - "lastModified": 1743756170, - "narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -899,11 +899,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743775855, - "narHash": "sha256-ZhhiYvHlA9f/Ck1i76ilfapLS7abLPRlWJQRxJEDTnQ=", + "lastModified": 1743075971, + "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", "owner": "danth", "repo": "stylix", - "rev": "581fa67c818aaf91a1533149fb737d3e8c0949b8", + "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1743346993, - "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "lastModified": 1742773235, + "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", "type": "github" }, "original": { diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix index 51eef63..2458d8b 100644 --- a/home/david/configurations/Akun/default.nix +++ b/home/david/configurations/Akun/default.nix @@ -35,7 +35,6 @@ atuin.enable = true; obs.enable = true; chromium.enable = true; - espanso.enable = true; }; }; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index b783507..ed6e5f4 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -40,7 +40,6 @@ thunderbird.enable = true; obs.enable = true; chromium.enable = true; - espanso.enable = true; }; }; diff --git a/home/modules/programs/default.nix b/home/modules/programs/default.nix index dadbcce..509d445 100644 --- a/home/modules/programs/default.nix +++ b/home/modules/programs/default.nix @@ -25,6 +25,5 @@ ./helix ./waybar.nix ./jujutsu.nix - ./espanso.nix ]; } diff --git a/home/modules/programs/espanso.nix b/home/modules/programs/espanso.nix deleted file mode 100644 index 9d19bb8..0000000 --- a/home/modules/programs/espanso.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.youthlic.programs.espanso; -in -{ - options = { - youthlic.programs.espanso = { - enable = lib.mkEnableOption "espanso"; - }; - }; - config = lib.mkIf cfg.enable { - services.espanso = { - enable = true; - package = pkgs.espanso-wayland; - configs = { - default = { }; - }; - matches = { - base = { - matches = [ - { - trigger = ":date"; - replace = "{{date}}"; - vars = [ - { - name = "date"; - type = "date"; - params = { - format = "%Y-%m-%d"; - }; - } - ]; - } - ]; - }; - }; - }; - }; -} diff --git a/home/modules/programs/obs.nix b/home/modules/programs/obs.nix index 6026d82..b86cfdb 100644 --- a/home/modules/programs/obs.nix +++ b/home/modules/programs/obs.nix @@ -21,7 +21,6 @@ in obs-vaapi obs-vkcapture obs-webkitgtk - obs-pipewire-audio-capture ]; }; }; diff --git a/nixos/configurations/Akun/stylix.nix b/nixos/configurations/Akun/stylix.nix index f508dda..9b89163 100644 --- a/nixos/configurations/Akun/stylix.nix +++ b/nixos/configurations/Akun/stylix.nix @@ -16,8 +16,8 @@ name = "LXGW WenKai"; }; sansSerif = { - package = pkgs.source-han-sans; - name = "Source Han Sans SC"; + package = pkgs.noto-fonts-cjk-serif; + name = "Noto Serif CJK SC"; }; monospace = { package = pkgs.maple-mono.NF-CN; diff --git a/nixos/configurations/Akun/users/default.nix b/nixos/configurations/Akun/users/default.nix index 7c04dd4..66611bf 100644 --- a/nixos/configurations/Akun/users/default.nix +++ b/nixos/configurations/Akun/users/default.nix @@ -11,7 +11,6 @@ "libvirtd" "wheel" "video" - "input" ]; }; }; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 0106071..bb89824 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -17,7 +17,6 @@ ./hardware-configuration.nix ./networking.nix ./disk-config.nix - ./hardware.nix ]; youthlic = { @@ -42,7 +41,6 @@ nix-ld.enable = true; juicity.client.enable = true; asusd.enable = true; - owncast.enable = true; }; gui.enabled = "niri"; }; diff --git a/nixos/configurations/Tytonidae/hardware.nix b/nixos/configurations/Tytonidae/hardware.nix deleted file mode 100644 index 448d99a..0000000 --- a/nixos/configurations/Tytonidae/hardware.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, ... }: -{ - nixpkgs.config.cudaSupport = true; - services = { - hardware.bolt.enable = true; - fstrim.enable = true; - }; - hardware = { - graphics = { - extraPackages = with pkgs; [ - vaapiIntel - libva - libvdpau-va-gl - vaapiVdpau - ocl-icd - intel-ocl - intel-compute-runtime - nvidia-vaapi-driver - intel-media-driver - ]; - extraPackages32 = with pkgs.pkgsi686Linux; [ - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; - }; - }; -} diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index 67d64aa..bb6e5d7 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -16,8 +16,8 @@ name = "LXGW WenKai"; }; sansSerif = { - package = pkgs.source-han-sans; - name = " Serif Han Sans SC"; + package = pkgs.noto-fonts-cjk-serif; + name = "Noto Serif CJK SC"; }; monospace = { package = pkgs.maple-mono.NF-CN; diff --git a/nixos/configurations/Tytonidae/users/default.nix b/nixos/configurations/Tytonidae/users/default.nix index a1d9132..a2089b6 100644 --- a/nixos/configurations/Tytonidae/users/default.nix +++ b/nixos/configurations/Tytonidae/users/default.nix @@ -10,7 +10,6 @@ "wheel" "video" "audio" - "input" ]; }; services.udev = { diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 6ea87f4..c67347f 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -44,24 +44,16 @@ in noto-fonts-cjk-serif noto-fonts-emoji lxgw-wenkai - source-sans - source-serif - source-han-serif - source-han-sans ]; fontconfig.defaultFonts = { serif = [ "LXGW WenKai" - "Source Han Serif SC" "Noto Serif CJK SC" - "Source Serif 4" "Noto Serif" ]; sansSerif = [ - "Source Han Sans SC" - "Noto Sans CJK SC" - "Source Sans 3" - "Noto Sans" + "Noto Serif CJK SC" + "Noto Serif" ]; monospace = [ "Maple Mono NF CN" diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index 54f4520..c24b76d 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -22,6 +22,5 @@ ./miniflux.nix ./guix.nix ./asusd.nix - ./owncast.nix ]; } diff --git a/nixos/modules/programs/owncast.nix b/nixos/modules/programs/owncast.nix deleted file mode 100644 index dc25db2..0000000 --- a/nixos/modules/programs/owncast.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, config, ... }: -let - cfg = config.youthlic.programs.owncast; -in -{ - options = { - youthlic.programs.owncast = { - enable = lib.mkEnableOption "owncast"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { - services.owncast = { - enable = true; - listen = "0.0.0.0"; - port = 8486; - rtmp-port = 1935; - openFirewall = true; - }; - }) - (lib.mkIf (cfg.enable && config.youthlic.programs.caddy.enable) { - services.caddy.virtualHosts = { - "owncast.${config.youthlic.programs.caddy.baseDomain}" = { - extraConfig = '' - reverse_proxy 127.0.0.1:8486 - ''; - }; - }; - }) - ]; -} diff --git a/pkgs/_sources/dioxionary-71f064e2cca49d36950b505873e05b256b868b56/Cargo.lock b/pkgs/_sources/dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/Cargo.lock similarity index 100% rename from pkgs/_sources/dioxionary-71f064e2cca49d36950b505873e05b256b868b56/Cargo.lock rename to pkgs/_sources/dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/Cargo.lock diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 5cb98ba..8acc752 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -2,11 +2,11 @@ "dioxionary": { "cargoLocks": { "./Cargo.lock": [ - "./dioxionary-71f064e2cca49d36950b505873e05b256b868b56/./Cargo.lock", + "./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock", {} ] }, - "date": "2025-04-04", + "date": "2025-03-17", "extract": null, "name": "dioxionary", "passthru": null, @@ -16,13 +16,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "71f064e2cca49d36950b505873e05b256b868b56", + "rev": "20d7b44e49e51c2fce3b0369bd544ec561476108", "sha256": "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=", "sparseCheckout": [], "type": "git", "url": "https://github.com/vaaandark/dioxionary.git" }, - "version": "71f064e2cca49d36950b505873e05b256b868b56" + "version": "20d7b44e49e51c2fce3b0369bd544ec561476108" }, "juicity": { "cargoLocks": null, @@ -44,55 +44,9 @@ }, "version": "4c5e8bd948ba2f72a0dd38681cf13ae532f6c9f5" }, - "noto-sans-cjk": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "noto-sans-cjk", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "notofonts", - "repo": "noto-cjk", - "rev": "Serif2.003", - "sha256": "sha256-UxbwdY2w3u6i1kBWwr5vMKvsnD3eCllN+kBrCH38KlY=", - "sparseCheckout": [ - "Sans/OTC" - ], - "type": "github" - }, - "version": "Serif2.003" - }, - "noto-serif-cjk": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "noto-serif-cjk", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "notofonts", - "repo": "noto-cjk", - "rev": "Serif2.003", - "sha256": "sha256-mfbBSdJrUCZiUUmsmndtEW6H3z6KfBn+dEftBySf2j4=", - "sparseCheckout": [ - "Serif/OTC" - ], - "type": "github" - }, - "version": "Serif2.003" - }, "rime-ice": { "cargoLocks": null, - "date": "2025-04-01", + "date": "2025-03-30", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,12 +58,12 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "a5f5404e369100fcfc5562f86f1205827453e31c", - "sha256": "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw=", + "rev": "af3ea15b5c843d2c2d9ce904356073f962e8aa3d", + "sha256": "sha256-52Iu5qikFJzYc5jL604C/zklLozV6p+C0/zr/DUvlGk=", "sparseCheckout": [], "type": "github" }, - "version": "a5f5404e369100fcfc5562f86f1205827453e31c" + "version": "af3ea15b5c843d2c2d9ce904356073f962e8aa3d" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 3dcf608..8b10b49 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -3,10 +3,10 @@ { dioxionary = { pname = "dioxionary"; - version = "71f064e2cca49d36950b505873e05b256b868b56"; + version = "20d7b44e49e51c2fce3b0369bd544ec561476108"; src = fetchgit { url = "https://github.com/vaaandark/dioxionary.git"; - rev = "71f064e2cca49d36950b505873e05b256b868b56"; + rev = "20d7b44e49e51c2fce3b0369bd544ec561476108"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; @@ -14,12 +14,12 @@ sha256 = "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0="; }; cargoLock."./Cargo.lock" = { - lockFile = ./dioxionary-71f064e2cca49d36950b505873e05b256b868b56/./Cargo.lock; + lockFile = ./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock; outputHashes = { }; }; - date = "2025-04-04"; + date = "2025-03-17"; }; juicity = { pname = "juicity"; @@ -35,45 +35,17 @@ }; date = "2025-02-20"; }; - noto-sans-cjk = { - pname = "noto-sans-cjk"; - version = "Serif2.003"; - src = fetchFromGitHub { - owner = "notofonts"; - repo = "noto-cjk"; - rev = "Serif2.003"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ "Sans/OTC" ]; - sha256 = "sha256-UxbwdY2w3u6i1kBWwr5vMKvsnD3eCllN+kBrCH38KlY="; - }; - }; - noto-serif-cjk = { - pname = "noto-serif-cjk"; - version = "Serif2.003"; - src = fetchFromGitHub { - owner = "notofonts"; - repo = "noto-cjk"; - rev = "Serif2.003"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ "Serif/OTC" ]; - sha256 = "sha256-mfbBSdJrUCZiUUmsmndtEW6H3z6KfBn+dEftBySf2j4="; - }; - }; rime-ice = { pname = "rime-ice"; - version = "a5f5404e369100fcfc5562f86f1205827453e31c"; + version = "af3ea15b5c843d2c2d9ce904356073f962e8aa3d"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "a5f5404e369100fcfc5562f86f1205827453e31c"; + rev = "af3ea15b5c843d2c2d9ce904356073f962e8aa3d"; fetchSubmodules = false; - sha256 = "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw="; + sha256 = "sha256-52Iu5qikFJzYc5jL604C/zklLozV6p+C0/zr/DUvlGk="; }; - date = "2025-04-01"; + date = "2025-03-30"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 3969f44..5f001cc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14,9 +14,6 @@ in juicity = callPackage ./juicity.nix { }; rime-ice = callPackage ./rime-ice.nix { }; dioxionary = callPackage ./dioxionary.nix { }; - - noto-serif-cjk = callPackage ./noto-serif-cjk.nix { }; - noto-sans-cjk = callPackage ./noto-sans-cjk.nix { }; } // ( let diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index 6d2abc1..ceb939d 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -27,7 +27,6 @@ let yaml-language-server taplo markdown-oxide - marksman nixd deno nixfmt-rfc-style diff --git a/pkgs/noto-sans-cjk.nix b/pkgs/noto-sans-cjk.nix deleted file mode 100644 index 1ddeef2..0000000 --- a/pkgs/noto-sans-cjk.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - nixosTests, - srcs, - stdenvNoCC, - ... -}: -let - source = srcs.noto-sans-cjk; -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "noto-sans-cjk"; - version = source.version; - - src = source.src; - - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-sans-cjk Sans/OTC/*.ttc - ''; - - passthru.tests.noto-fonts = nixosTests.noto-fonts; -}) diff --git a/pkgs/noto-serif-cjk.nix b/pkgs/noto-serif-cjk.nix deleted file mode 100644 index 143b30a..0000000 --- a/pkgs/noto-serif-cjk.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - nixosTests, - srcs, - stdenvNoCC, - ... -}: -let - source = srcs.noto-serif-cjk; -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "noto-serif-cjk"; - version = source.version; - - src = source.src; - - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-serif-cjk Serif/OTC/*.ttc - ''; - - passthru.tests.noto-fonts = nixosTests.noto-fonts; -}) diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml index a405554..4aa06f1 100644 --- a/pkgs/nvfetcher.toml +++ b/pkgs/nvfetcher.toml @@ -15,13 +15,3 @@ fetch.github = "iDvel/rime-ice" src.git = "https://github.com/vaaandark/dioxionary.git" fetch.git = "https://github.com/vaaandark/dioxionary.git" cargo_locks = ["./Cargo.lock"] - -[noto-serif-cjk] -src.github = "notofonts/noto-cjk" -fetch.github = "notofonts/noto-cjk" -git.sparseCheckout = ["Serif/OTC"] - -[noto-sans-cjk] -src.github = "notofonts/noto-cjk" -fetch.github = "notofonts/noto-cjk" -git.sparseCheckout = ["Sans/OTC"]