diff --git a/configurations/profile/home/editor/emacs/default.nix b/configurations/profile/home/editor/emacs/default.nix index 52001e8..ee0cbac 100644 --- a/configurations/profile/home/editor/emacs/default.nix +++ b/configurations/profile/home/editor/emacs/default.nix @@ -31,19 +31,30 @@ let rainbow-delimiters use-package + cmake-mode lsp-mode - lsp-bridge + lsp-java + lsp-jedi + lsp-haskell + lsp-ui + lsp-treemacs dap-mode d-mode multiple-cursors org org-rainbow-tags + org-roam + org-roam-ui + org-review markdown-mode json-mode nix-mode minimap + + moe-theme + doom-themes ]; @@ -52,8 +63,10 @@ let (defvar materus/init-from-home nil) (defvar materus/init-from-default nil) (when (not materus/init-from-home) + (setq-default materus/home-dir (concat user-emacs-directory "materus/" )) (setq-default materus/init-from-default t) (message "Config loading not from homeDir, need "materus/init-from-home" variable in init.el") + ${setNixInit} (require 'materus-config) ) @@ -113,12 +126,21 @@ in options.materus.profile.editor.emacs.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable emacs with materus cfg"; config = lib.mkIf cfg.enable { + home.activation.emacsCompile = lib.hm.dag.entryAfter [ "linkGeneration" ] '' + ${config.programs.emacs.finalPackage}/bin/emacs --batch \ + --eval '(setq warning-minimum-log-level :error)' \ + --eval '(byte-recompile-directory "${config.xdg.configHome}/emacs/materus" 0 t)' \ + --eval '(byte-recompile-file "${config.xdg.configHome}/emacs/init.el")' + ''; xdg.configFile."emacs/init.el".text = '' + (setq inhibit-defaul-init 1) + (setq native-comp-speed 3) (defvar materus/nix-packages nil) (defvar materus/init-from-home t) (defvar materus/init-from-default nil) ${setNixInit} (setq-default materus/init-from-home t) + (setq-default materus/home-dir (concat user-emacs-directory "materus/" )) (setq-default materus/nix-packages (require 'materus-config nil 'noerror)) (when (not materus/nix-packages) (load (concat user-emacs-directory "materus/init")) diff --git a/extraFiles/config/emacs/materus-config.el b/extraFiles/config/emacs/materus-config.el index 04a1815..36c398f 100644 --- a/extraFiles/config/emacs/materus-config.el +++ b/extraFiles/config/emacs/materus-config.el @@ -1,4 +1,5 @@ (message "Config loading from package") (setq-default materus/nix-packages t) +(require 'load-relative) (load-relative "materus/init") (provide 'materus-config) \ No newline at end of file diff --git a/extraFiles/config/emacs/materus/init.el b/extraFiles/config/emacs/materus/init.el index fe90187..c63a165 100644 --- a/extraFiles/config/emacs/materus/init.el +++ b/extraFiles/config/emacs/materus/init.el @@ -1,12 +1,13 @@ (defvar materus/nix-packages nil) (defvar materus/init-from-home nil) +(defvar materus/home-dir (concat user-emacs-directory "materus/" )) +(setq native-comp-async-report-warnings-errors nil) +(setq package-enable-at-startup nil) +(setq frame-inhibit-implied-resize t) + (when (not materus/nix-packages) - (message "Not using config from packages, will compile") - (setq native-comp-async-report-warnings-errors nil) - (setq package-enable-at-startup nil) - (defvar straight-use-package-by-default nil) - (setq straight-use-package-by-default t) + (message "Not using config from nix packages, using straight") (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) @@ -22,19 +23,14 @@ (declare-function straight-use-package "straight" (&optional ARG)) (declare-function load-relative "load-relative" (&optional ARG)) (straight-use-package 'load-relative) - (require 'load-relative) (load-relative "packages") - - (if materus/init-from-home - (byte-recompile-directory (concat (expand-file-name user-emacs-directory) "materus/" ) 0) - (byte-recompile-directory (expand-file-name user-emacs-directory) 0)) - ) (require 'telephone-line) (require 'elcord) (require 'dashboard) (require 'minions) +(require 'doom-themes) ;Graphical @@ -53,7 +49,7 @@ (tool-bar-mode -1) -(load-theme 'moe-dark t) +(load-theme 'doom-horizon t) (setq ring-bell-function 'ignore) (setq-default cursor-type '(bar . 1)) diff --git a/extraFiles/config/emacs/materus/packages.el b/extraFiles/config/emacs/materus/packages.el index 1745a71..8e8ceae 100644 --- a/extraFiles/config/emacs/materus/packages.el +++ b/extraFiles/config/emacs/materus/packages.el @@ -3,6 +3,9 @@ (straight-use-package 'elcord) (straight-use-package 'dashboard) (straight-use-package 'minions) + (straight-use-package 'lsp-mode) + (straight-use-package 'lsp-ui) + (straight-use-package 'moe-theme) - + (straight-use-package 'doom-themes) diff --git a/flake.lock b/flake.lock index 8ae162f..3256544 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699090626, - "narHash": "sha256-QOE2Cf5WDBfgP4ENQQHJs+u2MPrGE1LZKUri3ERgBcA=", + "lastModified": 1699954689, + "narHash": "sha256-gJtxMQotdEyiuGoiPPSdYqa8Pdw9ptgFFMrxKsWKj54=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8e42a3463ac1a25a9948e965e2fefc570fadd702", + "rev": "1d4ed29d4d9d076210485697c325f8d6914d908f", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1699090626, - "narHash": "sha256-QOE2Cf5WDBfgP4ENQQHJs+u2MPrGE1LZKUri3ERgBcA=", + "lastModified": 1699954689, + "narHash": "sha256-gJtxMQotdEyiuGoiPPSdYqa8Pdw9ptgFFMrxKsWKj54=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8e42a3463ac1a25a9948e965e2fefc570fadd702", + "rev": "1d4ed29d4d9d076210485697c325f8d6914d908f", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1699748081, + "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", + "rev": "04bac349d585c9df38d78e0285b780a140dc74a4", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699044561, - "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=", + "lastModified": 1699954245, + "narHash": "sha256-CSnfeOHc/wco8amdA0j268OaLrMcI5gGtK6Zm+y3lT0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c", + "rev": "df9bb8a436607da124e8cfa0fd19e70e9d9e0b7b", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1699044561, - "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=", + "lastModified": 1699954245, + "narHash": "sha256-CSnfeOHc/wco8amdA0j268OaLrMcI5gGtK6Zm+y3lT0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c", + "rev": "df9bb8a436607da124e8cfa0fd19e70e9d9e0b7b", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698942558, - "narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=", + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "621f51253edffa1d6f08d5fce4f08614c852d17e", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", "type": "github" }, "original": { @@ -318,11 +318,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1698942558, - "narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=", + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "621f51253edffa1d6f08d5fce4f08614c852d17e", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1698942558, - "narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=", + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "621f51253edffa1d6f08d5fce4f08614c852d17e", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1699781429, + "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nur_2": { "locked": { - "lastModified": 1699105543, - "narHash": "sha256-ZAArNdE3cO59tIlomzhWPksA4enZ0LoGR7VEtFHYaXI=", + "lastModified": 1699957785, + "narHash": "sha256-N7XJ+Otvn5GERktkIxw6K757JsmfvyO7I95VPgk38Z8=", "owner": "nix-community", "repo": "NUR", - "rev": "ae4f2079a94ebbf4f3ec66f7d25372de5d4b346d", + "rev": "34dadf63b2715951bec44a3ba01c4e72e07900dc", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nur_4": { "locked": { - "lastModified": 1699105543, - "narHash": "sha256-ZAArNdE3cO59tIlomzhWPksA4enZ0LoGR7VEtFHYaXI=", + "lastModified": 1699957785, + "narHash": "sha256-N7XJ+Otvn5GERktkIxw6K757JsmfvyO7I95VPgk38Z8=", "owner": "nix-community", "repo": "NUR", - "rev": "ae4f2079a94ebbf4f3ec66f7d25372de5d4b346d", + "rev": "34dadf63b2715951bec44a3ba01c4e72e07900dc", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nur_5": { "locked": { - "lastModified": 1699105543, - "narHash": "sha256-ZAArNdE3cO59tIlomzhWPksA4enZ0LoGR7VEtFHYaXI=", + "lastModified": 1699957785, + "narHash": "sha256-N7XJ+Otvn5GERktkIxw6K757JsmfvyO7I95VPgk38Z8=", "owner": "nix-community", "repo": "NUR", - "rev": "ae4f2079a94ebbf4f3ec66f7d25372de5d4b346d", + "rev": "34dadf63b2715951bec44a3ba01c4e72e07900dc", "type": "github" }, "original": {