diff --git a/nixos/hardware/apple-silicon-linux/default.nix b/nixos/hardware/apple-silicon-linux/default.nix index 6750a1a..9caef98 100644 --- a/nixos/hardware/apple-silicon-linux/default.nix +++ b/nixos/hardware/apple-silicon-linux/default.nix @@ -2,8 +2,10 @@ pkgs, lib, ... -}: let -in { +}: +let +in +{ #nixpkgs.overlays = [ # (import ./widevine-overlay.nix) #]; @@ -13,7 +15,7 @@ in { ]; hardware.asahi = { peripheralFirmwareDirectory = ./firmware; - useExperimentalGPUDriver = true; + #useExperimentalGPUDriver = true; #deprecated #experimentalGPUInstallMode = "overlay"; setupAsahiSound = true; }; diff --git a/nixos/modules/emacs/default.nix b/nixos/modules/emacs/default.nix index 9a2eb40..0b188c4 100644 --- a/nixos/modules/emacs/default.nix +++ b/nixos/modules/emacs/default.nix @@ -7,9 +7,9 @@ }: let emacs = pkgs.emacs; #pkgs.emacs-pgtk; in { - services.emacs.enable = true; + #services.emacs.enable = true; services.emacs.startWithGraphical = true; - services.emacs.install = true; + #services.emacs.install = true; services.emacs.package = emacs; #pkgs.emacs-unstable environment.systemPackages = diff --git a/nixos/modules/emacs/packages.nix b/nixos/modules/emacs/packages.nix index 1b41925..3a30111 100644 --- a/nixos/modules/emacs/packages.nix +++ b/nixos/modules/emacs/packages.nix @@ -1,10 +1,12 @@ { pkgs, emacs, -}: { +}: +{ packages = with pkgs; [ git gzip + wkhtmltopdf zip unzip gnutar @@ -19,6 +21,7 @@ nixfmt-rfc-style markdownlint-cli pandoc + groff gnumake python3 isort