Maybe I do want them, and should just update with home manager later...

This commit is contained in:
2023-12-19 11:23:21 -05:00
parent 2146ab4237
commit 75e06be676
3 changed files with 12 additions and 5 deletions

View File

@@ -2,13 +2,15 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
sops-nix.url = "github:Mic92/sops-nix"; 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.url = "github:LnL7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; 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: { hydraGitea = (final: prev: {
hydra_unstable = prev.hydra_unstable.overrideAttrs hydra_unstable = prev.hydra_unstable.overrideAttrs
(old: { (old: {
@@ -28,6 +30,11 @@
nixpkgsConfig = { nixpkgsConfig = {
config = { allowUnfree = true; }; 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 { in {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@@ -47,7 +54,7 @@
modules = modules =
[ [
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ ]; nixpkgs.overlays = [ me-emacs-overlay ];
}) })
./machines/universedesktop/configuration.nix ./machines/universedesktop/configuration.nix
]; ];
@@ -60,7 +67,7 @@
modules = [ modules = [
./machines/universeair/configuration.nix ./machines/universeair/configuration.nix
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ ]; nixpkgs.overlays = [ me-emacs-overlay ];
}) })
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {

View File

@@ -41,7 +41,7 @@ flakify() {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
emacs mac-emacs
(aspellWithDicts (p: with p;[ (aspellWithDicts (p: with p;[
en en
en-computers en-computers

View File

@@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { { lib, config, pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kitty kitty
emacs me-emacs
rnix-lsp rnix-lsp
texlive.combined.scheme-full texlive.combined.scheme-full
pandoc pandoc