From 263aca485e715c9ebf3430139fe1fded2de91bd8 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sun, 23 Mar 2025 08:48:48 +0800 Subject: [PATCH 1/5] update flake inputs --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 747336f..fe636d1 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1742631003, - "narHash": "sha256-8joGkRd75mq8Wrd+iNTqMqAy51nAGvMVWyqis3iEobg=", + "lastModified": 1742659815, + "narHash": "sha256-kUciZIDj9JRnLIP7B+qfUOjysCaUESXNQ3YrWOT+M0Y=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "8f29f914ae6965e16ef61ca297526a799a210ee4", + "rev": "5654b8c40aa4f33a3760eb8da1d3ae879828a3e9", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1742589311, - "narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=", + "lastModified": 1742680131, + "narHash": "sha256-Ph95WgoSNfwRiOxDY0/NnoXxrlC7PhUDpQQlWqmPtkk=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba", + "rev": "b722f537e7212b4252f87123f4e763a4c42983a0", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742627201, - "narHash": "sha256-2sKLhRoN5LJG7LrgxlFB/JmTjj7k9Mgu+QUL1wpxHOg=", + "lastModified": 1742678656, + "narHash": "sha256-hp2an3zhY0VwCfMejc6sJfHV0G3iZSJIvdfMmeHWfCc=", "owner": "helix-editor", "repo": "helix", - "rev": "3a63e85b6ab204bf0e55d56db63ea02263175424", + "rev": "6bedca80646ce7350fb73029adf802ce7d9e241d", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1742670145, + "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1742624823, - "narHash": "sha256-s2J3pzxnpI0Hf5k1lSA4Q2h6Wso9qvruxgM4UZoMscc=", + "lastModified": 1742634044, + "narHash": "sha256-BF/31/kEapsv2kriBSuhWCiNqMWcx9Uz3jHhMHMcb+o=", "owner": "jj-vcs", "repo": "jj", - "rev": "78239ee133159b29b6483e9a46ed1012026aef7c", + "rev": "9a615b5b6225794bc58b52ad44a4cfdc10e64066", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742629677, - "narHash": "sha256-x3s8p2rTjB42PQR5yN49qYhEOx/AhykqiNNyDFHmAas=", + "lastModified": 1742676311, + "narHash": "sha256-EZ+/JXbyE7r/e4tNftecWcWtzjb8YBOGLG75Z+rFgZg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b6db5c8dc7e46864b090e01114a2b8b40e7b6c3b", + "rev": "d56129adbc7cc099b44eb134d2c25e3e2201ec7f", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742627013, - "narHash": "sha256-GOp+thjLXji90Apk6yBhH/5+nuYKGdaG7gAaOQba8Lk=", + "lastModified": 1742641057, + "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", "owner": "YaLTeR", "repo": "niri", - "rev": "0d4f0f00c0cd83a72151468bc610ce230a550027", + "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1742555319, - "narHash": "sha256-EcBXXGcJDDIy2uhr0ObGXGgubbpgdCxvSh5SIGRCFs8=", + "lastModified": 1742641703, + "narHash": "sha256-hoN8blvJco8OSZmPj8izwQaQUdydVi+5FO4/nWd1MNU=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e8207c233ac95a927bfb02f914f02a9d41dbdfa0", + "rev": "216557e6cd229dbe7d73a497c227824a3c579cd7", "type": "github" }, "original": { @@ -677,11 +677,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1742388435, - "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -1044,11 +1044,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742475924, - "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", + "lastModified": 1742671548, + "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", + "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", "type": "github" }, "original": { From 1e5ee9f41a9d897546af81b175b6b18db9efcbf0 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sun, 23 Mar 2025 08:54:26 +0800 Subject: [PATCH 2/5] add asusd for Tytonidae --- nixos/configurations/Tytonidae/default.nix | 1 + nixos/configurations/Tytonidae/networking.nix | 8 ++++---- nixos/modules/programs/asusd.nix | 20 +++++++++++++++++++ nixos/modules/programs/default.nix | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/programs/asusd.nix diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index cd4de8d..5f10727 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -40,6 +40,7 @@ transmission.enable = true; nix-ld.enable = true; juicity.client.enable = true; + asusd.enable = true; }; gui.enabled = "niri"; }; diff --git a/nixos/configurations/Tytonidae/networking.nix b/nixos/configurations/Tytonidae/networking.nix index a852bee..3da415a 100644 --- a/nixos/configurations/Tytonidae/networking.nix +++ b/nixos/configurations/Tytonidae/networking.nix @@ -20,10 +20,10 @@ } ]; matchConfig.Name = "eno2"; - networkConfig = { - DHCP = "yes"; - IPv6AcceptRA = true; - }; + # networkConfig = { + # DHCP = "yes"; + # IPv6AcceptRA = true; + # }; }; }; }; diff --git a/nixos/modules/programs/asusd.nix b/nixos/modules/programs/asusd.nix new file mode 100644 index 0000000..7627478 --- /dev/null +++ b/nixos/modules/programs/asusd.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + ... +}: +let + cfg = config.youthlic.programs.asusd; +in +{ + options = { + youthlic.programs.asusd = { + enable = lib.mkEnableOption "asusd"; + }; + }; + config = lib.mkIf cfg.enable { + services.asusd = { + enable = true; + }; + }; +} diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index 72f9007..c24b76d 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -21,5 +21,6 @@ ./juicity ./miniflux.nix ./guix.nix + ./asusd.nix ]; } From 7109a1643d79126b563ac57dbd1b7b95e593b5f2 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sun, 23 Mar 2025 10:01:32 +0800 Subject: [PATCH 3/5] update dioxionary --- .../Cargo.lock | 0 pkgs/_sources/generated.json | 21 ++++++++--------- pkgs/_sources/generated.nix | 23 +++++++++++-------- pkgs/nvfetcher.toml | 4 ++-- 4 files changed, 25 insertions(+), 23 deletions(-) rename pkgs/_sources/{dioxionary-v1.1.4 => dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108}/Cargo.lock (100%) diff --git a/pkgs/_sources/dioxionary-v1.1.4/Cargo.lock b/pkgs/_sources/dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/Cargo.lock similarity index 100% rename from pkgs/_sources/dioxionary-v1.1.4/Cargo.lock rename to pkgs/_sources/dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/Cargo.lock diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index fcd201a..8d21f75 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -2,11 +2,11 @@ "dioxionary": { "cargoLocks": { "./Cargo.lock": [ - "./dioxionary-v1.1.4/./Cargo.lock", + "./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock", {} ] }, - "date": null, + "date": "2025-03-17", "extract": null, "name": "dioxionary", "passthru": null, @@ -16,14 +16,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "owner": "vaaandark", - "repo": "dioxionary", - "rev": "v1.1.4", + "rev": "20d7b44e49e51c2fce3b0369bd544ec561476108", "sha256": "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=", "sparseCheckout": [], - "type": "github" + "type": "git", + "url": "https://github.com/vaaandark/dioxionary.git" }, - "version": "v1.1.4" + "version": "20d7b44e49e51c2fce3b0369bd544ec561476108" }, "juicity": { "cargoLocks": null, @@ -47,7 +46,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-03-11", + "date": "2025-03-22", "extract": null, "name": "rime-ice", "passthru": null, @@ -59,12 +58,12 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7", - "sha256": "sha256-/sKoufIf4m5h1Zds6AqIyeCjDaZsFU9ot5ln3ykuNyU=", + "rev": "1dcc6f1119836af276dd35c6f0fe93f6bdabc65a", + "sha256": "sha256-9Xpx3s7iHLiwdzehPQZl44Q1aWhqViekrAHFBXE2PCc=", "sparseCheckout": [], "type": "github" }, - "version": "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7" + "version": "1dcc6f1119836af276dd35c6f0fe93f6bdabc65a" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index b045f71..77c343a 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -3,20 +3,23 @@ { dioxionary = { pname = "dioxionary"; - version = "v1.1.4"; - src = fetchFromGitHub { - owner = "vaaandark"; - repo = "dioxionary"; - rev = "v1.1.4"; + version = "20d7b44e49e51c2fce3b0369bd544ec561476108"; + src = fetchgit { + url = "https://github.com/vaaandark/dioxionary.git"; + rev = "20d7b44e49e51c2fce3b0369bd544ec561476108"; fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; sha256 = "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0="; }; cargoLock."./Cargo.lock" = { - lockFile = ./dioxionary-v1.1.4/./Cargo.lock; + lockFile = ./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock; outputHashes = { }; }; + date = "2025-03-17"; }; juicity = { pname = "juicity"; @@ -34,15 +37,15 @@ }; rime-ice = { pname = "rime-ice"; - version = "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7"; + version = "1dcc6f1119836af276dd35c6f0fe93f6bdabc65a"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7"; + rev = "1dcc6f1119836af276dd35c6f0fe93f6bdabc65a"; fetchSubmodules = false; - sha256 = "sha256-/sKoufIf4m5h1Zds6AqIyeCjDaZsFU9ot5ln3ykuNyU="; + sha256 = "sha256-9Xpx3s7iHLiwdzehPQZl44Q1aWhqViekrAHFBXE2PCc="; }; - date = "2025-03-11"; + date = "2025-03-22"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml index 9c952cc..4aa06f1 100644 --- a/pkgs/nvfetcher.toml +++ b/pkgs/nvfetcher.toml @@ -12,6 +12,6 @@ src.git = "https://github.com/iDvel/rime-ice.git" fetch.github = "iDvel/rime-ice" [dioxionary] -src.github = "vaaandark/dioxionary" -fetch.github = "vaaandark/dioxionary" +src.git = "https://github.com/vaaandark/dioxionary.git" +fetch.git = "https://github.com/vaaandark/dioxionary.git" cargo_locks = ["./Cargo.lock"] From 94218afbe15a7230788afa1ee55ccde19b58b852 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sun, 23 Mar 2025 15:13:34 +0800 Subject: [PATCH 4/5] change matrix clients to neochat and fluffychat --- nixos/configurations/Akun/default.nix | 3 ++- nixos/configurations/Tytonidae/default.nix | 4 ++-- nixos/modules/nix.nix | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index 3d7a8cc..beed60d 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -41,7 +41,8 @@ vim helix - element-desktop + fluffychat + kdePackages.neochat vlc btop spotify diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 5f10727..bb89824 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -77,7 +77,8 @@ vim helix - element-desktop + fluffychat + kdePackages.neochat vlc btop handbrake @@ -90,7 +91,6 @@ vesktop gg aria2 - fractal juicity waypipe diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 760fd44..2de491c 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -11,6 +11,14 @@ nixpkgs = { config = { allowUnfree = true; + allowInsecurePredicate = + p: + builtins.elem (lib.getName p) [ + # for fluffychat and neochat + "olm" + + "fluffychat-linux" + ]; }; }; sops.secrets."access-tokens" = { From 5f3b317091baaa0b20671ef4f89645d5a1c21c4f Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 25 Mar 2025 19:20:36 +0800 Subject: [PATCH 5/5] update flake inputs --- flake.lock | 135 ++++++++++++++-------- flake.nix | 7 ++ home/modules/programs/waybar.nix | 2 +- nixos/configurations/Akun/stylix.nix | 4 +- nixos/configurations/Tytonidae/stylix.nix | 4 +- nixos/modules/gui/default.nix | 4 +- overlays/modifications/default.nix | 1 + overlays/modifications/fix-zed-editor.nix | 10 ++ 8 files changed, 112 insertions(+), 55 deletions(-) create mode 100644 overlays/modifications/fix-zed-editor.nix diff --git a/flake.lock b/flake.lock index fe636d1..48a6210 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1742659815, - "narHash": "sha256-kUciZIDj9JRnLIP7B+qfUOjysCaUESXNQ3YrWOT+M0Y=", + "lastModified": 1742890212, + "narHash": "sha256-VvIO75OmcERTwHaFjeOoAqUToPVJGGiLytxraCUN8mk=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "5654b8c40aa4f33a3760eb8da1d3ae879828a3e9", + "rev": "fccf19116032fbf31e31d9d720c2359477af1e48", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1742680131, - "narHash": "sha256-Ph95WgoSNfwRiOxDY0/NnoXxrlC7PhUDpQQlWqmPtkk=", + "lastModified": 1742838227, + "narHash": "sha256-LSmn3lGFH4WWeDDMR01c+bgGXwbSN+cl//58PtP6IKg=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b722f537e7212b4252f87123f4e763a4c42983a0", + "rev": "5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742678656, - "narHash": "sha256-hp2an3zhY0VwCfMejc6sJfHV0G3iZSJIvdfMmeHWfCc=", + "lastModified": 1742895806, + "narHash": "sha256-YUcOlvm126wR8IaGZRsAQkpVoTYqCD1vsX99/I5kAuo=", "owner": "helix-editor", "repo": "helix", - "rev": "6bedca80646ce7350fb73029adf802ce7d9e241d", + "rev": "5adb4b7413e294d80494a1dea6294e68dd0cd49c", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1742670145, - "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1742634044, - "narHash": "sha256-BF/31/kEapsv2kriBSuhWCiNqMWcx9Uz3jHhMHMcb+o=", + "lastModified": 1742893123, + "narHash": "sha256-yea0Pw8NWab/VixNMJeGwKg8CkvfUDalbivl8j4Xq8c=", "owner": "jj-vcs", "repo": "jj", - "rev": "9a615b5b6225794bc58b52ad44a4cfdc10e64066", + "rev": "60ce0b87d8e256e68d631d3ff34b3a003ca64b93", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1741888409, - "narHash": "sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4=", - "rev": "20edd45ae816c73504ddfb9c678756e003ceeafd", + "lastModified": 1742622332, + "narHash": "sha256-z652gNdFc/95Fheq4DzVObERYRo+j9RdCF6tzkR8r80=", + "rev": "6059cbb031e49e05dd5d16208e2e50d3ab2611db", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/20edd45ae816c73504ddfb9c678756e003ceeafd.tar.gz?rev=20edd45ae816c73504ddfb9c678756e003ceeafd" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6059cbb031e49e05dd5d16208e2e50d3ab2611db.tar.gz?rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db" }, "original": { "type": "tarball", @@ -505,11 +505,11 @@ ] }, "locked": { - "lastModified": 1741894565, - "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=", + "lastModified": 1742709496, + "narHash": "sha256-6rWA8QlVe3HTCVHyI/gJ5IULyvHkT9d8fMpYC0Kyeh8=", "ref": "refs/heads/main", - "rev": "a6da43f8193d9e329bba1795c42590c27966082e", - "revCount": 136, + "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": 1742676311, - "narHash": "sha256-EZ+/JXbyE7r/e4tNftecWcWtzjb8YBOGLG75Z+rFgZg=", + "lastModified": 1742832363, + "narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d56129adbc7cc099b44eb134d2c25e3e2201ec7f", + "rev": "8720365191e3931cefd3fc9484dccba5e219b73d", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742641057, - "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", + "lastModified": 1742719554, + "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", "owner": "YaLTeR", "repo": "niri", - "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", + "rev": "c709696237f3e963225b8df248538cc691ccba3d", "type": "github" }, "original": { @@ -580,14 +580,15 @@ "inputs": { "flake-compat": "flake-compat_3", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_3", + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1742641703, - "narHash": "sha256-hoN8blvJco8OSZmPj8izwQaQUdydVi+5FO4/nWd1MNU=", + "lastModified": 1742863891, + "narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "216557e6cd229dbe7d73a497c227824a3c579cd7", + "rev": "366999efebcad2165f472ef93e9c996693bda75d", "type": "github" }, "original": { @@ -598,11 +599,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742631601, - "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "380ed15bcd6440606c6856db44a99140d422b46f", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -628,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, @@ -693,11 +710,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -733,11 +750,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1742489760, - "narHash": "sha256-OkYl/wf09cKviSV1R6SshcRmeX1iDNEKCMg5KlmTwK0=", + "lastModified": 1742773104, + "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "10f7b577f5081b30ca6b7fd5f98de8d7dfdb5a27", + "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", "type": "gitlab" }, "original": { @@ -781,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", @@ -829,6 +847,27 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742437918, + "narHash": "sha256-Vflb6KJVDikFcM9E231mRN88uk4+jo7BWtaaQMifthI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f03085549609e49c7bcbbee86a1949057d087199", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -836,11 +875,11 @@ ] }, "locked": { - "lastModified": 1742595978, - "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -877,11 +916,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742591463, - "narHash": "sha256-CguaHULcm4RuIGN+i4u80dYZujFgZaeOTiShFxCwFhw=", + "lastModified": 1742856759, + "narHash": "sha256-IiHFsSC2xXD/RT4CW5ThaBybFQ+xha7HOTGbdD+TiXQ=", "owner": "danth", "repo": "stylix", - "rev": "113643f332e1f70d90991722f8c4e5a0ace6fd06", + "rev": "b4feb69fd2c1b6ef02a6a81761a62af62ac7bf1b", "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/waybar.nix b/home/modules/programs/waybar.nix index fd0f8d7..364e4b5 100644 --- a/home/modules/programs/waybar.nix +++ b/home/modules/programs/waybar.nix @@ -141,7 +141,7 @@ in ]; style = '' * { - font-family: LXGW Wenkai, Maple Mono SC NF; + font-family: LXGW Wenkai, Maple Mono NF CN; font-weight: bold; font-size: 14px; } diff --git a/nixos/configurations/Akun/stylix.nix b/nixos/configurations/Akun/stylix.nix index 9dee95a..9b89163 100644 --- a/nixos/configurations/Akun/stylix.nix +++ b/nixos/configurations/Akun/stylix.nix @@ -20,8 +20,8 @@ name = "Noto Serif CJK SC"; }; monospace = { - package = pkgs.maple-mono-SC-NF; - name = "Maple Mono SC NF"; + package = pkgs.maple-mono.NF-CN; + name = "Maple Mono NF CN"; }; emoji = { package = pkgs.noto-fonts-emoji; diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index 297ea6f..bb6e5d7 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -20,8 +20,8 @@ name = "Noto Serif CJK SC"; }; monospace = { - package = pkgs.maple-mono-SC-NF; - name = "Maple Mono SC NF"; + package = pkgs.maple-mono.NF-CN; + name = "Maple Mono NF CN"; }; emoji = { package = pkgs.noto-fonts-emoji; diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 0dc59fd..c67347f 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -38,7 +38,7 @@ in enableDefaultPackages = false; packages = with pkgs; [ nerd-fonts.fira-code - maple-mono-SC-NF + maple-mono.NF-CN noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif @@ -56,7 +56,7 @@ in "Noto Serif" ]; monospace = [ - "Maple Mono SC NF" + "Maple Mono NF CN" ]; emoji = [ "Noto Color Emoji" ]; }; 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; +}