aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbin/linux/dnf-needs-restarting2
-rw-r--r--config/all/dircolors.conf15
-rw-r--r--config/linux/foot/foot.ini3
-rw-r--r--config/linux/kitty/kitty.conf48
-rw-r--r--config/linux/sway/config4
-rw-r--r--config/linux/waybar/config36
-rw-r--r--config/linux/waybar/style.css18
-rw-r--r--config/linux/wofi/style.css2
-rwxr-xr-xdeploy.sh28
9 files changed, 50 insertions, 106 deletions
diff --git a/bin/linux/dnf-needs-restarting b/bin/linux/dnf-needs-restarting
index 60f7f7c..a080649 100755
--- a/bin/linux/dnf-needs-restarting
+++ b/bin/linux/dnf-needs-restarting
@@ -16,7 +16,7 @@ fi
set -u
if ! output="$($DNFCMD needs-restarting -r)"; then
- icon="勒"
+ icon=""
else
icon=""
fi
diff --git a/config/all/dircolors.conf b/config/all/dircolors.conf
index cfd5f8d..a36f679 100644
--- a/config/all/dircolors.conf
+++ b/config/all/dircolors.conf
@@ -55,6 +55,7 @@ TERM xterm-256color
TERM xterm-88color
TERM xterm-color
TERM xterm-debian
+TERM foot
#
# Generic types
@@ -71,17 +72,17 @@ TERM xterm-debian
RESET 0 # reset to "normal" color
DIR 34 # directory
LINK 36 # symbolic link
-FIFO 40;33 # pipe
+FIFO 47;33 # pipe
SOCK 35 # socket
DOOR 35 # door
-BLK 40;33 # block device driver
-CHR 40;33 # character device driver
-ORPHAN 40;31 # symlink to nonexistent file, or non-stat'able file
+BLK 47;33 # block device driver
+CHR 47;33 # character device driver
+ORPHAN 47;31 # symlink to nonexistent file, or non-stat'able file
SETUID 37;41 # file that is setuid (u+s)
-SETGID 30;43 # file that is setgid (g+s)
+SETGID 37;43 # file that is setgid (g+s)
CAPABILITY 30;41 # file with capability
-STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
-OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+STICKY_OTHER_WRITABLE 37;42 # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE 37;42 # dir that is other-writable (o+w) and not sticky
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
EXEC 32 # executable files
diff --git a/config/linux/foot/foot.ini b/config/linux/foot/foot.ini
index 47ba8be..1055f45 100644
--- a/config/linux/foot/foot.ini
+++ b/config/linux/foot/foot.ini
@@ -4,7 +4,8 @@
# term=foot (or xterm-256color if built with -Dterminfo=disabled)
# login-shell=no
-font=JetBrainsMono Nerd Font:size=9
+font=Cascadia Mono PL Light:size=9
+font-bold=Cascadia Mono PL:size=9
# font-bold=<bold variant of regular font>
# font-italic=<italic variant of regular font>
# font-bold-italic=<bold+italic variant of regular font>
diff --git a/config/linux/kitty/kitty.conf b/config/linux/kitty/kitty.conf
deleted file mode 100644
index 318ce8e..0000000
--- a/config/linux/kitty/kitty.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-font_family JetBrainsMono Nerd Font Mono
-disable_ligatures always
-font_size 11.0
-
-copy_on_select clipboard
-shell_integration disabled
-enable_audio_bell no
-
-# theme: Tempus Dawn
-# author: Protesilaos Stavrou (https://protesilaos.com)
-# description: Light theme with a soft, slightly desaturated palette (WCAG AA compliant)
-
-cursor #4a4b4e
-cursor_text_color #eff0f2
-url_color #4b529a
-
-active_border_color #676364
-inactive_border_color #dee2e0
-bell_border_color #8b590a
-
-active_tab_foreground #206620
-active_tab_background #dee2e0
-inactive_tab_foreground #676364
-inactive_tab_background #eff0f2
-
-foreground #4a4b4e
-background #eff0f2
-selection_foreground #eff0f2
-selection_background #4a4b4e
-
-color0 #4a4b4e
-color1 #a32a3a
-color2 #206620
-color3 #745300
-color4 #4b529a
-color5 #8d377e
-color6 #086784
-color7 #dee2e0
-color8 #676364
-color9 #a64822
-color10 #187408
-color11 #8b590a
-color12 #5c59b2
-color13 #8e45a8
-color14 #3f649c
-color15 #eff0f2
-
-include local.conf
diff --git a/config/linux/sway/config b/config/linux/sway/config
index ae737ea..7674e1d 100644
--- a/config/linux/sway/config
+++ b/config/linux/sway/config
@@ -8,14 +8,14 @@ set $down j
set $up k
set $right l
# Your preferred terminal emulator
-set $term kitty
+set $term foot
# Your preferred application launcher
# 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.
#set $menu dmenu_path | dmenu | xargs swaymsg exec --
set $menu wofi --show=drun | xargs swaymsg exec --
-font JetBrainsMono Nerd Font Mono 9
+font Noto Sans 9
default_border pixel 1
smart_borders on
diff --git a/config/linux/waybar/config b/config/linux/waybar/config
index d8cefd2..17bade2 100644
--- a/config/linux/waybar/config
+++ b/config/linux/waybar/config
@@ -22,9 +22,9 @@
},
"temperature": {
"critical-threshold": 80,
- "format": "{icon} {temperatureC}°C",
+ "format": "{icon}",
"format-icons": ["", "", "", "", ""],
- "tooltip": false
+ "tooltip-format": "Temperature: {temperatureC}°C"
},
"battery#bat1": {
"bat": "BAT0",
@@ -38,38 +38,30 @@
"1": 20,
"0": 5
},
- "format": "{icon} {capacity}%",
- "format-charging-5": " {capacity}%",
- "format-charging-4": " {capacity}%",
- "format-charging-3": " {capacity}%",
- "format-charging-2": " {capacity}%",
- "format-charging-1": " {capacity}%",
- "format-charging-0": " {capacity}%",
- "format-icons": ["", "", "", "", "", ""]
+ "format": "{icon}",
+ "format-charging": "",
+ "format-icons": ["", "", "", "", ""],
+ "tooltip-format": "Battery: {capacity}%\n{timeTo}"
},
"network#wifi": {
"interface": "wlp*",
"format-ethernet": "",
- "format-wifi": " {signalStrength}%",
+ "format-wifi": "",
"format-linked": "",
"format-disconnected": "",
- "tooltip-format": "{essid}\n{ifname}: {ipaddr}/{cidr}",
- "on-click": "nm-connection-editor"
+ "tooltip-format": "Signal: {signalStrength}%\n{essid}\n{ifname}: {ipaddr}/{cidr}",
+ "on-click": "gnome-control-center wifi"
},
"pulseaudio": {
"scroll-step": 1,
- "format": "{icon} {volume}%",
- "format-muted": "婢 {volume}%",
- "format-bluetooth": "{icon} {volume}%",
- "format-bluetooth-muted": "婢 {icon}",
+ "format": "{icon}",
+ "format-muted": "",
"format-icons": {
"headphone": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["奄", "奔", "墳"]
+ "default": ["", ""]
},
- "on-click": "pavucontrol"
+ "tooltip-format": "Volume: {volume}%\n{desc}",
+ "on-click": "gnome-control-center sound"
},
"idle_inhibitor": {
"format": "{icon}",
diff --git a/config/linux/waybar/style.css b/config/linux/waybar/style.css
index ebcf4a6..e83e12b 100644
--- a/config/linux/waybar/style.css
+++ b/config/linux/waybar/style.css
@@ -1,7 +1,7 @@
* {
border-radius: 0;
border: 0;
- font-family: Noto Sans, JetBrainsMono Nerd Font;
+ font-family: "Noto Sans", "Font Awesome 5 Free";
font-size: 11pt;
text-shadow: none;
}
@@ -10,6 +10,22 @@ window#waybar {
background: #eff0f2;
color: #4a4b4e;
border-bottom: 1px solid #dee2e0;
+ border-left: 5px solid black;
+ border-right: 5px solid black;
+}
+
+.modules-left, .modules-center, .modules-right {
+ background: #eff0f2;
+ border-bottom: 1px solid #dee2e0;
+}
+
+.modules-left {
+ border-radius: 5px 0 0 0;
+ padding-left: 5px;
+}
+
+.modules-right {
+ border-radius: 0 5px 0 0;
}
tooltip {
diff --git a/config/linux/wofi/style.css b/config/linux/wofi/style.css
index abf8ae8..63d408d 100644
--- a/config/linux/wofi/style.css
+++ b/config/linux/wofi/style.css
@@ -1,7 +1,7 @@
window {
background: #eff0f2;
color: #4a4b4e;
- font-family: Noto Sans, JetBrainsMono Nerd Font;
+ font-family: Noto Sans;
font-size: 10pt;
border: 1px solid #dee2e0;
}
diff --git a/deploy.sh b/deploy.sh
index 4402a54..e1bcd04 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -44,9 +44,7 @@ function link {
mkdir -p "../dotfiles-backup"
mv "$link_dest" "../dotfiles-backup/."
fi
- if [ ! -e "$link_dest" ]; then
- ln -sf "$link_src" "$link_dest"
- fi
+ ln -snf "$link_src" "$link_dest"
}
function deploy {
@@ -106,14 +104,14 @@ cd ..
# create local files
if [ ! -e "$HOME/.config/zsh/00-local.zsh" ]; then
- cp local/local.zsh config/zsh/00-local.zsh
+ cp local/local.zsh "$HOME/.config/zsh/00-local.zsh"
fi
if [ ! -e "$HOME/.config/git/config-local" ]; then
- cp local/gitconfig-local config/git/config-local
+ cp local/gitconfig-local "$HOME/.config/git/config-local"
fi
if [ "$uname" = "linux" ]; then
if [ ! -e "$HOME/.config/kitty/local.conf" ]; then
- cp local/kitty-local.conf config/kitty/local.conf
+ cp local/kitty-local.conf "$HOME/.config/kitty/local.conf"
fi
dconfig="$xconfig/duplicity"
mkdir -p "$dconfig"
@@ -125,7 +123,7 @@ if [ "$uname" = "linux" ]; then
fi
fi
-# download nerdfonts
+# download custom fonts
if command -v fc-cache > /dev/null; then
new_font=0
function get_font {
@@ -141,22 +139,6 @@ if command -v fc-cache > /dev/null; then
new_font=1
fi
}
- get_font sourcecodepro-nerd \
- https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/SourceCodePro.zip \
- "Sauce Code Pro Medium Nerd Font Complete.ttf" \
- "Sauce Code Pro Bold Nerd Font Complete.ttf" \
- "Sauce Code Pro Medium Italic Nerd Font Complete.ttf" \
- "Sauce Code Pro Bold Italic Nerd Font Complete.ttf"
- get_font jetbrainsmono-nerd \
- https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/JetBrainsMono.zip \
- "JetBrains Mono Regular Nerd Font Complete Mono.ttf" \
- "JetBrains Mono Italic Nerd Font Complete Mono.ttf" \
- "JetBrains Mono Bold Nerd Font Complete Mono.ttf" \
- "JetBrains Mono Bold Italic Nerd Font Complete Mono.ttf" \
- "JetBrains Mono Regular Nerd Font Complete.ttf" \
- "JetBrains Mono Italic Nerd Font Complete.ttf" \
- "JetBrains Mono Bold Nerd Font Complete.ttf" \
- "JetBrains Mono Bold Italic Nerd Font Complete.ttf"
if [ "$new_font" = "1" ]; then
echo "Hint: Run 'fc-cache -v' to rebuild your font cache"
fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-18 10:14:49 +0000