From a09fade6d2bd2e8e7e6efcb60ed22985876f29a4 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 3 Sep 2024 23:03:03 +0200 Subject: [PATCH] editors: remove old nix files --- modules/programs/editors/emacs.nix | 63 ----------------------------- modules/programs/editors/helix.nix | 65 ------------------------------ 2 files changed, 128 deletions(-) delete mode 100644 modules/programs/editors/emacs.nix delete mode 100644 modules/programs/editors/helix.nix diff --git a/modules/programs/editors/emacs.nix b/modules/programs/editors/emacs.nix deleted file mode 100644 index 69d1b5c..0000000 --- a/modules/programs/editors/emacs.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: let - cfg = config.modules.system.programs.editors.emacs; - inherit (config.modules.other.system) username; - inherit (lib) mkIf; - - # Taken from outfoxxed since figuring this out is really annoying. - emacsOverlay = - pkgs.appendOverlays - (with inputs.emacs-overlay.overlays; [ - emacs - package - ]); - - customEmacs = with emacsOverlay; ((emacsPackagesFor - (emacs29-pgtk.override {withNativeCompilation = true;})) - .emacsWithPackages (epkgs: - with epkgs; [ - vterm - ])); -in { - config = mkIf cfg.enable { - environment.variables.PATH = ["$XDG_CONFIG_HOME/emacs/bin"]; - home-manager.users.${username} = { - home.packages = with pkgs; [ - # needed by native-comp - binutils - # Emacs itself - customEmacs - - # Doom dependencies - git - ripgrep - gnutls - - ## Optional dependencies - fd # faster projectile indexing - imagemagick # for image-dired - # (mkIf (config.programs.gnupg.agent.enable) - # pinentry-emacs) # in-emacs gnupg prompts - zstd # for undo-fu-session/undo-tree compression - - # Module dependencies - # :checkers spell - (aspellWithDicts (ds: with ds; [de en en-computers en-science])) - # :tools editorconfig - editorconfig-core-c # per-project style config - # :tools lookup & :lang org +roam - sqlite - ]; - - services.emacs = { - enable = true; - package = customEmacs; - }; - }; - }; -} diff --git a/modules/programs/editors/helix.nix b/modules/programs/editors/helix.nix deleted file mode 100644 index dffd903..0000000 --- a/modules/programs/editors/helix.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.modules.system.programs.editors.helix; - inherit (config.modules.other.system) username; - inherit (lib) mkIf getExe makeBinPath; -in { - config = mkIf cfg.enable { - home-manager.users.${username} = { - programs.helix = { - enable = true; - # thanks fufexan, this is great! - package = pkgs.helix.overrideAttrs (previousAttrs: { - makeWrapperArgs = with pkgs; - previousAttrs.makeWrapperArgs - or [] - ++ [ - "--suffix" - "PATH" - ":" - (makeBinPath [ - clang-tools - marksman - nil - bash-language-server - shellcheck - # typst-lsp - ]) - ]; - }); - settings = { - editor = { - indent-guides.render = true; - lsp.display-inlay-hints = true; - line-number = "relative"; - mouse = true; - bufferline = "multiple"; - soft-wrap.enable = true; - lsp.display-messages = true; - cursor-shape = {insert = "bar";}; - statusline.left = ["mode" "spinner" "version-control" "file-name"]; - }; - keys.normal = { - C-g = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"]; - esc = ["collapse_selection" "keep_primary_selection"]; - A-H = "goto_previous_buffer"; - A-L = "goto_next_buffer"; - A-w = ":buffer-close"; - }; - }; - languages = { - language-server = { - nil = { - command = getExe pkgs.nil; - config.nil.formatting.command = ["${getExe pkgs.alejandra}" "-q"]; - }; - }; - }; - }; - }; - }; -}