diff --git a/bashrc b/bashrc index 1d35ad1..6c11fd5 100644 --- a/bashrc +++ b/bashrc @@ -14,7 +14,4 @@ alias kssh="/usr/bin/kitty +kitten ssh" neofetch - -# BEGIN_KITTY_SHELL_INTEGRATION -if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi -# END_KITTY_SHELL_INTEGRATION +[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 7c71fe9..a46720f 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,9 +1,10 @@ font_family Hack -font_size 12 +font_size 10 cursor_shape block -shell_integration no-cursor +cursor_stop_blinking_after 10 +shell_integration enabled no-cursor enable_audio_bell no -#background_opacity 0.9 +#background_opacity 0.7 window_padding_width 20 #background #202020 include everforest-dark.conf diff --git a/emacs.d/init.el b/emacs.d/init.el index b0e9c4a..f6164d7 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -117,16 +117,20 @@ :custom (straight-use-package-by-default t)) ;; Theme + (setq custom-safe-themes t) -;; (use-package atom-one-dark-theme -;; :config -;; (load-theme 'atom-one-dark t)) +;; (use-package everforest +;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme") +;; :config +;; (load-theme 'everforest-hard-dark t)) -(use-package everforest-hard-dark-theme - :straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme") - :config - (load-theme 'everforest-hard-dark t)) +;; (use-package gruvbox-theme +;; :config +;; (load-theme 'gruvbox-dark-soft t)) + +(add-to-list 'custom-theme-load-path "~/.cache/emacs/custom/everforest-theme") +(load-theme 'everforest-hard-dark t) ;; Help distinguish work buffers from others like sidebars and terminal (use-package solaire-mode @@ -243,6 +247,7 @@ :hook ((c-mode . lsp) (c++-mode . lsp) + (go-mode . lsp) (java-mode . lsp) (js-mode . lsp) (latex-mode . lsp) @@ -312,7 +317,9 @@ ("C-n" . company-select-next) ("C-p" . company-select-previous))) -;;; Languages +;;; Languages/Tools + +;; Highlighting/Formatting (use-package apheleia :init @@ -337,7 +344,13 @@ ;(use-package modern-cpp-font-lock ; :config -; (modern-c++-font-lock-global-mode)) + ; (modern-c++-font-lock-global-mode)) + +;; Golang + +(use-package go-mode + :config + (add-hook 'before-save-hook #'lsp-organize-imports)) ;; Java @@ -416,6 +429,11 @@ (setq lsp-tex-server 'digestif) + +;; Protocol Buffers + +(use-package protobuf-mode) + ;; Python (setq dap-python-debugger 'debugpy)