From a29e531bd0032cc4027a7815961fe8b6aa614819 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Tue, 28 Jun 2022 05:00:40 -0400 Subject: [PATCH 1/7] Added go-mode --- emacs.d/init.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emacs.d/init.el b/emacs.d/init.el index 4f24c70..e1a2841 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -243,6 +243,7 @@ :hook ((c-mode . lsp) (c++-mode . lsp) + (go-mode . lsp) (java-mode . lsp) (js-mode . lsp) (latex-mode . lsp) @@ -330,7 +331,11 @@ ;(use-package modern-cpp-font-lock ; :config -; (modern-c++-font-lock-global-mode)) + ; (modern-c++-font-lock-global-mode)) + +;; Golang + +(use-package go-mode) ;; Java From 1aff5e7284f366bf91e20198ca1800054110253c Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sun, 3 Jul 2022 11:38:26 -0400 Subject: [PATCH 2/7] pulseauido-control setting changed upstream --- config/polybar/custom_modules.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/polybar/custom_modules.ini b/config/polybar/custom_modules.ini index d09eafb..d7b1f1f 100644 --- a/config/polybar/custom_modules.ini +++ b/config/polybar/custom_modules.ini @@ -88,7 +88,7 @@ label-foreground = ${color.dark-blue} # You can copy-paste your options for each possible action, which is more # trouble-free but repetitive, or apply only the relevant ones (for example # --sink-blacklist is only needed for next-sink). -exec = pulseaudio-control --icons-volume " , , " --icon-muted " " --sink-nicknames-from "device.name" listen +exec = pulseaudio-control --icons-volume " , , " --icon-muted " " --node-nicknames-from "device.name" listen #exec = pulseaudio-control --icons-volume " , , " --icon-muted " " --sink-nicknames-from "device.description" --sink-nickname "alsa_output.pci-0000_00_1b.0.analog-stereo: Speakers" --sink-nickname "alsa_output.usb-Kingston_HyperX_Virtual_Surround_Sound_00000000-00.analog-stereo: Headphones" listen click-right = exec pavucontrol & click-left = pulseaudio-control togmute From 6366ab9592243f0475f510934a34e2f17c424653 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Mon, 4 Jul 2022 13:05:31 -0400 Subject: [PATCH 3/7] Problem wth everforest - switch to gruvbox, added protobuf-mode --- emacs.d/init.el | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/emacs.d/init.el b/emacs.d/init.el index 5661c32..e8fbd95 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -117,17 +117,18 @@ :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") +(use-package gruvbox-theme :config - (load-theme 'everforest-hard-dark t)) - + (load-theme 'gruvbox-dark-soft t)) + ;; Help distinguish work buffers from others like sidebars and terminal (use-package solaire-mode :init @@ -313,7 +314,9 @@ ("C-n" . company-select-next) ("C-p" . company-select-previous))) -;;; Languages +;;; Languages/Tools + +;; Highlighting/Formatting (use-package apheleia :init @@ -421,6 +424,11 @@ (setq lsp-tex-server 'digestif) + +;; Protocol Buffers + +(use-package protobuf-mode) + ;; Python (setq dap-python-debugger 'debugpy) From 58a9f69e79eb7ea63de9518c4ca40a25b1e7af56 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sat, 30 Jul 2022 23:10:33 -0400 Subject: [PATCH 4/7] Add go-mode, load theme from custom path --- emacs.d/init.el | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/emacs.d/init.el b/emacs.d/init.el index e8fbd95..6ec4e5b 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -125,10 +125,13 @@ ;; :config ;; (load-theme 'everforest-hard-dark t)) -(use-package gruvbox-theme - :config - (load-theme 'gruvbox-dark-soft 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 :init @@ -345,7 +348,9 @@ ;; Golang -(use-package go-mode) +(use-package go-mode + :config + (add-hook 'before-save-hook #'lsp-organize-imports)) ;; Java From 843f0dc23def4a26bb36a9728a18c2221e8f04a6 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Tue, 27 Sep 2022 17:45:28 -0400 Subject: [PATCH 5/7] Update colors to differeniate dark from light --- config/kitty/everforest-dark.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/kitty/everforest-dark.conf b/config/kitty/everforest-dark.conf index b3d1ec3..e725d6b 100644 --- a/config/kitty/everforest-dark.conf +++ b/config/kitty/everforest-dark.conf @@ -13,29 +13,29 @@ color0 #4a555b color8 #525c62 # red -color1 #e68183 +color1 #e26c6e color9 #e68183 # green -color2 #a7c080 +color2 #9bb86f color10 #a7c080 # yellow -color3 #dbbc7f +color3 #d5b26b color11 #dbbc7f # blue -color4 #7fbbb3 +color4 #6eb2a9 color12 #7fbbb3 # magenta -color5 #d699b6 +color5 #cf87a9 color13 #d699b6 # cyan -color6 #83c092 +color6 #72b783 color14 #83c092 # white -color7 #d8caac +color7 #d0bf9b color15 #d8caac From 264fd648bdb2289aea8e0c803e09b00c56443f24 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Tue, 11 Oct 2022 21:05:18 -0400 Subject: [PATCH 6/7] Remove kitty integration from rc file, add conda --- bashrc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bashrc b/bashrc index 8dce138..ef30374 100644 --- a/bashrc +++ b/bashrc @@ -13,7 +13,4 @@ alias r="urxvt -name Ranger -e ranger & disown" 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 From 627988acfdf3cf78ec49343c40b2a888365772fd Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Tue, 11 Oct 2022 21:06:32 -0400 Subject: [PATCH 7/7] update font size and theme --- config/kitty/kitty.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 0f5e4a8..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 zenburn.conf +include everforest-dark.conf