diff --git a/home-manager/programs/#common.nix# b/home-manager/programs/#common.nix# deleted file mode 100644 index 0119266..0000000 --- a/home-manager/programs/#common.nix# +++ /dev/null @@ -1,22 +0,0 @@ -{config, pkgs, ... }: { - programs.quickshell.enable = true; - programs.quickshell.systemd.enable = true; - programs.fuzzel.enable = true; - programs.home-manager.enable = true; - services.syncthing.enable = true; - programs.spicetify.enable = true; - home.packages = with pkgs; [ - xournalpp - fastfetch - hyfetch - pavucontrol - material-symbols - nixd - nixfmt - config.stylix.fonts.monospace.package - unzip - nixd - qmlls - unixodbc - ]; -} diff --git a/home-manager/programs/.#init.el b/home-manager/programs/.#init.el new file mode 120000 index 0000000..16e4621 --- /dev/null +++ b/home-manager/programs/.#init.el @@ -0,0 +1 @@ +lucy@seele.2660:1787221025 \ No newline at end of file diff --git a/home-manager/programs/emacs.nix b/home-manager/programs/emacs.nix index 6f90db6..2f242e3 100644 --- a/home-manager/programs/emacs.nix +++ b/home-manager/programs/emacs.nix @@ -1,11 +1,65 @@ -{ config, ... }: { +{ config, ... }: { programs.emacs = { enable = true; - extraConfig = ./init.el; + extraConfig = '' + (add-to-list 'package-archives '("melpa-snapshots" . "https://snapshots.melpa.org/packages/") t) + ;;(use-package qml-mode + ;; :ensure t) + ;;(use-package lua-mode + ;;:ensure t) + ;; (use-package elcord + ;; :ensure t) + (setq ring-bell-function 'ignore) + (require 'elcord) + (elcord-mode) + (add-to-list 'display-buffer-alist + '("\\*compilation\\*" + (display-buffer-reuse-window display-buffer-below-selected) + (window-height . 0.3))) + (menu-bar-mode -1) + (tool-bar-mode -1) + (setq display-line-numbers-type 'relative) + (global-display-line-numbers-mode +1) + (global-tab-line-mode 1) + + (scroll-bar-mode -1) + (setq inhibit-splash-screen 1) + (setq custom-file "~/.emacs.d/custom.el") + (load custom-file 'noerror) + (require 'corfu) + (global-corfu-mode) + (setq corfu-auto t + corfu-auto-delay 0.1 + corfu-auto-prefix 1) + + (add-hook 'nix-mode-hook #'eglot-ensure) + (add-hook 'c-mode-hook #'eglot-ensure) + (add-hook 'qml-mode-hook #'eglot-ensure) + (with-eval-after-load 'eglot + (add-to-list 'eglot-server-programs + '(nix-mode . ("nixd")) + ) + (add-to-list 'eglot-server-programs + '(qml-mode . ("qmlls")) + )) + + + (add-hook 'eglot-managed-mode-hook (lambda () (eglot-inlay-hints-mode -1))) + + (keymap-global-set "C-c f" 'eglot-format) + (keymap-global-set "C-c t" 'term) + (keymap-global-set "C-c c" 'compile) + (keymap-global-set "C-c k b" 'kill-current-buffer) + (keymap-global-set "C-c k w" 'kill-buffer-and-window) + + (windmove-default-keybindings) + ''; extraPackages = epkgs: with epkgs; [ + qml-mode nix-mode corfu + elcord ]; }; }