This commit is contained in:
Elizabeth Hunt 2024-09-02 00:31:27 -07:00
parent e433bfd70a
commit 0ba0ccf9de
14 changed files with 210 additions and 42 deletions

View File

@ -5,7 +5,7 @@ style = "Block"
unfocused_hollow = false unfocused_hollow = false
[font] [font]
size = 11.0 size = 7.0
[font.bold] [font.bold]
family = "JetBrainsMono Nerd Font" family = "JetBrainsMono Nerd Font"

View File

@ -1,4 +1,23 @@
import = [ [colors.bright]
"~/.config/alacritty/catppucin-mocha.toml", black = "0x747c84"
"~/.config/alacritty/config.toml" blue = "0xae95c7"
] cyan = "0x95aec7"
green = "0x95c7ae"
magenta = "0xc795ae"
red = "0xc7ae95"
white = "0xf3f4f5"
yellow = "0xaec795"
[colors.normal]
black = "0x1c2023"
blue = "0xae95c7"
cyan = "0x95aec7"
green = "0x95c7ae"
magenta = "0xc795ae"
red = "0xc7ae95"
white = "0xc7ccd1"
yellow = "0xaec795"
[colors.primary]
background = "0x141322"
foreground = "0xf09db9"

View File

@ -0,0 +1,27 @@
colors:
# Default colors
primary:
background: '0x1c2023'
foreground: '0xe07c9f'
# Normal colors
normal:
black: '0x1c2023'
red: '0xc7ae95'
green: '0x95c7ae'
yellow: '0xaec795'
blue: '0xae95c7'
magenta: '0xc795ae'
cyan: '0x95aec7'
white: '0xc7ccd1'
# Bright colors
bright:
black: '0x747c84'
red: '0xc7ae95'
green: '0x95c7ae'
yellow: '0xaec795'
blue: '0xae95c7'
magenta: '0xc795ae'
cyan: '0x95aec7'
white: '0xf3f4f5'

View File

@ -1,17 +1,17 @@
[global] [global]
frame_color = "#89b4fa" frame_color = "#f09db9"
separator_color= frame separator_color= frame
[urgency_low] [urgency_low]
background = "#1e1e2e" background = "#141322"
foreground = "#cdd6f4" foreground = "#f09db9"
[urgency_normal] [urgency_normal]
background = "#1e1e2e" background = "#141322"
foreground = "#cdd6f4" foreground = "#f09db9"
[urgency_critical] [urgency_critical]
background = "#1e1e2e" background = "#141322"
foreground = "#cdd6f4" foreground = "#f09db9"
frame_color = "#fab387" frame_color = "#c7ae95"

View File

@ -23,5 +23,6 @@
"nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" }, "nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" },
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" } "telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" },
"transparent.nvim": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" }
} }

View File

@ -159,6 +159,14 @@ local plugins = {
"rktjmp/fwatch.nvim", "rktjmp/fwatch.nvim",
lazy = true, lazy = true,
}, },
-- transparent
{
"xiyaowong/transparent.nvim",
config = function()
vim.cmd("TransparentEnable")
end
},
} }
require("lazy").setup(plugins, require "plugins.configs.lazy") require("lazy").setup(plugins, require "plugins.configs.lazy")

View File

@ -30,7 +30,8 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
) '(custom-safe-themes
'("bdbb37a5b43210930749d2bebe2ce092dd4abe0597249b883eef00a9814e0013" default)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

View File

@ -84,37 +84,37 @@
#+END_SRC #+END_SRC
** Font ** Font
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(let ((font "JetBrains Mono-12:style=Regular")) (let ((font "JetBrains Mono-10:style=Regular"))
(set-face-attribute 'default nil :font font) (set-face-attribute 'default nil :font font)
(set-frame-font font nil t)) (set-frame-font font nil t))
#+END_SRC #+END_SRC
** Catppuccin and theme notify watcher
#+BEGIN_SRC emacs-lisp ** Doom-modeline && Doom-themes
(use-package catppuccin-theme
:ensure t)
(require 'filenotify)
(setq *theme-file* "~/theme")
(defun set-system-theme ()
(let ((theme
(with-temp-buffer
(insert-file-contents *theme-file*)
(buffer-string)))
(current-flavor catppuccin-flavor))
(setq catppuccin-flavor (if (string-prefix-p "dark" theme) 'mocha 'latte))
(if (not (eq catppuccin-flavor current-flavor))
(catppuccin-reload))))
(setq catppuccin-flavor 'latte)
(set-system-theme)
(file-notify-add-watch *theme-file* '(change)
#'(lambda (event) (set-system-theme)))
#+END_SRC
** Doom-modeline
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package doom-themes
:ensure t
:config
;; Global settings (defaults)
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
doom-themes-enable-italic t) ; if nil, italics is universally disabled
(load-theme 'doom-laserwave t)
;; Enable flashing mode-line on errors
(doom-themes-visual-bell-config)
;; Enable custom neotree theme (all-the-icons must be installed!)
(doom-themes-neotree-config)
;; or for treemacs users
(setq doom-themes-treemacs-theme "doom-atom") ; use "doom-colors" for less minimal icon theme
(doom-themes-treemacs-config)
;; Corrects (and improves) org-mode's native fontification.
(doom-themes-org-config))
(use-package doom-modeline (use-package doom-modeline
:ensure t :ensure t
:config :config
(doom-modeline-mode 1)) (doom-modeline-mode 1))
#+END_SRC #+END_SRC
** Icons ** Icons
must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -257,7 +257,7 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
(go-ts-mode . lsp) (go-ts-mode . lsp)
(java-mode . lsp) (java-mode . lsp)
(php-mode . lsp) (php-mode . lsp)
(c-mode . lsp) (c-ts-mode . lsp)
(typescript-ts-mode . lsp) (typescript-ts-mode . lsp)
(tsx-ts-mode . lsp) (tsx-ts-mode . lsp)
(lsp-mode . lsp-enable-which-key-integration)) (lsp-mode . lsp-enable-which-key-integration))

View File

@ -1,4 +1,5 @@
exec ~/.screenlayout/screenlayout.sh & exec ~/.screenlayout/screenlayout.sh &
exec ~/scripts/statusbar.sh &
[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
@ -11,6 +12,6 @@ exec picom -b &
exec dunst & exec dunst &
exec feh --bg-fill --randomize ~/Wallpapers/light & exec feh --bg-center --randomize ~/Wallpapers &
while type dwm >/dev/null; do dwm 2>/tmp/dwm.log && continue || break ; done while type dwm >/dev/null; do dwm 2>/tmp/dwm.log && continue || break ; done

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

BIN
Wallpapers/pink pfps.jpeg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

View File

@ -1,3 +1,5 @@
export PATH=$PATH:/home/lizzy/.cargo/bin
eval "$(zoxide init --cmd z zsh)" eval "$(zoxide init --cmd z zsh)"
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
@ -7,3 +9,8 @@ export GPG_TTY=$(tty)
. /opt/asdf-vm/asdf.sh . /opt/asdf-vm/asdf.sh
alias cd="z"
export PYENV_ROOT="$HOME/.pyenv"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"

104
scripts/statusbar.sh Executable file
View File

@ -0,0 +1,104 @@
#!/bin/sh
usbmon() {
usb1=$(lsblk -la | awk '/sdc1/ { print $1 }')
usb1mounted=$(lsblk -la | awk '/sdc1/ { print $7 }')
if [ "$usb1" ]; then
if [ -z "$usb1mounted" ]; then
echo " |"
else
echo "$usb1 |"
fi
fi
}
battery() {
percentage=$(acpi -b | awk '{ print $4; }' | tr -d "%" | tr -d ",")
state=$(acpi -b | awk '{ print $3; }' | tr -d ",")
if [ $state = "Discharging" ]; then
if [ $percentage -gt 75 ]; then
state=""
elif [ $percentage -gt 50 ]; then
state=""
elif [ $percentage -gt 25 ]; then
state=""
else
state=""
fi
elif [ $state = "Full" ]; then
state=""
elif [ $state = "Charging" ]; then
state=""
fi
echo "$state $percentage %"
}
fsmon() {
ROOTPART=$(df -h | awk '/\/$/ { print $3}')
HOMEPART=$(df -h | awk '/\/home/ { print $3}')
SWAPPART=$(cat /proc/swaps | awk '/\// { print $4 }')
echo "$ROOTPART$HOMEPART$SWAPPART"
}
ram() {
mem=$(free -h | awk '/Mem:/ { print $3 }' | cut -f1 -d 'i')
echo"$mem"
}
cpu() {
read -r cpu a b c previdle rest < /proc/stat
prevtotal=$((a+b+c+previdle))
sleep 0.5
read -r cpu a b c idle rest < /proc/stat
total=$((a+b+c+idle))
cpu=$((100*( (total-prevtotal) - (idle-previdle) ) / (total-prevtotal) ))
echo"$cpu"%
}
network() {
conntype=$(ip route | awk '/default/ { print substr($5,1,1) }')
if [ -z "$conntype" ]; then
echo " down"
elif [ "$conntype" = "e" ]; then
echo " up"
elif [ "$conntype" = "w" ]; then
echo " up"
fi
}
volume_pa() {
muted=$(pactl list sinks | awk '/Mute:/ { print $2 }')
vol=$(pactl list sinks | grep Volume: | awk 'FNR == 1 { print $5 }' | cut -f1 -d '%')
if [ "$muted" = "yes" ]; then
echo " muted"
else
if [ "$vol" -ge 65 ]; then
echo "$vol%"
elif [ "$vol" -ge 40 ]; then
echo "$vol%"
elif [ "$vol" -ge 0 ]; then
echo "$vol%"
fi
fi
}
clock() {
dte=$(date +"%D")
time=$(date +"%H:%M")
echo "$dte$time"
}
main() {
while true; do
dwm -s " $(usbmon) $(ram) | $(cpu) | $(battery) | $(network) | $(volume_pa) | $(clock)"
sleep 1
done
}
main