Merge branch 'dev' into logos

sb-music: fix song parsing
wget: keep history in ~/.cache
zsh: more readable vcs prompt
nvim: fix python lsp path
      add maps for verilog
      cleanup files
      !!!BREAKING: change colorscheme

dwm: cleanup files
dmenu: manage colors through XResources
system: change colorscheme, system-wide
        add relevent script
        adapt XResources management

        add $XDG_STATE_HOME directory
        filesystem cleanup

.config/X11/xcolors_dark

@@ -0,0 +1,39 @@
+/* name		dark	light */
+/* black	0	8 */
+/* red		1	9 */
+/* green	2	10 */
+/* yellow	3	11 */
+/* blue		4	12 */
+/* purple	5	13 */
+/* cyan		6	14 */
+/* white	7	15 */
+
+/* theme */
+*.color0: #131616
+*.color1: #b73935
+*.color2: #427d61
+*.color3: #f7a583
+*.color4: #458588
+*.color5: #b16286
+*.color6: #7cafa3
+*.color7: #d5c4a1
+*.color8: #373737
+*.color9: #ea6962
+*.color10: #89b594
+*.color11: #ffeca3
+*.color12: #7daea3
+*.color13: #d3869b
+*.color14: #ace5d7
+*.color15: #fbf1c7
+*.background: #131616
+*.selbackground: #373737
+*.foreground: #fbf1c7
+*.normforeground: #a89984
+*.selforeground: #ebdbb2
+*.cursorColor: #ebdbb2
+
+/* dmenu colors */
+dmenu.background: #131616
+dmenu.foreground: #fbf1c7
+dmenu.selbackground: #427d61
+dmenu.selforeground: #fbf1c7

.config/X11/xcolors_light

@@ -0,0 +1,39 @@
+/* name		dark	light */
+/* black	0	8 */
+/* red		1	9 */
+/* green	2	10 */
+/* yellow	3	11 */
+/* blue		4	12 */
+/* purple	5	13 */
+/* cyan		6	14 */
+/* white	7	15 */
+
+/* theme */
+*.color0: #1d2021
+*.color1: #9d0006
+*.color2: #427d61
+*.color3: #d65d0e
+*.color4: #076678
+*.color5: #8f3f71
+*.color6: #4a8785
+*.color7: #a89984
+*.color8: #373737
+*.color9: #b73935
+*.color10: #689d6a
+*.color11: #d79921
+*.color12: #458588
+*.color13: #b16286
+*.color14: #7cafa3
+*.color15: #fbf1c7
+*.background: #fbf1c7
+*.selbackground: #ebdbb2
+*.foreground: #665c64
+*.normforeground: #665c64
+*.selforeground: #1d2021
+*.cursorColor: #1d2021
+
+/* dmenu colors */
+dmenu.background: #fbf1c7
+dmenu.foreground: #665c64
+dmenu.selbackground: #427d61
+dmenu.selforeground: #fbf1c7

.config/X11/xprofile

@@ -4,7 +4,6 @@
 
 # session launch
 
-xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/X11/xresources
 xss-lock -- slock &
 redshift &
 dunst -follow mouse &> /dev/null & #temp fix
@@ -14,6 +13,8 @@ dunst -follow mouse &> /dev/null & #temp fix
 pulsemixer --set-volume 50
 setbg &
 dwmblocks &
+xrdb "$XDG_CONFIG_HOME/X11/xresources"
+xrdb -merge "$XDG_STATE_HOME/xcolors"
 
 setxkbmap 'fr(oss)'
 xset r rate 300 50 &

.config/X11/xresources

@@ -2,46 +2,12 @@
 *.font: Iosevka Fixed Slab:size=12
 *.symbols: Symbols Nerd Font:size=11
 
-/* name		dark	light */
-/* black	0	8 */
-/* red		1	9 */
-/* green	2	10 */
-/* yellow	3	11 */
-/* blue		4	12 */
-/* purple	5	13 */
-/* cyan		6	14 */
-/* white	7	15 */
-
-/* theme */
-*.color0: #1d2021
-*.color1: #b73935
-*.color2: #5d9179
-*.color3: #f7a583
-*.color4: #458588
-*.color5: #b16286
-*.color6: #7cafa3
-*.color7: #d5c4a1
-*.color8: #373737
-*.color9: #ea6962
-*.color10: #89b482
-*.color11: #ffeca3
-*.color12: #7daea3
-*.color13: #d3869b
-*.color14: #ace5d7
-*.color15: #fbf1c7
-*.background: #1d2021
-*.selbackground: #373737
-*.foreground: #fbf1c7
-*.normforeground: #a89984
-*.selforeground: #ebdbb2
-*.cursorColor: #ebdbb2
+/* dwm config */
+dwm.borderpx: 2
+dwm.gappx: 15
 
 /* st config */
 st.font: Iosevka Fixed Slab:size=13
 st.symbols: Symbols Nerd Font:size=13
 st.termname: st-256color
 st.borderpx: 5
-
-/* dwm config */
-dwm.borderpx: 2
-dwm.gappx: 15

.config/aliasrc

@@ -20,3 +20,4 @@ alias dotfiles='/usr/bin/git --git-dir=$DOTFILES --work-tree=$HOME'
 alias abcde='abcde -c $XDG_CONFIG_HOME/abcde/config'
 alias abook='abook --config $XDG_CONFIG_HOME/abook/abookrc --datafile "$XDG_DATA_HOME"/abook/addressbook'
 alias pip-upgrade="pip freeze --user | cut -d'=' -f1 | xargs -n1 pip install -U"
+alias wget="wget --hsts-file=$XDG_CACHE_HOME/wget-hsts"

.config/nvim/after/ftplugin/verilog.lua

@@ -3,8 +3,11 @@
 -- License      : GPLv3
 -- Description  : verilog fietype config
 
-utils.map("n", "<leader>j", ":CoqNext<Enter>")
-utils.map("n", "<leader>k", ":CoqUndo<Enter>")
-utils.map("n", "<leader><Enter>", ":CoqToLine<Enter>")
+utils.map("n", "<C-c>", "<cmd>CoqInterrupt<CR>")
+utils.map("n", "<leader>j", "<cmd>CoqNext<CR>")
+utils.map("n", "<leader>k", "<cmd>CoqUndo<CR>")
+utils.map("n", "<leader><CR>", "<cmd>CoqToLine<CR>")
+utils.map("n", "<leader>a", "<cmd>Coq About")
+utils.map("n", "<leader>G", "<cmd>CoqJumpToEnd")
 
 utils.map("i", "//", "∥")

.config/nvim/init.lua

@@ -9,5 +9,3 @@ require("settings")     -- ./lua/settings.lua
 require("plugins")      -- ./lua/plugins.lua
 require("maps")         -- ./lua/maps.lua
 require("statusline")   -- ./lua/statusline.lua
-
-require("polyjuice")    -- ~/.local/src/polyjuice/lua/polyjuice.lua

.config/nvim/lua/colorscheme.lua

@@ -0,0 +1,13 @@
+-- Author        : swytch
+-- Created       : Friday Oct. 22, 2021 22:07:41 CET
+-- License       : GPLv3
+-- Description   : colorscheme config file
+
+
+local utils = require("utils")
+local file = os.getenv("XDG_STATE_HOME") .. "/nvim_colorscheme"
+local colorscheme = utils.lines_from(file)[0]
+
+require("astronomy").setup {
+        variant = colorscheme,
+}

.config/nvim/lua/lsp/init.lua

@@ -8,33 +8,33 @@ local M = {}
 vim.fn.sign_define(
         "DiagnosticSignError",
         {
-		texthl = "DiagnosticError",
+		texthl = "DiagnosticVirtualTextError",
 		text = globals.sign_error,
-		numhl = "DiagnosticError"
+		numhl = "DiagnosticSignError"
 	}
 )
 vim.fn.sign_define(
         "DiagnosticSignWarn",
         {
-		texthl = "DiagnosticWarn",
+		texthl = "DiagnosticVirtualTextWarn",
 		text = globals.sign_warning,
-		numhl = "DiagnosticWarn"
+		numhl = "DiagnosticSignWarn"
         }
 )
 vim.fn.sign_define(
         "DiagnosticSignHint",
         {
-		texthl = "DiagnosticHint",
+		texthl = "DiagnosticVirtualTextHint",
 		text = globals.sign_hint,
-		numhl = "DiagnosticHint"
+		numhl = "DiagnosticSignHint"
 	}
 )
 vim.fn.sign_define(
         "DiagnosticSignInfo",
         {
-		texthl = "DiagnosticInfo",
+		texthl = "DiagnosticVirtualTextInfo",
 		text = globals.sign_info,
-		numhl = "DiagnosticInfo"
+		numhl = "DiagnosticSignInfo"
 	}
 )
 

.config/nvim/lua/lsp/python.lua

@@ -3,4 +3,6 @@
 -- License       : GPLv3
 -- Description   : jedi (python) config file for lsp
 
-require("lspconfig").jedi_language_server.setup{}
+require("lspconfig").jedi_language_server.setup{
+    cmd = { vim.fn.stdpath("data") .. "/lsp_servers/jedi_language_server/venv/bin/jedi-language-server" }
+}

.config/nvim/lua/maps.lua

@@ -4,8 +4,6 @@
 -- Description   : neovim mappings file
 
 utils.map("n", "<space>", "<leader>")
-utils.map("n", "<leader>j", "<cmd>bn<CR>")
-utils.map("n", "<leader>k", "<cmd>bp<CR>")
 utils.map("n", "<leader>y", "\"+y")
 utils.map("n", "<leader>p", "\"+P")
 utils.map("n", "<leader><enter>", "<cmd>w! | !compiler %<CR>")
@@ -25,3 +23,6 @@ utils.map("n", "<leader>lf", "<cmd>lua vim.lsp.buf.formatting()<CR>")
 utils.map("n", "<leader>tf", "<cmd>Telescope find_files<CR>")
 utils.map("n", "<leader>tb", "<cmd>Telescope file_browser<CR>")
 utils.map("n", "<leader>tl", "<cmd>Telescope live_grep<CR>")
+
+-- colorscheme
+utils.map("n", "<C-s>", "<cmd>lua require(\"astronomy\").toggle_variant()<CR>")

.config/nvim/lua/plugins.lua

@@ -20,8 +20,8 @@ return require("packer").startup(function()
 
         -- colorscheme
         use {
-                "~/.local/src/polyjuice/",
-                requires = "tjdevries/colorbuddy.nvim"
+                "~/.local/src/astronomy.nvim",
+                config = function() require("colorscheme") end
         }
 
         -- tree-sitter

.config/nvim/lua/statusline.lua

@@ -148,17 +148,17 @@ local function statusline_focused()
                                 process_diagnostics(
                                         globals.sign_error .. " ",
                                         diagnostics.errors,
-                                        "%#DiagnosticError#"
+                                        "%#DiagnosticVirtualTextError#"
                                 ),
                                 process_diagnostics(
                                         globals.sign_warning .. " ",
                                         diagnostics.warnings,
-                                        "%#DiagnosticWarn#"
+                                        "%#DiagnosticVirtualTextWarn#"
                                 ),
                                 process_diagnostics(
                                         globals.sign_info .. " ",
                                         diagnostics.info,
-                                        "%#DiagnosticInfo#"
+                                        "%#DiagnosticVirtualTextInfo#"
                                 )
                         }
                 )

.config/nvim/lua/utils.lua

@@ -28,6 +28,24 @@ function M.map(mode, keys, action, options)
         vim.api.nvim_set_keymap(mode, keys, action, options)
 end
 
+-- see if a file exists
+function M.file_exists(file)
+        local f = io.open(file, "rb")
+        if f then f:close() end
+        return f ~= nil
+end
+
+-- get all lines from a file
+-- @return table (empty if the file does not exist)
+function M.lines_from(file)
+        if not M.file_exists(file) then return {} end
+        local lines = {}
+        for line in io.lines(file) do
+                lines[#lines] = line
+        end
+        return lines
+end
+
 -- Make it accessible everywhere
 _G.utils = M
 -- Export the module

.config/sxhkd/sxhkdrc

@@ -26,6 +26,15 @@ super + shift + r
 super + shift + d
 		displayselect
 
+super + shift + o
+		dmenuopen
+
+super + c
+                switch-colors
+
+super + shift + c
+                switch-colors -s
+
 # Others
 super + Return
 		$TERMINAL

.config/zsh/zsh_prompt

@@ -6,7 +6,7 @@ setopt prompt_subst
 zstyle ':vcs_info:git:*' check-for-changes true
 zstyle ':vcs_info:git:*' stagedstr '*'
 zstyle ':vcs_info:git:*' unstagedstr '!'
-zstyle ':vcs_info:git:*' formats '(%F{208}%b%F{015}: %c/%u%F{015}) '
+zstyle ':vcs_info:git:*' formats '(%F{202}%b%F{007}: %c/%u%F{007}) '
 zstyle ':vcs_info:*' enable git
 
 PROMPT="[ %{$fg[cyan]%}%n\

.gitmodules

@@ -1,6 +1,3 @@
-[submodule ".local/src/polyjuice"]
-	path = .local/src/polyjuice
-	url = git@github.com:swy7ch/polyjuice.git
 [submodule ".local/src/dwm"]
 	path = .local/src/dwm
 	url = git@github.com:swy7ch/dwm.git
@@ -16,3 +13,6 @@
 [submodule ".local/src/slock"]
 	path = .local/src/slock
 	url = git@github.com:swy7ch/slock.git
+[submodule ".local/src/astronomy.nvim"]
+	path = .local/src/astronomy.nvim
+	url = git@github.com:swy7ch/astronomy.nvim

.local/bin/setbg

@@ -13,8 +13,9 @@
 	# if $1 is a jpg file, set it as a wallpaper
 	# if $1 is a directory, choose a randomized image in it, set it as wallpaper
 
-[ -f "$1" ] && cp $1 "$XDG_CONFIG_HOME/wall.jpg" && dunstify -u "low" "Wallpaper changed"
+wall="$XDG_STATE_HOME/wall.jpg"
+[ -f "$1" ] && cp $1 "$wall" && dunstify -u "low" "Wallpaper changed"
 
-[ -d "$1" ] && cp "$(find "$1"/*.jpg -type f | shuf -n 1)" "$XDG_CONFIG_HOME/wall.jpg" && dunstify -u "low" "Random wallpaper chosen"
+[ -d "$1" ] && cp "$(find "$1"/*.jpg -type f | shuf -n 1)" "$" && dunstify -u "low" "Random wallpaper chosen"
 
-xwallpaper --zoom "$XDG_CONFIG_HOME/wall.jpg"
+xwallpaper --zoom "$wall"

.local/bin/statusbar/sb-battery

@@ -15,16 +15,17 @@
 # In any case, show the remaining battery percentage
 # Also sends a notification if battery running low
 
+time="$XDG_STATE_HOME/batteryupdate"
 notify() { \
 	now=$(date +%s)
-	if [ -e $XDG_CONFIG_HOME/batteryupdate ]; then
-		old=$(cat $XDG_CONFIG_HOME/batteryupdate)
+	if [ -e $time ]; then
+		old=$(cat $time)
 		delta=$(expr $now - $old)
 	else
 		delta=$now
 	fi
 	[ 300 -gt $delta ] && return;
-	echo $now > $XDG_CONFIG_HOME/batteryupdate
+	echo $now > $time
 	case "$capacity" in
 		2[0-9]) notify-send -u "normal" "Battery is running low ($capacity%)" "Please plug your computer to a power source" ;;
 		*) notify-send -u "critical" "Battery is dangerously low ($capacity%)" "Please plug your computer to a power source - <b>NOW!</b>" ;;

.local/bin/statusbar/sb-music

@@ -13,12 +13,12 @@
 unicode() { sed "s/[‘’]/'/g;s/[“”]/\"/g"; }
 format() { sed "s/^volume:n\/a.*//g;/^volume:/d;s/\\&/&/g;s/\\[paused\\].*//g;s/\\[playing\\].*//g"; }
 
-mpc="$(mpc --format "%albumartist% - %artist% - %title%")"
-title="$(echo "$mpc" | head -n1 | cut -d'-' -f3 | unicode)"
+mpc="$(mpc --format "%albumartist% ~ %artist% ~ %title%")"
+title="$(echo "$mpc" | head -n1 | cut -d'~' -f3 | unicode)"
 [ "$(echo "$title" | wc -c)" -gt 18 ] && title="$(printf "%.15s..." "$title")"
-artist="$(echo "$mpc" | head -n1 | cut -d'-' -f1 | unicode)"
+artist="$(echo "$mpc" | head -n1 | cut -d'~' -f1 | unicode)"
 [ "Various Artists " = "$artist" ] &&
-        artist="$(echo "$mpc" | head -n1 | cut -d'-' -f2 | unicode)"
+        artist="$(echo "$mpc" | head -n1 | cut -d'~' -f2 | unicode)"
 [ "$(echo "$artist" | wc -c)" -gt 18 ] && artist="$(printf "%.15s..." "$artist")"
 status="$(echo "$mpc" | tail -n2 | format)"
 

.local/bin/switch-colors

@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+######################################################################
+# @author      : swytch
+# @file        : switch-colors
+# @license     : GPLv3
+# @created     : Fridat Oct. 22, 2022 23:52:53 CEST
+#
+# @description : switch colorscheme system-wide
+######################################################################
+
+
+trim() { rev | cut -d'_' -f1 | rev; }
+
+switch_scheme() {
+        current="$(ls -l $XDG_STATE_HOME/xcolors | trim)"
+        [ "dark" = "$current" ] && new="light" || new="dark"
+        select_nvim_scheme
+        set_scheme "$new" "$nvim_scheme"
+}
+
+set_scheme() {
+        [ "" = "$new" ] && exit 1
+        xcolors="$XDG_STATE_HOME/xcolors"
+        [ -f "$xcolors" ] && rm "$xcolors"
+        ln -s "$XDG_CONFIG_HOME/X11/xcolors_$new" "$xcolors"
+        xrdb -merge "$xcolors" && dunstify -u "low" "$new colorscheme set"
+        echo "$nvim_scheme" > "$XDG_STATE_HOME/nvim_colorscheme"
+        xrdb -merge "$xcolors" && dunstify -u "low" "neovim" "$nvim_scheme colorscheme set"
+}
+
+select_scheme() {
+        new="$(ls "$XDG_CONFIG_HOME/X11" | grep -i "xcolors_" | trim | dmenu -i -l 5 -p "colorscheme:")"
+}
+
+select_nvim_scheme() {
+        nvim_scheme="$(grep -i "$new" "$XDG_DATA_HOME/colorschemes" | cut -d'"' -f2 )"
+}
+
+if [ "-s" = "$1" -o "select" = "$1" ]; then
+        select_scheme && select_nvim_scheme && set_scheme "$new" "$nvim_scheme"
+else
+        if [ ! "" = "$1" ]; then
+                dunstify -u "normal" "Wrong parameter. Nothing performed" && exit 1
+        else
+                switch_scheme
+        fi
+fi
+
+exit 0

.local/share/colorschemes

@@ -0,0 +1,2 @@
+"blackhole" dark
+"pulsar" light

.local/src/astronomy.nvim

@@ -0,0 +1 @@
+Subproject commit c329ff44d3aef42e8347563bf7ae119b5a2a2d70

.local/src/dmenu

@@ -1 +1 @@
-Subproject commit e64ab6522752e3ac48357fb6e3a9b37e6e03f575
+Subproject commit 0f4c5faed3e396832bd11586371698d06bf21b71

.local/src/dwm

@@ -1 +1 @@
-Subproject commit 7199d8d564c144bbf4d47641db72b071f39533c7
+Subproject commit f8ad07e02878adfbdab1241869630d608566c5c0

.local/src/polyjuice

@@ -1 +0,0 @@
-Subproject commit bd4119a8c1a57b84f9470950a514f52d81907abb

.zshenv

@@ -4,6 +4,7 @@
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
 
 export ZDOTDIR="$HOME/.config/zsh"