all repos — nixfiles @ 4177621ce4b79813e53000d499a95a8d51068610

System and user configuration, managed by nix and home-manager

darwin: remove config for emacs-macport easier to use upstream and reduce special cases

Alin
commit

4177621ce4b79813e53000d499a95a8d51068610

parent

cc699158cd67ffebbd142e961477b7d1791eae04

1 file changed, 11 insertions(+), 37 deletions(-)

changed files
M user/settings/darwin.nix → user/settings/darwin.nix
@@ -17,43 +17,17 @@ };
 
   home.file.".hushlogin".text = "";
 
-  programs.emacs =
-    let
-      useMacPort = false;
-    in
-    {
-      package = if useMacPort then pkgs.emacs-macport else pkgs.emacs;
-      extraPackages = (
-        epkgs:
-        lib.lists.optionals useMacPort [
-          epkgs.ultra-scroll
-        ]
-      );
-
-      extraConfig = ''
-        (with-eval-after-load 'dired
-          (setq insert-directory-program "gls"
-                dired-use-ls-dired t))
-      ''
-      + (
-        if useMacPort then
-          ''
-            (use-package ultra-scroll
-              :config (progn
-                        (setq scroll-conservatively 3
-                              scroll-margin 0)
-                        (ultra-scroll-mode +1)))
-
-          ''
-        else
-          ''
-            (use-package pixel-scroll
-              :config (progn
-                        (setq pixel-scroll-precision-use-momentum t)
-                        (pixel-scroll-precision-mode 1)))
-          ''
-      );
-    };
+  programs.emacs = {
+    extraConfig = ''
+      (with-eval-after-load 'dired
+        (setq insert-directory-program "gls"
+              dired-use-ls-dired t))
+      (use-package pixel-scroll
+        :config (progn
+                  (setq pixel-scroll-precision-use-momentum t)
+                  (pixel-scroll-precision-mode 1)))
+    '';
+  };
 
   programs.fish.plugins =
     map