diff --git a/flake.nix b/flake.nix index ceedfc33..e0151798 100644 --- a/flake.nix +++ b/flake.nix @@ -52,30 +52,35 @@ in { darwinConfigurations = { "macmini" = darwin.lib.darwinSystem { - system = "x86_64-darwin"; - modules = [ - (./. + "/nixos/boxes/macmini") - home-manager.darwinModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.cyryl = { imports = [ ./nixos/home-manager ]; }; + system = "x86_64-darwin"; + modules = [ + (./. + "/nixos/boxes/macmini") + home-manager.darwinModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.cyryl = { + imports = [ ./nixos/home-manager ]; + }; - } - ]; + } + ]; }; "FORM3-CYRYLPLOTN" = darwin.lib.darwinSystem { - system = "x86_64-darwin"; - modules = [ - (./. + "/nixos/boxes/form3") - home-manager.darwinModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.cyryl = { imports = [ ./nixos/home-manager ]; }; + system = "x86_64-darwin"; + modules = [ + (./. + "/nixos/boxes/form3") + home-manager.darwinModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.cyryl = { + imports = [ ./nixos/home-manager ]; + _module.args.inputs = inputs; + }; - } - ]; + } + ]; }; }; diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix index ea5e5563..ce6520eb 100644 --- a/nixos/home-manager/cli.nix +++ b/nixos/home-manager/cli.nix @@ -12,7 +12,6 @@ binutils bitwarden-cli bottom - btop curl dnsutils docker-compose diff --git a/nixos/home-manager/linux.nix b/nixos/home-manager/linux.nix index 50c05ed6..6e5f6682 100644 --- a/nixos/home-manager/linux.nix +++ b/nixos/home-manager/linux.nix @@ -5,6 +5,7 @@ }; home.packages = with pkgs; [ atop + btop btrfs-progs glibcLocales lm_sensors