restructure hosts
This commit is contained in:
10
flake.nix
10
flake.nix
@@ -10,6 +10,7 @@
|
|||||||
url = "github:LnL7/nix-darwin";
|
url = "github:LnL7/nix-darwin";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
nix-homebrew.url = "github:zhaofengli/nix-homebrew";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -40,6 +41,7 @@
|
|||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-unstable,
|
nixpkgs-unstable,
|
||||||
nix-darwin,
|
nix-darwin,
|
||||||
|
nix-homebrew,
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
systems = {
|
systems = {
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
system = systems.x86_64;
|
system = systems.x86_64;
|
||||||
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/snowbelle/configuration.nix
|
./hosts/nixos/snowbelle/configuration.nix
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -63,7 +65,7 @@
|
|||||||
system = systems.x86_64;
|
system = systems.x86_64;
|
||||||
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/vaniville/configuration.nix
|
./hosts/nixos/vaniville/configuration.nix
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -71,9 +73,9 @@
|
|||||||
darwinConfigurations = {
|
darwinConfigurations = {
|
||||||
CEN-IT-07 = nix-darwin.lib.darwinSystem {
|
CEN-IT-07 = nix-darwin.lib.darwinSystem {
|
||||||
system = systems.darwin;
|
system = systems.darwin;
|
||||||
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
|
specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/cen-it-07/configuration.nix
|
./hosts/darwin/cen-it-07/configuration.nix
|
||||||
inputs.home-manager.darwinModules.default
|
inputs.home-manager.darwinModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
40
hosts/darwin/default.nix
Normal file
40
hosts/darwin/default.nix
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
];
|
||||||
|
|
||||||
|
# base system package install list
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
wget
|
||||||
|
curl
|
||||||
|
rsync
|
||||||
|
git
|
||||||
|
age
|
||||||
|
fzf
|
||||||
|
neofetch
|
||||||
|
usbutils
|
||||||
|
pciutils
|
||||||
|
python3
|
||||||
|
vim
|
||||||
|
lf
|
||||||
|
btop
|
||||||
|
powertop
|
||||||
|
];
|
||||||
|
|
||||||
|
# set timezone
|
||||||
|
time.timeZone = "America/Chicago";
|
||||||
|
|
||||||
|
# allow proprietary packages
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
# enable flakes
|
||||||
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
users.defaultUserShell = pkgs.zsh;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -8,12 +8,12 @@ in
|
|||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../hosts
|
../../../hosts
|
||||||
../../users/blake
|
../../../users/blake
|
||||||
../../modules/system
|
../../../modules/system
|
||||||
../../modules/holocron
|
../../../modules/holocron
|
||||||
../../modules/homelab
|
../../../modules/homelab
|
||||||
../../modules/homelab/minecraft_recpro
|
../../../modules/homelab/minecraft_recpro
|
||||||
];
|
];
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
@@ -12,8 +12,8 @@
|
|||||||
homeDirectory = "/home/blake";
|
homeDirectory = "/home/blake";
|
||||||
};
|
};
|
||||||
home_darwin = {
|
home_darwin = {
|
||||||
username = "bdhelderman";
|
username = "bhelderman";
|
||||||
homeDirectory = "/Users/bdhelderman";
|
homeDirectory = "/Users/bhelderman";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user