From 8207b0e249513feffd163d4228de685530fc665b Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 13 Oct 2023 20:39:39 +0300 Subject: 2023-10-13 --- modules/darwin/homebrew.nix | 2 +- modules/darwin/profiles/headful.nix | 2 +- modules/darwin/vim/default.nix | 21 +++++++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) (limited to 'modules/darwin') diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index 2667828..643787a 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -23,8 +23,8 @@ in { enable = true; onActivation = { autoUpdate = true; - cleanup = "zap"; upgrade = true; + cleanup = "zap"; }; }; }; diff --git a/modules/darwin/profiles/headful.nix b/modules/darwin/profiles/headful.nix index c50c657..01b1951 100644 --- a/modules/darwin/profiles/headful.nix +++ b/modules/darwin/profiles/headful.nix @@ -19,9 +19,9 @@ in { ]; homebrew.casks = [ - {name = "chromium";} {name = "firefox";} {name = "iterm2";} + {name = "macfuse";} {name = "telegram-desktop";} ]; }; diff --git a/modules/darwin/vim/default.nix b/modules/darwin/vim/default.nix index 519f120..e0a6898 100644 --- a/modules/darwin/vim/default.nix +++ b/modules/darwin/vim/default.nix @@ -9,14 +9,19 @@ with lib; let in { config = mkIf cfg.enable { programs.vim.package = - (pkgs.macvim.overrideAttrs (_: final: { - # TODO https://github.com/NixOS/nixpkgs/pull/239842 - configureFlags = - final.configureFlags - ++ [ - "--disable-perlinterp" - "--disable-rubyinterp" - ]; + (pkgs.macvim.overrideAttrs (_: _: { + # Too much of a hassle to selectively override this. Let's just + # explicitly override everything. + configureFlags = [ + "--disable-luainterp" + "--disable-python3interp" + "--disable-sparkle" + "--enable-gui=macvim" + "--with-compiledby=Nix" + "--with-features=huge" + "--with-tlib=ncurses" + "--without-local-dir" + ]; })) .configure (with cfg; { customRC = rc; -- cgit 1.4.1