From ee0fd8835c219d99ae3cf3c343f6a51d210dace7 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 25 Jun 2023 21:38:07 +0200 Subject: [PATCH] Remove emacs config --- home/modules/default.nix | 4 - home/modules/emacs/default.nix | 73 ---------- home/modules/emacs/doom.d/config.el | 12 -- home/modules/emacs/doom.d/init.el | 189 -------------------------- home/modules/emacs/doom.d/packages.el | 3 - 5 files changed, 281 deletions(-) delete mode 100644 home/modules/emacs/default.nix delete mode 100644 home/modules/emacs/doom.d/config.el delete mode 100644 home/modules/emacs/doom.d/init.el delete mode 100644 home/modules/emacs/doom.d/packages.el diff --git a/home/modules/default.nix b/home/modules/default.nix index 7120aa8..9d0427c 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -2,10 +2,6 @@ alacritty = import ./alacritty; colors = import ./colors.nix; direnv = import ./direnv.nix; - - # Disable because can't get importing the module to work - #emacs = import ./emacs; - fish = import ./fish.nix; git = import ./git.nix; gpg = import ./gpg.nix; diff --git a/home/modules/emacs/default.nix b/home/modules/emacs/default.nix deleted file mode 100644 index 2fa0b0f..0000000 --- a/home/modules/emacs/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: -with lib; let - cfg = config.dadada.home.emacs; -in -{ - options.dadada.home.emacs = { - enable = mkEnableOption "Enable dadada emacs config"; - }; - - config = mkIf cfg.enable { - programs.doom-emacs = { - enable = true; - doomPrivateDir = ./doom.d; - emacsPackagesOverlay = self: super: - with pkgs; { - tsc = super.tsc.overrideAttrs (old: - let - libtsc_dyn = rustPlatform.buildRustPackage rec { - pname = "emacs-tree-sitter"; - version = "0.15.1"; - src = fetchFromGitHub { - owner = "ubolonton"; - repo = "emacs-tree-sitter"; - rev = version; - sha256 = "sha256-WgkGtmw63+kRLTRiSEO4bFF2IguH5g4odCujyazkwJc="; - }; - preBuild = '' - export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ - ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ - ${lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include/"} \ - ${lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ - $NIX_CFLAGS_COMPILE" - ''; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY="; - }; - in - { - inherit (libtsc_dyn) src; - preBuild = '' - ext=${stdenv.hostPlatform.extensions.sharedLibrary} - dest=$out/share/emacs/site-lisp/elpa/tsc-${old.version} - install -D ${libtsc_dyn}/lib/libtsc_dyn$ext $dest/tsc-dyn$ext - echo -n "0.15.1" > $dest/DYN-VERSION - ''; - }); - tree-sitter-langs = super.tree-sitter-langs.overrideAttrs (old: { - postInstall = '' - dest=$out/share/emacs/site-lisp/elpa/tree-sitter-langs-${old.version} - echo -n "0.10.2" > $dest/BUNDLE-VERSION - ${lib.concatStringsSep "\n" - (lib.mapAttrsToList (name: src: "name=${name}; ln -s ${src}/parser $dest/bin/\${name#tree-sitter-}.so") pkgs.tree-sitter.builtGrammars)}; - ''; - }); - }; - }; - home.file.".tree-sitter".source = pkgs.runCommand "grammars" { } '' - mkdir -p $out/bin - echo -n "0.10.2" > $out/BUNDLE-VERSION - ${lib.concatStringsSep "\n" - (lib.mapAttrsToList (name: src: "name=${name}; ln -s ${src}/parser $out/bin/\${name#tree-sitter-}.so") pkgs.tree-sitter.builtGrammars)}; - ''; - }; -} diff --git a/home/modules/emacs/doom.d/config.el b/home/modules/emacs/doom.d/config.el deleted file mode 100644 index 31e15d8..0000000 --- a/home/modules/emacs/doom.d/config.el +++ /dev/null @@ -1,12 +0,0 @@ -(setq doom-font (font-spec :family "Source Code Pro" :size 13 :weight 'semi-light)) -(setq org-directory "~/src/notes/org/") -(with-eval-after-load 'treemacs - (define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action)) -(defun fixed-tree-sitter-langs-install-grammars (&optional skip-if-installed version os keep-bundle) ()) -(advice-add 'tree-sitter-langs-install-grammars :override #'fixed-tree-sitter-langs-install-grammars) -(use-package! tree-sitter - :config - (cl-pushnew (expand-file-name "~/.tree-sitter") tree-sitter-load-path) - (require 'tree-sitter-langs) - (global-tree-sitter-mode) - (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode)) diff --git a/home/modules/emacs/doom.d/init.el b/home/modules/emacs/doom.d/init.el deleted file mode 100644 index bbc96d9..0000000 --- a/home/modules/emacs/doom.d/init.el +++ /dev/null @@ -1,189 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; This file controls what Doom modules are enabled and what order they load -;; in. Remember to run 'doom sync' after modifying it! - -;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's -;; documentation. There you'll find a "Module Index" link where you'll find -;; a comprehensive list of Doom's modules and what flags they support. - -;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or -;; 'C-c c k' for non-vim users) to view its documentation. This works on -;; flags as well (those symbols that start with a plus). -;; -;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its -;; directory (for easy access to its source code). - -(doom! :input - ;;chinese - ;;japanese - ;;layout ; auie,ctsrnm is the superior home row - - :completion - company ; the ultimate code completion backend - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - ivy ; a search engine for love and life - - :ui - ;;deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs - doom-quit ; DOOM quit-message prompts when you quit Emacs - (emoji +unicode) ; 🙂 - ;;fill-column ; a `fill-column' indicator - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - hydra - ;;indent-guides ; highlighted indent columns - ;;ligatures ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API - ;;nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim - ophints ; highlight the region an operation acts on - (popup +defaults) ; tame sudden yet inevitable temporary windows - tabs ; a tab bar for Emacs - treemacs ; a project drawer, like neotree but cooler - unicode ; extended unicode support for various languages - vc-gutter ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB - window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces - ;;zen ; distraction-free coding or writing - - :editor - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - ;;(format +onsave) ; automated prettiness - ;;god ; run Emacs commands without modifier keys - ;;lispy ; vim for lisp, for people who don't like vim - multiple-cursors ; editing in many places at once - ;;objed ; text object editing for the innocent - ;;parinfer ; turn lisp into python, sort of - ;;rotate-text ; cycle region at point between text candidates - snippets ; my elves. They type so I don't have to - ;;word-wrap ; soft wrapping with language-aware indent - - :emacs - dired ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent - ;;ibuffer ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree - - :term - ;;eshell ; the elisp shell that works everywhere - ;;shell ; simple shell REPL for Emacs - ;;term ; basic terminal emulator for Emacs - vterm ; the best terminal emulation in Emacs - - :checkers - syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :tools - ;;ansible - ;;debugger ; FIXME stepping through code, to help you add bugs - direnv - docker - editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists - lookup ; navigate your code and its documentation - lsp - magit ; a git porcelain for Emacs - ;;make ; run make tasks from Emacs - ;;pass ; password manager for nerds - ;;pdf ; pdf enhancements - ;;prodigy ; FIXME managing external services & code builders - ;;rgb ; creating color strings - ;;taskrunner ; taskrunner for all your projects - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;upload ; map local to remote projects via ssh/ftp - - :os - (:if IS-MAC macos) ; improve compatibility with macOS - ;;tty ; improve the terminal Emacs experience - - :lang - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - cc ; C > C++ == 1 - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - ;;data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - (go +lsp) ; the hipster dialect - (haskell +dante) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - json ; At least it ain't XML - ;;(java +meghanada) ; the poster child for carpal tunnel syndrome - (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - ;;lua ; one-based indices? one-based indices - markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - org ; organize your plain life in plain text - php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - python ; beautiful is better than ugly - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust (+lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - vue-mode - (web +lsp) ; the tubes - yaml ; JSON, but readable - ;;zig ; C, but simpler - - :email - ;;(mu4e +gmail) - ;;notmuch - ;;(wanderlust +gmail) - - :app - ;;calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - - :config - ;;literate - (default +bindings +smartparens)) diff --git a/home/modules/emacs/doom.d/packages.el b/home/modules/emacs/doom.d/packages.el deleted file mode 100644 index 1e55f3e..0000000 --- a/home/modules/emacs/doom.d/packages.el +++ /dev/null @@ -1,3 +0,0 @@ -(package! direnv) -(package! tree-sitter) -(package! tree-sitter-langs)