diff --git a/flake.nix b/flake.nix index 7e88fdb..7673020 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-homebrew.url = "github:zhaofengli/nix-homebrew"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -40,6 +41,7 @@ nixpkgs, nixpkgs-unstable, nix-darwin, + nix-homebrew, ... } @ inputs: let systems = { @@ -55,7 +57,7 @@ system = systems.x86_64; specialArgs = {inherit inputs stable_pkgs unstable_pkgs;}; modules = [ - ./hosts/snowbelle/configuration.nix + ./hosts/nixos/snowbelle/configuration.nix inputs.home-manager.nixosModules.default ]; }; @@ -63,7 +65,7 @@ system = systems.x86_64; specialArgs = {inherit inputs stable_pkgs unstable_pkgs;}; modules = [ - ./hosts/vaniville/configuration.nix + ./hosts/nixos/vaniville/configuration.nix inputs.home-manager.nixosModules.default ]; }; @@ -71,9 +73,9 @@ darwinConfigurations = { CEN-IT-07 = nix-darwin.lib.darwinSystem { system = systems.darwin; - specialArgs = {inherit inputs stable_pkgs unstable_pkgs;}; + specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;}; modules = [ - ./hosts/cen-it-07/configuration.nix + ./hosts/darwin/cen-it-07/configuration.nix inputs.home-manager.darwinModules.default ]; }; diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix new file mode 100644 index 0000000..4c06f11 --- /dev/null +++ b/hosts/darwin/default.nix @@ -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; + +} diff --git a/hosts/default.nix b/hosts/nixos/default.nix similarity index 100% rename from hosts/default.nix rename to hosts/nixos/default.nix diff --git a/hosts/snowbelle/configuration.nix b/hosts/nixos/snowbelle/configuration.nix similarity index 94% rename from hosts/snowbelle/configuration.nix rename to hosts/nixos/snowbelle/configuration.nix index ade220c..deab8f1 100644 --- a/hosts/snowbelle/configuration.nix +++ b/hosts/nixos/snowbelle/configuration.nix @@ -8,12 +8,12 @@ in imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../hosts - ../../users/blake - ../../modules/system - ../../modules/holocron - ../../modules/homelab - ../../modules/homelab/minecraft_recpro + ../../../hosts + ../../../users/blake + ../../../modules/system + ../../../modules/holocron + ../../../modules/homelab + ../../../modules/homelab/minecraft_recpro ]; system = { diff --git a/hosts/snowbelle/hardware-configuration.nix b/hosts/nixos/snowbelle/hardware-configuration.nix similarity index 100% rename from hosts/snowbelle/hardware-configuration.nix rename to hosts/nixos/snowbelle/hardware-configuration.nix diff --git a/hosts/vaniville/configuration.nix b/hosts/nixos/vaniville/configuration.nix similarity index 100% rename from hosts/vaniville/configuration.nix rename to hosts/nixos/vaniville/configuration.nix diff --git a/users/blake/home.nix b/users/blake/home.nix index 17dee0d..74559b4 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -12,8 +12,8 @@ homeDirectory = "/home/blake"; }; home_darwin = { - username = "bdhelderman"; - homeDirectory = "/Users/bdhelderman"; + username = "bhelderman"; + homeDirectory = "/Users/bhelderman"; }; in {