Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emacs New Overlay

Browse Source
This commit is contained in:
David Crompton
2024-05-04 16:00:25 -04:00
parent cd235b33c4
commit e9f36c71ce
3 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714852682, "lastModified": 1714853356,
"narHash": "sha256-JcMj7oCJ9IuquBoPmMgxLQNPcWB+GZ9oWiW9otgeX4E=", "narHash": "sha256-2I7uFSeTAF0b8MU+Apb2JoczlAYmEAxj+ke/eWe1boA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "116b93e52a97d4922f086b004fa9e8043ba8931c", "rev": "a25078b1c1afd3fd887042ac8187bd9b300a6e83",
"revCount": 48, "revCount": 51,
"type": "git", "type": "git",
"url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git" "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
}, },

54
flake.nix
View File

@@ -30,39 +30,37 @@
nixpkgsConfig = { nixpkgsConfig = {
config = { allowUnfree = true; }; config = { allowUnfree = true; };
}; };
me-emacs-overlay = (final: prev: { me-emacs-overlay = me-emacs.overlays.default;
me-emacs = me-emacs.packages."x86_64-linux".emacs;
# Will in future be macports based
mac-emacs = me-emacs.packages."aarch64-darwin".emacs;
});
pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux"; pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux"; pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
in { in {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations = {
system = "x86_64-linux"; nixos = nixpkgs.lib.nixosSystem {
specialArgs = attrs; system = "x86_64-linux";
modules = specialArgs = attrs;
[ modules =
({ config, pkgs, ... }: { [
nixpkgs.overlays = [ hydraGitea nvidiaContainer ]; ({ config, pkgs, ... }: {
}) nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
./machines/hippocampus/configuration.nix })
sops-nix.nixosModules.sops ./machines/hippocampus/configuration.nix
]; sops-nix.nixosModules.sops
}; ];
nixosConfigurations.universedesktop = nixpkgs.lib.nixosSystem { };
system = "x86_64-linux"; universedesktop = nixpkgs.lib.nixosSystem {
specialArgs = attrs; system = "x86_64-linux";
modules = specialArgs = attrs;
[ modules =
({ config, pkgs, ... }: { [
nixpkgs.overlays = [ me-emacs-overlay ]; ({ config, pkgs, ... }: {
}) nixpkgs.overlays = [ me-emacs-overlay ];
./machines/universedesktop/configuration.nix })
sops-nix.nixosModules.sops ./machines/universedesktop/configuration.nix
]; sops-nix.nixosModules.sops
];
};
}; };
darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem { darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";

5
machines/universeair/configuration.nix
View File

@@ -52,11 +52,12 @@ in
services.emacs = { services.emacs = {
# Emacsclient behaving weirdly # Emacsclient behaving weirdly
# enable = true; # enable = true;
package = pkgs.mac-emacs; package = pkgs.me-emacs;
}; };
environment.variables = { environment.variables = {
EDITOR = "emacs"; EDITOR = "emacs -nw";
VISUAL = "emacs";
}; };
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [