the great update

This commit is contained in:
2025-03-07 17:04:41 +09:00
parent 442f46f622
commit 6216fcd751
77 changed files with 732 additions and 305 deletions

View File

@@ -5,10 +5,11 @@
nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
homix.url = "github:sioodmy/homix/main";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
};
outputs = inputs@{ self, nixpkgs, home-manager, ... }:
outputs = inputs@{ self, nixpkgs, homix, ... }:
let
systemSettings = {
system = "x86_64-linux";
@@ -16,12 +17,6 @@
host = "syushiki";
timezone = "Asia/Tokyo";
locale = "ja_JP.UTF-8";
bootConf = {
mode = "uefi";
mountPath = "/boot";
grubDev = "";
};
gpuType = "nvidia";
};
userSettings = {
@@ -29,8 +24,6 @@
name = "Kenryu Shibata";
email-dev = "kenryudev5894@gmail.com";
dotfilesDir = "/etc/nixos";
editor = "nvim";
editor-pkg = pkgs.neovim;
};
pkgs = import inputs.nixpkgs {
@@ -39,34 +32,27 @@
lib = inputs.nixpkgs.lib;
in {
#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;
# };
nixosModules = {
homix = homix.nixosModules.default;
};
nixosConfigurations = import ./hosts inputs;
#nixosConfigurations.syushiki = lib.nixosSystem {
# system = systemSettings.system;
# modules = [
# ./hosts/syushiki
# ./overlays
# 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;
# };
# }
# ];
# specialArgs = {
# inherit inputs systemSettings userSettings;
# };
#};
#nixosConfigurations = import ./hosts inputs { inherit systemSettings; inherit userSettings; };
nixosConfigurations.syushiki = lib.nixosSystem {
system = systemSettings.system;
modules = [
./hosts/syushiki
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;
};
}
];
specialArgs = {
inherit inputs systemSettings userSettings;
};
};
};
}