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

fix(nix): Fix firefox-darwin overlay is never actually applied

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-10-25 09:15:40 +07:00
parent f596ba43f5
commit d8ad75f69d
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.config/nix/lib/mkSystem.nix
View file

@ -1,4 +1,4 @@
system: nixpkgs: # e.g. x86_64-linux system: nixpkgs: extraOverlays:
{ {
system = system; system = system;
@ -7,7 +7,7 @@ system: nixpkgs: # e.g. x86_64-linux
overlays = overlays =
[ [
(import ../overlays/python.nix) (import ../overlays/python.nix)
]; ] ++ extraOverlays;
config.allowUnfree = true; config.allowUnfree = true;
}; };
} }

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

@ -1,4 +1,4 @@
{ pkgs, config, vars, common, ... }: { pkgs, config, vars, common, inputs, ... }:
{ {
# 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
@ -33,6 +33,7 @@
pkgs.duti pkgs.duti
pkgs.pinentry_mac pkgs.pinentry_mac
pkgs.iina pkgs.iina
pkgs.floorp-bin
]; ];
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.

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

@ -3,7 +3,6 @@
let let
mkCommon = import ../../lib/mkCommon.nix; mkCommon = import ../../lib/mkCommon.nix;
mkSystem = import ../../lib/mkSystem.nix; mkSystem = import ../../lib/mkSystem.nix;
pkgs.overlays = pkgs.overlays ++ [ inputs.firefox-darwin.overlay ];
in in
{ {
# Host list # Host list
@ -14,7 +13,7 @@ in
# Lenovo ThinkPad L460; Intel Core i5-6300U # Lenovo ThinkPad L460; Intel Core i5-6300U
"ThiccBook-Pro" = "ThiccBook-Pro" =
let let
inherit (mkSystem "x86_64-darwin" nixpkgs) system pkgs; inherit (mkSystem "x86_64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
common = (mkCommon pkgs); common = (mkCommon pkgs);
in in
nix-darwin.lib.darwinSystem { nix-darwin.lib.darwinSystem {
@ -28,7 +27,7 @@ in
# Imaginary M1, just for reference # Imaginary M1, just for reference
MacBookProM1 = MacBookProM1 =
let let
inherit (mkSystem "aarch64-darwin" nixpkgs) system pkgs; inherit (mkSystem "aarch64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
common = (mkCommon pkgs); common = (mkCommon pkgs);
in in
nix-darwin.lib.darwinSystem { nix-darwin.lib.darwinSystem {

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

@ -7,7 +7,7 @@ in
{ {
"potato" = "potato" =
let let
inherit (mkSystem "x86_64-linux" nixpkgs) system pkgs; inherit (mkSystem "x86_64-linux" nixpkgs []) system pkgs;
common = (mkCommon pkgs); common = (mkCommon pkgs);
in in
system-manager.lib.makeSystemConfig { system-manager.lib.makeSystemConfig {

5
.config/nix/users/default.nix
View file

@ -18,7 +18,7 @@ in
"ziro@ThiccBook-Pro" = "ziro@ThiccBook-Pro" =
let let
inherit (mkSystem "x86_64-darwin" nixpkgs) system pkgs; inherit (mkSystem "x86_64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
vars.name = "ziro"; vars.name = "ziro";
in in
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
@ -27,12 +27,13 @@ in
modules = [ modules = [
./ziro ./ziro
./ziro/darwin.nix ./ziro/darwin.nix
../modules/home-manager/floorp.nix
]; ];
}; };
"ziro@potato" = "ziro@potato" =
let let
inherit (mkSystem "x86_64-linux" nixpkgs) system pkgs; inherit (mkSystem "x86_64-linux" nixpkgs []) system pkgs;
vars.name = "ziro"; vars.name = "ziro";
in in
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {