.

9 files changed, 259 insertions, 23 deletions

diff --git a/drawio/drawio b/drawio/drawio
index 1c1743f..d38d17f 100755
--- a/drawio/drawio
+++ b/drawio/drawio
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# TODO edit /usr/lib/draw.io/drawio/src/main/webapp/electron.js
+# TODO edit /usr/lib/draw.io/src/main/electron.js
 # let argv = process.argv;
 # argv = argv.filter(i => !i.startsWith('--enable-features=') && !i.startsWith('--ozone-platform='));
 
-exec electron21 \
+exec electron25 \
     $([ -n "$WAYLAND_DISPLAY" ] && \
       echo "--enable-features=UseOzonePlatform --ozone-platform=wayland") \
     /usr/lib/draw.io "$@"
diff --git a/foot/foot.ini b/foot/foot.ini
new file mode 100644
index 0000000..862b61e
--- /dev/null
+++ b/foot/foot.ini
@@ -0,0 +1,199 @@
+# -*- conf -*-
+
+# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
+# term=foot (or xterm-256color if built with -Dterminfo=disabled)
+# login-shell=no
+
+# app-id=foot
+# title=foot
+# locked-title=no
+
+font=RobotoMono Nerd Font:size=14
+# font-bold=<bold variant of regular font>
+# font-italic=<italic variant of regular font>
+# font-bold-italic=<bold+italic variant of regular font>
+# line-height=18
+# letter-spacing=0
+# horizontal-letter-offset=0
+# vertical-letter-offset=2
+# underline-offset=<font metrics>
+# box-drawings-uses-font-glyphs=no
+# dpi-aware=auto
+
+# initial-window-size-pixels=700x500  # Or,
+# initial-window-size-chars=<COLSxROWS>
+# initial-window-mode=windowed
+# pad=3x2                             # optionally append 'center'
+# resize-delay-ms=100
+
+# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body}
+
+# bold-text-in-bright=no
+# word-delimiters=,│`|:"'()[]{}<>
+# selection-target=primary
+# workers=<number of logical CPUs>
+
+# include=/usr/share/foot/themes/monokai-pro
+include=/usr/share/foot/themes/tango
+
+[environment]
+# name=value
+
+[bell]
+# urgent=no
+# notify=no
+# command=
+# command-focused=no
+
+[scrollback]
+# lines=1000
+# multiplier=3.0
+# indicator-position=relative
+# indicator-format=
+
+[url]
+# launch=xdg-open ${url}
+# label-letters=sadfjklewcmpgh
+# osc8-underline=url-mode
+# protocols=http, https, ftp, ftps, file, gemini, gopher
+# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
+
+[cursor]
+# style=block
+# color=<inverse foreground/background>
+# blink=no
+# beam-thickness=1.5
+# underline-thickness=<font underline thickness>
+
+[mouse]
+# hide-when-typing=no
+# alternate-scroll-mode=yes
+
+[colors]
+# alpha=1.0
+# foreground=dcdccc
+# background=111111
+# background=080808
+
+## Normal/regular colors (color palette 0-7)
+# regular0=222222  # black
+# regular1=cc9393  # red
+# regular2=7f9f7f  # green
+# regular3=d0bf8f  # yellow
+# regular4=6ca0a3  # blue
+# regular5=dc8cc3  # magenta
+# regular6=93e0e3  # cyan
+# regular7=dcdccc  # white
+
+## Bright colors (color palette 8-15)
+# bright0=666666   # bright black
+# bright1=dca3a3   # bright red
+# bright2=bfebbf   # bright green
+# bright3=f0dfaf   # bright yellow
+# bright4=8cd0d3   # bright blue
+# bright5=fcace3   # bright magenta
+# bright6=b3ffff   # bright cyan
+# bright7=ffffff   # bright white
+
+## dimmed colors (see foot.ini(5) man page)
+# dim0=<not set>
+# ...
+# dim7=<not-set>
+
+## The remaining 256-color palette
+# 16 = <256-color palette #16>
+# ...
+# 255 = <256-color palette #255>
+
+## Misc colors
+# selection-foreground=<inverse foreground/background>
+# selection-background=<inverse foreground/background>
+# jump-labels=<regular0> <regular3>          # black-on-yellow
+# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
+# search-box-no-match=<regular0> <regular1>  # black-on-red
+# search-box-match=<regular0> <regular3>     # black-on-yellow
+# urls=<regular3>
+
+[csd]
+# preferred=server
+# size=26
+# font=<primary font>
+# color=<foreground color>
+# hide-when-typing=no
+# border-width=0
+# border-color=<csd.color>
+# button-width=26
+# button-color=<background color>
+# button-minimize-color=<regular4>
+# button-maximize-color=<regular2>
+# button-close-color=<regular1>
+
+[key-bindings]
+# scrollback-up-page=Shift+Page_Up
+# scrollback-up-half-page=none
+# scrollback-up-line=none
+# scrollback-down-page=Shift+Page_Down
+# scrollback-down-half-page=none
+# scrollback-down-line=none
+# clipboard-copy=Control+Shift+c XF86Copy
+# clipboard-paste=Control+Shift+v XF86Paste
+# primary-paste=Shift+Insert
+# search-start=Control+Shift+r
+# font-increase=Control+plus Control+equal Control+KP_Add
+# font-decrease=Control+minus Control+KP_Subtract
+# font-reset=Control+0 Control+KP_0
+# spawn-terminal=Control+Shift+n
+# minimize=none
+# maximize=none
+# fullscreen=none
+# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-selected=[xargs -r firefox] none
+# show-urls-launch=Control+Shift+u
+# show-urls-copy=none
+# show-urls-persistent=none
+# prompt-prev=Control+Shift+z
+# prompt-next=Control+Shift+x
+# unicode-input=none
+# noop=none
+
+[search-bindings]
+# cancel=Control+g Control+c Escape
+# commit=Return
+# find-prev=Control+r
+# find-next=Control+s
+# cursor-left=Left Control+b
+# cursor-left-word=Control+Left Mod1+b
+# cursor-right=Right Control+f
+# cursor-right-word=Control+Right Mod1+f
+# cursor-home=Home Control+a
+# cursor-end=End Control+e
+# delete-prev=BackSpace
+# delete-prev-word=Mod1+BackSpace Control+BackSpace
+# delete-next=Delete
+# delete-next-word=Mod1+d Control+Delete
+# extend-to-word-boundary=Control+w
+# extend-to-next-whitespace=Control+Shift+w
+# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
+# primary-paste=Shift+Insert
+# unicode-input=none
+
+[url-bindings]
+# cancel=Control+g Control+c Control+d Escape
+# toggle-url-visible=t
+
+[text-bindings]
+# \x03=Mod4+c  # Map Super+c -> Ctrl+c
+
+[mouse-bindings]
+# selection-override-modifiers=Shift
+# primary-paste=BTN_MIDDLE
+# select-begin=BTN_LEFT
+# select-begin-block=Control+BTN_LEFT
+# select-extend=BTN_RIGHT
+# select-extend-character-wise=Control+BTN_RIGHT
+# select-word=BTN_LEFT-2
+# select-word-whitespace=Control+BTN_LEFT-2
+# select-row=BTN_LEFT-3
+
+# vim: ft=dosini
diff --git a/install.sh b/install.sh
index 2cd200c..3b49c9c 100755
--- a/install.sh
+++ b/install.sh
@@ -78,6 +78,9 @@ fi
 # dunst
 symlink ~/.dotfiles/dunst ~/.config/dunst
 
+# foot
+symlink ~/.dotfiles/foot ~/.config/foot
+
 # git
 symlink ~/.dotfiles/git/.gitconfig ~/.gitconfig
 
diff --git a/kanshi/config b/kanshi/config
index af9b675..8558082 100644
--- a/kanshi/config
+++ b/kanshi/config
@@ -6,7 +6,7 @@ profile single {
 
 profile dual {
     output eDP-1
-    output DP-6
+    output *
     exec ~/.config/kanshi/dual.sh
 }
 
diff --git a/nvim/init.lua b/nvim/init.lua
index d852fe8..e3b859a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -51,9 +51,9 @@ vim.o.colorcolumn = "80"
 vim.o.cursorline = true
 
 -- set tab width and use spaces for tabs
-vim.o.tabstop = 4 
-vim.o.shiftwidth = 4 
-vim.o.softtabstop = 4 
+vim.o.tabstop = 4
+vim.o.shiftwidth = 4
+vim.o.softtabstop = 4
 vim.o.expandtab = true
 
 -- disable netrw
@@ -88,6 +88,9 @@ vim.api.nvim_create_autocmd({"FileType"}, {
     command = "set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab"
 })
 
+-- trim whitespace
+vim.keymap.set('n', '<Leader>wt', [[:%s/\s\+$//e<cr>]])
+
 -- reload vimrc on change
 vim.api.nvim_create_augroup("reload_vimrc", {})
 vim.api.nvim_create_autocmd({"BufWritePost"}, {
@@ -139,10 +142,10 @@ require('packer').startup {
         use {
             'tanvirtin/monokai.nvim',
             config = function()
-                require('monokai').setup({})
+                require('monokai').setup {}
             end
         }
-        
+
         use 'christoomey/vim-tmux-navigator'
 
         -- use 'jiangmiao/auto-pairs'
@@ -155,7 +158,7 @@ require('packer').startup {
         }
 
         use 'mg979/vim-visual-multi'
-        
+
         use {
             'nvim-tree/nvim-web-devicons',
             config = function()
@@ -171,7 +174,7 @@ require('packer').startup {
                 'nvim-lua/plenary.nvim'
             },
             after = {
-                'nvim-web-devicons' 
+                'nvim-web-devicons'
             },
             config = function()
                 require("nvim-tree").setup {
@@ -206,7 +209,7 @@ require('packer').startup {
 
         use {
             'romgrk/barbar.nvim',
-            after = { 
+            after = {
                 'nvim-tree.lua',
                 'nvim-web-devicons'
             },
@@ -257,7 +260,7 @@ require('packer').startup {
 
         use {
             'nvim-telescope/telescope.nvim',
-            requires = { 
+            requires = {
                 'BurntSushi/ripgrep',
                 'nvim-lua/plenary.nvim',
                 'cljoly/telescope-repo.nvim'
@@ -347,6 +350,35 @@ require('packer').startup {
             end
         }
 
+        use {
+            'hrsh7th/nvim-cmp',
+            requires = {
+                'hrsh7th/cmp-nvim-lsp',
+                'hrsh7th/cmp-buffer',
+                'hrsh7th/cmp-vsnip',
+                'hrsh7th/vim-vsnip'
+            },
+            config = function()
+                local cmp = require('cmp')
+                cmp.setup {
+                    snippet = {
+                        expand = function (args)
+                            vim.fn["vsnip#anonymous"](args.body)
+                        end
+                    },
+                    mapping = cmp.mapping.preset.insert({
+                        ['<C-Space>'] = cmp.mapping.complete(),
+                        ['<C-e>'] = cmp.mapping.abort(),
+                        ['<CR>'] = cmp.mapping.confirm({ select = true })
+                    }),
+                    sources = cmp.config.sources({
+                        { name = 'nvim_lsp' },
+                        { name = 'buffer' }
+                    })
+                }
+            end
+        }
+
         if bootstrap_packer then
             require('packer').sync()
         end
diff --git a/shell/.profile b/shell/.profile
index f234445..395ff47 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -26,6 +26,7 @@ export VISUAL=nvim
 
 prepend_path ~/opt/python311/bin
 prepend_path ~/opt/river/bin
+prepend_path ~/opt/janet/bin
 prepend_path ~/bin
 export PATH
 
diff --git a/sublime-text/Package Control.sublime-settings b/sublime-text/Package Control.sublime-settings
index 2d87d10..fa63a77 100644
--- a/sublime-text/Package Control.sublime-settings
+++ b/sublime-text/Package Control.sublime-settings
@@ -9,6 +9,7 @@
 		"AutoWrap",
 		"Compare Side-By-Side",
 		"Git",
+		"Janet",
 		"LSP",
 		"MagicPython",
 		"Material Theme",
diff --git a/sway/terminal.sh b/sway/terminal.sh
index 2acb4ad..d3d1b81 100755
--- a/sway/terminal.sh
+++ b/sway/terminal.sh
@@ -18,9 +18,9 @@ else
 
     if ! (swaymsg -t get_tree -r |
           jq -e "recurse(.nodes[]) | select(.app_id == \"$term_app_id\")" > /dev/null); then
-        exec alacritty --class $term_app_id -e \
-            tmux new-session -A -s default
-        # exec foot --app-id $term_app_id \
+        # exec alacritty --class $term_app_id -e \
         #     tmux new-session -A -s default
+        exec foot --app-id $term_app_id \
+            tmux new-session -A -s default
     fi
 fi
diff --git a/waybar/sway.conf b/waybar/sway.conf
index 8f0862d..11b4daa 100644
--- a/waybar/sway.conf
+++ b/waybar/sway.conf
@@ -9,26 +9,26 @@
     },
 
     "network": {
-        "format-wifi": "直 {essid}",
-        "format-ethernet": "ﯱ {ifname}",
-        "format-disconnected": " disconnected",
+        "format-wifi": "&#xf1eb; {essid}",
+        "format-ethernet": "&#xf06f3; {ifname}",
+        "format-disconnected": "&#xf0c9b; disconnected",
         "on-click": "connman-gtk"
     },
 
     "pulseaudio": {
-        "format": "墳 {volume:3}%",
-        "format-muted": "婢 mute",
+        "format": "&#xf057e; {volume:3}%",
+        "format-muted": "&#xf075f; mute",
         "scroll-step": 5,
         "on-click": "pavucontrol",
         "on-click-right": "pulsemixer --toggle-mute"
     },
 
     "battery": {
-        "format": "{icon} {capacity:3}%",
-        "format-icons": ["", "", ""]
+        "format": "{icon}  {capacity:3}%",
+        "format-icons": ["&#xf244;", "&#xf243;", "&#xf242;", "&#xf241;", "&#xf240;"]
     },
 
     "clock": {
-        "format": " {:%Y-%m-%d %H:%M}"
+        "format": "&#xf00f0; {:%Y-%m-%d %H:%M}"
     }
 }