Darwin fixes

This commit is contained in:
Andrea Ciceri 2022-04-12 10:27:57 +02:00
parent d894374f53
commit 94b40d62d2
No known key found for this signature in database
GPG key ID: AAFD2423608B645B
4 changed files with 33 additions and 6 deletions

2
flake.lock generated
View file

@ -18,7 +18,7 @@
"darwin": {
"inputs": {
"nixpkgs": [
"unstable"
"stable"
]
},
"locked": {

View file

@ -17,7 +17,7 @@
home.inputs.nixpkgs.follows = "unstable";
darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "unstable";
darwin.inputs.nixpkgs.follows = "stable";
deploy.follows = "digga/deploy";
@ -173,7 +173,9 @@
system = "x86_64-darwin";
modules = [ home.darwinModules.home-manager ./hosts/mbp ];
inputs = { inherit darwin; };
specialArgs = { inherit emacs-overlay; };
specialArgs = {
inherit emacs-overlay; unstablePkgsInput = inputs.unstablePkgs;
};
};
};
}

View file

@ -1,4 +1,9 @@
{ pkgs, home-manager, emacs-overlay, ... }:
{ pkgs
, home-manager
, emacs-overlay
, unstablePkgsInput
, ...
}:
{
imports = [
../../users/andreaciceri
@ -15,7 +20,13 @@
};
nixpkgs = {
overlays = [ (import ../../pkgs) emacs-overlay.overlay ];
overlays = [
(import ../../pkgs {
inherit unstablePkgsInput
;
})
emacs-overlay.overlay
];
config.allowUnfree = true;
};
@ -25,5 +36,10 @@
user = "andreaciceri";
options = "--delete-older-than 3d";
};
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command
experimental-features = flakes
'';
};
}

View file

@ -13,13 +13,22 @@
yarn
pinentry_mac
openscad
nodejs
nodejs-14_x
poetry
ipfs
ipget
yabai
skhd
spacebar
xquartz
xterm
qmk
youtube-dl
ffmpeg
];
programs.gpg = {