feat(nix): Preparing common packages
This commit is contained in:
parent
6a5c04a1e4
commit
9147da1a71
5 changed files with 18 additions and 7 deletions
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, vars, ... }:
|
||||
{ pkgs, config, vars, common, ... }:
|
||||
|
||||
{
|
||||
# I don't want to risk breaking my hackintosh setup in case Apple decided to
|
||||
|
@ -15,8 +15,7 @@
|
|||
py.dnspython
|
||||
]));
|
||||
in
|
||||
[
|
||||
pkgs.zsh
|
||||
common.packages ++ [
|
||||
pkgs.git
|
||||
pkgs.vim
|
||||
pkgs.neovim
|
||||
|
|
|
@ -25,6 +25,7 @@ let
|
|||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
mkCommon = import ../mkCommon.nix;
|
||||
in
|
||||
{
|
||||
# Host list
|
||||
|
@ -36,10 +37,11 @@ in
|
|||
"ThiccBook-Pro" =
|
||||
let
|
||||
inherit (systemConfig "x86_64-darwin") system pkgs;
|
||||
common = (mkCommon pkgs);
|
||||
in
|
||||
nix-darwin.lib.darwinSystem {
|
||||
inherit system;
|
||||
specialArgs = { inherit inputs pkgs home-manager vars; };
|
||||
specialArgs = { inherit inputs pkgs home-manager vars common; };
|
||||
modules = [
|
||||
./configuration.nix
|
||||
home-manager.darwinModules.home-manager
|
||||
|
@ -54,6 +56,7 @@ in
|
|||
MacBookProM1 =
|
||||
let
|
||||
inherit (systemConfig "aarch64-darwin") system pkgs;
|
||||
vars.common = (mkCommon pkgs);
|
||||
in
|
||||
nix-darwin.lib.darwinSystem {
|
||||
inherit system;
|
||||
|
|
7
.config/nix/systems/mkCommon.nix
Normal file
7
.config/nix/systems/mkCommon.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
packages = [
|
||||
pkgs.zsh
|
||||
];
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, vars, ... }:
|
||||
{ pkgs, config, vars, common, ... }:
|
||||
|
||||
{
|
||||
# NOTE: List packages installed in system profile. To search by name, run:
|
||||
|
@ -11,7 +11,7 @@
|
|||
py.dnspython
|
||||
]));
|
||||
in
|
||||
[
|
||||
common.packages ++ [
|
||||
pkgs.zsh
|
||||
pkgs.git
|
||||
pkgs.vim
|
||||
|
|
|
@ -25,15 +25,17 @@ let
|
|||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
mkCommon = import ../mkCommon.nix;
|
||||
in
|
||||
{
|
||||
"potato" =
|
||||
let
|
||||
inherit (systemConfig "x86_64-linux") system pkgs;
|
||||
common = (mkCommon pkgs);
|
||||
in
|
||||
system-manager.lib.makeSystemConfig {
|
||||
inherit system;
|
||||
specialArgs = { inherit inputs pkgs home-manager vars; };
|
||||
specialArgs = { inherit inputs pkgs home-manager vars common; };
|
||||
modules = [
|
||||
./configuration.nix
|
||||
# home-manager.darwinModules.home-manager
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue