summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.Xresources.d/emacs4
-rw-r--r--.Xresources.d/fonts4
-rw-r--r--.config/foot/foot.ini10
-rw-r--r--.config/mpv/mpv.conf2
-rw-r--r--.config/sway/config77
-rw-r--r--.config/sway/marita16
-rw-r--r--.config/swaylock/config15
-rw-r--r--.emacs.d/lisp/bandali-essentials.el10
-rwxr-xr-x.local/bin/b-bar2
-rwxr-xr-x.local/bin/fff44
-rwxr-xr-x.local/bin/sway-run1
-rw-r--r--.local/share/foot/themes/doric-oak27
12 files changed, 170 insertions, 42 deletions
diff --git a/.Xresources.d/emacs b/.Xresources.d/emacs
index 3573b45..8c2ace3 100644
--- a/.Xresources.d/emacs
+++ b/.Xresources.d/emacs
@@ -4,6 +4,4 @@ Emacs.verticalScrollBars: off
Emacs.cursorBlink: off
Emacs.FontBackend: ftcrhb,x
-Emacs.font: Source Code Pro Medium-10.5
-!Emacs.font: Inconsolata Medium-12:hinting=true:autohint=true
-! other sizes: 13, 14
+Emacs.font: Source Code Pro Medium-11.5
diff --git a/.Xresources.d/fonts b/.Xresources.d/fonts
index e896636..a2df17c 100644
--- a/.Xresources.d/fonts
+++ b/.Xresources.d/fonts
@@ -5,5 +5,5 @@ Xft.hinting: true
Xft.hintstyle: hintslight
! Xft.hintstyle: hintfull
Xft.rgba: rgb
-Xft.dpi: 96
-! Xft.dpi: 192
+! 144 = 96 * 1.5
+Xft.dpi: 144
diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
index f60dad7..0884edd 100644
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@@ -1,5 +1,7 @@
# -*- conf -*-
+include=~/.local/share/foot/themes/doric-oak
+
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
# term=foot (or xterm-256color if built with -Dterminfo=disabled)
term=xterm-256color
@@ -10,7 +12,7 @@ term=xterm-256color
# locked-title=no
#font=Source Code Pro Medium:size=10, Apple Color Emoji:size=10
-font=Source Code Pro Medium:size=8, Apple Color Emoji:size=8
+font=Source Code Pro Medium:size=11, Apple Color Emoji:size=11
# font=monospace:size=8
# font-bold=<bold variant of regular font>
# font-italic=<italic variant of regular font>
@@ -24,12 +26,12 @@ font=Source Code Pro Medium:size=8, Apple Color Emoji:size=8
# underline-thickness=<font underline thickness>
# box-drawings-uses-font-glyphs=no
# dpi-aware=no
-dpi-aware=yes
# initial-window-size-pixels=700x500 # Or,
# initial-window-size-chars=<COLSxROWS>
# initial-window-mode=windowed
# pad=0x0 # optionally append 'center'
+pad=5x5
# resize-delay-ms=100
initial-window-size-chars=80x24
@@ -83,9 +85,9 @@ lines=100000
[colors]
# alpha=1.0
# background=242424
-background=000000
+#background=000000
# foreground=ffffff
-foreground=c3c0b8
+#foreground=c3c0b8
# flash=7f7f00
# flash-alpha=0.5
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index 4b22d1c..ab010f1 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -1,5 +1,5 @@
# ytdl-format=(bestvideo[height<=720]+bestaudio)[ext=webm]/bestvideo[height<=720]+bestaudio/best[height<=720]/bestvideo+bestaudio/best
-ytdl-format=bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best
+#ytdl-format=bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best
# Uncomment this line to load the profile by default.
# Otherwise, launch mpv with '--profile=emacsconf-talks'.
diff --git a/.config/sway/config b/.config/sway/config
index 9e859bb..9249e13 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,4 +1,4 @@
-set $font Source Code Pro Medium 10.5
+set $font Source Code Pro Medium 11.5
# set $font Inconsolata Medium 12
font pango:$font
@@ -16,11 +16,11 @@ set $right l
set $term foot
set $menu dmenu_path | wmenu -f '$font' | xargs swaymsg exec --
-set $lock swaylock -f -c 000000
+set $lock swaylock
exec swayidle -w \
- timeout 600 '$lock' \
- timeout 610 'swaymsg "output * power off"' \
+ timeout 300 '$lock' \
+ timeout 310 'swaymsg "output * power off"' \
resume 'swaymsg "output * power on"' \
before-sleep '$lock'
@@ -35,7 +35,6 @@ floating_modifier $mod normal
bindsym $mod+Return exec $term
bindsym $mod+Shift+Return exec $term -a 'footfl'
-for_window [app_id="footfl"] floating enable
bindsym $mod+space exec $menu
bindsym $mod+backslash exec passmenu --type -f '$font'
@@ -168,42 +167,62 @@ mode passthrough {
}
bindsym $mod+p mode passthrough
+bindgesture swipe:3:right workspace prev
+bindgesture swipe:3:left workspace next
+bindgesture swipe:4:right exec b-ws-util sway move next
+bindgesture swipe:4:left exec b-ws-util sway move prev
+
bar {
+ # mode hide
position bottom
+ gaps 0 5
# status_command while date +'%a, %d %b %Y %T %z'; do sleep 1; done
status_command b-bar
colors {
- statusline #ffffff
- background #000000
- inactive_workspace #32323200 #32323200 #5c5c5c
+ statusline #6b5225
+ background #d5c9b5
+ focused_workspace #8f9373 #b1bf88 #3f5000
+ inactive_workspace #8f9373 #d5c9b5 #6b5225
+ urgent_workspace #e3b8a0 #e3b8a0 #982500
}
}
-seat seat0 hide_cursor 10000
-seat seat0 xcursor_theme DMZ-White
+seat * hide_cursor 10000
+seat * xcursor_theme DMZ-White
default_border pixel 4
-hide_edge_borders smart
-
-for_window [window_role="pop-up"] floating enable
-
-for_window [app_id="mumble"] floating enable, inhibit_idle open
-for_window [app_id="nm-connection-editor"] floating enable
-for_window [app_id="virt-manager"] floating enable
-for_window [class="Vncviewer"] floating enable
-for_window [class="TigerVNC Viewer"] floating enable
-for_window [app_id="thunar"] floating enable
-for_window [app_id="pavucontrol"] floating enable
-
-for_window [app_id="^[Ff]irefox.*" title="^Picture-in-Picture$"] \
- floating enable, move position 68 ppt 67 ppt, sticky enable
-for_window [app_id="^[Ff]irefox.*" title="Choose User Profile"] \
- floating enable
-for_window [app_id="^[Ff]irefox.*" title="Sharing Indicator"] \
- floating enable, kill
-for_window [class="Chromium"] inhibit_idle open
+gaps inner 5
+
+client.focused #8f9373 #b1bf88 #3f5000 #497020
+client.focused_inactive #8f9373 #b7d2b7 #0f5420 #497020
+client.unfocused #8f9373 #d5c9b5 #6b5225 #497020
+
+for_window {
+ [window_role="pop-up"] floating enable
+
+ [app_id="footfl"] floating enable
+
+ [app_id="mumble"] floating enable, inhibit_idle open
+ [app_id="nm-connection-editor"] floating enable
+ [app_id="virt-manager"] floating enable
+ [class="Vncviewer"] floating enable
+ [class="TigerVNC Viewer"] floating enable
+ [app_id="thunar"] floating enable
+ [app_id="pavucontrol"] floating enable
+
+ [app_id="^[Ff]irefox.*" title="^Picture-in-Picture$"] \
+ floating enable, move position 68 ppt 67 ppt, sticky enable
+ [app_id="^[Ff]irefox.*" title="Choose User Profile"] \
+ floating enable
+ [app_id="^[Ff]irefox.*" title="Sharing Indicator"] \
+ floating enable, kill
+ # [title="Mozilla Firefox Private Browsing"] \
+ # move window to workspace 5; workspace 5
+
+ [class="Chromium"] inhibit_idle open
+}
exec mako >/tmp/mako.log 2>&1
exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
diff --git a/.config/sway/marita b/.config/sway/marita
new file mode 100644
index 0000000..54f8893
--- /dev/null
+++ b/.config/sway/marita
@@ -0,0 +1,16 @@
+# -*-conf-*-
+
+output * bg ~/usr/pic/wallpaper fill
+output eDP-1 scale 1.5
+
+input * {
+ xkb_options ctrl:swap_rwin_rctl,grp:shifts_toggle
+}
+
+input "2362:628:PIXA3854:00_093A:0274_Touchpad" {
+ dwt enabled
+ tap enabled
+ natural_scroll enabled
+ middle_emulation enabled
+ click_method clickfinger
+}
diff --git a/.config/swaylock/config b/.config/swaylock/config
new file mode 100644
index 0000000..111452c
--- /dev/null
+++ b/.config/swaylock/config
@@ -0,0 +1,15 @@
+daemonize
+image=~/usr/pic/wallpaper
+ring-color=b1bf88
+key-hl-color=3f5000
+bs-hl-color=982500
+line-color=497020
+ring-wrong-color=982500
+inside-wrong-color=e3b8a0
+ring-clear-color=595000
+inside-clear-color=e2e0a8
+line-clear-color=3a2018
+ring-ver-color=103077
+inside-ver-color=c4c8dd
+line-ver-color=005460
+separator-color=497020
diff --git a/.emacs.d/lisp/bandali-essentials.el b/.emacs.d/lisp/bandali-essentials.el
index d46f1b5..426f90d 100644
--- a/.emacs.d/lisp/bandali-essentials.el
+++ b/.emacs.d/lisp/bandali-essentials.el
@@ -77,9 +77,9 @@
(with-eval-after-load 'faces
(let ((grey "#e7e7e7"))
(set-face-attribute 'default nil
- :font "Source Code Pro Medium-10.5")
+ :font "Source Code Pro Medium-11.5")
(set-face-attribute 'fixed-pitch nil
- :font "Source Code Pro Medium-10.5")
+ :font "Source Code Pro Medium-11.5")
(set-face-attribute 'mode-line nil
:box '(:line-width 2 :style released-button)
:background grey
@@ -382,6 +382,12 @@
(car args))
(cdr args)))))
+(with-eval-after-load 'calendar
+ (setopt
+ calendar-date-style 'iso
+ calendar-mark-diary-entries-flag t))
+(b/keymap-global-set "C-c c" #'calendar)
+
(with-eval-after-load 'doric-themes
(setopt doric-themes-to-toggle '(doric-oak doric-pine)))
(when (functionp #'doric-themes-select)
diff --git a/.local/bin/b-bar b/.local/bin/b-bar
index ed2308d..0e33479 100755
--- a/.local/bin/b-bar
+++ b/.local/bin/b-bar
@@ -17,7 +17,7 @@ do
nrbr="$(echo $sens | jq -r '.[].temp1.temp1_input')"
bar="$cpu1 $cpu2 $nrbr | $bar"
;;
- adelita|anahita|monarch)
+ adelita|anahita|monarch|marita)
if [ -x "$(command -v emacsclient)" ]; then
embat='(battery-format b/battery-format (funcall battery-status-function))'
bat="$(timeout 3 emacsclient -e "$embat")"
diff --git a/.local/bin/fff b/.local/bin/fff
new file mode 100755
index 0000000..24b8165
--- /dev/null
+++ b/.local/bin/fff
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+usage()
+{
+ cat <<EOF
+Usage: $0 [[-]profile]
+
+Optional 'profile' is the name of the browser profile to use.
+If profile is prefixed with a '-', a private window will be requested.
+EOF
+ exit "$1"
+}
+
+if command -v abrowser >/dev/null 2>&1; then
+ browser=abrowser
+elif command -v icecat >/dev/null 2>&1; then
+ browser=icecat
+elif command -v firefox-esr >/dev/null 2>&1; then
+ browser=firefox-esr
+else
+ printf '%s\n' 'error: Could not choose a browser.'
+ exit 1
+fi
+
+if [ "$#" -eq 1 ]; then
+ case "$1" in
+ -*)
+ if [ "$1" = "-" ]; then
+ opts="-private-window"
+ else
+ opts="-P ${1#?} -private-window"
+ fi
+ ;;
+ *)
+ opts="-P $1"
+ ;;
+ esac
+elif [ "$#" -eq 0 ]; then
+ opts=''
+else
+ usage 1
+fi
+
+"$browser" "$opts"&
diff --git a/.local/bin/sway-run b/.local/bin/sway-run
index 2044e4d..f9a3c4d 100755
--- a/.local/bin/sway-run
+++ b/.local/bin/sway-run
@@ -2,6 +2,7 @@
export _JAVA_AWT_WM_NONREPARENTING=1
export MOZ_ENABLE_WAYLAND=1
+export XDG_CURRENT_DESKTOP=sway
# not needed
unset MOZ_USE_XINPUT2
diff --git a/.local/share/foot/themes/doric-oak b/.local/share/foot/themes/doric-oak
new file mode 100644
index 0000000..70138e1
--- /dev/null
+++ b/.local/share/foot/themes/doric-oak
@@ -0,0 +1,27 @@
+# -*- conf -*-
+#
+# doric-oak
+# See: https://elpa.gnu.org/packages/doric-themes.html
+#
+[colors]
+background=e0d8c7
+foreground=3a2018
+regular0=000000
+regular1=982500
+regular2=226700
+regular3=595000
+regular4=103077
+regular5=700054
+regular6=005460
+regular7=b3b3b3
+bright0=4d4d4d
+bright1=e3b8a0
+bright2=bdcea0
+bright3=e2e0a8
+bright4=c4c8dd
+bright5=d8bade
+bright6=bee0db
+bright7=ffffff
+
+[cursor]
+color=c0a27a 497020
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-18 07:02:46 +0000