not even sure

master
Rachel Lambda Samuelsson 2023-01-10 19:29:35 +01:00
parent f4853bdbc5
commit e6d2f7548a
5 changed files with 61 additions and 26 deletions

View File

@ -16,8 +16,3 @@
`((".*" . ,temporary-file-directory)))
(setq auto-save-file-name-transforms
`((".*" ,temporary-file-directory t)))
;; Don't remove current window when opening new ones
(setq display-buffer-base-action '(display-buffer-below-selected))
(setq display-buffer-overriding-action '(display-buffer-below-selected))
(setq display-buffer-fallback-action '(display-buffer-below-selected))

View File

@ -16,6 +16,8 @@
(evil-mode 1)
(evil-commentary-mode 1)
(global-undo-tree-mode 1)
(evil-set-initial-state 'Custom-mode 'normal)
(evil-set-initial-state 'vterm-mode 'insert)
;; Agda input mode ∀ buffers
(load-file (let ((coding-system-for-read 'utf-8))
@ -56,7 +58,7 @@
(evil-define-key '(normal insert visual replace operator motion emacs) 'global (kbd "C-t") nil)
(evil-define-key '(normal insert visual replace operator motion emacs) 'global (kbd "C-d") nil)
(evil-define-key '(normal insert visual replace operator motion emacs) 'global (kbd "C-<return>") nil)
(global-set-key (kbd "C-<return>") 'vterm)
(global-set-key (kbd "C-<return>") 'multi-vterm)
(global-set-key (kbd "C-t") 'treemacs)
(global-set-key (kbd "C-d") 'evil-quit)
@ -66,7 +68,6 @@
(define-key vterm-mode-map (kbd "C-j") nil)
(define-key vterm-mode-map (kbd "C-k") nil)
(define-key vterm-mode-map (kbd "C-l") nil)
(define-key vterm-mode-map (kbd "C-d") nil)
(require 'org)
(define-key org-mode-map (kbd "C-<return>") nil)

59
exwm.el
View File

@ -1,45 +1,73 @@
(require 'dash)
(require 'exwm)
(require 'exwm-systemtray)
(require 'edwina)
(exwm-systemtray-enable)
(display-battery-mode 1)
(display-time-mode 1)
(defvar newbuf "*dashboard*")
(defun discord ()
(interactive)
(start-process "discord" nil "discord"))
(call-process "discord" nil 0 nil))
;; TODO: if running, switch focus, otherwise start
(defun firefox ()
(interactive)
(start-process "firefox" nil "firefox"))
(let ((buff (--filter (string= "Firefox" (buffer-name it))
(buffer-list))))
(if buff
(apply 'switch-to-buffer buff)
(call-process "firefox" nil 0 nil))))
(defun rofi ()
(interactive)
(start-process "rofi" nil "rofi" "-show" "run"))
(call-process "rofi" nil 0 nil "-show" "run"))
(defun pass ()
(interactive)
(call-process "/home/deppy/bin/cpypsk" nil 0 nil))
(defun scrot ()
(interactive)
(call-process "maim" nil 0 nil
"-s"
(concat "/home/deppy/img/scrot/" (format-time-string "%s" (current-time)) ".png")))
(setq exwm-input-global-keys
`((,(kbd "s-E") . exwm-exit)
(,(kbd "s-Q") . evil-quit)
(,(kbd "s-w") . exwm-workspace-switch)
;; Windowing
(,(kbd "s-h") . edwina-dec-mfact)
(,(kbd "s-j") . edwina-select-next-window)
(,(kbd "s-k") . edwina-select-previous-window)
(,(kbd "s-l") . edwina-inc-mfact)
(,(kbd "s-h") . (lambda () (interactive) (evil-window-decrease-width 1)))
(,(kbd "s-j") . (lambda () (interactive) (select-window (next-window))))
(,(kbd "s-k") . (lambda () (interactive) (select-window (previous-window))))
(,(kbd "s-l") . (lambda () (interactive) (evil-window-increase-width 1)))
(,(kbd "s-J") . edwina-swap-next-window)
(,(kbd "s-K") . edwina-swap-previous-window)
;; Maybe use window-right, window-left, etc, and add things to split in all directions too?
(,(kbd "s-J") . (lambda () (interactive)
(window-swap-states (selected-window) (next-window))))
(,(kbd "s-K") . (lambda () (interactive)
(window-swap-states (selected-window) (previous-window))))
(,(kbd "s-L") . (lambda () (interactive)
(select-window (split-window-right))
(switch-to-buffer ,newbuf)))
(,(kbd "s-H") . (lambda () (interactive)
(let ((cwin (selected-window))
(nwin (split-window-right)))
(window-swapstated cwin nwin)
(select-window nwin)
(switch-to-buffer ,newbuf))))
(,(kbd "s-r") . exwm-reset)
(,(kbd "s-f") . exwm-layout-set-fullscreen)
;; Applications
(,(kbd "s-<backspace>") . firefox)
(,(kbd "s-<return>") . vterm)
(,(kbd "s-<return>") . multi-vterm)
(,(kbd "s-d") . rofi)
(,(kbd "s-p") . pass)
(,(kbd "<print>") . scrot)
;; Workspaces
,@(mapcar (lambda (i)
@ -52,11 +80,6 @@
(add-hook 'exwm-update-class-hook
(lambda () (exwm-workspace-rename-buffer exwm-class-name)))
(edwina-mode)
(add-hook 'after-make-frame-functions 'edwina-arrange)
(add-hook 'delete-frame-functions 'edwina-arrange)
(setq exwm-manage-force-tiling 1)
(exwm-init)

13
init.el
View File

@ -121,8 +121,15 @@
'(3FR ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW CUR CUT DCM DCR DCX DDS DJVU DNG DPX EXR FAX FITS GBR GIF GIF87 GRB HRZ ICB ICO ICON J2C JNG JP2 JPC JPEG JPG JPX K25 KDC MIFF MNG MRW MSL MSVG MTV NEF ORF OTB PBM PCD PCDS PCL PCT PCX PDB PEF PGM PICT PIX PJPEG PNG PNG24 PNG32 PNG8 PNM PPM PSD PTIF PWP RAF RAS RBG RGB RGBA RGBO RLA RLE SCR SCT SFW SGI SR2 SRF SUN SVG SVGZ TGA TIFF TIFF64 TILE TIM TTF UYVY VDA VICAR VID VIFF VST WBMP WPG X3F XBM XC XCF XPM XV XWD YCbCr YCbCrA YUV ORA))
'(org-agenda-files '("/home/deppy/doc/org/todo.org"))
'(package-selected-packages
'(edwina markdown-preview-mode markdown-mode exwm org-superstar org-fragtog org-pretty-tags visual-fill writeroom-mode haskell-emacs treemacs-evil treemacs solarized-theme doom-modeline all-the-icons-dired page-break-lines all-the-icons dashboard org-evil zotero vterm magit undo-fu latex-math-preview use-package haskell-mode evil-surround undo-tree evil-org evil))
'(multi-vterm dmenu markdown-preview-mode markdown-mode exwm org-superstar org-fragtog org-pretty-tags visual-fill writeroom-mode haskell-emacs treemacs-evil treemacs solarized-theme doom-modeline all-the-icons-dired page-break-lines all-the-icons dashboard org-evil zotero vterm magit undo-fu latex-math-preview use-package haskell-mode evil-surround undo-tree evil-org evil))
'(shell-file-name "/bin/bash")
'(treemacs-collapse-dirs 3)
'(treemacs-filewatch-mode t)
'(treemacs-follow-mode t)
'(treemacs-fringe-indicator-mode t)
'(treemacs-git-mode t)
'(treemacs-no-delete-other-windows nil)
'(treemacs-select-when-already-in-treemacs 'next-or-back)
'(warning-suppress-log-types '((comp)))
'(warning-suppress-types '((comp)))
'(writeroom-mode-line t)
@ -144,3 +151,7 @@
;; Reset values
(run-hooks 'init-done-hook)
;; Performance post-init
(setq gc-cons-threshold (* 512 1024 1024))
(run-with-idle-timer 1 t 'garbage-collect)

View File

@ -79,3 +79,8 @@
(writeroom-mode)))
(setq org-format-latex-options '(:scale 1.5))
(setq org-agenda-start-on-weekday 1)
(add-hook 'markdown-mode-hook (lambda ()
(visual-line-mode)
(writeroom-mode)))