From ada1e1f76186ff2135989800232f5f7391939c44 Mon Sep 17 00:00:00 2001 From: tavo-wasd Date: Mon, 1 Jul 2024 19:24:58 -0600 Subject: [PATCH] emacs tabs and wrapper --- emacs/init.el | 35 +++++++++++++++++++++++++++++++- foot/foot.ini | 2 +- scripts/sway/swaystatus | 2 +- shell/mkshrc | 2 +- sway/config | 45 ++++++++++++++--------------------------- wrappers/em | 2 +- 6 files changed, 53 insertions(+), 35 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 6b3f234..2995aad 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -74,7 +74,7 @@ (set-face-attribute 'default nil :height 140) ;; Android (progn ;; Everywhere else (set-face-attribute 'default nil :font "JetBrains Mono") - (add-to-list 'default-frame-alist '(font . "JetBrains Mono-10")))) + (add-to-list 'default-frame-alist '(font . "JetBrains Mono-10.5")))) (use-package doom-themes :init (load-theme 'doom-material t)) @@ -122,6 +122,39 @@ :config (evil-collection-init)) +(use-package centaur-tabs + :demand + :config + (centaur-tabs-mode t) + :bind + ("C-" . centaur-tabs-backward) + ("C-" . centaur-tabs-forward) + :hook ((dashboard-mode . centaur-tabs-local-mode) + (pdf-view-mode . centaur-tabs-local-mode))) +(setq centaur-tabs-cycle-scope 'tabs) +(setq centaur-tabs-set-modified-marker t) +(setq centaur-tabs-modified-marker "*") + +(defun my/hide-modeline () + (setq-local mode-line-format nil)) + +(if (eq system-type 'android) + (message "Android device, ignoring org-mode-visual-fill") ;; Android + (progn ;; Everywhere else + (use-package pdf-tools + :defer t + :commands (pdf-loader-install) + :mode "\\.pdf\\'" + :bind (:map pdf-view-mode-map + ("j" . pdf-view-next-line-or-next-page) + ("k" . pdf-view-previous-line-or-previous-page) + ("C-=" . pdf-view-enlarge) + ("C--" . pdf-view-shrink)) + :init (pdf-loader-install) + :config (add-to-list 'revert-without-query ".pdf")) + (add-hook 'pdf-view-mode-hook #'(lambda () (interactive) (display-line-numbers-mode 0))) + (add-hook 'pdf-view-mode-hook 'my/hide-modeline))) + ;; --- Org Mode --- (use-package org-bullets) (custom-set-faces diff --git a/foot/foot.ini b/foot/foot.ini index 779850c..a18289c 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -1,4 +1,4 @@ -font=JetBrainsMono:size=10 +font=JetBrainsMono:size=10.5 dpi-aware=no [colors] diff --git a/scripts/sway/swaystatus b/scripts/sway/swaystatus index dd52af9..f20a7cb 100755 --- a/scripts/sway/swaystatus +++ b/scripts/sway/swaystatus @@ -1,5 +1,5 @@ #!/bin/sh -separator=" " +separator=" " get_todo() { todo="$(calcurse -t | wc -l)" diff --git a/shell/mkshrc b/shell/mkshrc index 097dee2..bb9c0cf 100644 --- a/shell/mkshrc +++ b/shell/mkshrc @@ -116,7 +116,7 @@ if [ "$(tty)" = "/dev/tty1" ] ; then sleep 0.5 amixer & exec startx - #exec sway + # exec sway fi command -v fetch >/dev/null 2>&1 && fetch min diff --git a/sway/config b/sway/config index d8e0c44..1d892ec 100644 --- a/sway/config +++ b/sway/config @@ -94,32 +94,17 @@ bindsym $mod+Shift+Down move down bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right # - -bindsym $mod+1 workspace " 1 " -bindsym $mod+2 workspace " 2 " -bindsym $mod+3 workspace " 3 " -bindsym $mod+4 workspace " 4 " -bindsym $mod+5 workspace " 5 " -bindsym $mod+6 workspace " 6 " -bindsym $mod+7 workspace " 7 " -bindsym $mod+8 workspace " 8 " -bindsym $mod+9 workspace " 9 " -bindsym $mod+Shift+1 move container to workspace " 1 " -bindsym $mod+Shift+2 move container to workspace " 2 " -bindsym $mod+Shift+3 move container to workspace " 3 " -bindsym $mod+Shift+4 move container to workspace " 4 " -bindsym $mod+Shift+5 move container to workspace " 5 " -bindsym $mod+Shift+6 move container to workspace " 6 " -bindsym $mod+Shift+7 move container to workspace " 7 " -bindsym $mod+Shift+8 move container to workspace " 8 " -bindsym $mod+Shift+9 move container to workspace " 9 " +bindsym $mod+1 workspace " I " +bindsym $mod+2 workspace " II " +bindsym $mod+3 workspace " III " +bindsym $mod+4 workspace " IV " +bindsym $mod+5 workspace " V " +bindsym $mod+Shift+1 move container to workspace " I " +bindsym $mod+Shift+2 move container to workspace " II " +bindsym $mod+Shift+3 move container to workspace " III " +bindsym $mod+Shift+4 move container to workspace " IV " +bindsym $mod+Shift+5 move container to workspace " V " # - -bindsym $alt+t workspace "  " -bindsym $alt+w workspace " 󰖟 " -bindsym $alt+m workspace "  " -bindsym $alt+Shift+t move container to workspace "  " -bindsym $alt+Shift+w move container to workspace " 󰖟 " -bindsym $alt+Shift+m move container to workspace "  " -#- bindsym $mod+comma workspace next_on_output bindsym $mod+period workspace prev_on_output # - @@ -137,16 +122,16 @@ gaps inner 5 font pango:JetBrainsMono Medium 8 bar { - position top - font pango:JetBrainsMono Bold 8 + position bottom + font pango:JetBrainsMono Bold 9 status_command ~/.config/scripts/sway/swaystatus tray_padding 4 colors { - background #12121200 - statusline #ebdbb2 + background #000000 + statusline #1d2021 focused_workspace $col_fg $col_fg $col_bg - inactive_workspace #12121200 #12121200 #ebdbb2 + inactive_workspace #000000 #000000 #1d2021 } } diff --git a/wrappers/em b/wrappers/em index 120783e..747f925 100755 --- a/wrappers/em +++ b/wrappers/em @@ -1,3 +1,3 @@ #!/usr/bin/env sh -exec emacsclient -c "$@" >/dev/null 2>&1 +exec emacsclient -c -a 'emacs' $@ >/dev/null 2>&1