From 21632788ed760bd27c529820319a0e23be1a60a1 Mon Sep 17 00:00:00 2001
From: termite <termite@mudf.lat>
Date: Tue, 6 May 2025 08:28:02 -0700
Subject: [PATCH] moved the scripts for i3blocks into a block directory, and
 changed i3lock to i3lock-color

---
 .gitignore                 |  1 +
 bin/{ => blocks}/battery   |  0
 bin/{ => blocks}/cpu_usage |  0
 bin/{ => blocks}/memory    |  0
 bin/{ => blocks}/wifi      |  0
 bin/lock                   | 36 ++++++++++++++++++++++++++++++++++++
 i3blocks                   |  8 ++++----
 i3config                   |  2 +-
 install                    |  3 ++-
 installpackages.txt        |  3 ++-
 10 files changed, 46 insertions(+), 7 deletions(-)
 rename bin/{ => blocks}/battery (100%)
 rename bin/{ => blocks}/cpu_usage (100%)
 rename bin/{ => blocks}/memory (100%)
 rename bin/{ => blocks}/wifi (100%)
 create mode 100755 bin/lock

diff --git a/.gitignore b/.gitignore
index 1771d8a..49f56c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 setup_specific
+tags
diff --git a/bin/battery b/bin/blocks/battery
similarity index 100%
rename from bin/battery
rename to bin/blocks/battery
diff --git a/bin/cpu_usage b/bin/blocks/cpu_usage
similarity index 100%
rename from bin/cpu_usage
rename to bin/blocks/cpu_usage
diff --git a/bin/memory b/bin/blocks/memory
similarity index 100%
rename from bin/memory
rename to bin/blocks/memory
diff --git a/bin/wifi b/bin/blocks/wifi
similarity index 100%
rename from bin/wifi
rename to bin/blocks/wifi
diff --git a/bin/lock b/bin/lock
new file mode 100755
index 0000000..be29748
--- /dev/null
+++ b/bin/lock
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+BLANK='#00000044'
+CLEAR='#00000022'
+DEFAULT='#aaaaaaff'
+TEXT='#eeeeeeee'
+WRONG='#880000bb'
+VERIFYING='#00bbbbbb'
+
+i3lock \
+--insidever-color=$CLEAR     \
+--ringver-color=$VERIFYING   \
+\
+--insidewrong-color=$CLEAR   \
+--ringwrong-color=$WRONG     \
+\
+--inside-color=$BLANK        \
+--ring-color=$DEFAULT        \
+--line-color=$BLANK          \
+--separator-color=$DEFAULT   \
+\
+--verif-color=$TEXT          \
+--wrong-color=$TEXT          \
+--time-color=$TEXT           \
+--date-color=$TEXT           \
+--layout-color=$TEXT         \
+--keyhl-color=$WRONG         \
+--bshl-color=$WRONG          \
+\
+--screen 1                   \
+--blur 5                     \
+--clock                      \
+--indicator                  \
+--time-str="%H:%M:%S"        \
+--date-str="%A, %Y-%m-%d"       \
+--keylayout 1                \
diff --git a/i3blocks b/i3blocks
index d81daef..4ade7ef 100644
--- a/i3blocks
+++ b/i3blocks
@@ -1,14 +1,14 @@
 [wifi]
-command=~/.dotfiles/bin/wifi -np 
+command=~/.dotfiles/bin/blocks/wifi -np 
 interval=5
 
 [battery]
-command=~/.dotfiles/bin/battery
+command=~/.dotfiles/bin/blocks/battery
 markup=pango
 interval=30
 
 [cpu_usage]
-command=~/.dotfiles/bin/cpu_usage
+command=~/.dotfiles/bin/blocks/cpu_usage
 interval=10
 LABEL= 
 #min_width=CPU: 100.00%
@@ -20,7 +20,7 @@ DECIMALS=1
 #COLOR_CRIT=#FF0000
 
 [memory]
-command=~/.dotfiles/bin/memory
+command=~/.dotfiles/bin/blocks/memory
 label= 
 interval=30
 
diff --git a/i3config b/i3config
index c7cceb2..f4cb52d 100644
--- a/i3config
+++ b/i3config
@@ -29,7 +29,7 @@ exec --no-startup-id dex --autostart --environment i3
 
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+exec --no-startup-id xss-lock --transfer-sleep-lock -- ~/.dotfiles/bin/lock --nofork
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
diff --git a/install b/install
index 2519068..38f4e13 100755
--- a/install
+++ b/install
@@ -1,5 +1,6 @@
+yay -Syu
 sudo pacman -S --needed --noconfirm - < installpackages.txt 
-yay -S light --needed --noconfirm
+yay -S light i3lock-color --needed --noconfirm
 
 mkdir -p ~/.config/i3
 ln -sf ~/.dotfiles/i3config ~/.config/i3/config
diff --git a/installpackages.txt b/installpackages.txt
index 19ecb4d..4e89ad3 100644
--- a/installpackages.txt
+++ b/installpackages.txt
@@ -1,4 +1,5 @@
-i3
+i3-wm
+i3blocks
 mpd
 ncmpcpp
 flameshot