Merge pull request 'update config with new stuff and things' (#3) from unstable into stable

Reviewed-on: #3

.config/alacritty/alacritty.yml

@@ -11,6 +11,8 @@
 import:
   - ~/.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.
@@ -119,7 +121,7 @@ font:
     family: JetBrains Mono Nerd Font
     style: Bold Italic
 
-  size: 11
+  size: 10
 #font:
   # Normal (roman) font face
   #normal:
@@ -442,8 +444,8 @@ cursor:
 #   - (Windows) powershell
 shell:
  program: /bin/zsh
- args:
-   - --login
+ #args:
+ #  - "--login"
 
 # Startup directory
 #

.config/alacritty/dracula.yml

@@ -25,7 +25,7 @@ colors:
     focused_match:
       foreground: '#44475a'
       background: '#ffb86c'
-    bar:
+    footer_bar:
       background: '#282a36'
       foreground: '#f8f8f2'
   hints:

.config/doom/config.el

@@ -22,3 +22,6 @@
 (load! "penguin/completions.el")
 (load! "penguin/misc.el")
 (load! "penguin/local.el")
+(load! "penguin/serial-terminator.el")
+
+(setq x-super-keysym 'meta)

.config/doom/init.el

@@ -22,20 +22,20 @@
 
        :completion
        company           ; the ultimate code completion backend
-       (helm +fuzzy +icons) ; the *other* search engine for love and life
+       ;; (helm +fuzzy +icons) ; the *other* search engine for love and life
        ;;ido               ; the other *other* search engine...
-       ;; ivy               ; a search engine for love and life
-       ;;vertico           ; the search engine of the future
+       ;; (ivy +fuzzy +icons +prescient)               ; a search engine for love and life
+       (vertico +icons)           ; the search engine of the future
 
        :ui
        ;;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
-       (emoji +unicode)  ; 🙂
+       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       (emoji +unicode +ascii +github)  ; 🙂
        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
 
@@ -90,13 +90,13 @@
        (debugger +lsp)          ; FIXME stepping through code, to help you add bugs
        ;;direnv
        ;;docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
        lsp               ; M-x vscode
-       magit             ; a git porcelain for Emacs
+       (magit +forge)             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
        pdf               ; pdf enhancements
@@ -145,7 +145,7 @@
        ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
        julia            ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
-       latex             ; writing papers in Emacs has never been so fun
+       (latex +cdlatex +lsp +fold)             ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove
        ;;ledger            ; be audit you can be
        lua               ; one-based indices? one-based indices
@@ -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
@@ -172,7 +172,7 @@
        ;;solidity          ; do you need a blockchain? No.
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       (web +lsp)               ; the tubes
        yaml              ; JSON, but readable
        zig               ; C, but simpler
 

.config/doom/packages.el

@@ -51,10 +51,33 @@
 (package! helm-icons)
 (package! helm-company)
 (package! helm-make)
+(package! helm-projectile)
 (package! impatient-mode)
 (package! vterm)
 (package! multi-vterm)
 (package! treemacs-projectile)
 (package! evil-terminal-cursor-changer)
 (package! dpaste)
+(package! gitlab)
+(package! pinentry)
+(package! ox-rst)
+(package! flycheck-projectile)
+(package! treemacs-projectile)
+(package! ox-mediawiki)
+(package! poetry)
 (load (expand-file-name "~/.local/share/doom/packages.el"))
+(package! modus-themes)
+(package! org-fancy-priorities)
+(package! ox-odt
+  :recipe
+  (
+   :host github
+   :repo "kjambunathan/org-mode-ox-odt"
+   :files ("lisp/ox-odt.el"
+           "lisp/odt.el"
+           "etc"
+           "docs"
+           "contrib/odt/LibreOffice")))
+;; at some point i want to try pulling in some of this
+;; (package! nano-emacs
+;;   :recipe (:host github :repo "rougier/nano-emacs"))

.config/doom/penguin/appearance.el

@@ -1,14 +1,10 @@
 ;;; $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)
+      doom-emoji-font (font-spec :family "Noto Color Emoji" :size 12)
+      )
 ;; (setq doom-font "JetBrains Mono Nerd Font")
 ;; Doom exposes five (optional) variables for controlling fonts in Doom:
 ;;
@@ -80,5 +76,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

@@ -1,5 +1,4 @@
 ;;; $DOOMDIR/penguin/keybinds.el -*- lexical-binding: t; -*-
-
 (map! :leader
       :desc "Comment/Uncomment"
       "/" #'comment-line)
@@ -97,3 +96,9 @@ _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 "c"
+    :desc "Errors List" "x" #'flycheck-projectile-list-errors)))

.config/doom/penguin/lang.el

@@ -62,10 +62,10 @@
 (add-hook! 'doom-after-reload-hook #'apply-lang-settings-to-open-buffers)
 
 ;; Markdown
-(add-hook 'text-mode-hook
-	  #'(lambda ()
-	      (setq indent-tabs-mode nil)
-	      (setq tab-width 4)))
+;; (add-hook 'text-mode-hook
+;; 	  #'(lambda ()
+;; 	      (setq indent-tabs-mode nil)
+;; 	      (setq tab-width 4)))
 
 (defun markdown-html (buffer)
   (princ (with-current-buffer buffer
@@ -89,12 +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)
-	    (add-to-list 'write-file-functions 'delete-trailing-whitespace))
-	  (tabify (point-min) (point-max)))
-
+	    ;; (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))
+          )

.config/doom/penguin/local.el

@@ -1,15 +1,18 @@
 ;;; $DOOMDIR/penguin/local.el -*- lexical-binding: t; -*-
 
-(setq-local local-doom-user-dir (expand-file-name "~/.local/share/doom/"))
-(if
-    (file-directory-p local-doom-user-dir)
+
+(defun post-window-setup-hook()
+  (setq-local local-doom-user-dir (expand-file-name "~/.local/share/doom/"))
+  (if (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
+	         (progn
+	           (unless (or (string= file "packages.el") (file-directory-p (concat local-doom-user-dir file)))
+		     (print (concat "Loading " file))
+		     (load (concat local-doom-user-dir file))
+		     ))))
     (progn
-      (cl-loop for file in
-	       (directory-files local-doom-user-dir nil directory-files-no-dot-files-regexp) do
-		   (progn
-			 (unless (string= file "packages.el")
-			   (print (concat "Loading " file))
-			   (load (concat local-doom-user-dir file))
-			   ))))
-  (progn
-    (print local-doom-user-dir " not found.")))
+      (print local-doom-user-dir " not found."))))
+
+(add-hook 'window-setup-hook 'post-window-setup-hook)

.config/doom/penguin/org.el

@@ -1,18 +1,49 @@
 ;;; $DOOMDIR/user/org.el -*- lexical-binding: t; -*-
 
 (require 'org)
+(require 'ox-org)
 (add-hook! 'org-mode-hook 'org-num-mode)
-(setq org-directory "~/org/")
-(setq org-noter-notes-search-path '("~/Documents/notes/"))
 (after! org
-  (setq org-agenda-files
-	'("~/Documents/agendas"))
+  (setq
+   org-link-file-path-type 'relative
+   org-directory "~/Documents/org/"
+   org-roam-directory "~/Documents/org/"
+   org-attach-id-dir ".attach/"
+   org-journal-dir "~/Documents/org/"
+   +org-capture-journal-file "journal.org"
+   org-agenda-files '("agendas.org" "todo.org" "journal.org")
+   org-fancy-priorities-list '("󰈅󰈅󰈅" "󰈅󰈅" "󰈅")
+   org-link-file-path-type 'relative)
+  (use-package! ox-extra
+    :config
+    (ox-extras-activate '(latex-header-blocks ignore-headlines)))
+
+  (use-package! ox-latex
+    :init
+    ;; code here will run immediately
+    :config
+    ;; code here will run after the package is loaded
+    (setq org-latex-pdf-process
+          '("pdflatex -interaction nonstopmode -output-directory %o %f"
+            "bibtex %b"
+            "pdflatex -interaction nonstopmode -output-directory %o %f"
+            "pdflatex -interaction nonstopmode -output-directory %o %f"))
+    (setq org-latex-hyperref-template nil) ;; stop org adding hypersetup{author..} to latex export
+    ;; (setq org-latex-prefer-user-labels t)
+
+    ;; deleted unwanted file extensions after latexMK
+    (setq org-latex-logfiles-extensions
+          (quote ("lof" "lot" "tex~" "aux" "idx" "log" "out" "toc" "nav" "snm" "vrb" "dvi" "fdb_latexmk" "blg" "brf" "fls" "entoc" "ps" "spl" "bbl" "xmpi" "run.xml" "bcf" "acn" "acr" "alg" "glg" "gls" "ist")))
+
+    (unless (boundp 'org-latex-classes)
+      (setq org-latex-classes nil)))
+
   (org-link-set-parameters "rel" :follow #'browse-url :export #'wvxvw/export-rel-url)
   (set-company-backend!
     'org-mode
     'company-capf 'company-files)
   (setq org-todo-keywords
-	'((sequence
+        '((sequence
 	   "TODO(t)"
 	   "BLOCKED(b)"
 	   "WIP(w)"
@@ -24,6 +55,7 @@
 
 
 
+
 ;; (setcdr (assq 'system org-file-apps-defaults-gnu) "xdg-open %s")
 (setcdr (assq 'system org-file-apps-gnu) "xdg-open %s")
 
@@ -58,3 +90,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/doom/penguin/project.el

@@ -11,13 +11,15 @@
 ;; 					  projectile-root-top-down-recurring))
 (setf treemacs-follow-mode nil)
 (setq treemacs-project-follow-mode t)
-(defun penguin-projectile-switch-project-action ()
-  (closure
-      t
-      nil
-    (+workspace-new)
-    (+workspaces-set-project-action-fn)
-    (+workspaces-switch-to-project-h)))
-(setq projectile-switch-project-action 'penguin-projectile-switch-project-action)
+;; (defun penguin-projectile-switch-project-action ()
+;;   (lambda ()
+;;       t
+;;       nil
+;;     (+workspace-new)
+;;     (+workspaces-set-project-action-fn)
+;;     (+workspaces-switch-to-project-h)))
+;; (setq projectile-switch-project-action 'penguin-projectile-switch-project-action)
 (after! projectile
-  (add-to-list 'projectile-globally-ignored-directories "^.cache$"))
+  (add-to-list 'projectile-globally-ignored-directories "^.cache$")
+  (setq projectile-ignored-projects '("~/"
+                                      "~/Projects/")))

.config/doom/penguin/serial-terminator.el

@@ -0,0 +1,54 @@
+;;; serial-terminator.el --- Allows for the creation of one or more serial terminals, each existing in their own buffer + window combo.  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2023  Penguin
+
+;; Author: Penguin <penguin@epenguin.net>
+;; Keywords: terminals
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+
+
+(provide 'serial-terminator)
+;;; serial-terminator.el ends here
+
+(require 'evil)
+(defun quad-serial-term-setup ()
+  "Opens 4 buffers in a 2x2 square, then opens serial ports in each one"
+  (interactive)
+
+  (ansi-term "/bin/zsh" "/dev/ttyUSB0")
+  (evil-window-split)
+
+  (ansi-term "/bin/zsh" "/dev/ttyUSB1")
+  (evil-window-vsplit)
+
+  (ansi-term "/bin/zsh" "/dev/ttyUSB2")
+  (evil-window-down 1)
+  (evil-window-vsplit)
+
+  (ansi-term "/bin/zsh" "/dev/ttyUSB3")
+
+  (comint-send-string "*/dev/ttyUSB0*" "minicom -D /dev/ttyUSB0 -b 115200\n")
+  (comint-send-string "*/dev/ttyUSB1*" "minicom -D /dev/ttyUSB1 -b 115200\n")
+  (comint-send-string "*/dev/ttyUSB2*" "minicom -D /dev/ttyUSB2 -b 115200\n")
+  (comint-send-string "*/dev/ttyUSB3*" "minicom -D /dev/ttyUSB3 -b 115200\n"))
+(provide 'quad-serial-term)
+;;; quad-serial-term.el ends here

.config/i3/config

@@ -1,7 +1,8 @@
+# -*- mode: i3wm-config -*-
 # General format of my i3 configuration file
 # Uses colors from .Xresources to color windowborders
 
-
+exec xrdb -merge ~/.Xresources
 # i3 config file (v4)
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 
@@ -32,15 +33,14 @@ font pango:JetBrains Nerd Font Mono 10, Jet Brains Nerd Font Mono 10
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec alacritty
+bindsym $mod+Return exec --no-startup-id kitty
 
 # kill focused window
 bindsym $mod+Shift+q kill
 
 # start program launcher
 #bindsym $mod+d exec --no-startup-id dmenu_recency
-bindsym $mod+d exec --no-startup-id rofi -run-list-command ". ~/.bash_alises" -run-command "/bin/bash -i -c '{cmd}'" -show run
-# launch categorized menu
+bindsym $mod+d exec --no-startup-id rofi -run-list-command ". ~/.bash_aliases" -run-command "/bin/bash -i -c '{cmd}'" -show run -theme "$HOME/.config/rofi/launchers/type-6/style-3.rasi"
 bindsym $mod+z exec --no-startup-id morc_menu
 
 ################################################################################################
@@ -50,7 +50,7 @@ bindsym $mod+z exec --no-startup-id morc_menu
 exec --no-startup-id volumeicon
 # bindsym $mod+Ctrl+m exec terminal -e 'alsamixer'
 #exec --no-startup-id pa-applet
-bindsym $mod+Ctrl+m exec pavucontrol
+bindsym $mod+Ctrl+m exec --no-startup-id pavucontrol
 
 ################################################################################################
 
@@ -59,10 +59,7 @@ bindsym $mod+Ctrl+m exec pavucontrol
 # bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'"
 
 # Start Applications
-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
@@ -115,12 +112,13 @@ 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 kitty -e ranger
 
 # change focus between tiling / floating windows
-bindsym $mod+space floating toggle 
+bindsym $mod+space floating toggle
 
 # toggle sticky
 bindsym $mod+Shift+s sticky toggle
@@ -202,8 +200,8 @@ for_window [class="teams-for-linux"] workspace --no-auto-back-and-forth $ws8, fo
 assign [class="(?i)discord"] $ws8
 for_window [class="(?i)discord"] workspace --no-auto-back-and-forth $ws8, focus
 
-assign [class="Alacritty"] $ws5
-for_window [class="Alacritty"] workspace --no-auto-back-and-forth $ws4, focus
+assign [class="kitty"] $ws5
+for_window [class="kitty"] workspace --no-auto-back-and-forth $ws4, focus
 assign [class="Emacs*"] $ws2
 for_window [class="Emacs*"] workspace --no-auto-back-and-forth $ws2, focus
 
@@ -238,7 +236,7 @@ for_window [class="Emacs*"] workspace --no-auto-back-and-forth $ws2, focus
 # for_window [class="discord"] floating enable border none
 # for_window [class="skypeforlinux"] floating enable border none
 # switch to workspace with urgent window automatically
-for_window [urgent=latest] focus
+# for_window [urgent=latest] focus
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -265,8 +263,18 @@ mode "$mode_system" {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
+bindsym $mod+m mode "$mode_monitor"
+set $mode_monitor (h)ome, (w)ork
+mode "$mode_monitor" {
+    bindsym h exec --no-startup-id "~/.screenlayout/home.sh", mode "default"
+    bindsym w exec --no-startup-id "~/.screenlayout/work.sh", mode "default"
 
-# using plasma's logout screen instead of i3's
+    # exit system mode: "Enter" or "Escape"
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+
+# using xfce's logout screen instead of i3's
 bindsym $mod+Shift+e exec --no-startup-id xfce4-session-logout
 
 # Resize window (you can also use the mouse for that)
@@ -293,91 +301,51 @@ mode "resize" {
         bindsym Escape mode "default"
 }
 
-# Lock screen
-# bindsym $mod+9 exec --no-startup-id blurlock
-
 # Autostart applications
-#exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-# exec --no-startup-id nm-applet
-#exec --no-startup-id xfce4-power-manager
-# exec --no-startup-id pamac-tray
-# exec --no-startup-id clipit
-#exec --no-startup-id blueman-applet
-# exec_always --no-startup-id sbxkb
-# exec --no-startup-id start_conky_maia
-# exec --no-startup-id start_conky_green
-#exec --no-startup-id xautolock -time 30 -locker blurlock
-exec --no-startup-id $HOME/.local/bin/launch_emacs.sh
-# exec_always --no-startup-id fix_xcursor
+# exec --no-startup-id $HOME/.local/bin/launch_emacs.sh
+exec_always --no-startup-id fix_xcursor
 
 # Colors set from ~/.Xresources
-set_from_resource	$background	background
-set_from_resource	$foreground	foreground
-set_from_resource	$color0		color0
-set_from_resource 	$color1 	color1
-set_from_resource 	$color2 	color2
-set_from_resource 	$color3 	color3
-set_from_resource 	$color4 	color4
-set_from_resource 	$color5 	color5
-set_from_resource 	$color6		color6
-set_from_resource	$color7		color7
-set_from_resource	$color8		color8
-set_from_resource	$color9		color9
-set_from_resource	$color10	color10
-set_from_resource	$color11	color11
-set_from_resource	$color12	color12
-set_from_resource	$color13	color13
-set_from_resource	$color14	color14
-set_from_resource	$color15	color15
-exec i3 --shmlog-size=26214400
-exec_always --no-startup-id $HOME/.screenlayout/default.sh
-exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-# bar {
-#     tray_output primary
-#     tray_padding 3
-#     font pango:Hack Nerd Font Mono 11, FontAwesome 11
-#     position top
-#     status_command $HOME/.cargo/bin/i3status-rs
-#     colors {
-#         separator #666666
-#         background #222222
-#         statusline #dddddd
-#     focused_workspace  #E6E6E6 #44475A #F8F8F2
-#     active_workspace   #282A36 #44475A #F8F8F2
-#     inactive_workspace #282A36 #282A36 #BFBFBF
-#     urgent_workspace   #FF5555 #FF5555 #F8F8F2
-#     binding_mode       #FF5555 #FF5555 #F8F8F2
-#     }
-# }
-
-
-
-#     colors {
-#         separator #666666
-#         background #222222
-#         statusline #dddddd
-#         focused_workspace #0088CC #0088CC #ffffff
-#         active_workspace #333333 #333333 #ffffff
-#         inactive_workspace #333333 #333333 #888888
-#         urgent_workspace #2f343a #900000 #ffffff
-#     }
-# }
-
-
-# hide/unhide i3status bar
-#bindsym $mod+m bar mode toggle
-
+set_from_resource   $background     background #1f2022
+set_from_resource   $foreground     foreground #a3a3a3
+set_from_resource   $color0         color0 #1f2022
+set_from_resource   $color1     color1 #f2241f
+set_from_resource   $color2     color2 #67b11d
+set_from_resource   $color3     color3 #b1951d
+set_from_resource   $color4     color4 #4f97d7
+set_from_resource   $color5     color5 #a31db1
+set_from_resource   $color6         color6 #2d9574
+set_from_resource   $color7         color7 #a3a3a3
+set_from_resource   $color8         color8 #585858
+set_from_resource   $color9         color9 #f2241f
+set_from_resource   $color10    color10 #67b11d
+set_from_resource   $color11    color11 #b1951d
+set_from_resource   $color12    color12 #4f97d7
+set_from_resource   $color13    color13 #a31db1
+set_from_resource   $color14    color14 #2d9574
+set_from_resource   $color15    color15 #f8f8f8
+set_from_resource   $clientchildborderalt #a3a3a3 #a3a3a3
+set_from_resource   $clientchildborder #f8f8f8 #f8f8f8
+
+exec_always --no-startup-id "$HOME/.screenlayout/default.sh"
+exec_always --no-startup-id "$HOME/.config/polybar/launch.sh"
 # Theme colors
 # class                 border  	backgr. 	text    	indic.  	child_border
-# My colors
-client.background	$background
+client.focused          $foreground $background $foreground $background $clientchildborder
+client.unfocused        $foreground $background $foreground $background $clientchildborderalt
+client.focused_inactive $foreground $background $foreground $background $clientchildborderalt
+client.urgent           $foreground $background $foreground $background $background
+client.placeholder      $foreground $background $foreground $background $background
+client.background       $background
+
+# class                 border  backgr. text    indicator child_border
+# client.focused          #4c7899 #285577 #ffffff #2e9ef4   #285577
+# client.focused_inactive #333333 #5f676a #ffffff #484e50   #5f676a
+# client.unfocused        #333333 #222222 #888888 #292d2e   #222222
+# client.urgent           #2f343a #900000 #ffffff #900000   #900000
+# client.placeholder      #000000 #0c0c0c #ffffff #000000   #0c0c0c
 
-# client.focused         	$foreground	$background	$foreground	$background #A4A4A4	
-client.focused         	$foreground	$background	$foreground	$background #FFFFFF
-client.unfocused       	$foreground	$background	$foreground	$background	#878787
-client.focused_inactive	$foreground	$background	$foreground	$background #878787	
-client.urgent		$foreground	$background	$foreground	$background	$background
-client.placeholder	$foreground	$background	$foreground	$background	$background
+# client.background       #ffffff
 
 
 #############################
@@ -408,6 +376,7 @@ gaps outer 0
 
 # for_window [class=^.*] floating enable
 bindsym $mod+x move workspace to output right
+bindsym $mod+Shift+x move workspace to output up
 # Pulse Audio Controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% # Increase
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% # Decrease
@@ -432,11 +401,12 @@ no_focus [class="plasmashell" window_type="notification"]
 for_window [title="Desktop — Plasma"] kill; floating enable; border none
 
 exec --no-startup-id flameshot
+exec --no-startup-id signal-desktop --start-in-tray
 exec --no-startup-id nitrogen --restore; sleep 1;
 exec_always --no-startup-id picom
 bindsym $mod+n exec --no-startup-id nitrogen --restore
-bindsym $mod+m exec $HOME/.screenlayout/home.sh
+# bindsym $mod+m exec $HOME/.screenlayout/home.sh
 bindsym $mod+Shift+p exec --no-startup-id $HOME/.config/polybar/launch.sh
-exec --no-startup-id xsettingsd
+bindsym $mod+p exec --no-startup-id killall polybar
 
-gaps top 25
+gaps top 40

.config/kitty/current-theme.conf

@@ -0,0 +1,20 @@
+foreground            #bfbfbf
+background            #282a2e
+selection_background  #5c4c79
+url_color             #29a1ae
+color0                #292b2d
+color8                #68717b
+color1                #ce527a
+color9                #ce527a
+color2                #2d9474
+color10               #84d82f
+color3                #bfa325
+color11               #edad0d
+color4                #4e97d6
+color12               #4c91cc
+color5                #bb6dc3
+color13               #bb6dc3
+color6                #299ba2
+color14               #299ba2
+color7                #e4e4e4
+color15               #f2f2f2

.config/kitty/diff.conf

@@ -0,0 +1,19 @@
+foreground           #f8f8f2
+background           #282a36
+title_fg             #f8f8f2
+title_bg             #282a36
+margin_bg            #6272a4
+margin_fg            #44475a
+removed_bg           #ff5555
+highlight_removed_bg #ff5555
+removed_margin_bg    #ff5555
+added_bg             #50fa7b
+highlight_added_bg   #50fa7b
+added_margin_bg      #50fa7b
+filler_bg            #44475a
+hunk_margin_bg       #44475a
+hunk_bg              #bd93f9
+search_bg            #8be9fd
+search_fg            #282a36
+select_bg            #f1fa8c
+select_fg            #282a36

.config/kitty/dracula.conf

@@ -0,0 +1,66 @@
+# https://draculatheme.com/kitty
+#
+# Installation instructions:
+#
+#  cp dracula.conf ~/.config/kitty/
+#  echo "include dracula.conf" >> ~/.config/kitty/kitty.conf
+#
+# Then reload kitty for the config to take affect.
+# Alternatively copy paste below directly into kitty.conf
+
+foreground            #f8f8f2
+background            #282a36
+selection_foreground  #ffffff
+selection_background  #44475a
+
+url_color #8be9fd
+
+# black
+color0  #21222c
+color8  #6272a4
+
+# red
+color1  #ff5555
+color9  #ff6e6e
+
+# green
+color2  #50fa7b
+color10 #69ff94
+
+# yellow
+color3  #f1fa8c
+color11 #ffffa5
+
+# blue
+color4  #bd93f9
+color12 #d6acff
+
+# magenta
+color5  #ff79c6
+color13 #ff92df
+
+# cyan
+color6  #8be9fd
+color14 #a4ffff
+
+# white
+color7  #f8f8f2
+color15 #ffffff
+
+# Cursor colors
+cursor            #f8f8f2
+cursor_text_color background
+
+# Tab bar colors
+active_tab_foreground   #282a36
+active_tab_background   #f8f8f2
+inactive_tab_foreground #282a36
+inactive_tab_background #6272a4
+
+# Marks
+mark1_foreground #282a36
+mark1_background #ff5555
+
+# Splits/Windows
+active_border_color #f8f8f2
+inactive_border_color #6272a4

.config/kitty/kitty-themes

@@ -0,0 +1 @@
+Subproject commit 46d9dfe230f315a6a0c62f4687f6b3da20fd05e4

.config/kitty/kitty.conf

@@ -0,0 +1,13 @@
+font_family        JetBrainsMonoNL NF SemiBold
+bold_font          JetBrainsMonoNL NF Bold
+italic_font        JetBrainsMonoNL NF SemiBold Italic
+bold_italic_font   JetBrainsMonoNL NF Bold Italic
+
+font_size 11.0
+enable_audio_bell no
+
+
+# BEGIN_KITTY_THEME
+# Spacemacs
+include current-theme.conf
+# END_KITTY_THEME

.config/kitty/kitty.conf.bak

@@ -0,0 +1,9 @@
+include dracula.conf
+
+font_family        JetBrainsMonoNL NF SemiBold
+bold_font          JetBrainsMonoNL NF Bold
+italic_font        JetBrainsMonoNL NF SemiBold Italic
+bold_italic_font   JetBrainsMonoNL NF Bold Italic
+
+font_size 11.0
+enable_audio_bell no

.config/polybar/config.ini

@@ -24,7 +24,7 @@ alert = #a60f2b
 #############################################
 
 [bar/small]
-pseudo-transparency = true
+pseudo-transparency =false
 dpi-x = 96
 dpi-y = 96
 separator =
@@ -47,7 +47,7 @@ cursor-scroll = ns-resize
 foreground = ${colors.foreground}
 background = ${colors.background-alt2}
 border-color = ${colors.background-alt}
-separator-foreground = ${colors.yellow}
+separator-foreground = ${colors.purple}
 tray-position=right
 tray-background = ${root.background}
 #############################################
@@ -60,7 +60,7 @@ modules-right = pulseaudio smalltime
 #############################################
 
 [bar/top]
-pseudo-transparency = true
+pseudo-transparency = false
 dpi-x = 96
 dpi-y = 96
 separator =
@@ -83,16 +83,19 @@ cursor-scroll = ns-resize
 foreground = ${colors.foreground}
 background = ${colors.background-alt2}
 border-color = ${colors.background-alt}
-separator-foreground = ${colors.yellow}
+separator-foreground = ${colors.white}
 tray-position=right
-tray-background = ${root.background}
+tray-background = ${colors.background-alt}
+tray-foreground = ${colors.foreground-alt}
+tray-padding=5
+tray-detached=false
 #############################################
 font-0 = JetBrainsMono Nerd Font:size=10;3
 font-N = <fontconfig pattern>;<vertical offset>
 #############################################
 modules-center = cpu
 modules-left = i3 title
-modules-right = filesystem memory pulseaudio time
+modules-right = filesystem memory pulseaudio time battery
 #############################################
 
 [module/i3]
@@ -109,29 +112,28 @@ ws-icon-7 = 8;
 ws-icon-8 = 9;
 #############################################
 # pin-workspaces = true
-format = <label-state>
+format = <label-state> <label-mode>
 index-sort = true
 wrapping-scroll = true
 #############################################
 label-mode = %mode%
-label-mode-padding = 5
-label-mode-foreground = ${colors.foreground}
+label-mode-padding = 2
+label-mode-foreground = ${colors.alert}
 #############################################
-label-unfocused = ${self.workspace-label}
+# label-unfocused = ${self.workspace-label}
 label-unfocused-foreground = ${colors.foreground-alt}
 label-unfocused-padding = 1
 #############################################
-label-visible = ${self.workspace-label}
 # label-visible-foreground = ${colors.foreground}
 label-visible-padding = 1
 #############################################
-label-focused = ${self.workspace-label}
+# label-focused = ${self.workspace-label}
 label-focused-foreground = ${colors.foreground}
 label-focused-background = ${colors.background-alt}
 label-focused-padding = 1
 label-focused-underline = ${colors.background-alt}
 #############################################
-label-urgent = ${self.workspace-label}
+# label-urgent = ${self.workspace-label}
 label-urgent-foreground = ${colors.alert}
 label-urgent-padding = 1
 #############################################
@@ -193,7 +195,7 @@ ramp-coreload-7 = █
 [module/time]
 type = internal/date
 interval = 5
-date = "%a %m/%d/%Y %I:%M:%S %p"
+date = "%a %m/%d %I:%M %p"
 label = %date%
 #############################################
 
@@ -208,16 +210,16 @@ label = %date%
 type = internal/battery
 low-at = 10
 full-at = 98
-battery = BAT1
-adapter = ACAD
+battery = BAT0
+adapter = AC
 poll-interval = 10
 time-format = %H:%M
 label-discharging = %percentage%%
 label-charging = Charging %percentage%%
 format-charging = <animation-charging> <label-charging>
 format-discharging = <ramp-capacity> <label-discharging>
-label-discharging-margin = 8px
-label-full = 100%
+label-discharging-margin = 1px
+label-full =   100%
 label-low = BATTERY LOW
 ramp-capacity-0 = 
 ramp-capacity-1 = 
@@ -238,7 +240,7 @@ animation-discharging-3 = 
 animation-discharging-4 = 
 animation-discharging-framerate = 500
 animation-low-0 = !
-animation-low-1 = 
+animation-low-1 =
 animation-low-framerate = 200
 
 #############################################
@@ -301,4 +303,4 @@ format = <label>
 format-padding = 4
 label = %title%
 label-maxlen = 50
-label-empty = 
+label-empty =

.config/polybar/launch.sh

@@ -7,13 +7,15 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 BAR_NAME=top
 LITTLE_BAR_NAME=small
-BAR_CONFIG=/home/$USER/.config/polybar/config.ini
+BAR_CONFIG="$HOME/.config/polybar/config.ini"
 
 PRIMARY=$(xrandr --query | grep " connected" | grep "primary" | cut -d" " -f1)
 OTHERS=$(xrandr --query | grep " connected" | grep -v "primary" | cut -d" " -f1)
+echo "hello" $PRIMARY
 
 # Launch on primary monitor
-MONITOR=$PRIMARY polybar --reload -c $BAR_CONFIG $BAR_NAME &
+export MONITOR=$PRIMARY 
+polybar --reload -c $BAR_CONFIG $BAR_NAME &
 sleep 0.2
 
 # Launch on all other monitors

.config/ranger/rc.conf

@@ -47,7 +47,7 @@ set confirm_on_delete multiple
 # set preview_script ~/.config/ranger/scope.sh
 
 # Use the external preview script or display simple plain text or image previews?
-# set use_preview_script true
+set use_preview_script true
 
 # Automatically count files in the directory, even before entering them?
 set automatically_count_files true
@@ -57,7 +57,7 @@ set automatically_count_files true
 set open_all_images true
 
 # Be aware of version control systems and display information.
-set vcs_aware false
+set vcs_aware true
 
 # State of the four backends git, hg, bzr, svn. The possible states are
 # disabled, local (only show local info), enabled (show local and remote
@@ -114,7 +114,7 @@ set preview_images true
 #   Preview images in full color with the external command "ueberzug".
 #   Images are shown by using a child window.
 #   Only for users who run X11 in GNU/Linux.
-set preview_images_method ueberzug
+set preview_images_method kitty
 
 # Delay in seconds before displaying an image with the w3m method.
 # Increase it in case of experiencing display corruption.
@@ -139,7 +139,7 @@ set show_hidden_bookmarks true
 
 # Which colorscheme to use?  These colorschemes are available by default:
 # default, jungle, snow, solarized
-set colorscheme dracula
+set colorscheme default
 
 # Preview files on the rightmost column?
 # And collapse (shrink) the last column if there is nothing to preview?

.config/ranger/rifle.conf

@@ -54,31 +54,31 @@
 # Rarely installed browsers get higher priority; It is assumed that if you
 # install a rare browser, you probably use it.  Firefox/konqueror/w3m on the
 # other hand are often only installed as fallback browsers.
-ext x?html?, has surf,             X, flag f = surf -- file://"$1"
-ext x?html?, has vimprobable,      X, flag f = vimprobable -- "$@"
-ext x?html?, has vimprobable2,     X, flag f = vimprobable2 -- "$@"
-ext x?html?, has qutebrowser,      X, flag f = qutebrowser -- "$@"
-ext x?html?, has dwb,              X, flag f = dwb -- "$@"
-ext x?html?, has jumanji,          X, flag f = jumanji -- "$@"
-ext x?html?, has luakit,           X, flag f = luakit -- "$@"
-ext x?html?, has uzbl,             X, flag f = uzbl -- "$@"
-ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed -- "$@"
-ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser -- "$@"
-ext x?html?, has uzbl-core,        X, flag f = uzbl-core -- "$@"
-ext x?html?, has midori,           X, flag f = midori -- "$@"
-ext x?html?, has opera,            X, flag f = opera -- "$@"
-ext x?html?, has firefox,          X, flag f = firefox -- "$@"
-ext x?html?, has seamonkey,        X, flag f = seamonkey -- "$@"
-ext x?html?, has iceweasel,        X, flag f = iceweasel -- "$@"
-ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
-ext x?html?, has chromium,         X, flag f = chromium -- "$@"
-ext x?html?, has google-chrome,    X, flag f = google-chrome -- "$@"
-ext x?html?, has epiphany,         X, flag f = epiphany -- "$@"
-ext x?html?, has konqueror,        X, flag f = konqueror -- "$@"
+ext x?html?, has surf,             X, flag f = surf file://"$1"
+ext x?html?, has vimprobable,      X, flag f = vimprobable "$@"
+ext x?html?, has vimprobable2,     X, flag f = vimprobable2 "$@"
+ext x?html?, has qutebrowser,      X, flag f = qutebrowser "$@"
+ext x?html?, has dwb,              X, flag f = dwb "$@"
+ext x?html?, has jumanji,          X, flag f = jumanji "$@"
+ext x?html?, has luakit,           X, flag f = luakit "$@"
+ext x?html?, has uzbl,             X, flag f = uzbl "$@"
+ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed "$@"
+ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser "$@"
+ext x?html?, has uzbl-core,        X, flag f = uzbl-core "$@"
+ext x?html?, has midori,           X, flag f = midori "$@"
+ext x?html?, has opera,            X, flag f = opera "$@"
+ext x?html?, has firefox,          X, flag f = firefox "$@"
+ext x?html?, has seamonkey,        X, flag f = seamonkey "$@"
+ext x?html?, has iceweasel,        X, flag f = iceweasel "$@"
+ext x?html?, has chromium-browser, X, flag f = chromium-browser "$@"
+ext x?html?, has chromium,         X, flag f = chromium "$@"
+ext x?html?, has google-chrome,    X, flag f = google-chrome "$@"
+ext x?html?, has epiphany,         X, flag f = epiphany "$@"
+ext x?html?, has konqueror,        X, flag f = konqueror "$@"
 ext x?html?, has elinks,            terminal = elinks "$@"
 ext x?html?, has links2,            terminal = links2 "$@"
 ext x?html?, has links,             terminal = links "$@"
-ext x?html?, has lynx,              terminal = lynx -- "$@"
+ext x?html?, has lynx,              terminal = lynx "$@"
 ext x?html?, has w3m,               terminal = w3m "$@"
 
 #-------------------------------------------
@@ -100,100 +100,100 @@ name ^[mM]akefile$            = make
 #--------------------------------------------
 # Scripts
 #-------------------------------------------
-ext py  = python -- "$1"
-ext pl  = perl -- "$1"
-ext rb  = ruby -- "$1"
-ext js  = node -- "$1"
-ext sh  = sh -- "$1"
-ext php = php -- "$1"
+ext py  = python "$1"
+ext pl  = perl "$1"
+ext rb  = ruby "$1"
+ext js  = node "$1"
+ext sh  = sh "$1"
+ext php = php "$1"
 
 #--------------------------------------------
 # Audio without X
 #-------------------------------------------
-mime ^audio|ogg$, terminal, has mpv      = mpv -- "$@"
-mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@"
-mime ^audio|ogg$, terminal, has mplayer  = mplayer -- "$@"
-ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
+mime ^audio|ogg$, terminal, has mpv      = mpv "$@"
+mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 "$@"
+mime ^audio|ogg$, terminal, has mplayer  = mplayer "$@"
+ext midi?,        terminal, has wildmidi = wildmidi "$@"
 
 #--------------------------------------------
 # Video/Audio with a GUI
 #-------------------------------------------
-mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
+mime ^video|audio, has gmplayer, X, flag f = gmplayer "$@"
 mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
-mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -fs -- "$@"
-mime ^video|audio, has vlc,      X, flag f = vlc -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem --fullscreen -- "$@"
+mime ^video,       has mpv,      X, flag f = mpv "$@"
+mime ^video,       has mpv,      X, flag f = mpv --fs "$@"
+mime ^video,       has mplayer2, X, flag f = mplayer2 "$@"
+mime ^video,       has mplayer2, X, flag f = mplayer2 -fs "$@"
+mime ^video,       has mplayer,  X, flag f = mplayer "$@"
+mime ^video,       has mplayer,  X, flag f = mplayer -fs "$@"
+mime ^video|audio, has vlc,      X, flag f = vlc "$@"
+mime ^video|audio, has totem,    X, flag f = totem "$@"
+mime ^video|audio, has totem,    X, flag f = totem --fullscreen "$@"
 
 #--------------------------------------------
 # Video without X
 #-------------------------------------------
-mime ^video, terminal, !X, has mpv       = mpv -- "$@"
-mime ^video, terminal, !X, has mplayer2  = mplayer2 -- "$@"
-mime ^video, terminal, !X, has mplayer   = mplayer -- "$@"
+mime ^video, terminal, !X, has mpv       = mpv "$@"
+mime ^video, terminal, !X, has mplayer2  = mplayer2 "$@"
+mime ^video, terminal, !X, has mplayer   = mplayer "$@"
 
 #-------------------------------------------
 # Documents
 #-------------------------------------------
 ext pdf, has llpp,     X, flag f = llpp "$@"
-ext pdf, has zathura,  X, flag f = zathura -- "$@"
+ext pdf, has zathura,  X, flag f = zathura "$@"
 ext pdf, has mupdf,    X, flag f = mupdf "$@"
 ext pdf, has mupdf-x11,X, flag f = mupdf-x11 "$@"
-ext pdf, has apvlv,    X, flag f = apvlv -- "$@"
-ext pdf, has xpdf,     X, flag f = xpdf -- "$@"
-ext pdf, has evince,   X, flag f = evince -- "$@"
-ext pdf, has atril,    X, flag f = atril -- "$@"
-ext pdf, has okular,   X, flag f = okular -- "$@"
-ext pdf, has epdfview, X, flag f = epdfview -- "$@"
+ext pdf, has apvlv,    X, flag f = apvlv "$@"
+ext pdf, has xpdf,     X, flag f = xpdf "$@"
+ext pdf, has evince,   X, flag f = evince "$@"
+ext pdf, has atril,    X, flag f = atril "$@"
+ext pdf, has okular,   X, flag f = okular "$@"
+ext pdf, has epdfview, X, flag f = epdfview "$@"
 ext pdf, has qpdfview, X, flag f = qpdfview "$@"
 ext pdf, has open,     X, flag f = open "$@"
 
-ext docx?, has catdoc,       terminal = catdoc -- "$@" | "$PAGER"
+ext docx?, has catdoc,       terminal = catdoc "$@" | "$PAGER"
 
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric -- "$@"
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread -- "$@"
+ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric "$@"
+ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has soffice,     X, flag f = soffice "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has ooffice,     X, flag f = ooffice "$@"
 
-ext djvu, has zathura,X, flag f = zathura -- "$@"
-ext djvu, has evince, X, flag f = evince -- "$@"
-ext djvu, has atril,  X, flag f = atril -- "$@"
-ext djvu, has djview, X, flag f = djview -- "$@"
+ext djvu, has zathura,X, flag f = zathura "$@"
+ext djvu, has evince, X, flag f = evince "$@"
+ext djvu, has atril,  X, flag f = atril "$@"
+ext djvu, has djview, X, flag f = djview "$@"
 
-ext epub, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
-ext epub, has zathura,      X, flag f = zathura -- "$@"
-ext epub, has mupdf,        X, flag f = mupdf -- "$@"
-ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
+ext epub, has ebook-viewer, X, flag f = ebook-viewer "$@"
+ext epub, has zathura,      X, flag f = zathura "$@"
+ext epub, has mupdf,        X, flag f = mupdf "$@"
+ext mobi, has ebook-viewer, X, flag f = ebook-viewer "$@"
 
-ext cbr,  has zathura,      X, flag f = zathura -- "$@"
-ext cbz,  has zathura,      X, flag f = zathura -- "$@"
+ext cbr,  has zathura,      X, flag f = zathura "$@"
+ext cbz,  has zathura,      X, flag f = zathura "$@"
 
 #-------------------------------------------
 # Images
 #-------------------------------------------
-mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
-mime ^image/svg, has display,  X, flag f = display -- "$@"
+mime ^image/svg, has inkscape, X, flag f = inkscape "$@"
+mime ^image/svg, has display,  X, flag f = display "$@"
 
-mime ^image, has imv,       X, flag f = imv -- "$@"
-mime ^image, has pqiv,      X, flag f = pqiv -- "$@"
-mime ^image, has sxiv,      X, flag f = sxiv -- "$@"
-mime ^image, has feh,       X, flag f = feh -- "$@"
-mime ^image, has mirage,    X, flag f = mirage -- "$@"
+mime ^image, has imv,       X, flag f = imv "$@"
+mime ^image, has pqiv,      X, flag f = pqiv "$@"
+mime ^image, has sxiv,      X, flag f = sxiv "$@"
+mime ^image, has feh,       X, flag f = feh "$@"
+mime ^image, has mirage,    X, flag f = mirage "$@"
 mime ^image, has ristretto, X, flag f = ristretto "$@"
-mime ^image, has eog,       X, flag f = eog -- "$@"
-mime ^image, has eom,       X, flag f = eom -- "$@"
-mime ^image, has nomacs,    X, flag f = nomacs -- "$@"
-mime ^image, has geeqie,    X, flag f = geeqie -- "$@"
-mime ^image, has gpicview,  X, flag f = gpicview -- "$@"
-mime ^image, has gwenview,  X, flag f = gwenview -- "$@"
-mime ^image, has gimp,      X, flag f = gimp -- "$@"
-ext xcf,                    X, flag f = gimp -- "$@"
+mime ^image, has eog,       X, flag f = eog "$@"
+mime ^image, has eom,       X, flag f = eom "$@"
+mime ^image, has nomacs,    X, flag f = nomacs "$@"
+mime ^image, has geeqie,    X, flag f = geeqie "$@"
+mime ^image, has gpicview,  X, flag f = gpicview "$@"
+mime ^image, has gwenview,  X, flag f = gwenview "$@"
+mime ^image, has gimp,      X, flag f = gimp "$@"
+ext xcf,                    X, flag f = gimp "$@"
 
 #-------------------------------------------
 # Archives
@@ -202,10 +202,10 @@ ext xcf,                    X, flag f = gimp -- "$@"
 # avoid password prompt by providing empty password
 ext 7z, has 7z = 7z -p l "$@" | "$PAGER"
 # This requires atool
-ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,     has atool = atool --list --each -- "$@" | "$PAGER"
-ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | "$PAGER"
-ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has atool = atool --extract --each -- "$@"
-ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@"
+ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,     has atool = atool --list --each "$@" | "$PAGER"
+ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each "$@" | "$PAGER"
+ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has atool = atool --extract --each "$@"
+ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each "$@"
 
 # Listing and extracting archives without atool:
 ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | "$PAGER"
@@ -231,7 +231,7 @@ mime ^font, has fontforge, X, flag f = fontforge "$@"
 # gnome-terminal/konsole/xterm on the other hand are often installed as part of
 # a desktop environment or as fallback terminal emulators.
 mime ^ranger/x-terminal-emulator, has terminology = terminology -e "$@"
-mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@"
+mime ^ranger/x-terminal-emulator, has kitty = kitty "$@"
 mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@"
 mime ^ranger/x-terminal-emulator, has sakura = sakura -e "$@"
 mime ^ranger/x-terminal-emulator, has lilyterm = lilyterm -e "$@"
@@ -248,7 +248,7 @@ mime ^ranger/x-terminal-emulator, has lxterminal = lxterminal -e "$@"
 mime ^ranger/x-terminal-emulator, has mate-terminal = mate-terminal -x "$@"
 mime ^ranger/x-terminal-emulator, has xfce4-terminal = xfce4-terminal -x "$@"
 mime ^ranger/x-terminal-emulator, has konsole = konsole -e "$@"
-mime ^ranger/x-terminal-emulator, has gnome-terminal = gnome-terminal -- "$@"
+mime ^ranger/x-terminal-emulator, has gnome-terminal = gnome-terminal "$@"
 mime ^ranger/x-terminal-emulator, has xterm = xterm -e "$@"
 
 #-------------------------------------------
@@ -262,8 +262,8 @@ label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
 #-------------------------------------------
 # Generic file openers
 #-------------------------------------------
-label open, has xdg-open = xdg-open -- "$@"
-label open, has open     = open -- "$@"
+label open, has xdg-open = xdg-open "$@"
+label open, has open     = open "$@"
 
 # Define the editor for non-text files + pager as last action
               !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = ask
@@ -280,5 +280,5 @@ label pager,  !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = "$PAGER"
 mime application/x-executable = "$1"
 
 # Move the file to trash using trash-cli.
-label trash, has trash-put = trash-put -- "$@"
-label trash = mkdir -p -- ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv -- "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash
+label trash, has trash-put = trash-put "$@"
+label trash = mkdir -p ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".config/kitty/kitty-themes"]
+	path = .config/kitty/kitty-themes
+	url = https://github.com/kovidgoyal/kitty-themes.git

.local/bin/launch_emacs.sh

@@ -2,7 +2,7 @@
 
 emacsclient -n -e "(> (length (frame-list)) 1)" | grep -q t
 if [ "$?" = "1" ]; then
-    emacsclient -c -n -a "" "$@"
+    emacsclient -c -n -a " " "$@"
 else
-    emacsclient -n -a "" "$@"
+    emacsclient -n -a " " "$@"
 fi