Compare commits

..

No commits in common. "0558b4869e4656c08ddc4786a9e299c82b0b8357" and "4f8452e78603c20ac81efeda05b2e0e8098150ba" have entirely different histories.

3 changed files with 15 additions and 34 deletions

View File

@ -204,8 +204,8 @@ Finish up
consult-eglot consult-eglot
all-the-icons-completion all-the-icons-completion
helpful helpful
vterm ;; vterm
;; eat eat
;; Enhancements ;; Enhancements
olivetti olivetti
doom-modeline doom-modeline
@ -539,7 +539,7 @@ Ligatures... are they that useful?
(setq-default line-spacing 5) (setq-default line-spacing 5)
(setq indent-line-function #'indent-relative) (setq indent-line-function #'indent-relative)
(set-default 'truncate-lines nil) (set-default 'truncate-lines t)
;; (add-hook 'before-save-hook 'whitespace-cleanup) ;; (add-hook 'before-save-hook 'whitespace-cleanup)
#+end_src #+end_src
** Text Editor ** Text Editor
@ -895,10 +895,8 @@ Fill region is great, except when you don't need it...
(kbd "SPC br") 'joe/revert-buffer-no-confirm (kbd "SPC br") 'joe/revert-buffer-no-confirm
(kbd "SPC gg") 'magit-status (kbd "SPC gg") 'magit-status
(kbd "SPC gc") 'magit-clone (kbd "SPC gc") 'magit-clone
;; (kbd "SPC ss") 'eat (kbd "SPC ss") 'eat
;; (kbd "SPC sv") 'eat-other-window (kbd "SPC sv") 'eat-other-window
(kbd "SPC ss") 'joe/vterm-here
(kbd "SPC sv") 'vterm-other-window
(kbd "SPC Ba") 'joe/bookmark-set-and-save (kbd "SPC Ba") 'joe/bookmark-set-and-save
(kbd "SPC Bd") 'bookmark-delete (kbd "SPC Bd") 'bookmark-delete
(kbd "SPC mr") 'joe/compile-run (kbd "SPC mr") 'joe/compile-run
@ -1827,10 +1825,6 @@ odd looking ~'(t .t)~ is for specifying a default for all other actions.
(dired-up-directory) (dired-up-directory)
(dirvish-dwim))) (dirvish-dwim)))
(setq dired-omit-files "\\`[.]?#\\|\\`[.][.]?\\|\\.meta$")
(add-hook 'dired-mode-hook #'dired-omit-mode)
(when (boundp 'evil-mode) (when (boundp 'evil-mode)
(evil-define-key 'normal joe/evil-space-mode-map (kbd "-") #'joe/dirvish-up-dwim)) (evil-define-key 'normal joe/evil-space-mode-map (kbd "-") #'joe/dirvish-up-dwim))
(global-set-key (kbd "C-x d") #'dirvish-dwim) (global-set-key (kbd "C-x d") #'dirvish-dwim)
@ -2001,7 +1995,7 @@ be kept here commented out in case we want to try it again.
(global-set-key (kbd "C-h C") #'helpful-command) (global-set-key (kbd "C-h C") #'helpful-command)
#+end_src #+end_src
** Terminals/Shells ** Terminals/Shells
*** vterm *** COMMENT vterm
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'vterm) (require 'vterm)
(setq vterm-shell "/bin/fish") (setq vterm-shell "/bin/fish")
@ -2024,8 +2018,8 @@ be kept here commented out in case we want to try it again.
(with-current-buffer vterm-buf (with-current-buffer vterm-buf
(setq popper-popup-status 'raised)))) (setq popper-popup-status 'raised))))
;; (global-set-key (kbd "C-c t") #'vterm) (global-set-key (kbd "C-c t") #'vterm)
;; (global-set-key (kbd "C-c T") #'joe/vterm-here) (global-set-key (kbd "C-c T") #'joe/vterm-here)
;; (setq explicit-shell-file-name "~/Development/fell/fell") ;; (setq explicit-shell-file-name "~/Development/fell/fell")
(add-hook 'shell-mode (lambda () (setq-local global-hl-line-mode nil))) (add-hook 'shell-mode (lambda () (setq-local global-hl-line-mode nil)))
(setq shell-kill-buffer-on-exit t) (setq shell-kill-buffer-on-exit t)
@ -2033,8 +2027,8 @@ be kept here commented out in case we want to try it again.
(defun joe/vterm-mode-hook () (defun joe/vterm-mode-hook ()
(define-key vterm-mode-map (kbd "C-c C-x") #'vterm-send-C-x) (define-key vterm-mode-map (kbd "C-c C-x") #'vterm-send-C-x)
(when (boundp 'evil-mode) (when (boundp 'evil-mode)
(evil-define-key 'insert vterm-mode-map (kbd "C-f") (lambda () (interactive) (vterm-send-key (kbd "C-f")))) (evil-define-key 'insert vterm-mode-map (kbd "C-f") #'vterm-send-C-f)
(evil-define-key 'insert vterm-mode-map (kbd "C-w") (lambda () (interactive) (vterm-send-key (kbd "C-w")))) (evil-define-key 'insert vterm-mode-map (kbd "C-w") #'vterm-send-C-w)
(evil-define-key 'insert vterm-mode-map (kbd "<delete>") #'vterm-send-delete)) (evil-define-key 'insert vterm-mode-map (kbd "<delete>") #'vterm-send-delete))
(setq-local global-hl-line-mode nil) (setq-local global-hl-line-mode nil)
(setq buffer-face-mode-face '(:family "Fira Code Nerd Font")) (setq buffer-face-mode-face '(:family "Fira Code Nerd Font"))
@ -2050,9 +2044,8 @@ startup. Reason we have to call this is so the vterm fucntion can call `vterm--i
;; (add-hook 'emacs-startup-hook (lambda () (require 'vterm))) ;; (add-hook 'emacs-startup-hook (lambda () (require 'vterm)))
#+end_src #+end_src
This bit of code is to achieve a vterm scratchpad for my window manager. In This bit of code is to achieve a vterm scratchpad. In order to know I'm closing
order to know I'm closing the right frame, I'm going to use the frame's name to the right frame, I'm going to use the frame's name to close and remove the hook
close and remove the hook
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun vterm--set-title (title) (defun vterm--set-title (title)
@ -2087,7 +2080,7 @@ close and remove the hook
(add-hook 'delete-frame-functions #'joe/kill-vterm-scratch) (add-hook 'delete-frame-functions #'joe/kill-vterm-scratch)
(add-hook 'kill-buffer-hook #'joe/kill-frame)))) (add-hook 'kill-buffer-hook #'joe/kill-frame))))
#+end_src #+end_src
*** COMMENT eat *** eat
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun joe/eat-mode-hook () (defun joe/eat-mode-hook ()
(setq-local global-hl-line-mode nil) (setq-local global-hl-line-mode nil)

View File

@ -11,6 +11,8 @@ overload_tap_timeout = 250
esc = capslock esc = capslock
capslock = overload(control, esc) capslock = overload(control, esc)
rightalt = layer(rightalt) rightalt = layer(rightalt)
rightcontrol = overload(hyper, rightcontrol)
leftcontrol = overload(hyper, leftcontrol)
[hyper:C-M-S-A] [hyper:C-M-S-A]

View File

@ -74,9 +74,6 @@ def toggle_language(qtile):
qtile.spawn("setxkbmap -layout us -variant altgr-intl") qtile.spawn("setxkbmap -layout us -variant altgr-intl")
current_language[0] = "en" current_language[0] = "en"
def get_current_window_info(qtile):
logger.warning(qtile.current_window.info())
keys = [ keys = [
# A list of available commands that can be bound to keys can be found # A list of available commands that can be bound to keys can be found
@ -124,7 +121,6 @@ keys = [
Key([mod, "shift"], "comma", lazy.prev_screen(), desc="Move focus to left screen"), Key([mod, "shift"], "comma", lazy.prev_screen(), desc="Move focus to left screen"),
Key([mod, "shift"], "period", lazy.next_screen(), desc="Move focus to left screen"), Key([mod, "shift"], "period", lazy.next_screen(), desc="Move focus to left screen"),
Key([mod], "w", lazy.next_layout(), desc="Toggle between layouts"), Key([mod], "w", lazy.next_layout(), desc="Toggle between layouts"),
Key([mod, "control"], "w", lazy.function(get_current_window_info), desc="Get window info"),
Key([mod], "s", lazy.spawn("flameshot gui"), desc="Flameshot screenshot"), Key([mod], "s", lazy.spawn("flameshot gui"), desc="Flameshot screenshot"),
# TODO: Figure out another binding for this # TODO: Figure out another binding for this
@ -354,8 +350,6 @@ floating_layout = layout.Floating(
Match(wm_class="makebranch"), # gitk Match(wm_class="makebranch"), # gitk
Match(wm_class="maketag"), # gitk Match(wm_class="maketag"), # gitk
Match(wm_class="ssh-askpass"), # ssh-askpass Match(wm_class="ssh-askpass"), # ssh-askpass
Match(title="SimpleScreenRecorder"), # ssh-askpass
# Godot
Match(title="Alert!"), Match(title="Alert!"),
Match(title="Please Confirm..."), Match(title="Please Confirm..."),
Match(title="Create New Node"), Match(title="Create New Node"),
@ -365,14 +359,6 @@ floating_layout = layout.Floating(
Match(title="Save Scene As..."), Match(title="Save Scene As..."),
Match(title="branchdialog"), # gitk Match(title="branchdialog"), # gitk
Match(title="pinentry"), # GPG key password entry Match(title="pinentry"), # GPG key password entry
# Unity3D
Match(title="UnityEditor.AddComponent.AddComponentWindow"),
Match(title="UnityEditor.IconSelector"),
Match(title="UnityEditor.PopupWindow"),
Match(title="UnityEditor.PopupWindowWithoutFocus"),
Match(wm_class="Unity", title="Select Material"),
Match(wm_class="Unity", title="Color"),
# Match(wm_class="Unity", title="Select Material"),
] ]
) )
auto_fullscreen = True auto_fullscreen = True