nixos: sorting

This commit is contained in:
Guanran Wang 2023-12-30 22:41:46 +08:00
parent b0ece0c86c
commit f9161573ff
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
70 changed files with 50 additions and 37 deletions

View file

@ -1,24 +1,22 @@
{...}: { {...}: {
imports = [ imports = [
# OS # OS
../../profiles/core ../../profiles/laptop
../../profiles/device-type/laptop ../../profiles/common/opt-in/zram-generator.nix
../../profiles/opt-in/zram-generator.nix ../../profiles/common/opt-in/gaming.nix
../../profiles/opt-in/gaming.nix ../../profiles/common/opt-in/virt-manager.nix
../../profiles/opt-in/virt-manager.nix
# User # User
../../../users/guanranwang/nixos/profiles/core ../../../users/guanranwang/nixos/profiles/laptop
../../../users/guanranwang/nixos/profiles/device-type/laptop ../../../users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client
../../../users/guanranwang/nixos/profiles/opt-in/clash-meta-client ../../../users/guanranwang/nixos/profiles/common/opt-in/gaming
../../../users/guanranwang/nixos/profiles/opt-in/gaming ../../../users/guanranwang/nixos/profiles/common/opt-in/torrenting
../../../users/guanranwang/nixos/profiles/opt-in/torrenting
# Hardware # Hardware
./hardware-configuration.nix ./hardware-configuration.nix
../../profiles/opt-in/lanzaboote.nix ../../profiles/common/opt-in/lanzaboote.nix
../../profiles/opt-in/impermanence.nix ../../profiles/common/opt-in/impermanence.nix
../../profiles/opt-in/disko.nix ../../profiles/common/opt-in/disko.nix
]; ];
networking.hostName = "Aristotle"; networking.hostName = "Aristotle";

View file

@ -30,7 +30,7 @@
#"nvidia-persistenced" #"nvidia-persistenced"
"xow_dongle-firmware" "xow_dongle-firmware"
#"facetimehd-firmware" #"facetimehd-firmware"
"osu-lazer-bin-2023.1221.0" "osu-lazer-bin-2023.1224.0"
"spotify" "spotify"
"steam" "steam"
"steam-original" "steam-original"

View file

@ -1,6 +1,4 @@
{modulesPath, ...}: {modulesPath, ...}: {
# no i dont actually own a server
{
imports = [ imports = [
(modulesPath + "/profiles/minimal.nix") (modulesPath + "/profiles/minimal.nix")
]; ];

View file

@ -1,6 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [ imports = [
./graphical ../common/core
../common/graphical
]; ];
boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelPackages = pkgs.linuxPackages_zen;

View file

@ -0,0 +1,7 @@
{...}:
# no i dont actually own a server
{
imports = [
../common/minimal
];
}

View file

@ -25,7 +25,7 @@
### sops-nix ### sops-nix
sops = { sops = {
defaultSopsFile = ../../../secrets.yaml; defaultSopsFile = ../../../../secrets.yaml;
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
gnupg.sshKeyPaths = []; gnupg.sshKeyPaths = [];
secrets = { secrets = {

View file

@ -0,0 +1,6 @@
{...}: {
imports = [
../../../../../home-manager
../../../../../home-manager/applications/trashy
];
}

View file

@ -1,7 +1,3 @@
{...}: { _: {
imports = [
../desktop
];
home-manager.users.guanranwang = import ./home; home-manager.users.guanranwang = import ./home;
} }

View file

@ -119,4 +119,4 @@ rules:
- GEOIP, twitter, Twitter - GEOIP, twitter, Twitter
- GEOSITE, CN, 国内 - GEOSITE, CN, 国内
- GEOIP, CN, 国内 - GEOIP, CN, 国内
- MATCH, 其他 - MATCH, 其他

View file

@ -1,5 +1,5 @@
{...}: { {...}: {
imports = map (n: ../../../../../home-manager/applications/${n}) [ imports = map (n: ../../../../../../home-manager/applications/${n}) [
"steam" "steam"
"prismlauncher" "prismlauncher"
"osu-lazer" "osu-lazer"

View file

@ -0,0 +1,5 @@
{...}: {
imports = [
../../../../../../home-manager/applications/qbittorrent
];
}

View file

@ -1,6 +0,0 @@
{...}: {
imports = [
../../../../home-manager
../../../../home-manager/applications/trashy
];
}

View file

@ -0,0 +1,6 @@
{...}: {
imports = [
../common/core
../common/graphical
];
}

View file

@ -0,0 +1,7 @@
{...}: {
imports = [
../common/core
../common/graphical
../common/mobile
];
}

View file

@ -1,5 +0,0 @@
{...}: {
imports = [
../../../../../home-manager/applications/qbittorrent
];
}