diff --git a/emacs/custom.el b/emacs/custom.el index c9cf759..07902da 100644 --- a/emacs/custom.el +++ b/emacs/custom.el @@ -18,7 +18,7 @@ ("Radio Rota" . "http://streamer.radiorota.cz:8000/rota64.ogg") ("anonradio" . "http://anonradio.net:8000/anonradio"))) '(package-selected-packages - '(realgud projectile dash async yasnippet ace-jump ace-jump-mode acme-theme async-status cape corfu deft dired-git dired-git-info doom-modeline doom-themes embark emojify eshell-toggle eshell-vterm fic-mode flycheck fzf git-lens git-link go-projectile go-scratch god-mode graphviz-dot-mode json-mode kotlin-mode ligature lsp-mode magit mastodon mingus mmm-mode multi-web-mode multifiles multiple-cursors multishell nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer nlinum notmuch orderless org-ai org-context org-dashboard persistent-scratch php-mode plan9-theme plantuml-mode prescient project-explorer projectile-ripgrep protobuf-mode quelpa-use-package rego-mode scratch switch-window unicode-fonts vertico vterm-toggle wgrep which-key yaml-mode zenburn-theme zetteldeft)) + '(devil realgud projectile dash async yasnippet ace-jump ace-jump-mode acme-theme async-status cape corfu deft dired-git dired-git-info doom-modeline doom-themes embark emojify eshell-toggle eshell-vterm fic-mode flycheck fzf git-lens git-link go-projectile go-scratch god-mode graphviz-dot-mode json-mode kotlin-mode ligature lsp-mode magit mastodon mingus mmm-mode multi-web-mode multifiles multiple-cursors multishell nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer nlinum notmuch orderless org-ai org-context org-dashboard persistent-scratch php-mode plan9-theme plantuml-mode prescient project-explorer projectile-ripgrep protobuf-mode quelpa-use-package rego-mode scratch switch-window unicode-fonts vertico vterm-toggle wgrep which-key yaml-mode zenburn-theme zetteldeft)) '(tab-width 4) '(tool-bar-mode nil) '(use-short-answers t)) diff --git a/emacs/init.el b/emacs/init.el index a321d4e..f26554e 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -104,48 +104,10 @@ (use-package multifiles :ensure t) (use-package wgrep :ensure t) -;; god-mode +;; devil ;; === - -(use-package god-mode :ensure t - :config - (defun my/god-mode-update-cursor-type () - (setq cursor-type (if (or god-local-mode buffer-read-only) 'box 'bar))) - - (defun my/god-mode-update-mode-line () - (cond - (god-local-mode - (set-face-attribute 'mode-line nil - :foreground "#604000" - :background "#fff29a") - (set-face-attribute 'mode-line-inactive nil - :foreground "#3f3000" - :background "#fff3da")) - (t - (set-face-attribute 'mode-line nil - :foreground "#0a0a0a" - :background "#d7d7d7") - (set-face-attribute 'mode-line-inactive nil - :foreground "#404148" - :background "#efefef")))) - (add-hook 'post-command-hook #'my/god-mode-update-mode-line) - (add-hook 'post-command-hook #'my/god-mode-update-cursor-type) - (define-key god-local-mode-map (kbd ".") #'repeat) - (global-set-key (kbd "") #'god-local-mode) - (global-set-key (kbd "C-x C-1") #'delete-other-windows) - (global-set-key (kbd "C-x C-2") #'split-window-below) - (global-set-key (kbd "C-x C-3") #'split-window-right) - (global-set-key (kbd "C-x C-0") #'delete-window) - (global-set-key (kbd "C-x C-5 C-0") #'delete-frame) - (global-set-key (kbd "C-x C-5 C-u") #'undelete-frame) - (global-set-key (kbd "C-x C-5 C-1") #'delete-other-frames) - (global-set-key (kbd "C-x C-5 C-2") #'make-frame-command) - (global-set-key (kbd "C-x C-b") #'switch-to-buffer) - (global-set-key (kbd "C-x b") #'list-buffers) - (define-key god-local-mode-map (kbd "i") #'god-local-mode) - (add-to-list 'god-exempt-major-modes '(dired-mode - notmuch-show-mode - notmuch-message-mode))) +(use-package devil :ensure t + :init (global-devil-mode 1)) ;; eye candy ;; === @@ -196,9 +158,9 @@ ;; === (use-package multishell :ensure t :defer t) (use-package vterm-toggle :ensure t - :bind (("C-c C-u C-t" . #'vterm-toggle))) + :bind (("C-x ! t v" . #'vterm-toggle))) (use-package eshell-toggle :ensure t - :bind (("C-c C-t" . #'eshell-toggle))) + :bind (("C-x ! t e" . #'eshell-toggle))) (use-package eshell-vterm :ensure t :defer t :init (eshell-vterm-mode 1)) @@ -208,8 +170,8 @@ (use-package org :ensure t :defer t :mode (("\\.org$" . org-mode)) - :bind (("C-c C-o C-a" . org-agenda) - ("C-c C-o C-c" . org-capture)) + :bind (("C-c o a" . org-agenda) + ("C-c o c" . org-capture)) :config (defun my/notes-refile-targets () (directory-files "~/notes" t ".*\\.org$")) @@ -274,8 +236,8 @@ ;; === (use-package deft :ensure t - :bind (("C-c C-n C-d" . #'deft) - ("C-c C-n C-f" . #'deft-find-file)) + :bind (("C-c n d" . #'deft) + ("C-c n f" . #'deft-find-file)) :config (setq deft-directory "~/notes") (setq deft-recursive t) @@ -295,16 +257,16 @@ (use-package projectile :ensure t :defer t :bind (:map projectile-mode-map - ("C-c C-p" . projectile-command-map) - ("C-c C-p C-f" . #'projectile-find-file) - ("C-c C-p C-p" . #'projectile-switch-project) - ("C-c C-p C-/" . #'projectile-ripgrep) - ("C-c C-p C-b" . #'projectile-switch-to-buffer) - ("C-c C-p C-4 C-b" . #'projectile-switch-to-buffer-other-window) - ("C-c C-p C-5 C-b" . #'projectile-switch-to-buffer-other-frame) - ("C-c C-p C-d" . #'projectile-dired) - ("C-c C-p C-4 C-d" . #'projectile-dired-other-window) - ("C-c C-p C-4 C-d" . #'projectile-dired-other-frame)) + ("C-c p" . projectile-command-map) + ("C-c p f" . #'projectile-find-file) + ("C-c p p" . #'projectile-switch-project) + ("C-c p /" . #'projectile-ripgrep) + ("C-c p b" . #'projectile-switch-to-buffer) + ("C-c p 4 b" . #'projectile-switch-to-buffer-other-window) + ("C-c p 5 b" . #'projectile-switch-to-buffer-other-frame) + ("C-c p d" . #'projectile-dired) + ("C-c p 4 d" . #'projectile-dired-other-window) + ("C-c p 4 d" . #'projectile-dired-other-frame)) :diminish projectile-mode :init (projectile-mode)) @@ -318,7 +280,7 @@ ;; version control ;; === (use-package magit :ensure t :defer t - :bind ("C-c C-g" . magit-status) + :bind ("C-c g" . magit-status) :commands (magit-status-here magit-get-current-branch) :custom (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) @@ -401,23 +363,23 @@ (use-package cape :ensure t :defer t ;; Bind dedicated completion commands ;; Alternative prefix keys: C-c p, M-p, M-+, ... - :bind (("C-c C-/ p" . completion-at-point) ;; capf - ("C-c C-/ t" . complete-tag) ;; etags - ("C-c C-/ d" . cape-dabbrev) ;; or dabbrev-completion - ("C-c C-/ h" . cape-history) - ("C-c C-/ f" . cape-file) - ("C-c C-/ k" . cape-keyword) - ("C-c C-/ s" . cape-elisp-symbol) - ("C-c C-/ e" . cape-elisp-block) - ("C-c C-/ a" . cape-abbrev) - ("C-c C-/ l" . cape-line) - ("C-c C-/ w" . cape-dict) - ("C-c C-/ :" . cape-emoji) - ("C-c C-/ \\" . cape-tex) - ("C-c C-/ _" . cape-tex) - ("C-c C-/ ^" . cape-tex) - ("C-c C-/ &" . cape-sgml) - ("C-c C-/ r" . cape-rfc1345)) + :bind (("C-c / p" . completion-at-point) ;; capf + ("C-c / t" . complete-tag) ;; etags + ("C-c / d" . cape-dabbrev) ;; or dabbrev-completion + ("C-c / h" . cape-history) + ("C-c / f" . cape-file) + ("C-c / k" . cape-keyword) + ("C-c / s" . cape-elisp-symbol) + ("C-c / e" . cape-elisp-block) + ("C-c / a" . cape-abbrev) + ("C-c / l" . cape-line) + ("C-c / w" . cape-dict) + ("C-c / :" . cape-emoji) + ("C-c / \\" . cape-tex) + ("C-c / _" . cape-tex) + ("C-c / ^" . cape-tex) + ("C-c / &" . cape-sgml) + ("C-c / r" . cape-rfc1345)) :init ;; Add to the global default value of `completion-at-point-functions' which is ;; used by `completion-at-point'. The order of the functions matters, the diff --git a/sway/config b/sway/config index ecab7ad..af137c8 100644 --- a/sway/config +++ b/sway/config @@ -240,9 +240,18 @@ bar { # setup compose key input "type:keyboard" xkb_options compose:ralt exec foot --server + +# setup displays exec wlr-randr --output HDMI-A-1 --scale 1 --preferred exec wlr-randr --output eDP-1 --scale 1.5 +# start pipewire +exec pipewire & +exec wireplumber & + +# pulseaudio compatibility, mainly for gaming +exec pipewire-pulse & + bindsym --locked XF86AudioRaiseVolume exec --no-startup-id amixer set Master 5%+ bindsym --locked XF86AudioLowerVolume exec --no-startup-id amixer set Master 5%-