diff --git a/flake.nix b/flake.nix index c65ea9e..1b60bed 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,13 @@ 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, me-emacs, nix-darwin, home-manager }@attrs: let + outputs = { self, nixpkgs, sops-nix, nix-darwin, home-manager }@attrs: let hydraGitea = (final: prev: { hydra_unstable = prev.hydra_unstable.overrideAttrs (old: { @@ -30,11 +28,6 @@ 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"; @@ -54,7 +47,7 @@ modules = [ ({ config, pkgs, ... }: { - nixpkgs.overlays = [ me-emacs-overlay ]; + nixpkgs.overlays = [ ]; }) ./machines/universedesktop/configuration.nix ]; @@ -67,7 +60,7 @@ modules = [ ./machines/universeair/configuration.nix ({ config, pkgs, ... }: { - nixpkgs.overlays = [ me-emacs-overlay ]; + nixpkgs.overlays = [ ]; }) home-manager.darwinModules.home-manager { diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix index 779bd26..a5f8089 100644 --- a/machines/universeair/configuration.nix +++ b/machines/universeair/configuration.nix @@ -41,7 +41,7 @@ flakify() { nixpkgs.config.allowUnfree = true; environment.systemPackages = (with pkgs; [ - mac-emacs + emacs (aspellWithDicts (p: with p;[ en en-computers diff --git a/machines/universedesktop/programs/office.nix b/machines/universedesktop/programs/office.nix index a8408dd..4ce8ecd 100644 --- a/machines/universedesktop/programs/office.nix +++ b/machines/universedesktop/programs/office.nix @@ -1,7 +1,7 @@ { lib, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ kitty - me-emacs + emacs rnix-lsp texlive.combined.scheme-full pandoc