From f1c5d20edc0d51e65f44256bdd257ee9af1a2d6d Mon Sep 17 00:00:00 2001
From: ElKowar <5300871+elkowar@users.noreply.github.com>
Date: Wed, 20 Dec 2023 14:06:57 +0100
Subject: [PATCH] setup

---
 eww-bar/.config/eww-bar/audio.sh              |  5 +-
 eww-bar/.config/eww-bar/eww.scss              |  3 +-
 eww-bar/.config/eww-bar/eww.yuck              | 62 +++++---------
 eww-bar/.config/eww-bar/swayspaces.py         | 52 ++++++++++++
 foot/.config/foot/foot.ini                    |  4 +-
 nvim/.config/nvim/fnl/dots/plugins/lsp.fnl    |  4 +-
 .../.config/nvim/fnl/dots/plugins/plugins.fnl |  2 +-
 nvim/.config/nvim/init.lua                    |  5 +-
 nvim/.config/nvim/lazy-lock.json              | 85 ++++++++++---------
 profile/.profile                              | 15 ++--
 zsh/.config/zsh/.zshrc                        | 18 ++--
 11 files changed, 148 insertions(+), 107 deletions(-)
 create mode 100755 eww-bar/.config/eww-bar/swayspaces.py

diff --git a/eww-bar/.config/eww-bar/audio.sh b/eww-bar/.config/eww-bar/audio.sh
index e636dca..95718bd 100755
--- a/eww-bar/.config/eww-bar/audio.sh
+++ b/eww-bar/.config/eww-bar/audio.sh
@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 
-
 case "$1" in
   "symbol")
     pactl subscribe | grep --line-buffered "Event 'change' on client" | while read -r; do
       case "$(pactl get-default-sink)" in
-        *Arctis_9*) echo "";;
+        *Arctis_9*) echo "";;
         #*Arctis_9*) echo "";;
         *)          echo "";;
       esac
@@ -28,7 +27,7 @@ case "$1" in
         pactl set-default-sink $speaker_sink_id
         ;;
       *)
-        eww -c ~/.config/eww-bar update audio_sink=""
+        eww -c ~/.config/eww-bar update audio_sink=""
         pactl set-default-sink $game_sink_id
         ;;
     esac
diff --git a/eww-bar/.config/eww-bar/eww.scss b/eww-bar/.config/eww-bar/eww.scss
index aceec39..706927d 100644
--- a/eww-bar/.config/eww-bar/eww.scss
+++ b/eww-bar/.config/eww-bar/eww.scss
@@ -10,6 +10,7 @@ window {
   & > * {
     margin: 3px;
   }
+  font-family: "Terminus (TTF)";
 }
 
 .workspaces {
@@ -76,7 +77,7 @@ window {
   padding: 5px 2px;
 }
 .metric-icon {
-  font-family: "FontAwesome5Free";
+  font-family: "Font Awesome 6 Free";
   font-size: 0.7em;
 }
 
diff --git a/eww-bar/.config/eww-bar/eww.yuck b/eww-bar/.config/eww-bar/eww.yuck
index 5271a34..40c6610 100644
--- a/eww-bar/.config/eww-bar/eww.yuck
+++ b/eww-bar/.config/eww-bar/eww.yuck
@@ -11,10 +11,19 @@
       (bottom :screen screen))))
 
 (defwidget top [screen]
-  (workspaces :wsp_yuck {screen == 1 ? workspaces_1_yuck : workspaces_2_yuck}))
+  (workspaces :screen screen)) 
+  ;(workspaces :wsp_yuck {screen == 1 ? workspaces_1_yuck : workspaces_2_yuck}))
 
-(defwidget workspaces [wsp_yuck]
-  (literal :content wsp_yuck))
+(defwidget workspaces [screen]
+  (box :orientation "v"
+    (for wsp in {workspaces[screen]}
+      (button :class "${wsp.occupied ? "occupied" : "empty"} ${wsp.focused ? "active" : "inactive"}"
+              :onclick "swaymsg workspace ${wsp.name}"
+        {wsp.occupied ? "◆" : "◇"}))))
+
+
+;(defwidget workspaces [wsp_yuck]
+  ;(literal :content wsp_yuck))
 
 (defwidget middle [] (time))
 (defwidget time []
@@ -37,8 +46,6 @@
        :space-evenly true
        :spacing "5"
 
-    (metric :icon "" :font-size 1 (music-button))
-
     (volume)
 
     (metric :icon "" 
@@ -51,9 +58,6 @@
 
     (box :class "metric" (date))))
 
-(defwidget music-button []
-  (button :onclick "playerctl play-pause"
-    "${music_data == "" ? "⏸" : music_data.status == "Playing" ? "⏸" : "▶"}"))
 
 (defwidget volume []
   (box :class "volume-metric"
@@ -73,8 +77,7 @@
            :valign "fill"
            :vexpand true
         (button :onclick "./audio.sh toggle"
-          (label :style "font-size: 1.2em; font-family: DejaVuSansMono Nerd Font Mono"
-                 :text audio_sink))
+          (label :text audio_sink))
         (button :onclick "pavucontrol &"
           "${volume}%")))))
 
@@ -93,13 +96,8 @@
 (defvar audio_sink "")
 
 (deflisten volume :initial "0" "./audio.sh volume")
+(deflisten workspaces :initial '{"0": [], "1": []}' "./swayspaces.py")
 
-(deflisten music_data 
-  :initial `{"status": ""}`
-  `
-  playerctl          metadata --format '{ "status": "{{status}}", "artist": "{{artist}}", "title": "{{title}}"}' || echo '{"status": ""}';
-  # playerctl --follow metadata --format '{ "status": "{{status}}", "artist": "{{artist}}", "title": "{{title}}"}'
-  `)
 
 (defpoll hour :interval "1s" "date +%H")
 (defpoll min  :interval "1s" "date +%M")
@@ -115,36 +113,18 @@
 
 
 (defwindow bar_1
-  :monitor "DisplayPort-0"
-  :stacking "bg"
-  :geometry (geometry :x 0 :y 0 :width "40px" :height "100%")
-  :anchor "top left"
+  :monitor 0
+  ; :monitor "DisplayPort-0"
+  :stacking "fg"
+  :geometry (geometry :x 0 :y 0 :width "40px" :height "100%" :anchor "center left")
   :reserve (struts :distance "40px" :side "left")
+  :exclusive true
+  :stacking "fg"
   (bar :screen 1))
 
 (defwindow bar_2
   :monitor "HDMI-A-1"
-  :geometry (geometry :x 0 :y 0 :width "40px" :height "100%")
-  :anchor "top left"
+  :geometry (geometry :x 0 :y 0 :width "40px" :height "100%" :anchor "top left")
   :reserve (struts :distance "40px" :side "left")
   (bar :screen 2))
 
-
-
-
-;(defwidget music-popup []
-;(if-else :cond {music_data.status == "Stopped" || music_data.status == ""}
-;"No music playing"
-;(box :orientation "h" 
-;:valign "fill"
-;:space-evenly false 
-;:spacing 10
-;(button :onclick "playerctl previous" "⏮")
-;"${music_data.artist} - ${music_data.title}"
-;(button :onclick "playerctl next" "⏭"))))
-
-;(defwindow music_popup
-;:monitor 1
-;:anchor "bottom left"
-;:geometry (geometry :x "30px" :y "10px" :height "65px")
-;(music-popup))
diff --git a/eww-bar/.config/eww-bar/swayspaces.py b/eww-bar/.config/eww-bar/swayspaces.py
new file mode 100755
index 0000000..b677b66
--- /dev/null
+++ b/eww-bar/.config/eww-bar/swayspaces.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+import subprocess
+import json
+
+WSP_COUNT = 5
+MONITOR_COUNT = 2
+
+
+def get_workspaces():
+    output = subprocess.check_output(["swaymsg", "-t", "get_workspaces"])
+    return json.loads(output.decode("utf-8"))
+
+
+def generate_workspace_data_for_monitor(monitor: int) -> list[dict]:
+    workspaces = {w["name"]: w for w in get_workspaces()}
+    data = []
+    for i in range(WSP_COUNT):
+        name = f"{monitor+1}{i+1}"
+        wsp_data = workspaces.get(name)
+        entry = {
+            "name": name,
+            "monitor": monitor,
+            "occupied": False,
+            "focused": False,
+            "visible": False,
+        }
+        if wsp_data is not None:
+            entry["focused"] = wsp_data["focused"]
+            entry["visible"] = wsp_data["visible"]
+            entry["occupied"] = True
+        data.append(entry)
+    return data
+
+
+def generate_workspace_data() -> dict:
+    return {i: generate_workspace_data_for_monitor(i) for i in range(MONITOR_COUNT)}
+
+
+if __name__ == "__main__":
+    process = subprocess.Popen(
+        ["swaymsg", "-t", "subscribe", "-m", '["workspace"]', "--raw"],
+        stdout=subprocess.PIPE,
+    )
+    if process.stdout is None:
+        print("Error: could not subscribe to sway events")
+        exit(1)
+    while True:
+        print(json.dumps(generate_workspace_data()), flush=True)
+        line = process.stdout.readline().decode("utf-8")
+        if line == "":
+            break
diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini
index 3d5c158..ea13a9c 100644
--- a/foot/.config/foot/foot.ini
+++ b/foot/.config/foot/foot.ini
@@ -9,7 +9,7 @@
 # locked-title=no
 
 # font=APL386 Unicode:size=8
-font=Fira Code Nerd Font:size=8
+font=Fira Code Nerd Font:size=12
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
@@ -70,7 +70,7 @@ hide-when-typing=yes
 # alternate-scroll-mode=yes
 
 [colors]
-;background=1d2021
+#background=1d2021
 background=282828
 foreground=ebdbb2
 regular0=282828
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index acb22e1..d481f32 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -255,5 +255,7 @@
             (tset result :contents new-contents)
             (previous-handler a result b c)))))))
 
-[(utils.plugin :neovim/nvim-lspconfig {:event "VeryLazy" :lazy true :config setup})]
+[(utils.plugin :williamboman/mason.nvim {:config true})
+ (utils.plugin :williamboman/mason-lspconfig.nvim {:config {:ensure_installed ["rust_analyzer"]}})
+ (utils.plugin :neovim/nvim-lspconfig {:event "VeryLazy" :lazy true :config setup})]
 ; vim:foldmarker=<<<<<,>>>>>
diff --git a/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl
index b7bceab..8769465 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl
@@ -148,7 +148,7 @@
 
  (plugin :Saecki/crates.nvim
          {:dependencies ["nvim-lua/plenary.nvim"]
-          :dir "/Users/leon/tmp/crates.nvim"
+          ;:dir "/Users/leon/tmp/crates.nvim"
           :event ["BufRead Cargo.toml"]
           :lazy true
           :opts {:disable_invalid_feature_diagnostic true
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index a618c05..b097218 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -30,9 +30,10 @@ end
 -- Bootstrap essential plugins required for installing and loading the rest.
 --ensure("wbthomason", "packer.nvim", "master")
 --ensure("Olical", "aniseed", "master")
-ensure("Olical", "nfnl", "main")
+ensure("Olical", "nfnl", "v1.0.0")
 
--- require('nfnl')['compile-all-files']()
+require('nfnl')['setup']()
+--require('nfnl.api')['compile-all-files']()
 
 require("main")
 
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 47201c2..ceae9d7 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,5 +1,6 @@
 {
   "agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" },
+  "aniseed": { "branch": "master", "commit": "7bc09736f3651c10d29b82d1a465b7f540614be1" },
   "antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" },
   "any-jump.vim": { "branch": "master", "commit": "770ef708ae3f13322430fcc663d7dfb864756b9b" },
   "ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" },
@@ -7,60 +8,62 @@
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
   "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
-  "conjure": { "branch": "master", "commit": "58c46d1f4999679659a5918284b574c266a7ac83" },
-  "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" },
-  "diffview.nvim": { "branch": "main", "commit": "0437ef8bfdd67156d87140d692840a3c2824fa20" },
-  "dressing.nvim": { "branch": "master", "commit": "8f4d62b7817455896a3c73cab642002072c114bc" },
-  "editorconfig-vim": { "branch": "master", "commit": "0d54ea863089fb13be423b4aed6cca35f3a5d778" },
+  "conjure": { "branch": "master", "commit": "4880144f13a7693cded529b302de491bfbaedbd6" },
+  "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" },
+  "crates.nvim": { "branch": "main", "commit": "8da3bae1f0f8892b42e9596299ec09bc055e5507" },
+  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
+  "dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" },
+  "editorconfig-vim": { "branch": "master", "commit": "95cb75e21d11206dad4bd3895c99459bdaa13dd1" },
   "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
   "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
   "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" },
-  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
-  "gh.nvim": { "branch": "main", "commit": "2b5551656c1b896bf4ae06546eaaab00311f9a18" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
+  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
+  "gh.nvim": { "branch": "main", "commit": "4daf599fc053b0e411198956df5daa65b2e2c17c" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
   "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" },
   "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" },
   "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" },
   "idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" },
-  "inc-rename.nvim": { "branch": "main", "commit": "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e" },
+  "inc-rename.nvim": { "branch": "main", "commit": "a48c7cec5c4f00d7438dce5fadb55f4d715ef9f2" },
   "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" },
   "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" },
-  "lazy.nvim": { "branch": "main", "commit": "25f6009087cc2bb85aedf4425c23f35c03e60b02" },
-  "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" },
-  "lsp_lines.nvim": { "branch": "main", "commit": "9e3f99fbbd28aaec80dc0158c43be8cca8dd5017" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" },
-  "neoformat": { "branch": "master", "commit": "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0" },
-  "neogit": { "branch": "master", "commit": "ed99c59d7fda3ba5e2ce9a3adc0a8eb5ebfa6c8f" },
-  "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" },
-  "nfnl": { "branch": "main", "commit": "979dbfc48bcb601a9107764a99f9459cb5bd4051" },
+  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "litee.nvim": { "branch": "main", "commit": "3c51764a615566e4c0223362f4be00acc23c430e" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "cf2306dd332e34a3e91075b40bdd4f6db824b2ee" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
+  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
+  "neoformat": { "branch": "master", "commit": "cd45ca8309d5261e8e76557c11a22b2f1ffc710b" },
+  "neogit": { "branch": "master", "commit": "cd5c395c69e0b2210919b7f7ebd65794ee2bf81b" },
+  "nerdcommenter": { "branch": "master", "commit": "da948e160d9f54c2967c7927b9c74c5a68c8dc49" },
+  "nfnl": { "branch": "main", "commit": "eaeef3337d7377cf16d8592ad2d345b1a192e4f2" },
   "nvim-bufferline.lua": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
-  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-code-action-menu": { "branch": "main", "commit": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027" },
+  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
+  "nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
+  "nvim-dap": { "branch": "master", "commit": "e64ebf3309154b578a03c76229ebf51c37898118" },
   "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
-  "nvim-jenkinsfile-linter": { "branch": "main", "commit": "6e740a9e42251452cbc79808ea894f5233a93e92" },
-  "nvim-lspconfig": { "branch": "master", "commit": "2b361e043810d5587d9af0787f8ce40da92ec5e9" },
+  "nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-treesitter": { "branch": "master", "commit": "10bfa4826f2235c600c073a82e0d78718aa7240e" },
-  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "48b3bf54e32f23e2299c59ff76fa3b0599565b39" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7241635869b7a8115893ffa67bab3907756caf4f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
+  "nvim-treesitter": { "branch": "master", "commit": "25ddfde8d7167d7d81403d6809242439037d2b68" },
+  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "011c09784f1a95cf469a48c1993b664190440391" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" },
+  "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" },
   "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" },
-  "nvlime": { "branch": "master", "commit": "83606f7e2d017ee7fcafe4ed4bf91ac776705633" },
-  "octo.nvim": { "branch": "master", "commit": "22a231fc621346734464c3cbca0be467b292b343" },
+  "nvlime": { "branch": "master", "commit": "6f143d5f7f31a7dc8c909ec7bb6f6ffedd9c92b7" },
+  "octo.nvim": { "branch": "master", "commit": "4a60f50bb886572a59fde095b990fa28e2b50dba" },
   "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" },
-  "parsley": { "branch": "main", "commit": "9a388fe9e8a443d9d892318b4cce6dd287c47e38" },
-  "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
+  "parsley": { "branch": "main", "commit": "1f2c64ccd289e23b6d21e07212f409625d05b506" },
+  "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
   "rust-tools.nvim": { "branch": "patched", "commit": "4338a9b08faa8da8b5aad095a035ceff31301e3f" },
@@ -71,13 +74,13 @@
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
   "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" },
-  "telescope.nvim": { "branch": "master", "commit": "205f469244916716c49cc2b9026566749425c5ba" },
-  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
-  "typescript-vim": { "branch": "master", "commit": "31ede5ad905ce4159a5e285073a391daa3bf83fa" },
+  "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" },
+  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
+  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
+  "typescript-vim": { "branch": "master", "commit": "eafdcf5e9ee73b43d92372d69dd84458bf98c5e3" },
   "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
   "vim-exchange": { "branch": "master", "commit": "784d63083ad7d613aa96f00021cd0dfb126a781a" },
-  "vim-fugitive": { "branch": "master", "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" },
+  "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" },
   "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" },
   "vim-gruvbox8": { "branch": "master", "commit": "8a634bd8d7539eb645e23147516d6c3054e71306" },
   "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" },
@@ -93,12 +96,12 @@
   "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
   "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
   "vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" },
-  "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" },
-  "vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" },
+  "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" },
+  "vim-vsnip": { "branch": "master", "commit": "8eebdf6ab4a880d845893f210fd20516d2e2384f" },
   "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
-  "vimtex": { "branch": "master", "commit": "a59a49b54ae039f1a439c9a16c2ea7b461b8e925" },
+  "vimtex": { "branch": "master", "commit": "5e6a8ff1405f0f2480c37bb10fa69ddfb1b6713f" },
   "webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
-  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
   "yats.vim": { "branch": "master", "commit": "2b6950c7143790e6930b8cf32d60c6858a50d47c" },
   "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
 }
\ No newline at end of file
diff --git a/profile/.profile b/profile/.profile
index c608a0b..5690b0d 100644
--- a/profile/.profile
+++ b/profile/.profile
@@ -1,5 +1,9 @@
 if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then 
   . $HOME/.nix-profile/etc/profile.d/nix.sh; 
+  export XDG_DATA_DIRS="$HOME/.nix-profile/share/applications:$HOME/.local/share/applications:/usr/local/share:/usr/share"
+  export LOCALE_ARCHIVE=$(nix-build '<nixpkgs>' --no-out-link -A glibcLocales)/lib/locale/locale-archive
+  export PATH="$HOME/.nix-profile/share/applications/:$PATH"
+  export PATH="$HOME/.nix-profile/bin/:$PATH"
 fi
 
 
@@ -9,8 +13,6 @@ export PATH="$HOME/.emacs.d/bin/:$PATH"
 export PATH="$HOME/.npm-global/bin:$PATH"
 export PATH="$HOME/intelliJInstall/bin:$PATH"
 export PATH="$HOME/.cargo/bin:$PATH"
-export PATH="$HOME/.nix-profile/share/applications/:$PATH"
-export PATH="$HOME/.nix-profile/bin/:$PATH"
 export PATH="$HOME/.cpm/bin:$PATH"
 export PATH="$HOME/.local/bin:$PATH"
 export PATH="$HOME/.nimble/bin:$PATH"
@@ -19,7 +21,8 @@ export PATH="$HOME/.dotnet/tools:$PATH"
 
 export EDITOR="$(which nvim)"
 export BROWSER="$(which google-chrome-stable)"
-export TERMINAL="$(which alacritty)"
+#export TERMINAL="$(which alacritty)"
+export TERMINAL="$(which foot)"
 
 
 export RANGER_LOAD_DEFAULT_RC=FALSE
@@ -51,8 +54,6 @@ export FREETYPE_PROPERTIES='truetype:interpreter-version=40'
 export _JAVA_OPTIONS='-Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd'
 
 
-export XDG_DATA_DIRS="$HOME/.nix-profile/share/applications:$HOME/.local/share/applications:/usr/local/share:/usr/share"
-export LOCALE_ARCHIVE=$(nix-build '<nixpkgs>' --no-out-link -A glibcLocales)/lib/locale/locale-archive
 
 export _JAVA_AWT_WM_NONREPARENTING=1
 
@@ -65,5 +66,7 @@ command -v zoxide > /dev/null && eval "$(zoxide init zsh)"
 
 ## Launches tbsm on session start
 if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
-  tbsm
+  if command -v tbsm > /dev/null; then
+    tbsm
+  fi
 fi
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index efd9d83..22c2f82 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -2,7 +2,7 @@
 # history config
 HISTSIZE=50000
 SAVEHIST=50000
-HISTFILE="/home/leon/.cache/zsh/history"
+HISTFILE="/$HOME/.cache/zsh/history"
 setopt HIST_SAVE_NO_DUPS
 setopt HIST_IGNORE_ALL_DUPS
 #setopt INC_APPEND_HISTORY
@@ -89,7 +89,7 @@ autoload -Uz promptinit && promptinit
 
 
 # alias
-alias ls="exa --icons"
+alias ls="lsd"
 alias dots="git -C $HOME/dots-of-war"
 
 # load prompt
@@ -102,28 +102,28 @@ fi
 export EDITOR=nvim
 export VISUAL=nvim
 
-export ANDROID_HOME="/home/leon/Android/Sdk"
-export ANDROID_NDK="/home/leon/Android/Sdk/ndk/21.4.7075529"
+export ANDROID_HOME="/$HOME/Android/Sdk"
+export ANDROID_NDK="/$HOME/Android/Sdk/ndk/21.4.7075529"
 export JAVA_HOME="/usr/lib/jvm/java-1.19.0-openjdk-amd64/"
 
 if [ -d "$HOME/anaconda3" ]; then
     # >>> conda initialize >>>
     # !! Contents within this block are managed by 'conda init' !!
-    __conda_setup="$('/home/leon/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+    __conda_setup="$('$HOME/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
     if [ $? -eq 0 ]; then
         eval "$__conda_setup"
     else
-        if [ -f "/home/leon/anaconda3/etc/profile.d/conda.sh" ]; then
-            . "/home/leon/anaconda3/etc/profile.d/conda.sh"
+        if [ -f "$HOME/anaconda3/etc/profile.d/conda.sh" ]; then
+            . "$HOME/anaconda3/etc/profile.d/conda.sh"
         else
-            export PATH="/home/leon/anaconda3/bin:$PATH"
+            export PATH="$HOME/anaconda3/bin:$PATH"
         fi
     fi
     unset __conda_setup
     # <<< conda initialize <<<
 fi
 
-export PATH="/home/leon/.volta/bin:$PATH"
+export PATH="$HOME/.volta/bin:$PATH"
 
 
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!