balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Emacs config changes

Browse Source
This commit is contained in:
Alexander Bantyev 2021-05-18 15:50:49 +03:00
parent 8b4e7fff64
commit aca29797be
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/applications/emacs/default.nix
View File

@ -66,6 +66,7 @@ in {
lsp-treemacs lsp-treemacs
treemacs-projectile treemacs-projectile
dap-mode dap-mode
forge
]; ];
}; };

31
modules/applications/emacs/init.el
View File

@ -31,13 +31,10 @@
(setq-default indent-tabs-mode nil) (setq-default indent-tabs-mode nil)
(setq-default tab-always-indent 't)
(setq-default tab-always-indent 'complete)
(setq-default compilation-scroll-output 'first-error) (setq-default compilation-scroll-output 'first-error)
(use-package ws-butler (use-package ws-butler
:config :config
(ws-butler-global-mode) (ws-butler-global-mode)
@ -86,18 +83,6 @@
:config :config
(push 'company-ghci company-backends)) (push 'company-ghci company-backends))
(defun smart-beginning-of-line ()
"Move point to first non-whitespace character or beginning of line.
Move point to the first non-whitespace character on this line.
If point was already at that position, move point to beginning of line."
(interactive "^") ; Use (interactive) in Emacs 22 or older
(let ((oldpos (point)))
(back-to-indentation)
(and (= oldpos (point))
(beginning-of-line))))
(global-set-key [home] 'smart-beginning-of-line) (global-set-key [home] 'smart-beginning-of-line)
(global-unset-key [menu-bar options cua-mode]) (global-unset-key [menu-bar options cua-mode])
@ -120,11 +105,6 @@ If point was already at that position, move point to beginning of line."
(setq gdb-use-separate-io-buffer nil) (setq gdb-use-separate-io-buffer nil)
(setq gdb-many-windows nil) (setq gdb-many-windows nil)
(use-package counsel
:config
(counsel-mode 1))
;; ------------------- ;; -------------------
;; Projectile ;; Projectile
;; ------------------- ;; -------------------
@ -136,9 +116,9 @@ If point was already at that position, move point to beginning of line."
(define-key projectile-mode-map (kbd "C-x p") 'projectile-command-map) (define-key projectile-mode-map (kbd "C-x p") 'projectile-command-map)
(projectile-mode 1) (projectile-mode 1)
(global-unset-key [menu-bar tools Projectile]) (global-unset-key [menu-bar tools Projectile])
(projectile-register-project-type 'nix-shell '("shell.nix") (projectile-register-project-type 'flake '("flake.nix")
:compile "nix-build shell.nix" :compile "nix build"
:run "nix-shell") :run "nix run")
(setq projectile-project-search-path '("~/projects/")) (setq projectile-project-search-path '("~/projects/"))
(global-set-key (kbd "<f9>") 'projectile-compile-project) (global-set-key (kbd "<f9>") 'projectile-compile-project)
@ -172,6 +152,9 @@ If point was already at that position, move point to beginning of line."
(setq ivy-count-format "") (setq ivy-count-format "")
(setq ivy-initial-inputs-alist nil)) (setq ivy-initial-inputs-alist nil))
(use-package counsel
:config
counsel-mode)
(use-package smex) (use-package smex)