Compare commits

...

5 commits

18 changed files with 181 additions and 91 deletions

147
flake.lock generated
View file

@ -70,11 +70,11 @@
"bt-tracker": {
"flake": false,
"locked": {
"lastModified": 1742631003,
"narHash": "sha256-8joGkRd75mq8Wrd+iNTqMqAy51nAGvMVWyqis3iEobg=",
"lastModified": 1742890212,
"narHash": "sha256-VvIO75OmcERTwHaFjeOoAqUToPVJGGiLytxraCUN8mk=",
"owner": "XIU2",
"repo": "TrackersListCollection",
"rev": "8f29f914ae6965e16ef61ca297526a799a210ee4",
"rev": "fccf19116032fbf31e31d9d720c2359477af1e48",
"type": "github"
},
"original": {
@ -332,11 +332,11 @@
"zon2nix": "zon2nix"
},
"locked": {
"lastModified": 1742589311,
"narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=",
"lastModified": 1742838227,
"narHash": "sha256-LSmn3lGFH4WWeDDMR01c+bgGXwbSN+cl//58PtP6IKg=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba",
"rev": "5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f",
"type": "github"
},
"original": {
@ -421,11 +421,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1742627201,
"narHash": "sha256-2sKLhRoN5LJG7LrgxlFB/JmTjj7k9Mgu+QUL1wpxHOg=",
"lastModified": 1742895806,
"narHash": "sha256-YUcOlvm126wR8IaGZRsAQkpVoTYqCD1vsX99/I5kAuo=",
"owner": "helix-editor",
"repo": "helix",
"rev": "3a63e85b6ab204bf0e55d56db63ea02263175424",
"rev": "5adb4b7413e294d80494a1dea6294e68dd0cd49c",
"type": "github"
},
"original": {
@ -442,11 +442,11 @@
]
},
"locked": {
"lastModified": 1742588233,
"narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
"lastModified": 1742871411,
"narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
"rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625",
"type": "github"
},
"original": {
@ -466,11 +466,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1742624823,
"narHash": "sha256-s2J3pzxnpI0Hf5k1lSA4Q2h6Wso9qvruxgM4UZoMscc=",
"lastModified": 1742893123,
"narHash": "sha256-yea0Pw8NWab/VixNMJeGwKg8CkvfUDalbivl8j4Xq8c=",
"owner": "jj-vcs",
"repo": "jj",
"rev": "78239ee133159b29b6483e9a46ed1012026aef7c",
"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": 1742629677,
"narHash": "sha256-x3s8p2rTjB42PQR5yN49qYhEOx/AhykqiNNyDFHmAas=",
"lastModified": 1742832363,
"narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "b6db5c8dc7e46864b090e01114a2b8b40e7b6c3b",
"rev": "8720365191e3931cefd3fc9484dccba5e219b73d",
"type": "github"
},
"original": {
@ -563,11 +563,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1742627013,
"narHash": "sha256-GOp+thjLXji90Apk6yBhH/5+nuYKGdaG7gAaOQba8Lk=",
"lastModified": 1742719554,
"narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "0d4f0f00c0cd83a72151468bc610ce230a550027",
"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": 1742555319,
"narHash": "sha256-EcBXXGcJDDIy2uhr0ObGXGgubbpgdCxvSh5SIGRCFs8=",
"lastModified": 1742863891,
"narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "e8207c233ac95a927bfb02f914f02a9d41dbdfa0",
"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,
@ -677,11 +694,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": {
@ -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": {
@ -1044,11 +1083,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": {

View file

@ -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 = {

View file

@ -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;
}

View file

@ -41,7 +41,8 @@
vim
helix
element-desktop
fluffychat
kdePackages.neochat
vlc
btop
spotify

View file

@ -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;

View file

@ -40,6 +40,7 @@
transmission.enable = true;
nix-ld.enable = true;
juicity.client.enable = true;
asusd.enable = true;
};
gui.enabled = "niri";
};
@ -76,7 +77,8 @@
vim
helix
element-desktop
fluffychat
kdePackages.neochat
vlc
btop
handbrake
@ -89,7 +91,6 @@
vesktop
gg
aria2
fractal
juicity
waypipe

View file

@ -20,10 +20,10 @@
}
];
matchConfig.Name = "eno2";
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true;
};
# networkConfig = {
# DHCP = "yes";
# IPv6AcceptRA = true;
# };
};
};
};

View file

@ -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;

View file

@ -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" ];
};

View file

@ -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" = {

View file

@ -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;
};
};
}

View file

@ -21,5 +21,6 @@
./juicity
./miniflux.nix
./guix.nix
./asusd.nix
];
}

View file

@ -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)

View file

@ -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;
}

View file

@ -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,

View file

@ -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";

View file

@ -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"]