Merge remote-tracking branch 'origin/unstable' into unstable

.config/alacritty/alacritty.yml

@@ -9,8 +9,11 @@
 # All imports must either be absolute paths starting with `/`, or paths relative
 # to the user's home directory starting with `~/`.
 import:
-  - ~/.config/alacritty/spacemacs2.yml
+  # - ~/.config/alacritty/dracula.yml
+  - ~/.config/alacritty/spacemacs.yml
 
+env:
+  TERM: xterm-256color
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
 # set by alacritty itself.

.config/doom/config.el

@@ -12,6 +12,27 @@
 (unless 'display-graphic-p
   (setq confirm-kill-emacs nil))
 
+(defun penguin/lsp-treemacs-symbols-toggle ()
+  "Toggle the lsp-treemacs-symbols buffer."
+  (interactive)
+  (if (get-buffer "*LSP Symbols List*")
+      (kill-buffer "*LSP Symbols List*")
+    (progn (lsp-treemacs-symbols)
+	   (other-window -1))))
+
+(defun penguin/lsp-ui-imenu-toggle ()
+  (interactive)
+  (if (get-buffer "*lsp-ui-imenu*")
+      (kill-buffer "*lsp-ui-imenu*")
+    (progn (lsp-ui-imenu)
+	   (other-window -1))))
+
+(defun penguin/treemacs-with-symbols ()
+  (interactive)
+  (penguin/lsp-treemacs-symbols-toggle)
+  (+treemacs/toggle))
+
+
 (load! "penguin/appearance.el")
 (load! "penguin/lang.el")
 (load! "penguin/keybinds.el")

.config/doom/init.el

@@ -31,11 +31,11 @@
        ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
-       ;; doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       doom-quit         ; DOOM quit-message prompts when you quit Emacs
        (emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        hydra
-       ;;indent-guides     ; highlighted indent columns
+       indent-guides     ; highlighted indent columns
        ;;ligatures         ; ligatures and symbols to make your code pretty again
        ;;minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
@@ -48,7 +48,7 @@
        ;;unicode           ; extended unicode support for various languages
        (vc-gutter +pretty) ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       ;;window-select     ; visually switch windows
+       window-select     ; visually switch windows
        workspaces        ; tab emulation, persistence & separate workspaces
        ;;zen               ; distraction-free coding or writing
 
@@ -157,7 +157,7 @@
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       (python +lsp +tree-sitter +pyright)            ; beautiful is better than ugly
+       (python +lsp +tree-sitter +pyright +poetry)            ; beautiful is better than ugly
        qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6

.config/doom/packages.el

@@ -51,6 +51,7 @@
 (package! helm-icons)
 (package! helm-company)
 (package! helm-make)
+(package! helm-projectile)
 (package! impatient-mode)
 (package! vterm)
 (package! multi-vterm)
@@ -58,5 +59,8 @@
 (package! evil-terminal-cursor-changer)
 (package! dpaste)
 (package! forge)
+(package! pinentry)
 (package! ox-rst)
+(package! flycheck-projectile)
+(package! treemacs-projectile)
 (load (expand-file-name "~/.local/share/doom/packages.el"))

.config/doom/penguin/appearance.el

@@ -1,14 +1,9 @@
 ;;; $DOOMDIR/penguin/appearance.el -*- lexical-binding: t; -*-
-
-
-;; (load-theme 'spamcemacs-dark t)
-;; (use-package spacemacs-theme
-;;                       :config
-;;                       (load-theme 'spacemacs-dark t))
-
 (setq doom-font (font-spec :family "JetBrains Mono Nerd Font" :size 14 :weight 'semibold)
       doom-big-font (font-spec :family "JetBrains Mono Nerd Font" :size 28 :weight 'bold)
-      doom-serif-font (font-spec :family "JetBrains Mono Nerd Font" :size 14 :weight 'bold))
+      doom-serif-font (font-spec :family "JetBrains Mono Nerd Font" :size 14 :weight 'bold)
+      doom-symbol-font (font-spec :family "JetBrains Mono Nerd Font" :size 12 :weight 'bold)
+      )
 ;; (setq doom-font "JetBrains Mono Nerd Font")
 ;; Doom exposes five (optional) variables for controlling fonts in Doom:
 ;;
@@ -80,5 +75,8 @@
 (setq centaur-tabs-style "wave")
 (setq centaur-tabs-set-bar 'under)
 
-(use-package! evil-terminal-cursor-changer
-  :hook (tty-setup . evil-terminal-cursor-changer-activate))
+
+(unless (display-graphic-p)
+  (require 'evil-terminal-cursor-changer)
+  (evil-terminal-cursor-changer-activate) ; or (etcc-on)
+  )

.config/doom/penguin/keybinds.el

@@ -96,3 +96,13 @@ _h_ decrease width    _l_ increase width     _<left>_ decrease width    _<right>
 ;; kill company completion
 (with-eval-after-load 'company
   (define-key company-active-map (kbd "C-k") 'company-abort))
+
+(after! projectile
+  ;; (map!
+  ;;  (:leader
+  ;;   :prefix "o"
+  ;;   :desc "Initialize or toggle treemacs and lsp treemacs symbols" "p" #'penguin/treemacs-with-symbols))
+  (map!
+   (:leader
+    :prefix "c"
+    :desc "Errors List" "x" #'flycheck-projectile-list-errors)))

.config/doom/penguin/lang.el

@@ -89,13 +89,14 @@
 
 (add-hook 'python-mode-hook
 	  (lambda ()
-	    (setq +format-with-lsp nil)
-	    (setq indent-tabs-mode t)
-	    (setq tab-width 4)
-	    (setq py-indent-tabs-mode t)
-	    (setq python-indent 4)
-	    (setq python-indent-offset 4)
+	    ;; (setq +format-with-lsp nil)
+	    ;; (setq indent-tabs-mode t)
+	    ;; (setq tab-width 4)
+	    ;; (setq py-indent-tabs-mode t)
+	    ;; (setq python-indent 4)
+	    ;; (setq python-indent-offset 4)
 	    (add-to-list 'write-file-functions 'delete-trailing-whitespace)
 	    (setq dap-python-debugger 'debugpy)
 	    (setq dap-python-executable "python3"))
-	  (tabify (point-min) (point-max)))
+	  ;; (tabify (point-min) (point-max))
+          )

.config/doom/penguin/local.el

@@ -1,10 +1,10 @@
 ;;; $DOOMDIR/penguin/local.el -*- lexical-binding: t; -*-
 
-(setq-local local-doom-user-dir (expand-file-name "~/.local/share/doom/"))
 
 (defun post-window-setup-hook()
-(if
-    (file-directory-p local-doom-user-dir)
+  (if
+      (setq-local local-doom-user-dir (expand-file-name "~/.local/share/doom/"))
+      (file-directory-p local-doom-user-dir)
     (progn
       (cl-loop for file in
 	       (directory-files local-doom-user-dir nil directory-files-no-dot-files-regexp) do
@@ -13,7 +13,7 @@
 		   (print (concat "Loading " file))
 		   (load (concat local-doom-user-dir file))
 		   ))))
-  (progn
-    (print local-doom-user-dir " not found."))))
+    (progn
+      (print local-doom-user-dir " not found."))))
 
 (add-hook! 'window-setup-hook #'post-window-setup-hook)

.config/doom/penguin/org.el

@@ -5,6 +5,7 @@
 (setq org-directory "~/org/")
 (setq org-noter-notes-search-path '("~/Documents/notes/"))
 (after! org
+  (setq org-link-file-path-type 'relative)
   (setq org-agenda-files
 	'("~/Documents/agendas"))
   (org-link-set-parameters "rel" :follow #'browse-url :export #'wvxvw/export-rel-url)
@@ -58,3 +59,6 @@
     (html (format "<a href=\"%s\">%s</a>" path (or desc path)))
     (latex (format "\\href{%s}{%s}" path (or desc path)))
     (otherwise path)))
+
+(after! 'org-mode
+  (require 'ox-rst))

.config/i3/config

@@ -63,7 +63,6 @@ bindsym $mod+Ctrl+m exec pavucontrol
 bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
 bindsym $mod+F2 exec palemoon
 bindsym $mod+F3 exec pcmanfm
-# bindsym $mod+F3 exec ranger
 bindsym $mod+Shift+F3 exec gksu pcmanfm
 bindsym $mod+F5 exec terminal -e 'mocp'
 bindsym $mod+t exec --no-startup-id pkill picom
@@ -116,9 +115,10 @@ bindsym $mod+q split toggle
 bindsym $mod+f fullscreen toggle
 
 # change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
+# bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
+bindsym $mod+s layout toggle split
+bindsym $mod+e exec alacritty -e ranger
 
 # change focus between tiling / floating windows
 bindsym $mod+space floating toggle
@@ -295,7 +295,7 @@ mode "resize" {
 }
 
 # Autostart applications
-exec --no-startup-id $HOME/.local/bin/launch_emacs.sh
+# exec --no-startup-id $HOME/.local/bin/launch_emacs.sh
 exec_always --no-startup-id fix_xcursor
 
 # Colors set from ~/.Xresources

user/.Xresources

@@ -1,42 +1,19 @@
-Xft.dpi:        96
-Xft.rgba:       rgb
-Xft.antialias:  true
-Xft.hinting:    true
-Xft.hintstyle:  hintslight
-
-! special
-*.foreground:   #a3a3a3
-*.background:   #1f2022
-*.cursorColor:  #a3a3a3
-
-! black
-*.color0:       #1f2022
-*.color8:       #585858
-
-! red
-*.color1:       #f2241f
-*.color9:       #f2241f
-
-! green
-*.color2:       #67b11d
-*.color10:      #67b11d
-
-! yellow
-*.color3:       #b1951d
-*.color11:      #b1951d
-
-! blue
-*.color4:       #4f97d7
-*.color12:      #4f97d7
-
-! magenta
-*.color5:       #a31db1
-*.color13:      #a31db1
-
-! cyan
-*.color6:       #2d9574
-*.color14:      #2d9574
-
-! white
-*.color7:       #a3a3a3
-*.color15:      #f8f8f8
+! Dracula Xresources palette
+*.foreground: #F8F8F2
+*.background: #282A36
+*.color0:     #000000
+*.color8:     #4D4D4D
+*.color1:     #FF5555
+*.color9:     #FF6E67
+*.color2:     #50FA7B
+*.color10:    #5AF78E
+*.color3:     #F1FA8C
+*.color11:    #F4F99D
+*.color4:     #BD93F9
+*.color12:    #CAA9FA
+*.color5:     #FF79C6
+*.color13:    #FF92D0
+*.color6:     #8BE9FD
+*.color14:    #9AEDFE
+*.color7:     #BFBFBF
+*.color15:    #E6E6E6

user/.zshrc

@@ -12,7 +12,7 @@ fi
 # plug "zap-zsh/supercharge"
 # plug "zap-zsh/zap-prompt"
 plug "romkatv/powerlevel10k"
-plug "$HOME/.config/zsh/keybindings.zsh"
+plug "embeddedpenguin/sanekeybinds"
 plug "wintermi/zsh-lsd"
 
 # Load and initialise completion system
@@ -30,10 +30,9 @@ setopt nomenucomplete
 . "$HOME/.bash_aliases"
 . "$HOME/.bash_sources"
 
-LS_COLORS='di=1;35:fi=0:ln=31:pi=5:so=5:bd=5:cd=5:or=31:mi=0:ex=35:*.rpm=90:*.png=35:*.gif=36:*.jpg=35:*.c=92:*.jar=33:*.py=93:*.h=90:*.txt=94:*.doc=104:*.docx=104:*.odt=104:*.csv=102:*.xlsx=102:*.xlsm=102:*.rb=31:*.cpp=92:*.sh=92:*.html=96:*.zip=4;33:*.tar.gz=4;33:*.mp4=105:*.mp3=106:tw=1;37:ow=1;37'
+LS_COLORS="$(vivid generate dracula)"
 export LS_COLORS
 setopt globdots
-# eval "$(dircolors)"
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 
 export EDITOR="launch_emacs.sh"
@@ -76,3 +75,6 @@ else
 	echo "$HOME/.localrc not found. Have you created it yet?" | gawk '{ print strftime("[%Y-%m-%d %H:%M:%S]"), $0 }' >> ~/.local/var/log/localrc.log
 fi
 export GPG_TTY=$TTY
+if [[ -z "$SSH_AUTH_SOCK" ]]; then
+    eval $(ssh-agent) >/dev/null
+fi