alex/nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

简化stable/unstable切换的方式；增加兼容性代码，根据版本引用

Browse Source
This commit is contained in:
alex
2025-05-05 18:59:34 +08:00
parent e6891f9f8e
commit c133e5637f
12 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
profiles/apollo/configuration.nix
View File

@@ -1,4 +1,4 @@
args@{ self, pkgs, home-manager, username, sysversion, ... }: {
args@{ self, pkgs, home-manager, username, version, ... }: {
# You can import other NixOS modules here
imports = [
./mount.nix
@@ -20,12 +20,11 @@ args@{ self, pkgs, home-manager, username, sysversion, ... }: {
# home-manager.useUserPackages = true;
home-manager = {
extraSpecialArgs = {
inherit (args) self inputs outputs libs sourcepath hostname username useremail sysversion;
inherit (args) self inputs outputs libs sourcepath hostname username useremail version;
};
users."${username}" = { ... }: {
imports = [
./hm
"${self}/libs/home-libs.nix"
"${self}/home/desktop.nix"
"${self}/modules/home/develop.nix"
];
@@ -55,5 +54,5 @@ args@{ self, pkgs, home-manager, username, sysversion, ... }: {
users.users."${username}".shell = pkgs.zsh;
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = sysversion;
system.stateVersion = version;
}

11
profiles/apollo/default.nix
View File

@@ -1,11 +1,8 @@
args@{ libs, inputs, ... }:
args@{ libs, inputs, nixos, ... }:
let
# 这里可以选择使用稳定版或不稳定版的nixpkgs
# nixpkgs = inputs.nixpkgs;
nixpkgs = inputs.nixpkgs-unstable; # 如果需要使用unstable版本，取消这行注释并注释上一行
home-manager = inputs.home-manager-unstable;
sysversion = "25.05";
sysArgs = args // { inherit home-manager sysversion; };
# 使用pkgs.unstable中的nixpkgs和home-manager
inherit (nixos.unstable) nixpkgs home-manager version;
sysArgs = args // { inherit home-manager version; };
in
# 使用libs.mkNixosSystem创建nixosSystem
libs.mkNixosSystem {

6
profiles/gaea/configuration.nix
View File

@@ -1,4 +1,4 @@
args@{ self, pkgs, home-manager, username, sysversion, ... }: {
args@{ self, pkgs, home-manager, username, version, ... }: {
# You can import other NixOS modules here
imports = [
# If you want to use modules your own flake exports (from modules/nixos):
@@ -34,7 +34,7 @@ args@{ self, pkgs, home-manager, username, sysversion, ... }: {
# home-manager.useUserPackages = true;
home-manager = {
extraSpecialArgs = {
inherit (args) self inputs outputs libs hostname username useremail sysversion;
inherit (args) self inputs outputs libs sourcepath hostname username useremail version;
};
users."${username}" = { ... }: {
imports = [
@@ -48,5 +48,5 @@ args@{ self, pkgs, home-manager, username, sysversion, ... }: {
];
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = sysversion;
system.stateVersion = version;
}

11
profiles/gaea/default.nix
View File

@@ -1,11 +1,8 @@
args@{ libs, inputs, ... }:
args@{ libs, inputs, nixos, ... }:
let
# 这里可以选择使用稳定版或不稳定版的nixpkgs
# nixpkgs = inputs.nixpkgs;
nixpkgs = inputs.nixpkgs-unstable; # 如果需要使用unstable版本，取消这行注释并注释上一行
home-manager = inputs.home-manager-unstable;
sysversion = "25.05";
sysArgs = args // { inherit home-manager sysversion; };
# 使用pkgs.unstable中的nixpkgs和home-manager
inherit (nixos.unstable) nixpkgs home-manager version;
sysArgs = args // { inherit home-manager version; };
in
# 使用libs.mkNixosSystem创建nixosSystem
libs.mkNixosSystem {

6
profiles/luna/configuration.nix
View File

@@ -1,4 +1,4 @@
args@{ self, home-manager, username, sysversion, ... }: {
args@{ self, home-manager, username, version, ... }: {
# You can import other NixOS modules here
imports = [
@@ -26,7 +26,7 @@ args@{ self, home-manager, username, sysversion, ... }: {
# home-manager.useUserPackages = true;
home-manager = {
extraSpecialArgs = {
inherit (args) self inputs outputs libs hostname username useremail sysversion;
inherit (args) self inputs outputs libs sourcepath hostname username useremail version;
};
users."${username}" = { ... }: {
imports = [
@@ -38,5 +38,5 @@ args@{ self, home-manager, username, sysversion, ... }: {
];
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = sysversion;
system.stateVersion = version;
}

11
profiles/luna/default.nix
View File

@@ -1,11 +1,8 @@
args@{ libs, inputs, ... }:
args@{ libs, inputs, nixos, ... }:
let
# 这里可以选择使用稳定版或不稳定版的nixpkgs
# nixpkgs = inputs.nixpkgs;
nixpkgs = inputs.nixpkgs-unstable; # 如果需要使用unstable版本，取消这行注释并注释上一行
home-manager = inputs.home-manager-unstable;
sysversion = "25.05";
sysArgs = args // { inherit home-manager sysversion; };
# 使用pkgs.unstable中的nixpkgs和home-manager
inherit (nixos.unstable) nixpkgs home-manager version;
sysArgs = args // { inherit home-manager version; };
in
# 使用libs.mkNixosSystem创建nixosSystem
libs.mkNixosSystem {