Maybe I do want them, and should just update with home manager later...
This commit is contained in:
13
flake.nix
13
flake.nix
@@ -2,13 +2,15 @@
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
me-emacs.url = "git+https://git.syzygial.cc/Syzygial/EmacsConfig.git";
|
||||
me-emacs.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-darwin.url = "github:LnL7/nix-darwin/master";
|
||||
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, sops-nix, nix-darwin, home-manager }@attrs: let
|
||||
outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
|
||||
hydraGitea = (final: prev: {
|
||||
hydra_unstable = prev.hydra_unstable.overrideAttrs
|
||||
(old: {
|
||||
@@ -28,6 +30,11 @@
|
||||
nixpkgsConfig = {
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
me-emacs-overlay = (final: prev: {
|
||||
me-emacs = me-emacs.packages."x86_64-linux".emacs;
|
||||
# Will in future be macports based
|
||||
mac-emacs = me-emacs.packages."aarch64-darwin".emacs;
|
||||
});
|
||||
in {
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
@@ -47,7 +54,7 @@
|
||||
modules =
|
||||
[
|
||||
({ config, pkgs, ... }: {
|
||||
nixpkgs.overlays = [ ];
|
||||
nixpkgs.overlays = [ me-emacs-overlay ];
|
||||
})
|
||||
./machines/universedesktop/configuration.nix
|
||||
];
|
||||
@@ -60,7 +67,7 @@
|
||||
modules = [
|
||||
./machines/universeair/configuration.nix
|
||||
({ config, pkgs, ... }: {
|
||||
nixpkgs.overlays = [ ];
|
||||
nixpkgs.overlays = [ me-emacs-overlay ];
|
||||
})
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user