27 files changed, 78 insertions(+), 67 deletions(-)

M .config/irssi/config
M .config/qutebrowser/config.py
M .local/bin/libs/_main.sh
M .local/bin/libs/aerc.sh
M .local/bin/libs/bemoji.sh
M .local/bin/libs/chromium.sh
M .local/bin/libs/firefox.sh
M .local/bin/libs/grim.sh
M .local/bin/libs/hugo.sh
M .local/bin/libs/imv.sh
M .local/bin/libs/irssi.sh
M .local/bin/libs/khal.sh
M .local/bin/libs/mbsync.sh
M .local/bin/libs/mpv.sh
M .local/bin/libs/ncmpcpp.sh
M .local/bin/libs/newsboat.sh
M .local/bin/libs/nextcloud.sh
M .local/bin/libs/pinta.sh
M .local/bin/libs/qutebrowser.sh
M .local/bin/libs/rbw.sh
M .local/bin/libs/shellcheck.sh
M .local/bin/libs/signal.sh
M .local/bin/libs/slurp.sh
M .local/bin/libs/tut.sh
M .local/bin/libs/zathura.sh
M .local/bin/pinta.sh
M .profile

@@ 21,13 21,26 @@ servers = (
     port = "6697";
     use_tls = "yes";
     tls_verify = "yes";
+  },
+  {
+    address = "znc.chromic.org";
+    chatnet = "znc_libera";
+    password = "chimo/libera:<ZNC_PASS>";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+  },
+  {
+    address = "znc.chromic.org";
+    chatnet = "znc_oftc";
+    password = "chimo/oftc:<ZNC_PASS>";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
   }
 );
 
-aliases = {
-  wc = "WINDOW CLOSE";
-  znc = "msg *status";
-};
+aliases = { wc = "WINDOW CLOSE"; znc = "msg *status"; };
 
 chatnets = {
   twitch = {


@@ 37,6 50,10 @@ chatnets = {
     autosendcmd = "/quote CAP REQ :twitch.tv/membership";
   };
 
+  znc_libera = { nick = "chimo"; type = "IRC"; username = "chimo"; };
+
+  znc_oftc = { nick = "chimo"; type = "IRC"; username = "chimo"; };
+
   liberachat = {
     type = "IRC";
     max_kicks = "1";


@@ 44,9 61,7 @@ chatnets = {
     max_whois = "1";
   };
 
-  oftc = {
-    type = "IRC";
-  };
+  oftc = { type = "IRC"; };
 };
 
 statusbar = {


@@ 179,12 194,8 @@ settings = {
   };
 };
 
-hilights = (
-  {
-    color = "%M";
-    nick = "yes";
-    text = "chimo";
-    word = "yes";
-  }
+hilights = ( 
+  { color = "%M"; nick = "yes"; text = "chimo"; word = "yes"; }
 );
 
+logs = { };

@@ 30,14 30,12 @@ js_whitelist = [
     "*://*.brub.ca/*",
     "*://chromic.org/*",
     "*://*.chromic.org/*",
-    "*://github.com/*",
-    "*://news.ycombinator.com/*",
-    "*://duckduckgo.com/*"
+    "*://github.com/*"
 ]
 
 for site in js_whitelist:
     with config.pattern(site) as p:
         p.content.javascript.enabled = True
 
-config.source('pyconfig/redirectors.py')
+# config.source('pyconfig/redirectors.py')
 

@@ 2,10 2,10 @@
 
 start_container() (
     container_name="${1}"
-    state=$(lxc list -c s "${container_name}" --format csv)
+    state=$(incus list -c s "${container_name}" --format csv)
 
     if [ "${state}" = "STOPPED" ]; then
-        lxc start "${container_name}"
+        incus start "${container_name}"
 
         # TODO: find a better way to wait for container
         #       while state != AVAILABLE (?)

@@ 1,12 1,12 @@
 #!/bin/sh -eu
 
 # Launch mail client
-lxc exec aerc -- aerc
+incus exec aerc -- aerc
 
 # Run this in the background after quitting `aerc`
 (
     # Sync IMAP in case there were any changes
-    lxc exec mbsync -- sh -c "/etc/periodic/15min/refresh_mail" < /dev/null
+    incus exec mbsync -- sh -c "/etc/periodic/15min/refresh_mail" < /dev/null
 
     # Force swaybar status update
     ~/.config/sway/swaybar/bin/run_block.sh -b mail.sh -c "-1" -p json

@@ 4,9 4,9 @@ container="bemoji"
 command="/root/${container}"
 
 if [ "${#}" -lt 1 ]; then
-    lxc exec "${container}" -- "${command}" -n
+    incus exec "${container}" -- "${command}" -n
 else
-    lxc exec "${container}" -- "${command}" "${@}"
+    incus exec "${container}" -- "${command}" "${@}"
 fi
 
 

@@ 1,4 1,4 @@
 #!/bin/sh -eu
 
-lxc exec chromium -- sh -c 'chromium --no-sandbox --ozone-platform=wayland'
+incus exec chromium -- sh -c 'chromium --no-sandbox --ozone-platform=wayland'
 

@@ 2,5 2,5 @@
 
 url="${1}"
 
-lxc exec firefox -- sh -c "firefox-esr ${1}"
+incus exec firefox -- sh -c "firefox-esr ${1}"
 

@@ 1,4 1,4 @@
 #!/bin/sh -eu
 
-lxc exec grim -- grim "${@}" screenshots/$(date +'%s_grim.png')
+incus exec grim -- grim "${@}" screenshots/$(date +'%s_grim.png')
 

@@ 1,12 1,12 @@
 #!/bin/sh
 
 get_state() (
-    lxc list name=hugo -c s --format csv
+    incus list name=hugo -c s --format csv
 )
 
 
 get_ip_address() (
-    lxc list name=hugo -c 4 --format csv | awk '{print $1}'
+    incus list name=hugo -c 4 --format csv | awk '{print $1}'
 )
 
 


@@ 16,7 16,7 @@ wait_until_container_is_running() (
     if [ "${state}" != "RUNNING" ]; then
         printf "Instance not running. Starting now..."
 
-        lxc start hugo
+        incus start hugo
 
         while [ "$(get_state)" != "RUNNING" ];
         do


@@ 52,7 52,7 @@ main() (
     wait_until_container_has_ip_address
 
     ip_address=$(get_ip_address)
-    lxc exec hugo -- hugo "${@}" -s /root/chromic.org/ --bind 0.0.0.0 -b http://"${ip_address}"/
+    incus exec hugo -- hugo "${@}" -s /root/chromic.org/ --bind 0.0.0.0 -b http://"${ip_address}"/
 )
 
 

@@ 3,7 3,7 @@
 file="${1}"
 
 if [ -z "${1}" ]; then
-    lxc exec imv -- imv
+    incus exec imv -- imv
 else
     container_name="imv"
 


@@ 22,15 22,15 @@ else
     remote_path="${remote_prefix}${filepath}"
 
     # Create remote directory
-    lxc exec "${container_name}" -- mkdir -p "${remote_dir}"
+    incus exec "${container_name}" -- mkdir -p "${remote_dir}"
 
     # Copy file over
-    lxc file push -q "${filepath}" "${container_name}${remote_path}"
+    incus file push -q "${filepath}" "${container_name}${remote_path}"
 
     # Run
-    lxc exec "${container_name}" -- sh -c "imv ${remote_path}"
+    incus exec "${container_name}" -- sh -c "imv ${remote_path}"
 
     # Cleanup
-    lxc exec "${container_name}" -- sh -c "rm -fr ${remote_dir}"
+    incus exec "${container_name}" -- sh -c "rm -fr ${remote_dir}"
 fi
 

@@ 9,13 9,13 @@ case "${profile}" in
         # https://github.com/irssi/irssi/issues/6#issuecomment-1019966535
         # POSIX "process substitution"
         # https://unix.stackexchange.com/a/639752
-        lxc exec irssi -- sh -c 'irssi -c twitch --config=/dev/fd/3 3<<-EOF
+        incus exec irssi -- sh -c 'irssi -c twitch --config=/dev/fd/3 3<<-EOF
             $(sed '\''s/<PASSWORD>/'"${TWITCH_OAUTH}"'/'\'' .irssi/config)
 EOF'
 
         ;;
     "")
-        lxc exec irssi -- irssi "${@}"
+        incus exec irssi -- irssi "${@}"
         ;;
 esac
 

@@ 1,8 1,8 @@
 #!/bin/sh -eu
 
 if [ "${#}" -eq 0 ]; then
-    lxc exec khal -- khal calendar today 7d
+    incus exec khal -- khal calendar today 7d
 else
-    lxc exec khal -- khal "${@}"
+    incus exec khal -- khal "${@}"
 fi
 

@@ 1,9 1,9 @@
 #!/bin/sh -eu
 
 if [ "${#}" -lt 1 ]; then
-    lxc exec mbsync -- mbsync -c /root/.config/mbsync/mbsyncrc primary
+    incus exec mbsync -- mbsync -c /root/.config/mbsync/mbsyncrc primary
 else
-    lxc exec mbsync -- mbsync "${@}"
+    incus exec mbsync -- mbsync "${@}"
 fi
 
 ~/devel/swaybar/bin/run_block.sh -b 'mail.sh' -c '-1'

@@ 1,4 1,4 @@
 #!/bin/sh
 
-lxc exec mpv -- mpv "${@}"
+incus exec mpv -- mpv "${@}"
 

@@ 1,4 1,4 @@
 #!/bin/sh
 
-lxc exec ncmpcpp -- ncmpcpp "${@}"
+incus exec ncmpcpp -- ncmpcpp "${@}"
 

@@ 1,6 1,6 @@
 #!/bin/sh -eu
 
-lxc exec newsboat -- sh -c 'newsboat -r -c ~/.config/newsboat/cache.db -C ~/.config/newsboat/config'
+incus exec newsboat -- sh -c 'newsboat -r -c ~/.config/newsboat/cache.db -C ~/.config/newsboat/config'
 
 ~/.config/sway/swaybar/bin/run_block.sh -b rss.sh -p json -c '-1'& > /dev/null
 

@@ 3,5 3,5 @@
 container_name="nextcloud"
 
 # Run "sync" script
-lxc exec "${container_name}" -- /etc/periodic/15min/sync
+incus exec "${container_name}" -- /etc/periodic/15min/sync
 

@@ 3,7 3,7 @@
 file="${1}"
 
 if [ -z "${1}" ]; then
-    lxc exec pinta -- pinta
+    incus exec pinta -- pinta
 else
     container_name="pinta"
 


@@ 22,15 22,15 @@ else
     remote_path="${remote_prefix}${filepath}"
 
     # Create remote directory
-    lxc exec "${container_name}" -- mkdir -p "${remote_dir}"
+    incus exec "${container_name}" -- mkdir -p "${remote_dir}"
 
     # Copy file over
-    lxc file push -q "${filepath}" "${container_name}${remote_path}"
+    incus file push -q "${filepath}" "${container_name}${remote_path}"
 
     # Run
-    lxc exec "${container_name}" -- sh -c "pinta ${remote_path}"
+    incus exec "${container_name}" -- sh -c "pinta ${remote_path}"
 
     # Cleanup
-    lxc exec "${container_name}" -- sh -c "rm -fr ${remote_dir}"
+    incus exec "${container_name}" -- sh -c "rm -fr ${remote_dir}"
 fi
 

@@ 2,5 2,5 @@
 
 url="${1}"
 
-lxc exec qutebrowser -- qutebrowser "${url}" --qt-flag no-sandbox
+incus exec qutebrowser -- qutebrowser "${url}" --qt-flag no-sandbox
 

@@ 1,9 1,9 @@
 #!/bin/sh -eu
 
 if [ "${#}" -lt 1 ]; then
-    lxc exec rbw -- rbw unlock
+    incus exec rbw -- rbw unlock
 else
-    lxc exec rbw -- rbw "${@}"
+    incus exec rbw -- rbw "${@}"
 fi
 
 

@@ 24,18 24,18 @@ main() (
     filedir=$(dirname -- "${filepath}")
 
     # Create remote directory
-    lxc exec "${container_name}" -- mkdir -p "${filedir}"
+    incus exec "${container_name}" -- mkdir -p "${filedir}"
 
     # Copy file over
-    lxc file push -q "${filepath}" "${container_name}${filepath}"
+    incus file push -q "${filepath}" "${container_name}${filepath}"
 
     # Lint
     set +e
-    lxc exec "${container_name}" -- sh -c "shellcheck -f gcc ${filepath}"
+    incus exec "${container_name}" -- sh -c "shellcheck -f gcc ${filepath}"
     set -e
 
     # Cleanup
-    lxc exec "${container_name}" -- sh -c "rm -fr ${filedir}"
+    incus exec "${container_name}" -- sh -c "rm -fr ${filedir}"
 )
 
 

@@ 1,4 1,4 @@
 #!/bin/sh
 
-lxc exec signal -- sh -c 'export NODE_ENV=production; exec electron --no-sandbox /usr/lib/signal-desktop/app.asar --ozone-platform=wayland --enable-features=UseOzonePlatform'
+incus exec signal -- sh -c 'export NODE_ENV=production; exec electron --no-sandbox /usr/lib/signal-desktop/app.asar --ozone-platform=wayland --enable-features=UseOzonePlatform'
 

@@ 1,4 1,4 @@
 #!/bin/sh -eu
 
-lxc exec slurp -- slurp "${@}" < /dev/null
+incus exec slurp -- slurp "${@}" < /dev/null
 

@@ 1,4 1,4 @@
 #!/bin/sh
 
-lxc exec tut -- tut "${@}"
+incus exec tut -- tut "${@}"
 

@@ 3,7 3,7 @@
 file="${1}"
 
 if [ -z "${1}" ]; then
-    lxc exec zathura -- zathura
+    incus exec zathura -- zathura
 else
     container_name="zathura"
 


@@ 22,15 22,15 @@ else
     remote_path="${remote_prefix}${filepath}"
 
     # Create remote directory
-    lxc exec "${container_name}" -- mkdir -p "${remote_dir}"
+    incus exec "${container_name}" -- mkdir -p "${remote_dir}"
 
     # Copy file over
-    lxc file push -q "${filepath}" "${container_name}${remote_path}"
+    incus file push -q "${filepath}" "${container_name}${remote_path}"
 
     # Run
-    lxc exec "${container_name}" -- sh -c "zathura ${remote_path}"
+    incus exec "${container_name}" -- sh -c "zathura ${remote_path}"
 
     # Cleanup
-    lxc exec "${container_name}" -- sh -c "rm -fr ${remote_dir}"
+    incus exec "${container_name}" -- sh -c "rm -fr ${remote_dir}"
 fi
 

@@ 1,1 1,1 @@
-./libs/pinta.sh>
\ No newline at end of file
+./libs/_main.sh<
\ No newline at end of file

@@ 23,6 23,8 @@ alias wl-copy="wl-copy -o"
 # vi -> vim
 alias vi="vim"
 
+alias uc="update-containers.sh"
+
 export PATH="${PATH}":~/.local/bin
 export EDITOR=vim