No need for pre-comped emacs, useful for smaller systems
This commit is contained in:
13
flake.nix
13
flake.nix
@@ -2,15 +2,13 @@
|
|||||||
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, me-emacs, nix-darwin, home-manager }@attrs: let
|
outputs = { self, nixpkgs, sops-nix, 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: {
|
||||||
@@ -30,11 +28,6 @@
|
|||||||
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";
|
||||||
@@ -54,7 +47,7 @@
|
|||||||
modules =
|
modules =
|
||||||
[
|
[
|
||||||
({ config, pkgs, ... }: {
|
({ config, pkgs, ... }: {
|
||||||
nixpkgs.overlays = [ me-emacs-overlay ];
|
nixpkgs.overlays = [ ];
|
||||||
})
|
})
|
||||||
./machines/universedesktop/configuration.nix
|
./machines/universedesktop/configuration.nix
|
||||||
];
|
];
|
||||||
@@ -67,7 +60,7 @@
|
|||||||
modules = [
|
modules = [
|
||||||
./machines/universeair/configuration.nix
|
./machines/universeair/configuration.nix
|
||||||
({ config, pkgs, ... }: {
|
({ config, pkgs, ... }: {
|
||||||
nixpkgs.overlays = [ me-emacs-overlay ];
|
nixpkgs.overlays = [ ];
|
||||||
})
|
})
|
||||||
home-manager.darwinModules.home-manager
|
home-manager.darwinModules.home-manager
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ flakify() {
|
|||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
environment.systemPackages = (with pkgs; [
|
environment.systemPackages = (with pkgs; [
|
||||||
mac-emacs
|
emacs
|
||||||
(aspellWithDicts (p: with p;[
|
(aspellWithDicts (p: with p;[
|
||||||
en
|
en
|
||||||
en-computers
|
en-computers
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ lib, config, pkgs, ... }: {
|
{ lib, config, pkgs, ... }: {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kitty
|
kitty
|
||||||
me-emacs
|
emacs
|
||||||
rnix-lsp
|
rnix-lsp
|
||||||
texlive.combined.scheme-full
|
texlive.combined.scheme-full
|
||||||
pandoc
|
pandoc
|
||||||
|
|||||||
Reference in New Issue
Block a user