6 files changed, 78 insertions, 43 deletions

diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 21ee0f5..85e940b 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -1,51 +1,87 @@
-# Colors (Ayu Dark)
 colors:
   # Default colors
   primary:
-    background: '0x0A0E14'
-    foreground: '0xB3B1AD'
+    background: "#000000"
+    foreground: "#D8DEE9"
 
   # Normal colors
   normal:
-    black: '0x01060E'
-    red: '0xEA6C73'
-    green: '0x91B362'
-    yellow: '0xF9AF4F'
-    blue: '0x53BDFA'
-    magenta: '0xFAE994'
-    cyan: '0x90E1C6'
-    white: '0xC7C7C7'
+    black: "#3B4252"
+    red: "#BF616A"
+    green: "#A3BE8C"
+    yellow: "#EBCB8B"
+    blue: "#81A1C1"
+    magenta: "#B48EAD"
+    cyan: "#88C0D0"
+    white: "#abb2bf"
 
   # Bright colors
   bright:
-    black: '0x686868'
-    red: '0xF07178'
-    green: '0xC2D94C'
-    yellow: '0xFFB454'
-    blue: '0x59C2FF'
-    magenta: '0xFFEE99'
-    cyan: '0x95E6CB'
-    white: '0xFFFFFF'
+    black: "#5c6370"
+    red: "#e06c75"
+    green: "#98c379"
+    yellow: "#d19a66"
+    blue: "#61afef"
+    magenta: "#c678dd"
+    cyan: "#56b6c2"
+    white: "#ECEFF4"
+
+background_opacity: 1.0
 
 font:
-  # Normal (roman) font face
   normal:
-    # Font family
-    #
-    # Default:
-    #   - (macOS) Menlo
-    #   - (Linux) monospace
-    #   - (Windows) Consolas
-    family: 'Hermit'
-
-    # The `style` can be specified to pick a specific face.
+    family: "ASM-Regular"
     style: Regular
+  bold:
+    family: "ASM-Bold"
+    style: Bold
+  italic:
+    family: "ASM-RegularItalic"
+    style: Italic
+  bold_italic:
+    family: "ASM-BoldItalic"
+    style: Bold Italic
 
   # Point size
-  size: 8.5
+  size: 9.0
+  antialias: true
+  autohint: true
 
   offset:
     x: 0
     y: 0
+  glyph_offset:
+    x: 0
+    y: 0
+
+window:
+  padding:
+    x: 8
+    y: 8
+
+scrolling:
+  # Maximum number of lines in the scrollback buffer.
+  # Specifying '0' will disable scrolling.
+  history: 10000
+
+  # Number of lines the viewport will move for every line scrolled when
+  # scrollback is enabled (history > 0).
+  multiplier: 10
+
+# If `true`, bold text is drawn using the bright color variants.
+draw_bold_text_with_bright_colors: true
+
+selection:
+  semantic_escape_chars: ',│`|:"'' ()[]{}<>'
+  save_to_clipboard: true
 
+live_config_reload: true
 
+key_bindings:
+  - { key: V, mods: Control|Shift, action: Paste }
+  - { key: C, mods: Control|Shift, action: Copy }
+  - { key: Key0, mods: Control, action: ResetFontSize }
+  - { key: Equals, mods: Control, action: IncreaseFontSize }
+  - { key: Add, mods: Control, action: IncreaseFontSize }
+  - { key: Subtract, mods: Control, action: DecreaseFontSize }
+  - { key: Minus, mods: Control, action: DecreaseFontSize }
diff --git a/bin/.local/bin/shut b/bin/.local/bin/shut
index 9e560f8..2ed1951 100755
--- a/bin/.local/bin/shut
+++ b/bin/.local/bin/shut
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-RET=$(echo -e "shutdown\nreboot\nsleep\nlock\ncancel" | dmenu -l 5 -p "Sayonara" -nb "#000000" -nf "#bfbfbf" -sb "#84a0c6" -sf "#000000" -fn "Hermit:size=10")
+RET=$(echo -e "shutdown\nreboot\nsleep\nlock\ncancel" | dmenu -l 5 -p "Sayonara" -nb "#000000" -nf "#bfbfbf" -sb "#84a0c6" -sf "#000000" -fn "ASM\-Bold:style=☞:size=10")
 
 case $RET in
-        shutdown) doas poweroff ;;
-        reboot) doas reboot ;;
+        shutdown) sudo poweroff ;;
+        reboot) sudo reboot ;;
         sleep) xset s activate & sudo zzz;;
         lock) xset s activate ;;
         *) ;;
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 3599360..4c6c383 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -112,7 +112,7 @@ nnoremap S :%s//gI<Left><Left><Left>
 
 "statusbar
 hi Comment cterm=italic
-hi CursorLine ctermbg=black cterm=bold guibg=#2b2b2b
+hi CursorLine cterm=bold guibg=#2b2b2b
 set statusline=
 set statusline +=%1*\ %n\ %*            "buffer number
 set statusline +=%5*%{&ff}%*            "file format
diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf
index 1856f93..bc22261 100644
--- a/picom/.config/picom.conf
+++ b/picom/.config/picom.conf
@@ -37,8 +37,8 @@ blur-background-exclude = [
 ];
 opacity-rule = [ 
     "40:class_g = 'Bspwm' && class_i = 'presel_feedback'",
-    "100:class_g = 'st-256color' && focused",
-    "95:class_g = 'st-256color' && !focused"
+    "100:class_g = 'alacritty' && focused",
+    "95:class_g = 'alacritty' && !focused"
 ];
 
 ## FADING
diff --git a/spectrwm/.config/spectrwm/spectrwm.conf b/spectrwm/.config/spectrwm/spectrwm.conf
index 87efc30..8cc43e5 100644
--- a/spectrwm/.config/spectrwm/spectrwm.conf
+++ b/spectrwm/.config/spectrwm/spectrwm.conf
@@ -38,7 +38,7 @@ bar_color[1]		= black
 bar_color_selected[1]   = rgb:00/80/80
 bar_font_color[1]       = rgb:b5/b5/b5, rgb:73/73/73
 bar_font_color_selected = black
-bar_font                = Hermit:size=9.5
+bar_font                = ASM\-Bold:style=☞:size=9.5
 bar_action              = ~/.config/spectrwm/statusbar
 bar_action_expand = 1
 bar_justify             = left
@@ -68,7 +68,7 @@ urgent_enabled		= 1
 # Launch applications in a workspace of choice
 autorun                 = ws[1]:~/.fehbg
 autorun                 = ws[1]:picom
-autorun                 = ws[2]:firefox-bin
+autorun                 = ws[2]:firefox
 autorun                 = ws[1]:~/bin/xss
 autorun                 = ws[1]:~/.local/bin/bat_check.sh
 
@@ -100,10 +100,10 @@ keyboard_mapping = ~/.config/spectrwm/keybindings.conf
 
 # Validated default programs:
 program[lock]           = xset s activate
-program[term]           = st
+program[term]           = alacritty
 program[menu]           = ~/bin/menu
-program[bup]            = doas bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
-program[bdown]          = doas bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+program[bup]            = sudo bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+program[bdown]          = sudo bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
 program[soundinc]    = pulsemixer --change-volume +5
 program[sounddec]    = pulsemixer --change-volume -5
 program[soundmute]   = pulsemixer --toggle-mute
diff --git a/x/.xinitrc b/x/.xinitrc
index d87cc5d..a169b02 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -4,8 +4,7 @@ xset b off &
 xset s 600 &
 # ~/bin/xss &
 # ~/.fehbg &
-# ~/bin/batcheck &
 # picom 2>/dev/null &
 # dwmbar &
 
-exec dbus-launch --exit-with-session spectrwm
+exec dbus-launch --exit-with-session spectrwm 2>/dev/null