Compare commits
12 commits
ddc50b1d78
...
0c999875eb
| Author | SHA1 | Date | |
|---|---|---|---|
| 0c999875eb | |||
| d0980e681c | |||
| e6ac0f0edf | |||
| 2b5035d657 | |||
| 2033cbe3a6 | |||
| 7966a78c62 | |||
| c8fdc0ef78 | |||
| acd597689b | |||
| dd2702f060 | |||
| a903a69c7c | |||
| 8b4dc83ea3 | |||
| 1e5377747e |
24 changed files with 338 additions and 88 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 290 KiB After Width: | Height: | Size: 4.1 MiB |
132
flake.lock
generated
132
flake.lock
generated
|
|
@ -70,11 +70,11 @@
|
|||
"bt-tracker": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743235797,
|
||||
"narHash": "sha256-tdIknwrnTSLBetEL4XpV5DvdnzZ+QmJCtjnFIlhaRMA=",
|
||||
"lastModified": 1743783051,
|
||||
"narHash": "sha256-i9UI/2fkk/fL1eAH+Q8fhUEkEDR0LAxCNhM/LkMJNXw=",
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"rev": "9a61fa0e67c4c475024def6baf35fbe0fb9eae4d",
|
||||
"rev": "1b3eba3c0ce9fcabd26d1f7250530cbe68d4ef70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -137,11 +137,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741786315,
|
||||
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
|
||||
"lastModified": 1743598667,
|
||||
"narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
|
||||
"rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -234,11 +234,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -332,11 +332,11 @@
|
|||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743191728,
|
||||
"narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=",
|
||||
"lastModified": 1743730265,
|
||||
"narHash": "sha256-j2bJGWJ3c9pne0/2npA47J7i+Ka1JUIQ0ixxDq19ygw=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941",
|
||||
"rev": "17a19e4837d631e0b0496aac625f95f519195212",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -421,11 +421,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743169896,
|
||||
"narHash": "sha256-cygagLb9KR6pZtKMzHUNCgfCn47aHrfTBe+FdH5Exdw=",
|
||||
"lastModified": 1743483316,
|
||||
"narHash": "sha256-yFT2zkL0S8ouuF8AyY+RxKI11V6juWcUPuhQn8qeZHQ=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "01fce51c45529fad2283716d81d7bb35f6182c73",
|
||||
"rev": "7ebf65002940d0ce8d6e59c3ec22c736f7d57d9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -442,11 +442,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743136572,
|
||||
"narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=",
|
||||
"lastModified": 1743788974,
|
||||
"narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "1efd2503172016a6742c87b47b43ca2c8145607d",
|
||||
"rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -466,11 +466,11 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743224558,
|
||||
"narHash": "sha256-LPglk7LB2Tn5otyh+c40XbQ+I61xAV5DLHT/jHu0m3c=",
|
||||
"lastModified": 1743784028,
|
||||
"narHash": "sha256-fl9K43x77XbR+dfSLDz8TmZJj6KuOq/WnZ0uPvvkjM0=",
|
||||
"owner": "jj-vcs",
|
||||
"repo": "jj",
|
||||
"rev": "0cd352e16ac4d2fd6b94c61e968feff77a43328b",
|
||||
"rev": "a31c811265b5d6a44589498c5db088a643d526f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -530,11 +530,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743186084,
|
||||
"narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=",
|
||||
"lastModified": 1743791363,
|
||||
"narHash": "sha256-hGETu0Ilugf0f7S5fFETUP+sS0ATrKcm+7YHs7GBwx4=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7",
|
||||
"rev": "f160e322673614c928e1187c268add9ef038a513",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -563,11 +563,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743017820,
|
||||
"narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=",
|
||||
"lastModified": 1743774669,
|
||||
"narHash": "sha256-xrg3m1RP7mvBi0sLPJjnn9UiCqN+NKqU94DZJMoaXZU=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d",
|
||||
"rev": "e8da89a430f4af0accfe80efe286b2cffd20a4aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -584,11 +584,11 @@
|
|||
"rust-overlay": "rust-overlay_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743160145,
|
||||
"narHash": "sha256-9DYlhUx9YS2JNkZzUJvVk/qt0n4W+pJtd29od0olwmg=",
|
||||
"lastModified": 1743774400,
|
||||
"narHash": "sha256-QZ6cjUrxoQbqB4CY5ogP/bJW1c73yVpCehKEfUS/0g8=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "977ebffd4a29f341139e2a80a7b1a9938fdfc2ba",
|
||||
"rev": "061a22595ad5dc0385436d0903d31d880b12c8d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -599,11 +599,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1743167577,
|
||||
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
|
||||
"lastModified": 1743420942,
|
||||
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
|
||||
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -615,11 +615,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -631,11 +631,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1740877520,
|
||||
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
|
||||
"lastModified": 1743296961,
|
||||
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
|
||||
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -662,11 +662,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1742937945,
|
||||
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
|
||||
"lastModified": 1743703532,
|
||||
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
|
||||
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -678,11 +678,11 @@
|
|||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1742937945,
|
||||
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
|
||||
"lastModified": 1743576891,
|
||||
"narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
|
||||
"rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -694,11 +694,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1743095683,
|
||||
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -734,11 +734,11 @@
|
|||
"nur-rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743119709,
|
||||
"narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
|
||||
"lastModified": 1743790892,
|
||||
"narHash": "sha256-Mb84ZhnqbErvQbOe+tbjU/7tqqczzKXGo3Jnv1/HGMw=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
|
||||
"rev": "29cbb2f7747d463424499d39da7308fa8ade093b",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -751,11 +751,11 @@
|
|||
"oskars-dotfiles": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1740768686,
|
||||
"narHash": "sha256-82VUIEalmL1yY5OW6+FsY+r4RKtfJWuEMkqqUDjXGrY=",
|
||||
"lastModified": 1743338345,
|
||||
"narHash": "sha256-7eOm26Y7nybMFe6uNbw4yPFgMd+CLyZyByXvpAvqmUo=",
|
||||
"owner": "oskardotglobal",
|
||||
"repo": ".dotfiles",
|
||||
"rev": "2743d9f1ac93d2daf6579d225fbb36e190dcc2e6",
|
||||
"rev": "182de5a67cd6fd30a9450d6bb7d5dd4d41272c5f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -838,11 +838,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743129211,
|
||||
"narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=",
|
||||
"lastModified": 1743682350,
|
||||
"narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "f93da1d26ba9963f34f94a6872b67a7939699543",
|
||||
"rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -858,11 +858,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742700801,
|
||||
"narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
|
||||
"lastModified": 1743756170,
|
||||
"narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
|
||||
"rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -899,11 +899,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743075971,
|
||||
"narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=",
|
||||
"lastModified": 1743775855,
|
||||
"narHash": "sha256-ZhhiYvHlA9f/Ck1i76ilfapLS7abLPRlWJQRxJEDTnQ=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a",
|
||||
"rev": "581fa67c818aaf91a1533149fb737d3e8c0949b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1066,11 +1066,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742773235,
|
||||
"narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=",
|
||||
"lastModified": 1743346993,
|
||||
"narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "b2613aec05f9e3f8488ef924203d62cafb712642",
|
||||
"rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
atuin.enable = true;
|
||||
obs.enable = true;
|
||||
chromium.enable = true;
|
||||
espanso.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
thunderbird.enable = true;
|
||||
obs.enable = true;
|
||||
chromium.enable = true;
|
||||
espanso.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,5 +25,6 @@
|
|||
./helix
|
||||
./waybar.nix
|
||||
./jujutsu.nix
|
||||
./espanso.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
44
home/modules/programs/espanso.nix
Normal file
44
home/modules/programs/espanso.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{
|
||||
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";
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -21,6 +21,7 @@ in
|
|||
obs-vaapi
|
||||
obs-vkcapture
|
||||
obs-webkitgtk
|
||||
obs-pipewire-audio-capture
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
name = "LXGW WenKai";
|
||||
};
|
||||
sansSerif = {
|
||||
package = pkgs.noto-fonts-cjk-serif;
|
||||
name = "Noto Serif CJK SC";
|
||||
package = pkgs.source-han-sans;
|
||||
name = "Source Han Sans SC";
|
||||
};
|
||||
monospace = {
|
||||
package = pkgs.maple-mono.NF-CN;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
"libvirtd"
|
||||
"wheel"
|
||||
"video"
|
||||
"input"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
./hardware-configuration.nix
|
||||
./networking.nix
|
||||
./disk-config.nix
|
||||
./hardware.nix
|
||||
];
|
||||
|
||||
youthlic = {
|
||||
|
|
@ -41,6 +42,7 @@
|
|||
nix-ld.enable = true;
|
||||
juicity.client.enable = true;
|
||||
asusd.enable = true;
|
||||
owncast.enable = true;
|
||||
};
|
||||
gui.enabled = "niri";
|
||||
};
|
||||
|
|
|
|||
28
nixos/configurations/Tytonidae/hardware.nix
Normal file
28
nixos/configurations/Tytonidae/hardware.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ 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
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
name = "LXGW WenKai";
|
||||
};
|
||||
sansSerif = {
|
||||
package = pkgs.noto-fonts-cjk-serif;
|
||||
name = "Noto Serif CJK SC";
|
||||
package = pkgs.source-han-sans;
|
||||
name = " Serif Han Sans SC";
|
||||
};
|
||||
monospace = {
|
||||
package = pkgs.maple-mono.NF-CN;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
"wheel"
|
||||
"video"
|
||||
"audio"
|
||||
"input"
|
||||
];
|
||||
};
|
||||
services.udev = {
|
||||
|
|
|
|||
|
|
@ -44,16 +44,24 @@ 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 = [
|
||||
"Noto Serif CJK SC"
|
||||
"Noto Serif"
|
||||
"Source Han Sans SC"
|
||||
"Noto Sans CJK SC"
|
||||
"Source Sans 3"
|
||||
"Noto Sans"
|
||||
];
|
||||
monospace = [
|
||||
"Maple Mono NF CN"
|
||||
|
|
|
|||
|
|
@ -22,5 +22,6 @@
|
|||
./miniflux.nix
|
||||
./guix.nix
|
||||
./asusd.nix
|
||||
./owncast.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
31
nixos/modules/programs/owncast.nix
Normal file
31
nixos/modules/programs/owncast.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ 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
|
||||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
"dioxionary": {
|
||||
"cargoLocks": {
|
||||
"./Cargo.lock": [
|
||||
"./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock",
|
||||
"./dioxionary-71f064e2cca49d36950b505873e05b256b868b56/./Cargo.lock",
|
||||
{}
|
||||
]
|
||||
},
|
||||
"date": "2025-03-17",
|
||||
"date": "2025-04-04",
|
||||
"extract": null,
|
||||
"name": "dioxionary",
|
||||
"passthru": null,
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"rev": "20d7b44e49e51c2fce3b0369bd544ec561476108",
|
||||
"rev": "71f064e2cca49d36950b505873e05b256b868b56",
|
||||
"sha256": "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=",
|
||||
"sparseCheckout": [],
|
||||
"type": "git",
|
||||
"url": "https://github.com/vaaandark/dioxionary.git"
|
||||
},
|
||||
"version": "20d7b44e49e51c2fce3b0369bd544ec561476108"
|
||||
"version": "71f064e2cca49d36950b505873e05b256b868b56"
|
||||
},
|
||||
"juicity": {
|
||||
"cargoLocks": null,
|
||||
|
|
@ -44,9 +44,55 @@
|
|||
},
|
||||
"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-03-30",
|
||||
"date": "2025-04-01",
|
||||
"extract": null,
|
||||
"name": "rime-ice",
|
||||
"passthru": null,
|
||||
|
|
@ -58,12 +104,12 @@
|
|||
"name": null,
|
||||
"owner": "iDvel",
|
||||
"repo": "rime-ice",
|
||||
"rev": "af3ea15b5c843d2c2d9ce904356073f962e8aa3d",
|
||||
"sha256": "sha256-52Iu5qikFJzYc5jL604C/zklLozV6p+C0/zr/DUvlGk=",
|
||||
"rev": "a5f5404e369100fcfc5562f86f1205827453e31c",
|
||||
"sha256": "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "af3ea15b5c843d2c2d9ce904356073f962e8aa3d"
|
||||
"version": "a5f5404e369100fcfc5562f86f1205827453e31c"
|
||||
},
|
||||
"tree-sitter-idris": {
|
||||
"cargoLocks": null,
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
{
|
||||
dioxionary = {
|
||||
pname = "dioxionary";
|
||||
version = "20d7b44e49e51c2fce3b0369bd544ec561476108";
|
||||
version = "71f064e2cca49d36950b505873e05b256b868b56";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/vaaandark/dioxionary.git";
|
||||
rev = "20d7b44e49e51c2fce3b0369bd544ec561476108";
|
||||
rev = "71f064e2cca49d36950b505873e05b256b868b56";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
|
|
@ -14,12 +14,12 @@
|
|||
sha256 = "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=";
|
||||
};
|
||||
cargoLock."./Cargo.lock" = {
|
||||
lockFile = ./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock;
|
||||
lockFile = ./dioxionary-71f064e2cca49d36950b505873e05b256b868b56/./Cargo.lock;
|
||||
outputHashes = {
|
||||
|
||||
};
|
||||
};
|
||||
date = "2025-03-17";
|
||||
date = "2025-04-04";
|
||||
};
|
||||
juicity = {
|
||||
pname = "juicity";
|
||||
|
|
@ -35,17 +35,45 @@
|
|||
};
|
||||
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 = "af3ea15b5c843d2c2d9ce904356073f962e8aa3d";
|
||||
version = "a5f5404e369100fcfc5562f86f1205827453e31c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iDvel";
|
||||
repo = "rime-ice";
|
||||
rev = "af3ea15b5c843d2c2d9ce904356073f962e8aa3d";
|
||||
rev = "a5f5404e369100fcfc5562f86f1205827453e31c";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-52Iu5qikFJzYc5jL604C/zklLozV6p+C0/zr/DUvlGk=";
|
||||
sha256 = "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw=";
|
||||
};
|
||||
date = "2025-03-30";
|
||||
date = "2025-04-01";
|
||||
};
|
||||
tree-sitter-idris = {
|
||||
pname = "tree-sitter-idris";
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ 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
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ let
|
|||
yaml-language-server
|
||||
taplo
|
||||
markdown-oxide
|
||||
marksman
|
||||
nixd
|
||||
deno
|
||||
nixfmt-rfc-style
|
||||
|
|
|
|||
21
pkgs/noto-sans-cjk.nix
Normal file
21
pkgs/noto-sans-cjk.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
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;
|
||||
})
|
||||
21
pkgs/noto-serif-cjk.nix
Normal file
21
pkgs/noto-serif-cjk.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
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;
|
||||
})
|
||||
|
|
@ -15,3 +15,13 @@ 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"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue