null2264/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nix): Preparing common packages

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-10-16 08:28:06 +07:00
parent 6a5c04a1e4
commit 9147da1a71
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
5 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.config/nix/systems/darwin/configuration.nix
View file

@ -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 # I don't want to risk breaking my hackintosh setup in case Apple decided to
@ -15,8 +15,7 @@
py.dnspython py.dnspython
])); ]));
in in
[ common.packages ++ [
pkgs.zsh
pkgs.git pkgs.git
pkgs.vim pkgs.vim
pkgs.neovim pkgs.neovim

5
.config/nix/systems/darwin/default.nix
View file

@ -25,6 +25,7 @@ let
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
mkCommon = import ../mkCommon.nix;
in in
{ {
# Host list # Host list
@ -36,10 +37,11 @@ in
"ThiccBook-Pro" = "ThiccBook-Pro" =
let let
inherit (systemConfig "x86_64-darwin") system pkgs; inherit (systemConfig "x86_64-darwin") system pkgs;
common = (mkCommon pkgs);
in in
nix-darwin.lib.darwinSystem { nix-darwin.lib.darwinSystem {
inherit system; inherit system;
specialArgs = { inherit inputs pkgs home-manager vars; }; specialArgs = { inherit inputs pkgs home-manager vars common; };
modules = [ modules = [
./configuration.nix ./configuration.nix
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
@ -54,6 +56,7 @@ in
MacBookProM1 = MacBookProM1 =
let let
inherit (systemConfig "aarch64-darwin") system pkgs; inherit (systemConfig "aarch64-darwin") system pkgs;
vars.common = (mkCommon pkgs);
in in
nix-darwin.lib.darwinSystem { nix-darwin.lib.darwinSystem {
inherit system; inherit system;

7
.config/nix/systems/mkCommon.nix Normal file
View file

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
packages = [
pkgs.zsh
];
}

4
.config/nix/systems/nix/configuration.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, vars, ... }: { pkgs, config, vars, common, ... }:
{ {
# NOTE: List packages installed in system profile. To search by name, run: # NOTE: List packages installed in system profile. To search by name, run:
@ -11,7 +11,7 @@
py.dnspython py.dnspython
])); ]));
in in
[ common.packages ++ [
pkgs.zsh pkgs.zsh
pkgs.git pkgs.git
pkgs.vim pkgs.vim

4
.config/nix/systems/nix/default.nix
View file

@ -25,15 +25,17 @@ let
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
mkCommon = import ../mkCommon.nix;
in in
{ {
"potato" = "potato" =
let let
inherit (systemConfig "x86_64-linux") system pkgs; inherit (systemConfig "x86_64-linux") system pkgs;
common = (mkCommon pkgs);
in in
system-manager.lib.makeSystemConfig { system-manager.lib.makeSystemConfig {
inherit system; inherit system;
specialArgs = { inherit inputs pkgs home-manager vars; }; specialArgs = { inherit inputs pkgs home-manager vars common; };
modules = [ modules = [
./configuration.nix ./configuration.nix
# home-manager.darwinModules.home-manager # home-manager.darwinModules.home-manager