kenryuS/old-nixos-dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

started modifing configuration structure

Browse Source
This commit is contained in:
Kenryu Shibata
2024-12-22 16:56:40 +09:00
parent 1030d3e37f
commit 87d132cb4f
37 changed files with 272 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
flake.nix
View File

@@ -8,12 +8,12 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
};
outputs = inputs@{ nixpkgs, home-manager, ... }:
outputs = inputs@{ self, nixpkgs, home-manager, ... }:
let
systemSettings = {
system = "x86_64-linux";
hostname = "kenryu-nixos";
machine = "workstation";
host = "syushiki";
timezone = "Asia/Tokyo";
locale = "ja_JP.UTF-8";
bootConf = {
@@ -35,32 +35,37 @@
pkgs = import inputs.nixpkgs {
system = systemSettings.system;
config = {
allowUnfree = true;
allowUnfreePredicate = (_: true );
};
};
lib = inputs.nixpkgs.lib;
home-manager = inputs.home-manager;
in {
nixosConfigurations.system = lib.nixosSystem {
#nixosModules = {
# home-mngr = home-manager.nixosModules.home-manager {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.${userSettings.username} = import (./. + "/hosts/${systemSettings.host}/home.nix");
# home-manager.extraSpecialArgs = {
# inherit userSettings;
# };
# };
#};
#nixosConfigurations = import ./hosts inputs { inherit systemSettings; inherit userSettings; };
nixosConfigurations.syushiki = lib.nixosSystem {
system = systemSettings.system;
modules = [
(./. + "/machines" + ("/" + systemSettings.machine) + "/configuration.nix")
./hosts/syushiki
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${userSettings.username} = import (./. + "/machines" + ("/" + systemSettings.machine) + "/home.nix");
home-manager.users.${userSettings.username} = import (./. + "/hosts/${systemSettings.host}/home.nix");
home-manager.extraSpecialArgs = {
inherit userSettings;
};
}
];
specialArgs = {
inherit systemSettings;
inherit userSettings;
inherit inputs;
inherit inputs systemSettings userSettings;
};
};
};