diff --git a/README.md b/README.md index 885fc64..069d78b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dotfiles -### Configuration files for Arch Linux with bspwm and a dark gruvbox theme +### Configuration files for Arch Linux with bspwm and zenburn ``` git clone https://codeberg.org/acscott/dotfiles.git ~/.dotfiles @@ -22,6 +22,8 @@ in ~/dotfiles_backup. The script is simple enough that it should be easily editable, but obviously feel free to copy or symlink the files how you see fit. +The below screenshots are using a dark gruvbox theme, however I'm currently experimenting with zenburn. The gruvbox configs are still available, but they are not the default on all branches. + ### laptop-hidpi configuration ![Desktop screenshot of the laptop-hidpi configuration](info/screenshots/screenshot.png) diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 753857a..0f5e4a8 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -6,4 +6,4 @@ enable_audio_bell no #background_opacity 0.9 window_padding_width 20 #background #202020 -include gruvbox.conf +include zenburn.conf diff --git a/config/kitty/zenburn.conf b/config/kitty/zenburn.conf new file mode 100644 index 0000000..ee74ea0 --- /dev/null +++ b/config/kitty/zenburn.conf @@ -0,0 +1,26 @@ +# Zenburn by jnurmine, https://github.com/jnurmine/Zenburn +# This work is licensed under the terms of the GNU GPL license. +# For a copy, see http://www.gnu.org/licenses/gpl.html. + +background #3f3f3f +foreground #dcdccc +cursor #73635a +selection_background #21322f +color0 #4d4d4d +color8 #709080 +color1 #b05050 +color9 #dca3a3 +color2 #60b48a +color10 #c3bf9f +color3 #f0deae +color11 #dfcf9f +color4 #506f8f +color12 #94bff3 +color5 #dc8cc3 +color13 #ec93d3 +color6 #8cd0d3 +color14 #93e0e3 +color7 #dcdccc +color15 #ffffff +selection_foreground #3f3f3f + diff --git a/config/rofi/config.rasi b/config/rofi/config.gruvbox.rasi similarity index 100% rename from config/rofi/config.rasi rename to config/rofi/config.gruvbox.rasi diff --git a/config/rofi/config.zenburn.rasi b/config/rofi/config.zenburn.rasi new file mode 100644 index 0000000..cce645e --- /dev/null +++ b/config/rofi/config.zenburn.rasi @@ -0,0 +1,185 @@ +/* ========================================================================== + Zenburn theme for rofi + + Based on the Zenburn color scheme for Vim by jnurmine + https://github.com/jnurmine/Zenburn + ========================================================================== */ + +* { + /* Theme settings */ + highlight: bold italic; + scrollbar: true; + + /* Zenburn colors */ + + zenburn-bg0: #3f3f3f; + zenburn-bg1: #4f4f4f; + zenburn-fg: #dcdccc; + zenburn-black: #282828; + zenburn-dark-grey: #709080; + zenburn-dark-red: #705050; + zenburn-red: #dca3a3; + zenburn-dark-yellow: #f0deae; + zenburn-yellow: #dfcf9f; + zenburn-dark-blue: #506070; + zenburn-blue: #94bff3; + zenburn-dark-magenta: #dc8cc3; + zenburn-magenta: #ec93d3; + zenburn-dark-cyan: #8cd0d3; + zenburn-cyan: #93e0e3; + zenburn-light-grey: #dcdccc; + zenburn-white: #ffffff; + + /* Theme colors */ + background: @zenburn-bg0; + background-color: @background; + foreground: @zenburn-fg; + border-color: @zenburn-dark-yellow; + separatorcolor: @border-color; + scrollbar-handle: @border-color; + + normal-background: @background; + normal-foreground: @foreground; + alternate-normal-background: @zenburn-bg1; + alternate-normal-foreground: @foreground; + selected-normal-background: @zenburn-dark-cyan; + selected-normal-foreground: @zenburn-black; + + active-background: @zenburn-yellow; + active-foreground: @background; + alternate-active-background: @active-background; + alternate-active-foreground: @active-foreground; + selected-active-background: @zenburn-cyan; + selected-active-foreground: @active-foreground; + + urgent-background: @zenburn-dark-red; + urgent-foreground: @background; + alternate-urgent-background: @urgent-background; + alternate-urgent-foreground: @urgent-foreground; + selected-urgent-background: @zenburn-red; + selected-urgent-foreground: @urgent-foreground; +} + +window { + background-color: @background; + border: 2; + padding: 2; +} + +mainbox { + border: 0; + padding: 0; +} + +message { + border: 2px 0 0; + border-color: @separatorcolor; + padding: 1px; +} + +textbox { + highlight: @highlight; + text-color: @foreground; +} + +listview { + border: 2px solid 0 0; + padding: 2px 0 0; + border-color: @separatorcolor; + spacing: 2px; + scrollbar: @scrollbar; +} + +element { + border: 0; + padding: 2px; +} + +element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; +} + +element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} + +element.normal.active { + background-color: @active-background; + text-color: @active-foreground; +} + +element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} + +element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; +} + +element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} + +element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; +} + +element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; +} + +element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; +} + +scrollbar { + width: 4px; + border: 0; + handle-color: @scrollbar-handle; + handle-width: 8px; + padding: 0; +} + +mode-switcher { + border: 2px 0 0; + border-color: @separatorcolor; +} + +inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 2px; + children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; +} + +case-indicator, +entry, +prompt, +button { + spacing: 0; + text-color: @normal-foreground; +} + +button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} + +textbox-prompt-sep { + expand: false; + str: ":"; + text-color: @normal-foreground; + margin: 0 0.3em 0 0; +} +element-text, element-icon { + background-color: inherit; + text-color: inherit; +} diff --git a/emacs.d/init.el b/emacs.d/init.el index 29b3685..5555098 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -86,26 +86,24 @@ ;; Theme (setq custom-safe-themes t) -;; (use-package doom-themes -;; :config -;; (setq doom-themes-enable-bold t -;; doom-themes-enable-italic t) -;; (load-theme 'doom-gruvbox) -;; (doom-themes-visual-bell-config) -;; (setq doom-themes-treemacs-theme "doom-colors") -;; (doom-themes-treemacs-config) -;; (doom-themes-org-config)) +;(use-package darktooth-theme +; :config +; (load-theme `darktooth t)) -;; (use-package gruvbox-theme -;; :init -;; (load-theme 'gruvbox-dark-hard t)) - -(use-package base16-theme - :ensure t +(use-package zenburn-theme :config - (load-theme 'gruvbox-dark-soft t)) + (load-theme `zenburn t)) -;; Help distinguish between work buffers from others like sidebars and terminal +;; (use-package ample-theme +;; :config +;; (load-theme `ample-flat t)) + +;; (use-package base16-theme +;; :ensure t +;; :config +;; (load-theme 'gruvbox-dark-soft t)) + +;; Help distinguish between work from others like sidebars and terminal (use-package solaire-mode :diminish :init @@ -115,17 +113,19 @@ (use-package all-the-icons) ;; Modeline + +;; (use-package simple-modeline +;; :hook (after-init . simple-modeline-mode)) + (use-package minions - :hook (doom-modeline-mode . minions-mode)) + :hook (doom-modeline-mode . minions-mode) + (simple-modeline-mode . minions-mode)) (use-package doom-modeline :init (doom-modeline-mode) - :custom-face - (mode-line ((t (:height 0.8)))) - (mode-line-inactive ((t (:height 0.75)))) :custom (doom-modeline-height 30) - (doom-modeline-bar-width 4) + (doom-modeline-bar-width .75) (doom-modeline-window-width-limit fill-column) (doom-modeline-lsp t) (doom-modeline-minor-modes t) @@ -221,7 +221,7 @@ (zig-mode . lsp) (lsp-mode . lsp-enable-which-key-integration)) :config - (setq lsp-prefer-flymake nil)) ;; prefer lsp-ui (flycheck) to flymake + (setq lsp-prefer-flymake nil)) ;prefer lsp-ui (flycheck) to flymake ; :bind ; (:map lsp-mode-map ; ("TAB" . completion-at-point))) diff --git a/info/Packages.txt b/info/Packages.txt index 2dc7f8b..d06c2b9 100644 --- a/info/Packages.txt +++ b/info/Packages.txt @@ -51,4 +51,4 @@ st acpi_call acpi_call-lts # only if LTS kernel installed, see 'acpi_call-dkms' for other variants acpilight # or 'light' is sometimes needed for older thinkpads -rtw89-dkms-git # wifi for thinkpad t14 gen2 amd +rtw89-dkms-git # wifi for thinkpad t14 gen2 amd, not needed for kernel 5.16 or later