Compare commits
9 commits
9556ca8d50
...
299b0621ad
| Author | SHA1 | Date | |
|---|---|---|---|
| 299b0621ad | |||
| 367f683bde | |||
| de798188e5 | |||
| 24caa95d84 | |||
| be185a893c | |||
| c2f2eacc72 | |||
| d9c7e3fc2c | |||
| cee982f17f | |||
| 3185f43ff7 |
21 changed files with 400 additions and 514 deletions
|
|
@ -22,7 +22,7 @@
|
|||
},
|
||||
"TrackersListCollection": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-11-11",
|
||||
"date": "2025-12-27",
|
||||
"extract": null,
|
||||
"name": "TrackersListCollection",
|
||||
"passthru": null,
|
||||
|
|
@ -34,14 +34,14 @@
|
|||
"name": null,
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"rev": "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de",
|
||||
"sha256": "sha256-jijgOp6SLzoIB3Vt94brwF316HwqYU8JppwTpXF+Y+A=",
|
||||
"rev": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9",
|
||||
"sha256": "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg=",
|
||||
"sparseCheckout": [
|
||||
"all.txt"
|
||||
],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de"
|
||||
"version": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9"
|
||||
},
|
||||
"cliphist": {
|
||||
"cargoLocks": null,
|
||||
|
|
@ -64,26 +64,6 @@
|
|||
},
|
||||
"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": {
|
||||
"cargoLocks": null,
|
||||
"date": null,
|
||||
|
|
@ -168,7 +148,7 @@
|
|||
},
|
||||
"spotx": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-11-07",
|
||||
"date": "2025-12-26",
|
||||
"extract": null,
|
||||
"name": "spotx",
|
||||
"passthru": null,
|
||||
|
|
@ -180,12 +160,12 @@
|
|||
"name": null,
|
||||
"owner": "SpotX-Official",
|
||||
"repo": "SpotX-Bash",
|
||||
"rev": "a2bd8479a2a80a068e749530aa5a78b2918358b8",
|
||||
"sha256": "sha256-pQgXi6AU0OlJgOe3GB+m1fivchzbfTp6UWF54hx+QNU=",
|
||||
"rev": "7c016872bf24ee5357f9621f1136955443f0a8a3",
|
||||
"sha256": "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "a2bd8479a2a80a068e749530aa5a78b2918358b8"
|
||||
"version": "7c016872bf24ee5357f9621f1136955443f0a8a3"
|
||||
},
|
||||
"tree-sitter-idris": {
|
||||
"cargoLocks": null,
|
||||
|
|
@ -275,4 +255,4 @@
|
|||
},
|
||||
"version": "184f55dbc5320c34a56d02353410ad35a0f3e090"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -15,18 +15,18 @@
|
|||
};
|
||||
TrackersListCollection = {
|
||||
pname = "TrackersListCollection";
|
||||
version = "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de";
|
||||
version = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "XIU2";
|
||||
repo = "TrackersListCollection";
|
||||
rev = "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de";
|
||||
rev = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ "all.txt" ];
|
||||
sha256 = "sha256-jijgOp6SLzoIB3Vt94brwF316HwqYU8JppwTpXF+Y+A=";
|
||||
sha256 = "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg=";
|
||||
};
|
||||
date = "2025-11-11";
|
||||
date = "2025-12-27";
|
||||
};
|
||||
cliphist = {
|
||||
pname = "cliphist";
|
||||
|
|
@ -40,20 +40,6 @@
|
|||
};
|
||||
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 = {
|
||||
pname = "noto-sans-cjk";
|
||||
version = "Serif2.003";
|
||||
|
|
@ -103,31 +89,17 @@
|
|||
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 = {
|
||||
pname = "spotx";
|
||||
version = "a2bd8479a2a80a068e749530aa5a78b2918358b8";
|
||||
version = "7c016872bf24ee5357f9621f1136955443f0a8a3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpotX-Official";
|
||||
repo = "SpotX-Bash";
|
||||
rev = "a2bd8479a2a80a068e749530aa5a78b2918358b8";
|
||||
rev = "7c016872bf24ee5357f9621f1136955443f0a8a3";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-pQgXi6AU0OlJgOe3GB+m1fivchzbfTp6UWF54hx+QNU=";
|
||||
sha256 = "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8=";
|
||||
};
|
||||
date = "2025-11-07";
|
||||
date = "2025-12-26";
|
||||
};
|
||||
tree-sitter-idris = {
|
||||
pname = "tree-sitter-idris";
|
||||
|
|
|
|||
683
flake.lock
generated
683
flake.lock
generated
File diff suppressed because it is too large
Load diff
15
flake.nix
15
flake.nix
|
|
@ -49,7 +49,6 @@
|
|||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
||||
# nixpkgs.url = "github:NixOS/nixpkgs/master";
|
||||
nixpkgs-fix-awscli2.url = "github:NixOS/nixpkgs/master";
|
||||
|
||||
lix-module = {
|
||||
url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93";
|
||||
|
|
@ -166,12 +165,6 @@
|
|||
repo = "treefmt-nix";
|
||||
};
|
||||
|
||||
chaotic = {
|
||||
type = "github";
|
||||
owner = "chaotic-cx";
|
||||
repo = "nyx";
|
||||
};
|
||||
|
||||
nur = {
|
||||
type = "github";
|
||||
owner = "nix-community";
|
||||
|
|
@ -208,7 +201,7 @@
|
|||
type = "github";
|
||||
owner = "nix-community";
|
||||
repo = "lanzaboote";
|
||||
ref = "v0.4.3";
|
||||
ref = "v1.0.0";
|
||||
};
|
||||
|
||||
nix-doom = {
|
||||
|
|
@ -243,5 +236,11 @@
|
|||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
ghostty = {
|
||||
type = "github";
|
||||
owner = "ghostty-org";
|
||||
repo = "ghostty";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ in {
|
|||
config = lib.mkIf cfg.enable {
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
package = pkgs.alacritty_git;
|
||||
settings =
|
||||
(
|
||||
with lib;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
|
|
@ -15,7 +16,7 @@
|
|||
programs.ghostty = lib.mkMerge [
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.ghostty;
|
||||
package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
settings = {
|
||||
# font-family = "Maple Mono NF CN";
|
||||
font-feature = [
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ in {
|
|||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
stylix.targets.noctalia-shell.enable = false;
|
||||
home.packages = [pkgs.app2unit];
|
||||
programs.noctalia-shell = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ in {
|
|||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
stylix.targets.zen-browser.enable = false;
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
profiles.default = {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
(with inputs; [
|
||||
niri-flake.homeModules.niri
|
||||
stylix.homeManagerModules.stylix
|
||||
chaotic.homeManagerModules.default
|
||||
])
|
||||
++ (lib.youthlic.loadImports ./.);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_cachyos;
|
||||
kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
loader.systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
kernelParams = ["i915.enable_guc=2"];
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
};
|
||||
};
|
||||
hardware = {
|
||||
graphics.package = pkgs.mesa_git;
|
||||
graphics.package = pkgs.mesa;
|
||||
intelgpu = {
|
||||
vaapiDriver = "intel-vaapi-driver";
|
||||
enableHybridCodec = true;
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
garage.enable = true;
|
||||
# emacs.enable = true;
|
||||
sunshine.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -95,6 +96,7 @@
|
|||
doom-emacs
|
||||
neovide
|
||||
osu-lazer-bin # typochecker: disable-line
|
||||
prismlauncher
|
||||
|
||||
sbctl
|
||||
];
|
||||
|
|
@ -108,7 +110,7 @@
|
|||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_cachyos-gcc;
|
||||
kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
|
|
|
|||
|
|
@ -23,12 +23,14 @@
|
|||
enable = true;
|
||||
users = ["david"];
|
||||
};
|
||||
graphics.package = pkgs.mesa_git;
|
||||
graphics.package = pkgs.mesa;
|
||||
intelgpu = {
|
||||
driver = "xe";
|
||||
vaapiDriver = "intel-media-driver";
|
||||
};
|
||||
nvidia = {
|
||||
# Fix Nvidia API Change, See <https://github.com/NixOS/nixpkgs/issues/467814/>
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
modesetting.enable = true;
|
||||
open = true;
|
||||
prime = {
|
||||
|
|
|
|||
|
|
@ -20,49 +20,56 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
netdevs = {
|
||||
"20-bond0" = {
|
||||
netdevConfig = {
|
||||
Kind = "bond";
|
||||
Name = "bond0";
|
||||
};
|
||||
bondConfig = {
|
||||
Mode = "balance-alb";
|
||||
MIIMonitorSec = "1s";
|
||||
PrimaryReselectPolicy = "better";
|
||||
};
|
||||
};
|
||||
};
|
||||
# netdevs = {
|
||||
# "20-bond0" = {
|
||||
# netdevConfig = {
|
||||
# Kind = "bond";
|
||||
# Name = "bond0";
|
||||
# };
|
||||
# bondConfig = {
|
||||
# Mode = "balance-alb";
|
||||
# MIIMonitorSec = "1s";
|
||||
# PrimaryReselectPolicy = "better";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
networks = {
|
||||
"20-eno2" = {
|
||||
networkConfig = {
|
||||
Bond = "bond0";
|
||||
PrimarySlave = true;
|
||||
};
|
||||
matchConfig = {
|
||||
Name = "eno2";
|
||||
};
|
||||
};
|
||||
"20-wlan0" = {
|
||||
networkConfig = {
|
||||
Bond = "bond0";
|
||||
};
|
||||
matchConfig = {
|
||||
Name = "wlan0";
|
||||
};
|
||||
};
|
||||
"20-bond0" = {
|
||||
networkConfig = {
|
||||
DHCP = "yes";
|
||||
# Bond = "bond0";
|
||||
# PrimarySlave = true;
|
||||
|
||||
DHCP = "ipv4";
|
||||
IPv6AcceptRA = true;
|
||||
};
|
||||
linkConfig = {
|
||||
RequiredForOnline = "routable";
|
||||
};
|
||||
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;
|
||||
};
|
||||
General = {
|
||||
EnableNetworkConfiguration = false;
|
||||
# EnableNetworkConfiguration = false;
|
||||
EnableNetworkConfiguration = true;
|
||||
};
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
cudaSupport = false;
|
||||
ncclSupport = false;
|
||||
};
|
||||
awscli2 = inputs.nixpkgs-fix-awscli2.legacyPackages.${p.stdenv.hostPlatform.system}.awscli2;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ routing {
|
|||
pname(juicity-client) -> 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(regex: ".*wgetcloud.*v2ray.*") -> must_direct
|
||||
domain(suffix: "hit.edu.cn") -> must_direct
|
||||
|
|
|
|||
18
nixos/modules/programs/kdeconnect.nix
Normal file
18
nixos/modules/programs/kdeconnect.nix
Normal 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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ in {
|
|||
config = lib.mkIf cfg.enable {
|
||||
hardware.graphics.enable32Bit = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
gamescope_git
|
||||
gamescope
|
||||
];
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
stylix.nixosModules.stylix
|
||||
disko.nixosModules.disko
|
||||
lix-module.nixosModules.default
|
||||
chaotic.nixosModules.default
|
||||
nixvim.nixosModules.nixvim
|
||||
|
||||
./..
|
||||
|
|
@ -23,7 +22,6 @@
|
|||
additions
|
||||
];
|
||||
};
|
||||
system.rebuild.enableNg = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
deploy-rs
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ in
|
|||
./nautilus.nix
|
||||
./neovim-nightly.nix
|
||||
./vim.nix
|
||||
./prismlauncher.nix
|
||||
|
||||
# Nur
|
||||
./nur.nix
|
||||
|
|
|
|||
5
overlays/modifications/prismlauncher.nix
Normal file
5
overlays/modifications/prismlauncher.nix
Normal 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
10
pkgs/prismlauncher'.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
prismlauncher,
|
||||
jdk17,
|
||||
jdk21,
|
||||
jdk8,
|
||||
jdk25,
|
||||
}:
|
||||
prismlauncher.override {
|
||||
jdks = [jdk17 jdk21 jdk8 jdk25];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue