diff --git a/.gitignore b/.gitignore index 84b500e..5261fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ lfm/.config/lfm/lfm.history -lazygit/.config/jesseduffield/lazygit/state.yml -lazygit/.config/**/*.patch +lazygit/.config/lazygit/**/*.patch +lazygit/.config/lazygit/state.yml bin/.local/bin/ @@ -16,6 +16,9 @@ mutt/.config/mutt/*.mailboxes matterhorn/.config/matterhorn/history.txt matterhorn/.config/matterhorn/last_run_state_*.json +nvim/.config/nvim/plugin/packer_compiled.lua +nvim/.config/nvim/spell + ssh/.ssh/* ssh/.ssh/known_hosts* !ssh/.ssh/config @@ -27,10 +30,8 @@ vifm/.config/vifm/vifminfo.json* vim/.vim/autoload/ vim/.vim/colors/ vim/.vim/plugged/ +vim/.vim/spell vim/.vim/swap/ vim/.vim/undo/ -lazygit/.config/lazygit/state.yml -nvim/.config/nvim/plugin/packer_compiled.lua -nvim/.config/nvim/spell -vim/.vim/spell +wofi/.config/wofi/style.css diff --git a/.gitleaksignore b/.gitleaksignore index b4a0350..a350607 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -132,3 +132,30 @@ bf90155a8ee60c1804963c45a83fa2e42df57f4e:git/.gitconfig:generic-api-key:4 964a5a3c30e100b800709cbd7476acd41ec2e14e:vdirsyncer/.config/vdirsyncer/config:generic-api-key:15 5bb838514a61299e111fd24299f1132b7380a151:vdirsyncer/.config/vdirsyncer/config:generic-api-key:15 +ae6c54de5832855c0792c91ec5d29ec3213f8078:fish/.config/fish/functions/stashplay.fish:jwt:2 +c548aa41b88976c86e531255ff3586283fd84312:fish/.config/fish/functions/stashplay.fish:jwt:2 +56db9f65f9b63293688aae104f2fe98cb02c6b3c:fish/.config/fish/functions/stashplay.fish:jwt:2 +76632ef9a4f3214497ddf88fb4ddb5256da889ee:fish/.config/fish/functions/stashplay.fish:jwt:2 +67d501575f91f9347572cd84f817df984fb8fc64:fish/.config/fish/functions/stashplay.fish:jwt:2 +a9bc0b9fb85863cd79cc9250fc8d4b3cd6344e85:fish/.config/fish/functions/stashplay.fish:jwt:2 +425d0d74f32971b14719dd7b40a05ef0f507ad3e:fish/.config/fish/functions/stashplay.fish:jwt:2 +5a71b0cbae1e4a9d91cceb5fe306b29a9151e609:fish/.config/fish/functions/stashplay.fish:jwt:2 +fdd5a5cccf289b61fa19acf714ceab8426d24af5:fish/.config/fish/functions/stashplay.fish:jwt:2 +ea99083a336e76b427c737239a811fe3921d8c7c:fish/.config/fish/functions/stashplay.fish:jwt:2 +d86bff5878e1a35f8a6ff6ec1f0618f6d27fe494:fish/.config/fish/functions/stashplay.fish:jwt:2 +a14038ec7aa05fe8fdef18acd88d018f623de9ed:fish/.config/fish/functions/stashplay.fish:jwt:2 +fb4c1a93d2af17e6a1c02f36a325ce840ed7c55f:fish/.config/fish/functions/stashplay.fish:jwt:2 +ab1a3cd1aa761895f0ca373c7664b0878053037e:fish/.config/fish/functions/stashplay.fish:jwt:2 +7b00b7ead143361aba85cd8ef463eee841aa83e5:fish/.config/fish/functions/stashplay.fish:jwt:2 +10d57a6596b438a571d8cf7f71a6ef303c9fe182:fish/.config/fish/functions/stashplay.fish:jwt:2 +e3aa3425b45d8c8e74256db1b2f0f2ed5ef6f750:fish/.config/fish/functions/stashplay.fish:jwt:2 +a1b7abe1e5703fbf6f50a38b4c6d841df30079fc:fish/.config/fish/functions/stashplay.fish:jwt:2 +3402523d1795ec47c0d5ad3c8646950ce8df343b:fish/.config/fish/functions/stashplay.fish:jwt:2 +9d9296f99035a5e96c8fab0f4b825588ad4345c5:fish/.config/fish/functions/stashplay.fish:jwt:2 +2b11b24c703a07acb6ec8877bfe442d72dee0752:fish/.config/fish/functions/stashplay.fish:jwt:2 +4a19729a6052d0ec9396f2a130399848a35de7e4:fish/.config/fish/functions/stashplay.fish:jwt:2 +1e20a0d5812aeeac5af3c72f94b0c68f8a65d045:fish/.config/fish/functions/stashplay.fish:jwt:2 +5f9c661751d2bd961a7a9e8449e448908bc5ea98:fish/.config/fish/functions/stashplay.fish:jwt:2 +554687b2c5a7537999e34343f06fad0d304d41f4:fish/.config/fish/functions/stashplay.fish:jwt:2 +e17d3cf8083414914c6daf7b104504469156b298:fish/.config/fish/functions/stashplay.fish:jwt:2 +b4e1c169a3f5830697601f038ce878dca5997f00:fish/.config/fish/functions/stashplay.fish:jwt:2 diff --git a/darkman/.config/darkman/config.yaml b/darkman/.config/darkman/config.yaml new file mode 100644 index 0000000..7733fdc --- /dev/null +++ b/darkman/.config/darkman/config.yaml @@ -0,0 +1,4 @@ +lat: 43.7 +lng: 7.2 +dbusserver: true +portal: true diff --git a/darkman/.local/share/dark-mode.d/gtk-theme.sh b/darkman/.local/share/dark-mode.d/gtk-theme.sh new file mode 100755 index 0000000..fbb8840 --- /dev/null +++ b/darkman/.local/share/dark-mode.d/gtk-theme.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +gsettings set org.gnome.desktop.interface color-scheme prefer-dark +gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark + diff --git a/darkman/.local/share/dark-mode.d/notification.sh b/darkman/.local/share/dark-mode.d/notification.sh new file mode 100755 index 0000000..cfc386d --- /dev/null +++ b/darkman/.local/share/dark-mode.d/notification.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# trigger a small, passive popup dialog to inform the user about darkman's activity +# reference https://wiki.archlinux.org/title/Desktop_notifications#Usage_in_programming + +notify-send --app-name="darkman" --urgency=low --icon=weather-clear-night "switching to dark mode" diff --git a/darkman/.local/share/dark-mode.d/wofi.sh b/darkman/.local/share/dark-mode.d/wofi.sh new file mode 100755 index 0000000..6b6ecac --- /dev/null +++ b/darkman/.local/share/dark-mode.d/wofi.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +cat \ + "$HOME/.config/wofi/colors-dark.css" \ + "$HOME/.config/wofi/base.css" \ + > "$HOME/.config/wofi/style.css" diff --git a/darkman/.local/share/light-mode.d/gtk-theme.sh b/darkman/.local/share/light-mode.d/gtk-theme.sh new file mode 100755 index 0000000..bdf4f63 --- /dev/null +++ b/darkman/.local/share/light-mode.d/gtk-theme.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +gsettings set org.gnome.desktop.interface color-scheme prefer-light +gsettings set org.gnome.desktop.interface gtk-theme Adwaita + diff --git a/darkman/.local/share/light-mode.d/notification.sh b/darkman/.local/share/light-mode.d/notification.sh new file mode 100755 index 0000000..12ba061 --- /dev/null +++ b/darkman/.local/share/light-mode.d/notification.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# trigger a small, passive popup dialog to inform the user about darkman's activity +# reference https://wiki.archlinux.org/title/Desktop_notifications#Usage_in_programming + +notify-send --app-name="darkman" --urgency=low --icon=weather-clear "switching to light mode" diff --git a/darkman/.local/share/light-mode.d/wofi.sh b/darkman/.local/share/light-mode.d/wofi.sh new file mode 100755 index 0000000..5b76dae --- /dev/null +++ b/darkman/.local/share/light-mode.d/wofi.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +cat \ + "$HOME/.config/wofi/colors-light.css" \ + "$HOME/.config/wofi/base.css" \ + > "$HOME/.config/wofi/style.css" diff --git a/jujutsu/.config/jj/config.toml b/jujutsu/.config/jj/config.toml index e356537..dedadb9 100644 --- a/jujutsu/.config/jj/config.toml +++ b/jujutsu/.config/jj/config.toml @@ -19,9 +19,13 @@ merge-args = ["-d", "$left", "$output", "$right", "-c", "wincmd l"] merge-tool-edits-conflict-markers = true [signing] -behavior = "own" +behavior = "drop" backend = "gpg" +[git] +private-commits = "description(glob:'wip:*') | description(glob:'private:*')" +sign-on-push = true + [colors] "rest" = "bright green" "working_copy empty" = "green" @@ -50,6 +54,3 @@ concat( ), ) ''' - -[git] -private-commits = "description(glob:'wip:*') | description(glob:'private:*')" diff --git a/nvim/.config/nvim/lua/plugins/neotree.lua b/nvim/.config/nvim/lua/plugins/neotree.lua index 87e49ae..0bc35d7 100644 --- a/nvim/.config/nvim/lua/plugins/neotree.lua +++ b/nvim/.config/nvim/lua/plugins/neotree.lua @@ -206,8 +206,9 @@ local config = { require("neo-tree").setup(config) vim.keymap.set("n", "n", ":Neotree reveal") -vim.keymap.set("n", "nf", ":Neotree reveal") +vim.keymap.set("n", "nn", ":Neotree reveal") vim.keymap.set("n", "nb", ":Neotree reveal buffers") vim.keymap.set("n", "ng", ":Neotree reveal git_status") vim.keymap.set("n", "no", ":Neotree reveal document_symbols") vim.keymap.set("n", "nd", ":Neotree reveal diagnostics") +vim.keymap.set("n", "", ":Neotree close") diff --git a/nvim/.config/nvim/lua/settings/types.lua b/nvim/.config/nvim/lua/settings/types.lua index 66adb6d..d27662c 100644 --- a/nvim/.config/nvim/lua/settings/types.lua +++ b/nvim/.config/nvim/lua/settings/types.lua @@ -14,4 +14,5 @@ vim.cmd [[ autocmd FileType vimwiki setlocal tw=80 ts=2 sts=2 sw=2 expandtab autocmd FileType xml setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab + autocmd FileType mail set spell spelllang=fr ]] diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 0ee9c7f..6a20d73 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -286,7 +286,7 @@ bindsym XF86MonBrightnessUp exec ddcutil setvcp 10 + 5 #bindsym --release Shift+Print exec --no-startup-id scrot -s -e 'mv $f ~/Images/screenshots/' ## Locker and reboot -set $Locker swaylock -i /home/bca/Images/waarp_wallpaper_x3.png && sleep 1 +set $Locker swaylock --daemonize --show-failed-attempts -i /home/bca/Images/waarp_wallpaper_x3.png && sleep 1 set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (S) shutdown mode "$mode_system" { diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc index 4bd3e5a..33566f9 100644 --- a/waybar/.config/waybar/config.jsonc +++ b/waybar/.config/waybar/config.jsonc @@ -17,6 +17,7 @@ "modules-right": [ "idle_inhibitor", "custom/ddcbrightness", + "custom/light-dark-mode", "pulseaudio", "network", "bluetooth", @@ -210,5 +211,16 @@ "format-ok": "", "system": true, // Monitor failed systemwide units. "user": true // Ignore failed user units. + }, + "custom/light-dark-mode": { + "exec": "/home/bca/.config/waybar/darkman", + "return-type": "json", + "format": "{icon}", + "tooltip": true, + "on-click": "darkman toggle", + "format-icons": { + "light": " ", + "dark": " " + } } } diff --git a/waybar/.config/waybar/darkman b/waybar/.config/waybar/darkman new file mode 100755 index 0000000..0105dd2 --- /dev/null +++ b/waybar/.config/waybar/darkman @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +# vim: ft=bash + +print_json() { + case "$1" in + prefer-dark) + echo '{"text": "dark", "alt": "dark", "class": "dark", "tooltip": "Dark mode"}' + ;; + prefer-light) + echo '{"text": "light", "alt": "light", "class": "light", "tooltip": "Light mode"}' + ;; + esac +} + +print_json "$(gsettings get org.gnome.desktop.interface color-scheme | cut -nd"'" -f 2)" +gsettings monitor org.gnome.desktop.interface color-scheme | while read -r l; do + print_json "$(echo "$l" | cut -d"'" -f 2)" +done + diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css index 2fd9d7b..5199f96 100644 --- a/waybar/.config/waybar/style.css +++ b/waybar/.config/waybar/style.css @@ -97,6 +97,7 @@ button:hover { #idle_inhibitor, #scratchpad, #power-profiles-daemon, +#customcustom-light-dark-mode, #custom-ddcbrightness, #idle_inhibitor, #mpd { diff --git a/wofi/.config/wofi/base.css b/wofi/.config/wofi/base.css new file mode 100644 index 0000000..2d0242b --- /dev/null +++ b/wofi/.config/wofi/base.css @@ -0,0 +1,42 @@ +#window { + background-color: @window-background; +} + +#outer-box { + margin: 10px; + background-color: @background; +} + +#entry{ + background-color: @background; +} + +#entry:selected { + background-color: @background-selected; +} + +#expander-box { + margin-left: 4em; +} + +expander { + color: @foreground; +} + +:not(expander) > * > .entry { + margin-left: 1.1em; +} + +image { + margin-right: 1em; +} + +#text { + color: @foreground; +} + +#input { + color: @foreground; + background-color: @background; + border: 0; +} diff --git a/wofi/.config/wofi/colors-dark.css b/wofi/.config/wofi/colors-dark.css new file mode 100644 index 0000000..1e1fdc3 --- /dev/null +++ b/wofi/.config/wofi/colors-dark.css @@ -0,0 +1,6 @@ +@define-color window-background rgba(255, 255, 255, 0.1); +@define-color background #002b36; +@define-color background-selected #073642; +@define-color foreground #839496; + + diff --git a/wofi/.config/wofi/colors-light.css b/wofi/.config/wofi/colors-light.css new file mode 100644 index 0000000..6e0caf1 --- /dev/null +++ b/wofi/.config/wofi/colors-light.css @@ -0,0 +1,5 @@ +@define-color window-background rgba(255, 255, 255, 0.1); +@define-color background #fdf6e3; +@define-color background-selected #eee8d5; +@define-color foreground #657b83; +