diff --git a/desktop/configs/tmux/theme.conf b/desktop/configs/tmux/theme.conf
index afce652..8a658d6 120000
--- a/desktop/configs/tmux/theme.conf
+++ b/desktop/configs/tmux/theme.conf
@@ -1 +1 @@
-/yang/.config/tmux/tmux-melange.conf
\ No newline at end of file
+/yang/.config/tmux/tmux-monochrome.conf
\ No newline at end of file
diff --git a/desktop/configs/tmux/tmux-monochrome.conf b/desktop/configs/tmux/tmux-monochrome.conf
new file mode 100644
index 0000000..e616264
--- /dev/null
+++ b/desktop/configs/tmux/tmux-monochrome.conf
@@ -0,0 +1,60 @@
+# status bar
+set -g status-style fg=colour15,bg=colour235
+# set-option -g status-attr default
+set-option -g status-position bottom
+set-option -g status-interval 60
+set-option -g status-bg default
+set-option -g status-fg colour249
+
+# Left side of status bar
+set-option -g status-left-length 20
+# set-option -g status-left "#[fg=colour249,bg=colour235] #S #[fg=default,bg=default] "
+set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour241] ,#[bg=colour234] #S }#[fg=default,bg=default] '
+
+# Window status
+set-option -g window-status-format "#[fg=colour249,bg=colour234] #I #[fg=colour249,bg=colour234] #W "
+set-option -g window-status-current-format "#[fg=black,bg=colour241] #I #[fg=colour249,bg=colour234] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 200
+set -g status-right "#{playerctl_short} | #(whoami)@#h "
+set -g @short_length "50"
+
+# set -g @short_length "30"
+# set -g @short_append_chars "..."
+# WEATHER='#(curl -s wttr.in/Berlin\?format\="%%t+%%C+%%w+%%m")'
+# set-option -g status-right "#[fg=colour249,bg=colour241]🌡 BER #[fg=colour249,bg=colour234] $WEATHER #[fg=colour249,bg=colour241] #[fg=colour249,bg=colour234] #(whoami)@#h "
+
+# pane border
+set -g pane-border-style fg=colour238,bg=colour235
+set -g pane-active-border-style fg=colour241,bg=colour236
+
+# Pane number indicator
+set-option -g display-panes-colour colour234
+set-option -g display-panes-active-colour colour249
+
+# Clock mode
+# set-option -g clock-mode-colour colour249
+# set-option -g clock-mode-style 24
+
+# Message
+set -g message-style fg=default,bg=default
+
+# Activity
+set-option -g monitor-activity on
+set-option -g monitor-silence 0
+set-option -g monitor-bell on
+set-option -g activity-action other
+set-option -g visual-activity off
+
+# Window numbering
+set-option -g base-index 1
+set-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# select default layout
+set-option -g main-pane-width 65
+set-option -g main-pane-height 65
+
diff --git a/desktop/configs/tmux/tmux.conf b/desktop/configs/tmux/tmux.conf
index 8b556de..0ebfa47 100644
--- a/desktop/configs/tmux/tmux.conf
+++ b/desktop/configs/tmux/tmux.conf
@@ -6,10 +6,10 @@ set -g default-terminal "tmux-256color"
set-option -sa terminal-overrides ",xterm-kitty:RGB"
unbind C-o
-bind C-o display-popup -E "tms"
+bind C-o display-popup -E "~/.cargo/bin/tms"
unbind C-j
-bind C-j display-popup -E "tms switch"
+bind C-j display-popup -E "~/.cargo/bin/tms switch"
unbind %
bind | split-window -h
diff --git a/desktop/configs/tofi/monochrome.conf b/desktop/configs/tofi/monochrome.conf
new file mode 100644
index 0000000..fb64bdc
--- /dev/null
+++ b/desktop/configs/tofi/monochrome.conf
@@ -0,0 +1,3 @@
+background-color = #0f1014BB
+text-color = #868690
+selection-color = #ccb901
diff --git a/desktop/configs/tofi/theme.conf b/desktop/configs/tofi/theme.conf
index ff69fb4..f2014d3 120000
--- a/desktop/configs/tofi/theme.conf
+++ b/desktop/configs/tofi/theme.conf
@@ -1 +1 @@
-/yang/.config/tofi/solarized.conf
\ No newline at end of file
+/yang/.config/tofi/monochrome.conf
\ No newline at end of file
diff --git a/desktop/configs/waybar/base16/base16-default-dark.css b/desktop/configs/waybar/base16/base16-default-dark.css
new file mode 100755
index 0000000..8d18a90
--- /dev/null
+++ b/desktop/configs/waybar/base16/base16-default-dark.css
@@ -0,0 +1,23 @@
+/*
+*
+* Base16 Default Dark
+* Author: Chris Kempson (http://chriskempson.com)
+*
+*/
+
+@define-color base00 #181818;
+@define-color base01 #282828;
+@define-color base02 #383838;
+@define-color base03 #585858;
+@define-color base04 #b8b8b8;
+@define-color base05 #d8d8d8;
+@define-color base06 #e8e8e8;
+@define-color base07 #f8f8f8;
+@define-color base08 #ab4642;
+@define-color base09 #dc9656;
+@define-color base0A #f7ca88;
+@define-color base0B #a1b56c;
+@define-color base0C #86c1b9;
+@define-color base0D #7cafc2;
+@define-color base0E #ba8baf;
+@define-color base0F #a16946;
diff --git a/desktop/configs/waybar/dwm.css b/desktop/configs/waybar/dwm.css
new file mode 100644
index 0000000..ae34d63
--- /dev/null
+++ b/desktop/configs/waybar/dwm.css
@@ -0,0 +1,76 @@
+@define-color accent #383838;
+@define-color text #f8f8f8;
+@define-color invText #f8f8f8;
+/* text when background is accent */
+@define-color bg #181818;
+
+/* @import "./wal.css";
+@define-color accent @color5;
+@define-color bg @background;
+@define-color text @foreground; */
+
+@import "./base16/base16-default-dark.css";
+
+@define-color accent @base01;
+@define-color text @base07;
+@define-color invText @base07;
+/* text when background is accent */
+@define-color bg @base00;
+
+* {
+ font-family: CartographCF Nerd Font;
+ font-size: 15px;
+ border-radius: 0px;
+ /* :[ */
+ min-height: 0px;
+}
+
+window#waybar {
+ background-color: @accent;
+ color: @text;
+ opacity: 1;
+}
+
+#workspaces {
+ background-color: transparent;
+}
+
+#workspaces button {
+ padding: 0 5px;
+ color: @text;
+}
+
+#workspaces button.active {
+ background-color: @accent;
+ color: @invText;
+ /* color: @background; */
+}
+
+#pulseaudio,
+#cpu,
+#memory,
+#temperature,
+#battery,
+#clock,
+#tray,
+#custom-icon {
+ background-color: transparent;
+ color: @text;
+ margin: 0px;
+}
+
+.modules-left {
+ background-color: @bg;
+ padding: 0px 0px 0px 0px;
+}
+
+#window {
+ color: @invText;
+ background-color: @accent;
+ padding-left: 4px;
+}
+
+.modules-right {
+ background-color: @bg;
+ padding: 0px 0px 0px 0px;
+}
diff --git a/desktop/configs/waybar/dwm.jsonc b/desktop/configs/waybar/dwm.jsonc
new file mode 100644
index 0000000..1aa54ef
--- /dev/null
+++ b/desktop/configs/waybar/dwm.jsonc
@@ -0,0 +1,61 @@
+{
+ "spacing": 4,
+ // try to keep it 4px across the config
+ "height": 25,
+ "modules-left": ["hyprland/workspaces", "custom/icon", "hyprland/window"],
+ "modules-right": [
+ "tray",
+ "pulseaudio",
+ "cpu",
+ "memory",
+ "temperature",
+ "clock",
+ ],
+
+ /*
+ MODULES
+ */
+ "custom/icon": {
+ "exec": "~/.config/waybar/state",
+ "interval": 5,
+ },
+ "tray": {
+ "spacing": 10,
+ },
+
+ "hyprland/workspaces": {
+ "on-scroll-up": "hyprctl dispatch workspace e+1",
+ "on-scroll-down": "hyprctl dispatch workspace e-1",
+ "all-outputs": true,
+ "on-click": "activate",
+ },
+ "clock": {
+ // "timezone": "America/New_York",
+ "tooltip-format": "[{:%Y %B}]\n{calendar}",
+ "format": "[{:%H:%M}]",
+ "format-alt": "[{:%Y-%m-%d}]",
+ },
+ "cpu": {
+ "format": "[CPU:{usage}%]",
+ "tooltip": false,
+ },
+ "memory": {
+ "format": "[MEM:{percentage}%]",
+ },
+ "temperature": {
+ // "thermal-zone": 2,
+ // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+ "critical-threshold": 80,
+ "format-critical": "[!!{temperatureC}°C!!]",
+ "format": "[{temperatureC}°C]",
+ },
+ "battery": {
+ "format": "[BAT::{capacity}%]",
+ },
+ "pulseaudio": {
+ // "scroll-step": 1, // %, can be a float
+ "format": "[VOL:{volume}%]",
+ "format-muted": "[VOL: M]",
+ "on-click": "pavucontrol",
+ },
+}
diff --git a/desktop/configs/waybar/state b/desktop/configs/waybar/state
new file mode 100755
index 0000000..ee81287
Binary files /dev/null and b/desktop/configs/waybar/state differ
diff --git a/desktop/configs/wezterm/colors/melange_light.toml b/desktop/configs/wezterm/colors/melange_light.toml
new file mode 100644
index 0000000..25a809b
--- /dev/null
+++ b/desktop/configs/wezterm/colors/melange_light.toml
@@ -0,0 +1,29 @@
+[colors]
+foreground = "#54433A"
+background = "#F1F1F1"
+cursor_bg = "#54433A"
+cursor_border = "#54433A"
+cursor_fg = "#F1F1F1"
+selection_bg = "#D9D3CE"
+selection_fg = "#54433A"
+ansi = [
+ "#E9E1DB",
+ "#C77B8B",
+ "#6E9B72",
+ "#BC5C00",
+ "#7892BD",
+ "#BE79BB",
+ "#739797",
+ "#7D6658"
+]
+brights = [
+ "#A98A78",
+ "#BF0021",
+ "#3A684A",
+ "#A06D00",
+ "#465AA4",
+ "#904180",
+ "#3D6568",
+ "#54433A"
+]
+
diff --git a/desktop/configs/wezterm/colors/monochrome_glorb.toml b/desktop/configs/wezterm/colors/monochrome_glorb.toml
new file mode 100644
index 0000000..41eab95
--- /dev/null
+++ b/desktop/configs/wezterm/colors/monochrome_glorb.toml
@@ -0,0 +1,21 @@
+[colors]
+# The default text color
+foreground = "#868690"
+# The default background color
+background = "#0F1014"
+# Overrides the cell background color when the current cell is occupied by the
+# cursor and the cursor style is set to Block
+cursor_bg = "#ccb901"
+# Overrides the text color when the current cell is occupied by the cursor
+cursor_fg = "#868690"
+# Specifies the border color of the cursor when the cursor style is set to Block,
+# or the color of the vertical or horizontal bar when the cursor style is set to
+# Bar or Underline.
+cursor_border = "#ccb901"
+# the foreground color of selected text
+selection_fg = "#93939c"
+# the background color of selected text
+selection_bg = "#22222a"
+
+ansi = ["#131317", "#999EB2", "#ccc04c", "#D3D5DE", "#ccb901", "#E2E4ED", "#B6BAC8", "#868690"]
+brights = ["#575861", "#999EB2", "#ccc04c", "#D3D5DE", "#ccb901", "#E2E4ED", "#B6BAC8", "#868690"]
diff --git a/desktop/configs/wezterm/wezterm.lua b/desktop/configs/wezterm/wezterm.lua
index d4d9dc8..6ff66f8 100644
--- a/desktop/configs/wezterm/wezterm.lua
+++ b/desktop/configs/wezterm/wezterm.lua
@@ -101,12 +101,12 @@ return {
-- General
automatically_reload_config = true,
inactive_pane_hsb = { saturation = 1.0, brightness = 1.0 },
- window_background_opacity = 0.80,
+ window_background_opacity = 0.90,
window_close_confirmation = "NeverPrompt",
window_frame = { active_titlebar_bg = "#45475a", font = font_with_fallback(font_name, { bold = true }) },
check_for_updates = false,
- -- color_scheme_dirs = { "~/.config/wezterm/colors" },
+ color_scheme_dirs = { "~/.config/wezterm/colors" },
- color_scheme = "Gruvbox light, medium (base16)"
+ color_scheme = "monochrome_glorb"
}
diff --git a/desktop/scripts/change-colorscheme.sh b/desktop/scripts/change-colorscheme.sh
index de146ef..0d21116 100755
--- a/desktop/scripts/change-colorscheme.sh
+++ b/desktop/scripts/change-colorscheme.sh
@@ -16,10 +16,28 @@ MELANGE_NORMAL_LIVE=3033188884
SOLARIZED_WIDE_WPP=~/pics/wallpapers/solarized5.jpg
SOLARIZED_NORMAL_WPP=~/pics/wallpapers/solarized4.png
+MONOCHROME_WIDE_WPP=~/pics/wallpapers/monochrome-1.png
+MONOCHROME_NORMAL_WPP=~/pics/wallpapers/monochrome-1.jpg
+
CHOICE=$(tofi <$HOME/scripts/choices)
case "$CHOICE" in
+ monochrome)
+ ~/scripts/swww.sh $MONOCHROME_WIDE_WPP $MONOCHROME_NORMAL_WPP
+
+
+ ln -sf ~/.config/tmux/tmux-monochrome.conf ~/.config/tmux/theme.conf
+ tmux source-file ~/.config/tmux/tmux.conf
+
+ sed -i 's/color_scheme = .*/color_scheme = "monochrome_glorb"/g' ~/.config/wezterm/wezterm.lua
+
+ sed -i 's/image_source=.*/image_source="$HOME\/pics\/the pitiful2.jpg"/g' ~/.config/neofetch/config.conf
+
+ ln -sf ~/.config/tofi/monochrome.conf ~/.config/tofi/theme.conf
+
+ ;;
+
solarized)
~/scripts/swww.sh $SOLARIZED_WIDE_WPP $SOLARIZED_NORMAL_WPP
diff --git a/desktop/scripts/choices b/desktop/scripts/choices
index a07ed92..8c7c00f 100644
--- a/desktop/scripts/choices
+++ b/desktop/scripts/choices
@@ -2,3 +2,4 @@ white
red
solarized
melange
+monochrome
diff --git a/desktop/scripts/hypr.sh b/desktop/scripts/hypr.sh
index 2f0cc62..1dd2b42 100755
--- a/desktop/scripts/hypr.sh
+++ b/desktop/scripts/hypr.sh
@@ -4,6 +4,11 @@
CURRENT_THEME=$(cat ~/colorscheme)
case "$CURRENT_THEME" in
+ monochrome)
+ killall waybar; waybar -c ~/.config/waybar/dwm.jsonc \
+ -s ~/.config/waybar/dwm.css > /dev/null &
+ # hyprctl keyword general:col.active_border todo
+ ;;
solarized)
killall waybar; waybar -s ~/.config/waybar/style-solarized.css > /dev/null &
# hyprctl keyword general:col.active_border todo
diff --git a/desktop/scripts/swww.sh b/desktop/scripts/swww.sh
index dbc3419..dbcc882 100755
--- a/desktop/scripts/swww.sh
+++ b/desktop/scripts/swww.sh
@@ -13,13 +13,16 @@ if [[ -z "$1" ]]; then
SECOND=~/pics/wallpapers/bm3.png
;;
melange)
- FIRST=~/pics/wallpapers/melange1.png
+ FIRST=~/pics/wallpapers/melange2.png
SECOND=~/pics/wallpapers/melange1.jpg
;;
white) # todo
FIRST=~/pics/wallpapers/sl3.jpg
SECOND=~/pics/wallpapers/sl2.png
;;
+ solarized)
+ FIRST=~/pics/wallpapers/solarized5.jpg
+ SECOND=~/pics/wallpapers/solarized4.png
esac
else
FIRST=$1