fix typo; fix package

This commit is contained in:
2025-04-20 18:46:21 +08:00
parent adc025c7d9
commit 59a7964634
2 changed files with 8 additions and 7 deletions

View File

@@ -14,7 +14,7 @@
├── pkgs ├── pkgs
│ └── - │ └── -
├── profiles # 不同机器的配置文件 ├── profiles # 不同机器的配置文件
│ ├── appolo # 主服务器配置 │ ├── apollo # 主服务器配置
│ ├── gaea # 主用机配置 │ ├── gaea # 主用机配置
│ └── luna # 虚拟机配置 │ └── luna # 虚拟机配置
├── secrets ├── secrets

View File

@@ -7,13 +7,14 @@
username = "alex"; username = "alex";
useremail = "reizero@live.com"; useremail = "reizero@live.com";
hostname = "luna"; hostname = "luna";
sysversion = "24.11";
libs = import ./libs { inherit nixpkgs; }; libs = import ./libs { inherit nixpkgs; };
in in
rec { rec {
# Your custom packages # Your custom packages
# Acessible through 'nix build', 'nix shell', etc # Acessible through 'nix build', 'nix shell', etc
packages = libs.forAllSystems (system: packages = libs.forAllSystems (system:
let pkgs = nixpkgs.legacyPackages.${system}; let pkgs = nixpkgs.packages.${system};
in import ./pkgs { inherit pkgs; } in import ./pkgs { inherit pkgs; }
); );
@@ -28,7 +29,7 @@
lib.nixosSystem lib.nixosSystem
{ {
specialArgs = { specialArgs = {
inherit self inputs outputs username useremail; inherit self inputs outputs username useremail sysversion;
hostname = profile; hostname = profile;
}; };
modules = [ modules = [
@@ -43,9 +44,9 @@
homeConfigurations = { homeConfigurations = {
# FIXME replace with your username@hostname # FIXME replace with your username@hostname
"${username}" = home-manager-unstable.lib.homeManagerConfiguration { "${username}" = home-manager-unstable.lib.homeManagerConfiguration {
pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance pkgs = nixpkgs-unstable.packages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs username useremail; inherit inputs outputs username useremail sysversion;
hyprland = inputs.hyprland; hyprland = inputs.hyprland;
}; };
modules = [ modules = [
@@ -63,7 +64,7 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-${sysversion}";
# You can access packages and modules from different nixpkgs revs # You can access packages and modules from different nixpkgs revs
# at the same time. Here's an working example: # at the same time. Here's an working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -74,7 +75,7 @@
# Home manager # Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-${sysversion}";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };