add dark mode (#1)

Reviewed-on: #1
Co-authored-by: elizabeth.hunt@simponic.xyz <elizabeth.hunt@simponic.xyz>
Co-committed-by: elizabeth.hunt@simponic.xyz <elizabeth.hunt@simponic.xyz>
This commit is contained in:
Elizabeth Hunt 2024-01-15 21:05:35 -05:00 committed by simponic
parent 0e0d58b50c
commit c2037fad9f
18 changed files with 392 additions and 141 deletions

View File

@ -1,83 +0,0 @@
[[colors.indexed_colors]]
color = "0xaf3a03"
index = 16
[[colors.indexed_colors]]
color = "0xd65d0e"
index = 17
[[colors.indexed_colors]]
color = "0xebdbb2"
index = 18
[[colors.indexed_colors]]
color = "0xd5c4a1"
index = 19
[[colors.indexed_colors]]
color = "0x665c54"
index = 20
[[colors.indexed_colors]]
color = "0x3c3836"
index = 21
[colors.bright]
black = "0xbdae93"
blue = "0x076678"
cyan = "0x427b58"
green = "0x79740e"
magenta = "0x8f3f71"
red = "0x9d0006"
white = "0x282828"
yellow = "0xb57614"
[colors.cursor]
cursor = "0x504945"
text = "0xfbf1c7"
[colors.normal]
black = "0xfbf1c7"
blue = "0x076678"
cyan = "0x427b58"
green = "0x79740e"
magenta = "0x8f3f71"
red = "0x9d0006"
white = "0x504945"
yellow = "0xb57614"
[colors.primary]
background = "0xfbf1c7"
foreground = "0x504945"
[cursor]
style = "Block"
unfocused_hollow = false
[font]
size = 11.0
[font.bold]
family = "JetBrains Mono"
[font.glyph_offset]
x = 0
y = 0
[font.italic]
family = "JetBrains Mono"
[font.normal]
family = "JetBrains Mono"
[font.offset]
x = 0
y = 0
[window]
dynamic_padding = true
#option_as_alt = "Both"
[window.padding]
x = 12
y = 12

View File

@ -0,0 +1,30 @@
[cursor]
style = "Block"
unfocused_hollow = false
[font]
size = 11.0
[font.bold]
family = "JetBrains Mono"
[font.glyph_offset]
x = 0
y = 0
[font.italic]
family = "JetBrains Mono"
[font.normal]
family = "JetBrains Mono"
[font.offset]
x = 0
y = 0
[window]
dynamic_padding = true
[window.padding]
x = 12
y = 12

View File

@ -0,0 +1,75 @@
[colors.primary]
background = "#1E1E2E"
foreground = "#CDD6F4"
dim_foreground = "#CDD6F4"
bright_foreground = "#CDD6F4"
[colors.cursor]
text = "#1E1E2E"
cursor = "#F5E0DC"
[colors.vi_mode_cursor]
text = "#1E1E2E"
cursor = "#B4BEFE"
[colors.search.matches]
foreground = "#1E1E2E"
background = "#A6ADC8"
[colors.search.focused_match]
foreground = "#1E1E2E"
background = "#A6E3A1"
[colors.footer_bar]
foreground = "#1E1E2E"
background = "#A6ADC8"
[colors.hints.start]
foreground = "#1E1E2E"
background = "#F9E2AF"
[colors.hints.end]
foreground = "#1E1E2E"
background = "#A6ADC8"
[colors.selection]
text = "#1E1E2E"
background = "#F5E0DC"
[colors.normal]
black = "#45475A"
red = "#F38BA8"
green = "#A6E3A1"
yellow = "#F9E2AF"
blue = "#89B4FA"
magenta = "#F5C2E7"
cyan = "#94E2D5"
white = "#BAC2DE"
[colors.bright]
black = "#585B70"
red = "#F38BA8"
green = "#A6E3A1"
yellow = "#F9E2AF"
blue = "#89B4FA"
magenta = "#F5C2E7"
cyan = "#94E2D5"
white = "#A6ADC8"
[colors.dim]
black = "#45475A"
red = "#F38BA8"
green = "#A6E3A1"
yellow = "#F9E2AF"
blue = "#89B4FA"
magenta = "#F5C2E7"
cyan = "#94E2D5"
white = "#BAC2DE"
[[colors.indexed_colors]]
index = 16
color = "#FAB387"
[[colors.indexed_colors]]
index = 17
color = "#F5E0DC"

View File

@ -0,0 +1,4 @@
import = [
"~/.config/alacritty/catppucin-mocha.toml",
"~/.config/alacritty/base.toml"
]

View File

@ -0,0 +1,58 @@
# Base16 Gruvbox light, medium 256 - alacritty color config
# Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
# Default colors
[colors.primary]
background = '0xfbf1c7'
foreground = '0x504945'
# Colors the cursor will use if `custom_cursor_colors` is true
[colors.cursor]
text = '0xfbf1c7'
cursor = '0x504945'
# Normal colors
[colors.normal]
black = '0xfbf1c7'
red = '0x9d0006'
green = '0x79740e'
yellow = '0xb57614'
blue = '0x076678'
magenta = '0x8f3f71'
cyan = '0x427b58'
white = '0x504945'
# Bright colors
[colors.bright]
black = '0xbdae93'
red = '0x9d0006'
green = '0x79740e'
yellow = '0xb57614'
blue = '0x076678'
magenta = '0x8f3f71'
cyan = '0x427b58'
white = '0x282828'
[[colors.indexed_colors]]
index = 16
color = "0xaf3a03"
[[colors.indexed_colors]]
index = 17
color = "0xd65d0e"
[[colors.indexed_colors]]
index = 18
color = "0xebdbb2"
[[colors.indexed_colors]]
index = 19
color = "0xd5c4a1"
[[colors.indexed_colors]]
index = 20
color = "0x665c54"
[[colors.indexed_colors]]
index = 21
color = "0x3c3836"

View File

@ -0,0 +1,4 @@
import = [
"~/.config/alacritty/gruvbox-medium-light.toml",
"~/.config/alacritty/base.toml"
]

View File

@ -8,9 +8,9 @@ set $down j
set $up k set $up k
set $right l set $right l
# Your preferred terminal emulator # Your preferred terminal emulator
set $term alacritty set $term "/home/lizzy/scripts/alacritty_with_theme.sh"
set $lock swaylock-corrupter set $lock swaylock-corrupter
set $browser firefox set $browser xdg-open "https://static.simponic.xyz/dvd-logo/"
# Your preferred application launcher # Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened # Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on. # on the original workspace that the command was run on.
@ -20,7 +20,7 @@ set $wallpapers_path $HOME/Wallpapers
### Output configuration ### Output configuration
# #
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
output * bg `find $wallpapers_path -type f | grep -v "gitkeep" | shuf -n 1` fill output * bg `find $wallpapers_path/$([ -z "$DARK_MODE" ] && echo "light" || echo "dark") -type f | grep -v "gitkeep" | shuf -n 1` fill
# VNC External Monitor # VNC External Monitor
output HEADLESS-1 { output HEADLESS-1 {
@ -209,7 +209,7 @@ bindsym $mod+r mode "resize"
# Bar # Bar
bar { bar {
swaybar_command waybar swaybar_command /home/lizzy/scripts/waybar_with_theme.sh
} }
# Cursor # Cursor

View File

@ -4,11 +4,11 @@
"spacing": 0, "spacing": 0,
"clock": { "clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": " {:%A, %d %B %Y, %H:%M}", "format": " {:%a, %d %b %Y, %H:%M}",
"interval": 60 "interval": 60
}, },
"cpu": { "cpu": {
"format": " {usage}%" "format": " {usage}%"
}, },
"memory": { "memory": {
"format": " {}%", "format": " {}%",
@ -16,11 +16,11 @@
}, },
"temperature#cpu": { "temperature#cpu": {
"critical-threshold": 70, "critical-threshold": 70,
"format": " {temperatureC}°C " "format": " {temperatureC}°C"
}, },
"network": { "network": {
"format-wifi": " {ipaddr}", "format-wifi": " {ipaddr}",
"format-ethernet": " {ipaddr}/{cidr}", "format-ethernet": " {ipaddr}/{cidr}",
"format-disconnected": "⚠ Disconnected", "format-disconnected": "⚠ Disconnected",
}, },
"pulseaudio": { "pulseaudio": {
@ -43,14 +43,14 @@
"on-click": "pavucontrol" "on-click": "pavucontrol"
}, },
"backlight": { "backlight": {
"format": " {}%" "format": " {}%"
}, },
"battery": { "battery": {
"states": { "states": {
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format": "{icon} {capacity}%", "format": "{icon} {capacity}%",
"format-charging": " {capacity}%", "format-charging": " {capacity}%",
"format-plugged": " {capacity}%", "format-plugged": " {capacity}%",
"format-alt": "{time} {icon}", "format-alt": "{time} {icon}",

View File

@ -1,7 +1,38 @@
@define-color base #fbf1c7;
@define-color mantle #f2e5bc;
@define-color crust #83a598;
@define-color text #3c3836;
@define-color subtext0 #a6adc8;
@define-color subtext1 #bac2de;
@define-color surface0 #313244;
@define-color surface1 #45475a;
@define-color surface2 #585b70;
@define-color overlay0 #6c7086;
@define-color overlay1 #7f849c;
@define-color overlay2 #9399b2;
@define-color blue #458588;
@define-color lavender #b16286;
@define-color sapphire #74c7ec;
@define-color sky #83a598;
@define-color teal #689d6a;
@define-color green #98971a;
@define-color yellow #d79921;
@define-color peach #fab387;
@define-color maroon #eba0ac;
@define-color red #cc241d;
@define-color mauve #cba6f7;
@define-color pink #d3869b;
@define-color flamingo #f2cdcd;
@define-color rosewater #f5e0dc;
* { * {
font-family: JetBrainsMono; font-family: JetBrainsMono;
font-size: 12px; font-size: 12px;
color: #3C3836; /* Foreground "black" */ color: @text; /* Foreground "black" */
} }
window > box { window > box {
@ -9,56 +40,60 @@ window > box {
} }
window#waybar { window#waybar {
background: rgba(251,241,199,0.7); /* Background "wheat"-ish */ background: shade(alpha(@base, 0.6), .95);
} border-radius: 3px;
#workspaces button {
background: #fbf1c7;
margin-right: 5px;
}
#workspaces button.focused {
background: #689d6a; /* Aqua */
} }
/* Modules */ /* Modules */
#clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, #mpris, #custom-aggietimed { #workspaces, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, #mpris, #custom-aggietimed {
padding: 0 10px; background: @base;
margin: 0px 5px; border-radius: 12px;
background: #fbf1c7; border: 2px solid @text;
border-radius: 3px; margin-right: 5px;
margin-left: 5px;
padding-left: 5px;
padding-right: 5px;
}
#workspaces {
background: @base;
padding: 2px;
border-radius: 10px;
}
#workspaces .focused {
background: @pink;
} }
#battery { #battery {
background-color: #D79921; background-color: @teal;
} }
#battery.charging, #battery.plugged { #battery.charging, #battery.plugged {
background-color: #98971A; background-color: @green;
} }
#network { #network {
background-color: #98971A; background-color: @sky;
} }
#network.disconnected { #network.disconnected {
background-color: #cc241d; background-color: @red;
} }
#temperature { #temperature {
background-color: #98971a; background-color: @sky;
} }
#temperature.critical { #temperature.critical {
background-color: #cc241d; background-color: @red;
} }
#pulseaudio.muted { #pulseaudio.muted {
background-color: #cc241d; background-color: @red;
} }
tooltip { tooltip {
background: #fbf1c7; background: @mantle;
border: 1px solid rgba(100, 114, 125, 0.5);
} }

View File

@ -0,0 +1,108 @@
@define-color base #1e1e2e;
@define-color mantle #181825;
@define-color crust #11111b;
@define-color text #cdd6f4;
@define-color subtext0 #a6adc8;
@define-color subtext1 #bac2de;
@define-color surface0 #313244;
@define-color surface1 #45475a;
@define-color surface2 #585b70;
@define-color overlay0 #6c7086;
@define-color overlay1 #7f849c;
@define-color overlay2 #9399b2;
@define-color blue #89b4fa;
@define-color lavender #b4befe;
@define-color sapphire #74c7ec;
@define-color sky #89dceb;
@define-color teal #94e2d5;
@define-color green #a6e3a1;
@define-color yellow #f9e2af;
@define-color peach #fab387;
@define-color maroon #eba0ac;
@define-color red #f38ba8;
@define-color mauve #cba6f7;
@define-color pink #f5c2e7;
@define-color flamingo #f2cdcd;
@define-color rosewater #f5e0dc;
* {
font-family: JetBrainsMono;
font-size: 12px;
}
window > box {
margin: 4px 4px 4px 0px;
}
window#waybar {
background: shade(alpha(@base, 0.6), .95);
border-radius: 3px;
}
/* Modules */
#workspaces, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, #mpris, #custom-aggietimed {
background: @base;
border-radius: 12px;
border: 2px solid @text;
margin-right: 5px;
margin-left: 5px;
padding-left: 5px;
padding-right: 5px;
color: @text;
}
#workspaces {
background: @mantle;
padding: 2px;
border-radius: 10px;
}
#workspaces button {
color: @text;
}
#workspaces button.focused {
background: @green;
color: @mantle;
}
#battery {
background-color: @teal;
color: @mantle;
}
#battery.charging, #battery.plugged {
background-color: @green;
}
#network {
background-color: @sky;
color: @mantle;
}
#network.disconnected {
background-color: @red;
}
#temperature {
background-color: @sky;
color: @mantle;
}
#temperature.critical {
background-color: @red;
color: @mantle;
}
#pulseaudio.muted {
background-color: @red;
}
tooltip {
background: @mantle;
}

View File

@ -106,8 +106,6 @@
;; Global settings (defaults) ;; Global settings (defaults)
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled (setq doom-themes-enable-bold t ; if nil, bold is universally disabled
doom-themes-enable-italic t) ; if nil, italics is universally disabled doom-themes-enable-italic t) ; if nil, italics is universally disabled
(load-theme 'doom-gruvbox-light t)
;; Enable flashing mode-line on errors ;; Enable flashing mode-line on errors
(doom-themes-visual-bell-config) (doom-themes-visual-bell-config)
;; Enable custom neotree theme (all-the-icons must be installed!) ;; Enable custom neotree theme (all-the-icons must be installed!)
@ -118,6 +116,20 @@
;; Corrects (and improves) org-mode's native fontification. ;; Corrects (and improves) org-mode's native fontification.
(doom-themes-org-config)) (doom-themes-org-config))
#+END_SRC #+END_SRC
** Catpuccin
#+BEGIN_SRC emacs-lisp
(use-package catppuccin-theme
:ensure t)
#+END_SRC
** Set theme according to DARK_MODE env var
#+BEGIN_SRC emacs-lisp
(cond
((getenv "DARK_MODE")
(load-theme 'catppuccin :no-confirm))
(t (load-theme 'doom-gruvbox-light t)))
#+END_SRC
** Doom-modeline ** Doom-modeline
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package doom-modeline (use-package doom-modeline

37
.vimrc
View File

@ -1,29 +1,26 @@
set nocompatible
syntax on syntax on
set modelines=0
set autoindent set number
set nowrap set encoding=utf-8
set backspace=indent,eol,start set wrap
set tabstop=2 set tabstop=2
set shiftwidth=2 set shiftwidth=2
set softtabstop=2
set autoindent
set copyindent
set expandtab set expandtab
set noshiftround
set cursorline set hlsearch
set number relativenumber set incsearch
set showmatch
set smartcase
set hidden
set ttyfast
set laststatus=2 set laststatus=2
set statusline=
set statusline+=\ %f
set statusline+=%=
set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
set statusline+=\[%{&fileformat}\]
set statusline+=\ %p%%
set statusline+=\ %l:%c
highlight Normal ctermbg=NONE set background=dark
highlight nonText ctermbg=NONE set number relativenumber
highlight StatusLine ctermbg=255
highlight StatusLineTerm ctermbg=238 ctermfg=255
highlight StatusLineTermNC ctermbg=232 ctermfg=238
set encoding=utf-8

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 MiB

View File

@ -0,0 +1,5 @@
#!/bin/bash
CONFIG=$([ -z "$DARK_MODE" ] && echo "light.toml" || echo "dark.toml")
alacritty --config-file=$HOME/.config/alacritty/$CONFIG

View File

@ -3,3 +3,4 @@ eval $(thefuck --alias)
. /opt/asdf-vm/asdf.sh . /opt/asdf-vm/asdf.sh
export PATH=$PATH:~/.roswell/bin export PATH=$PATH:~/.roswell/bin
export DARK_MODE=True

5
scripts/waybar_with_theme.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
STYLE=$([ -z "$DARK_MODE" ] && echo "style.css" || echo "style.dark.css")
waybar --style=$HOME/.config/waybar/$STYLE &