diff options
| -rw-r--r-- | config/hikari/hikari.conf | 4 | ||||
| -rw-r--r-- | config/kak/kakrc | 2 | ||||
| -rw-r--r-- | config/waybar/config.jsonc | 6 | ||||
| -rw-r--r-- | config/waybar/style.css | 2 | ||||
| -rw-r--r-- | cwmrc | 7 | ||||
| -rw-r--r-- | gnupg/gpg-agent.conf | 2 | ||||
| -rw-r--r-- | kshrc | 5 | ||||
| -rwxr-xr-x | local/bin/bemenu-toggle | 2 | ||||
| -rwxr-xr-x | local/bin/pfetch | 4 | ||||
| -rw-r--r-- | profile | 8 |
10 files changed, 16 insertions, 26 deletions
diff --git a/config/hikari/hikari.conf b/config/hikari/hikari.conf index 8006cb6..0b38c6b 100644 --- a/config/hikari/hikari.conf +++ b/config/hikari/hikari.conf @@ -62,7 +62,7 @@ actions { emacs = "emacsclient -nc" email = "foot aerc" browser = "firefox" - bemenu = "/bin/bash -c bemenu-toggle" + bemenu = "/bin/sh -c bemenu-toggle" brightness-down = "light -U 10" brightness-up = "light -A 10" volume-mute = "pamixer -t" @@ -75,7 +75,7 @@ actions { inputs { pointers { - "Elan Touchpad" = { + "*" = { natural-scrolling = true } } diff --git a/config/kak/kakrc b/config/kak/kakrc index a2a95a7..ef397b6 100644 --- a/config/kak/kakrc +++ b/config/kak/kakrc @@ -52,7 +52,7 @@ complete-command z shell-script-candidates %{ zoxide query -l } # --- KEYMAPS map global user = ':lsp-formatting<ret>' -docstring "LSP Format" -map global user w '|fmt --width 80<ret>' -docstring "Wrap to 80 columns" +map global user w '|fmt <ret>' -docstring "Wrap to 80 columns" map global user l %{:enter-user-mode lsp<ret>} -docstring "LSP mode" map global insert <tab> '<a-;>:try lsp-snippets-select-next-placeholders catch %{ execute-keys -with-hooks <lt>tab> }<ret>' -docstring 'Select next snippet placeholder' map global object a '<a-semicolon>lsp-object<ret>' -docstring 'LSP any symbol' diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 5cf6cbb..c66defc 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -7,10 +7,8 @@ "spacing": 2, // Gaps between modules (4px) // Choose the order of the modules "modules-right": [ - "pulseaudio", "network", "battery", - "battery#bat2", "clock" ], "clock": { @@ -32,8 +30,8 @@ "bat": "BAT2" }, "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "NET: {essid}", + // "interface": "wlp2*", // (Optionall) To force the use of this interface + "format-wifi": "NET: CONNECTED", "format-ethernet": "{ipaddr}/{cidr} ", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", diff --git a/config/waybar/style.css b/config/waybar/style.css index 275b893..c88b530 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,6 +1,6 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: Input Sans Compressed; + font-family: Input Mono Condensed; font-size: 18px; } @@ -16,8 +16,8 @@ color selfont "#000000" #black color activeborder "#559999" color inactiveborder "#E8E8E8" -bind-key 0-XF86MonBrightnessUp "xbacklight -inc 10" -bind-key 0-XF86MonBrightnessDown "xbacklight -dec 10" +bind-key 0-XF86MonBrightnessUp "backlight -inc 10" +bind-key 0-XF86MonBrightnessDown "backlight -dec 10" bind-key 0-XF86AudioLowerVolume "pamixer -d 5" bind-key 0-XF86AudioRaiseVolume "pamixer -i 5" bind-key 0-XF86AudioMute "pamixer -t" @@ -26,7 +26,7 @@ bind-mouse 4-3 window-resize bind-mouse 4-1 window-move bind-key 4-s menu-window bind-key 4-Return "alacritty" -bind-key 4-e "xterm +sb -e aerc " +bind-key 4-e "alacritty -e aerc " bind-key 4-q window-close bind-key 4-m window-fullscreen bind-key 4-l window-vtile @@ -39,7 +39,6 @@ bind-key 4-p window-move-up-big 4000 bind-key 4S-p window-resize-up-big 4000 bind-key 4-b window-move-left-big 4000 bind-key 4S-b window-resize-left-big 4000 -bind-key 4-u bind-key 4S-r restart bind-key 4-space menu-exec bind-key 4-Tab window-cycle diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index fa55fc7..a41b213 100644 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -1,4 +1,4 @@ default-cache-ttl 999999999 max-cache-ttl 999999999 -pinentry-program /usr/bin/pinentry-tty +pinentry-program /usr/local/bin/pinentry-tty allow-preset-passphrase @@ -3,9 +3,7 @@ export HISTFILE="$HOME/.history" gpg-connect-agent updatestartuptty /bye >/dev/null alias grep="ugrep --exclude-dir=node-modules --exclude-dir=_build" alias e="$EDITOR" -alias sudo='doas' alias g="git" -alias sic='sic -k $(pass libera.chat) -h irc.libera.chat' alias infols="inxi -S -c 0" alias de='eval "$(direnv export bash)"' alias f-commit="fossil commit && fossil git export" @@ -17,5 +15,6 @@ if [ -x "$(command -v opam)" ]; then eval $(opam env) fi -eval "$(direnv export bash)" +display-battery-freebsd.sh + eval "$(zoxide init posix --hook prompt)" diff --git a/local/bin/bemenu-toggle b/local/bin/bemenu-toggle index 13ac7c5..5b94590 100755 --- a/local/bin/bemenu-toggle +++ b/local/bin/bemenu-toggle @@ -19,4 +19,4 @@ export BEMENU_OPTS="--tb '#FFFFFF'\ --bdr '#FFFFFF'\ --scf '#000000'"; -bemenu-run -p 'RUN' -c -i -B 5 --hp 9 --fn 'Input Mono Compressed 14' +bemenu-run -p 'RUN' -c -i -B 5 --hp 9 --fn 'InputMonoCondensed 14' diff --git a/local/bin/pfetch b/local/bin/pfetch index 4dbc80f..ab098f2 100755 --- a/local/bin/pfetch +++ b/local/bin/pfetch @@ -382,7 +382,7 @@ get_os() { ;; (FreeBSD) - distro="$os $(freebsd-version)" + distro="$(echo $os | tr '[:upper:]' '[:lower:]')" ;; (*) @@ -1051,7 +1051,7 @@ get_wm() { ;; esac - log wm "hikari" >&6 + log wm "cwm" >&6 } @@ -1,11 +1,6 @@ if [ -e /home/mccd/.nix-profile/etc/profile.d/nix.sh ]; then . /home/mccd/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer -export LIBSEAT_BACKEND=logind -export QT_QPA_PLATFORM=wayland-egl -export MOZ_ENABLE_WAYLAND="1" -export XDG_CURRENT_DESKTOP="wlroots" -export XDG_SESSION_TYPE="wayland" -alias sudo='doas' +export XDG_RUNTIME_DIR=/var/run/user/`id -u` export EDITOR="kak" export GDK_DPI_SCALE="1.5" export GDK_SCALE="1.5" @@ -23,5 +18,4 @@ export TERM=xterm-256color test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true -if [ "$(tty)" == "/dev/tty1" ]; then exec dbus-run-session hikari; fi |