Compare commits

...

9 commits

21 changed files with 400 additions and 514 deletions

View file

@ -22,7 +22,7 @@
}, },
"TrackersListCollection": { "TrackersListCollection": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-11-11", "date": "2025-12-27",
"extract": null, "extract": null,
"name": "TrackersListCollection", "name": "TrackersListCollection",
"passthru": null, "passthru": null,
@ -34,14 +34,14 @@
"name": null, "name": null,
"owner": "XIU2", "owner": "XIU2",
"repo": "TrackersListCollection", "repo": "TrackersListCollection",
"rev": "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de", "rev": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9",
"sha256": "sha256-jijgOp6SLzoIB3Vt94brwF316HwqYU8JppwTpXF+Y+A=", "sha256": "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg=",
"sparseCheckout": [ "sparseCheckout": [
"all.txt" "all.txt"
], ],
"type": "github" "type": "github"
}, },
"version": "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de" "version": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9"
}, },
"cliphist": { "cliphist": {
"cargoLocks": null, "cargoLocks": null,
@ -64,26 +64,6 @@
}, },
"version": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2" "version": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2"
}, },
"juicity": {
"cargoLocks": null,
"date": "2025-06-30",
"extract": null,
"name": "juicity",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "412dbe43e091788c5464eb2d6e9c169bdf39f19c",
"sha256": "sha256-FU4+PXIyZS0RINEFD7Wylz9SOVEW9EnolaPGgZfhj9Y=",
"sparseCheckout": [],
"type": "git",
"url": "https://githuh.com/juicity/juicity"
},
"version": "412dbe43e091788c5464eb2d6e9c169bdf39f19c"
},
"noto-sans-cjk": { "noto-sans-cjk": {
"cargoLocks": null, "cargoLocks": null,
"date": null, "date": null,
@ -168,7 +148,7 @@
}, },
"spotx": { "spotx": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-11-07", "date": "2025-12-26",
"extract": null, "extract": null,
"name": "spotx", "name": "spotx",
"passthru": null, "passthru": null,
@ -180,12 +160,12 @@
"name": null, "name": null,
"owner": "SpotX-Official", "owner": "SpotX-Official",
"repo": "SpotX-Bash", "repo": "SpotX-Bash",
"rev": "a2bd8479a2a80a068e749530aa5a78b2918358b8", "rev": "7c016872bf24ee5357f9621f1136955443f0a8a3",
"sha256": "sha256-pQgXi6AU0OlJgOe3GB+m1fivchzbfTp6UWF54hx+QNU=", "sha256": "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "a2bd8479a2a80a068e749530aa5a78b2918358b8" "version": "7c016872bf24ee5357f9621f1136955443f0a8a3"
}, },
"tree-sitter-idris": { "tree-sitter-idris": {
"cargoLocks": null, "cargoLocks": null,

View file

@ -15,18 +15,18 @@
}; };
TrackersListCollection = { TrackersListCollection = {
pname = "TrackersListCollection"; pname = "TrackersListCollection";
version = "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de"; version = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "XIU2"; owner = "XIU2";
repo = "TrackersListCollection"; repo = "TrackersListCollection";
rev = "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de"; rev = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9";
fetchSubmodules = false; fetchSubmodules = false;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sparseCheckout = [ "all.txt" ]; sparseCheckout = [ "all.txt" ];
sha256 = "sha256-jijgOp6SLzoIB3Vt94brwF316HwqYU8JppwTpXF+Y+A="; sha256 = "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg=";
}; };
date = "2025-11-11"; date = "2025-12-27";
}; };
cliphist = { cliphist = {
pname = "cliphist"; pname = "cliphist";
@ -40,20 +40,6 @@
}; };
date = "2025-10-11"; date = "2025-10-11";
}; };
juicity = {
pname = "juicity";
version = "412dbe43e091788c5464eb2d6e9c169bdf39f19c";
src = fetchgit {
url = "https://githuh.com/juicity/juicity";
rev = "412dbe43e091788c5464eb2d6e9c169bdf39f19c";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-FU4+PXIyZS0RINEFD7Wylz9SOVEW9EnolaPGgZfhj9Y=";
};
date = "2025-06-30";
};
noto-sans-cjk = { noto-sans-cjk = {
pname = "noto-sans-cjk"; pname = "noto-sans-cjk";
version = "Serif2.003"; version = "Serif2.003";
@ -103,31 +89,17 @@
sha256 = "sha256-fw4DxYyONb1ZkoIiLc/TRPw5jBy7RcM1JLF4HfEvgrQ="; sha256 = "sha256-fw4DxYyONb1ZkoIiLc/TRPw5jBy7RcM1JLF4HfEvgrQ=";
}; };
}; };
spotifyd = {
pname = "spotifyd";
version = "f1acee9c6160db92dcd4214e96654cbbaed0e38a";
src = fetchgit {
url = "https://github.com/ulic-youthlic/spotifyd.git";
rev = "f1acee9c6160db92dcd4214e96654cbbaed0e38a";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
sha256 = "sha256-dcc+sklPJvV34U1A/eTD1kfIey4o5/kPq4yd72ey7LE=";
};
date = "2025-09-04";
};
spotx = { spotx = {
pname = "spotx"; pname = "spotx";
version = "a2bd8479a2a80a068e749530aa5a78b2918358b8"; version = "7c016872bf24ee5357f9621f1136955443f0a8a3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SpotX-Official"; owner = "SpotX-Official";
repo = "SpotX-Bash"; repo = "SpotX-Bash";
rev = "a2bd8479a2a80a068e749530aa5a78b2918358b8"; rev = "7c016872bf24ee5357f9621f1136955443f0a8a3";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-pQgXi6AU0OlJgOe3GB+m1fivchzbfTp6UWF54hx+QNU="; sha256 = "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8=";
}; };
date = "2025-11-07"; date = "2025-12-26";
}; };
tree-sitter-idris = { tree-sitter-idris = {
pname = "tree-sitter-idris"; pname = "tree-sitter-idris";

683
flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -49,7 +49,6 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
# nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.url = "github:NixOS/nixpkgs/master";
nixpkgs-fix-awscli2.url = "github:NixOS/nixpkgs/master";
lix-module = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93";
@ -166,12 +165,6 @@
repo = "treefmt-nix"; repo = "treefmt-nix";
}; };
chaotic = {
type = "github";
owner = "chaotic-cx";
repo = "nyx";
};
nur = { nur = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
@ -208,7 +201,7 @@
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
repo = "lanzaboote"; repo = "lanzaboote";
ref = "v0.4.3"; ref = "v1.0.0";
}; };
nix-doom = { nix-doom = {
@ -243,5 +236,11 @@
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };
}; };
ghostty = {
type = "github";
owner = "ghostty-org";
repo = "ghostty";
};
}; };
} }

View file

@ -14,7 +14,6 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
package = pkgs.alacritty_git;
settings = settings =
( (
with lib; with lib;

View file

@ -2,6 +2,7 @@
pkgs, pkgs,
config, config,
lib, lib,
inputs,
... ...
}: { }: {
options = { options = {
@ -15,7 +16,7 @@
programs.ghostty = lib.mkMerge [ programs.ghostty = lib.mkMerge [
{ {
enable = true; enable = true;
package = pkgs.ghostty; package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default;
settings = { settings = {
# font-family = "Maple Mono NF CN"; # font-family = "Maple Mono NF CN";
font-feature = [ font-feature = [

View file

@ -58,6 +58,7 @@ in {
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
stylix.targets.noctalia-shell.enable = false;
home.packages = [pkgs.app2unit]; home.packages = [pkgs.app2unit];
programs.noctalia-shell = { programs.noctalia-shell = {
enable = true; enable = true;

View file

@ -12,6 +12,7 @@ in {
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
stylix.targets.zen-browser.enable = false;
programs.zen-browser = { programs.zen-browser = {
enable = true; enable = true;
profiles.default = { profiles.default = {

View file

@ -7,7 +7,6 @@
(with inputs; [ (with inputs; [
niri-flake.homeModules.niri niri-flake.homeModules.niri
stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
chaotic.homeManagerModules.default
]) ])
++ (lib.youthlic.loadImports ./.); ++ (lib.youthlic.loadImports ./.);
} }

View file

@ -72,7 +72,7 @@
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_cachyos; kernelPackages = pkgs.linuxKernel.packages.linux_zen;
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
kernelParams = ["i915.enable_guc=2"]; kernelParams = ["i915.enable_guc=2"];
@ -83,7 +83,7 @@
}; };
}; };
hardware = { hardware = {
graphics.package = pkgs.mesa_git; graphics.package = pkgs.mesa;
intelgpu = { intelgpu = {
vaapiDriver = "intel-vaapi-driver"; vaapiDriver = "intel-vaapi-driver";
enableHybridCodec = true; enableHybridCodec = true;

View file

@ -51,6 +51,7 @@
garage.enable = true; garage.enable = true;
# emacs.enable = true; # emacs.enable = true;
sunshine.enable = true; sunshine.enable = true;
kdeconnect.enable = true;
}; };
}; };
@ -95,6 +96,7 @@
doom-emacs doom-emacs
neovide neovide
osu-lazer-bin # typochecker: disable-line osu-lazer-bin # typochecker: disable-line
prismlauncher
sbctl sbctl
]; ];
@ -108,7 +110,7 @@
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_cachyos-gcc; kernelPackages = pkgs.linuxKernel.packages.linux_zen;
lanzaboote = { lanzaboote = {
enable = true; enable = true;
pkiBundle = "/var/lib/sbctl"; pkiBundle = "/var/lib/sbctl";

View file

@ -23,12 +23,14 @@
enable = true; enable = true;
users = ["david"]; users = ["david"];
}; };
graphics.package = pkgs.mesa_git; graphics.package = pkgs.mesa;
intelgpu = { intelgpu = {
driver = "xe"; driver = "xe";
vaapiDriver = "intel-media-driver"; vaapiDriver = "intel-media-driver";
}; };
nvidia = { nvidia = {
# Fix Nvidia API Change, See <https://github.com/NixOS/nixpkgs/issues/467814/>
package = config.boot.kernelPackages.nvidiaPackages.beta;
modesetting.enable = true; modesetting.enable = true;
open = true; open = true;
prime = { prime = {

View file

@ -20,49 +20,56 @@
}; };
}; };
}; };
netdevs = { # netdevs = {
"20-bond0" = { # "20-bond0" = {
netdevConfig = { # netdevConfig = {
Kind = "bond"; # Kind = "bond";
Name = "bond0"; # Name = "bond0";
}; # };
bondConfig = { # bondConfig = {
Mode = "balance-alb"; # Mode = "balance-alb";
MIIMonitorSec = "1s"; # MIIMonitorSec = "1s";
PrimaryReselectPolicy = "better"; # PrimaryReselectPolicy = "better";
}; # };
}; # };
}; # };
networks = { networks = {
"20-eno2" = { "20-eno2" = {
networkConfig = { networkConfig = {
Bond = "bond0"; # Bond = "bond0";
PrimarySlave = true; # PrimarySlave = true;
};
matchConfig = { DHCP = "ipv4";
Name = "eno2";
};
};
"20-wlan0" = {
networkConfig = {
Bond = "bond0";
};
matchConfig = {
Name = "wlan0";
};
};
"20-bond0" = {
networkConfig = {
DHCP = "yes";
IPv6AcceptRA = true; IPv6AcceptRA = true;
}; };
linkConfig = { linkConfig = {
RequiredForOnline = "routable"; RequiredForOnline = "routable";
}; };
matchConfig = { matchConfig = {
Name = "bond0"; Name = "eno2";
}; };
}; };
# "20-wlan0" = {
# networkConfig = {
# # Bond = "bond0";
# };
# matchConfig = {
# Name = "wlan0";
# };
# };
# "20-bond0" = {
# networkConfig = {
# DHCP = "yes";
# IPv6AcceptRA = true;
# };
# linkConfig = {
# RequiredForOnline = "routable";
# };
# matchConfig = {
# Name = "bond0";
# };
# };
}; };
}; };
@ -80,7 +87,8 @@
Enabled = true; Enabled = true;
}; };
General = { General = {
EnableNetworkConfiguration = false; # EnableNetworkConfiguration = false;
EnableNetworkConfiguration = true;
}; };
Settings = { Settings = {
AutoConnect = true; AutoConnect = true;

View file

@ -32,7 +32,6 @@
cudaSupport = false; cudaSupport = false;
ncclSupport = false; ncclSupport = false;
}; };
awscli2 = inputs.nixpkgs-fix-awscli2.legacyPackages.${p.stdenv.hostPlatform.system}.awscli2;
}; };
}; };
}; };

View file

@ -65,7 +65,7 @@ routing {
pname(juicity-client) -> must_direct pname(juicity-client) -> must_direct
# pname(systemd-resolve) -> must_direct # pname(systemd-resolve) -> must_direct
dip(107.174.145.140) -> must_direct # dip(107.174.145.140) -> must_direct
domain(full: time.windows.com) -> must_direct domain(full: time.windows.com) -> must_direct
domain(regex: ".*wgetcloud.*v2ray.*") -> must_direct domain(regex: ".*wgetcloud.*v2ray.*") -> must_direct
domain(suffix: "hit.edu.cn") -> must_direct domain(suffix: "hit.edu.cn") -> must_direct

View file

@ -0,0 +1,18 @@
{
lib,
config,
...
}: let
cfg = config.youthlic.programs.kdeconnect;
in {
options = {
youthlic.programs.kdeconnect = {
enable = lib.mkEnableOption "kdeconnect";
};
};
config = lib.mkIf cfg.enable {
programs.kdeconnect = {
enable = true;
};
};
}

View file

@ -14,7 +14,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gamescope_git gamescope
]; ];
programs.steam = { programs.steam = {
enable = true; enable = true;

View file

@ -10,7 +10,6 @@
stylix.nixosModules.stylix stylix.nixosModules.stylix
disko.nixosModules.disko disko.nixosModules.disko
lix-module.nixosModules.default lix-module.nixosModules.default
chaotic.nixosModules.default
nixvim.nixosModules.nixvim nixvim.nixosModules.nixvim
./.. ./..
@ -23,7 +22,6 @@
additions additions
]; ];
}; };
system.rebuild.enableNg = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
deploy-rs deploy-rs
]; ];

View file

@ -15,6 +15,7 @@ in
./nautilus.nix ./nautilus.nix
./neovim-nightly.nix ./neovim-nightly.nix
./vim.nix ./vim.nix
./prismlauncher.nix
# Nur # Nur
./nur.nix ./nur.nix

View file

@ -0,0 +1,5 @@
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
prismlauncher = outputs.packages.${system}.prismlauncher';
}

10
pkgs/prismlauncher'.nix Normal file
View file

@ -0,0 +1,10 @@
{
prismlauncher,
jdk17,
jdk21,
jdk8,
jdk25,
}:
prismlauncher.override {
jdks = [jdk17 jdk21 jdk8 jdk25];
}