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

refactor(nix): Mix stable and unstable packages

Browse source 
Also replace inkscape with brew cask inkscape on macOS
This commit is contained in:
Ahmad Ansori Palembani 2024-11-02 10:06:35 +07:00
parent 90c0934bf2
commit 26c9cfbaed
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
13 changed files with 133 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ pkgs, config, vars, common, inputs, ... }:
{ pkgs, pkgs-unstable, config, vars, common, inputs, ... }:
{
# I don't want to risk breaking my hackintosh setup in case Apple decided to
@ -17,7 +17,6 @@
pkgs.gnupg
pkgs.htop-vim
common.custom.python
(pkgs.inkscape.override { python3 = common.custom.python; })
#(pkgs.poetry.override { python3 = common.custom.python; })
pkgs.fastfetch
pkgs.eza

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

@ -1,4 +1,4 @@
{ inputs, nixpkgs, nix-darwin, vars, ... }:
{ inputs, nixpkgs-stable, nixpkgs-unstable, nix-darwin, vars, ... }:
let
mkCommon = import ../../lib/mkCommon.nix;
@ -14,16 +14,21 @@ in
"ThiccBook-Pro" =
let
inherit (
mkSystem "x86_64-darwin" nixpkgs [
inputs.firefox-darwin.overlay
inputs.brew-nix.overlays.default
]
) system pkgs;
common = (mkCommon pkgs);
mkSystem {
arch = "x86_64-darwin";
stable = nixpkgs-stable;
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
inputs.brew-nix.overlays.default
];
}
) system pkgs pkgs-unstable;
common = (mkCommon { inherit pkgs pkgs-unstable; });
in
nix-darwin.lib.darwinSystem {
inherit system;
specialArgs = { inherit inputs pkgs vars common; };
specialArgs = { inherit inputs pkgs pkgs-unstable vars common; };
modules = [
./configuration.nix
];
@ -33,16 +38,21 @@ in
MacBookProM1 =
let
inherit (
mkSystem "aarch64-darwin" nixpkgs [
inputs.firefox-darwin.overlay
inputs.brew-nix.overlays.default
]
) system pkgs;
common = (mkCommon pkgs);
mkSystem {
arch = "aarch64-darwin";
stable = nixpkgs-stable;
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
inputs.brew-nix.overlays.default
];
}
) system pkgs pkgs-unstable;
common = (mkCommon { inherit pkgs pkgs-unstable; });
in
nix-darwin.lib.darwinSystem {
inherit system;
specialArgs = { inherit inputs pkgs vars common; };
specialArgs = { inherit inputs pkgs pkgs-unstable vars common; };
modules = [
./configuration.nix
];

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

@ -1,4 +1,4 @@
{ inputs, nixpkgs, system-manager, vars, ... }:
{ inputs, nixpkgs-stable, nixpkgs-unstable, system-manager, vars, ... }:
let
mkCommon = import ../../lib/mkCommon.nix;
@ -7,11 +7,17 @@ in
{
"potato" =
let
inherit (mkSystem "x86_64-linux" nixpkgs []) system pkgs;
common = (mkCommon pkgs);
inherit (
mkSystem {
arch = "x86_64-linux";
stable = nixpkgs-stable;
unstable = nixpkgs-unstable;
}
) system pkgs pkgs-unstable;
common = (mkCommon { inherit pkgs pkgs-unstable; });
in
system-manager.lib.makeSystemConfig {
extraSpecialArgs = { inherit inputs pkgs vars common; };
extraSpecialArgs = { inherit inputs pkgs pkgs-unstable vars common; };
modules = [
./potato
];

2
.config/nix/systems/nix/potato/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, vars, common, ... }:
{ pkgs, pkgs-unstable, config, vars, common, ... }:
{
config = {