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 d344b6f..c18d862 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -257,5 +257,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 c085928..b9fede5 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl
@@ -149,7 +149,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
deleted file mode 100644
index c2d7362..0000000
--- a/nvim/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" },
-  "aniseed": { "branch": "master", "commit": "7bc09736f3651c10d29b82d1a465b7f540614be1" },
-  "antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" },
-  "ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" },
-  "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
-  "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
-  "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": "dfb9f75010a181c090ab905b2a2b4180aea20f15" },
-  "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
-  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
-  "editorconfig-vim": { "branch": "master", "commit": "0956bc257ca4eaa3e087e0ba2253a3e980805820" },
-  "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
-  "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
-  "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "4f18033c3b78aa5450e538d81dfbbb3e67aeadec" },
-  "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
-  "gh.nvim": { "branch": "main", "commit": "3181973d0c80fe0553e30e0aeeb860bedef9a33b" },
-  "gitsigns.nvim": { "branch": "main", "commit": "c097cb255096f333e14d341082a84f572b394fa2" },
-  "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" },
-  "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" },
-  "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" },
-  "idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" },
-  "inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" },
-  "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" },
-  "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" },
-  "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
-  "litee.nvim": { "branch": "main", "commit": "3c51764a615566e4c0223362f4be00acc23c430e" },
-  "lsp_lines.nvim": { "branch": "main", "commit": "6f3defec73f7c87939e800e9afa5d0571b19b401" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
-  "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" },
-  "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" },
-  "nerdcommenter": { "branch": "master", "commit": "e361a44230860d616f799a337bc58f5218ab6e9c" },
-  "nfnl": { "branch": "main", "commit": "d6b33ae7376dda6f26cca8365d9beaf66f43c410" },
-  "nvim-bufferline.lua": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
-  "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
-  "nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
-  "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
-  "nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" },
-  "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
-  "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-treesitter": { "branch": "master", "commit": "ef267f0c285928ea3a0d3362a260a0728fd4a146" },
-  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "9f9a6b307fb122f13708f78483222abd43b7bb3a" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" },
-  "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" },
-  "nvlime": { "branch": "master", "commit": "936df437a74851e2696d802778f3217e2b296af9" },
-  "obsidian.nvim": { "branch": "main", "commit": "9644aca08334bb3f6fbeeccacc9e4dbb5855577e" },
-  "octo.nvim": { "branch": "master", "commit": "a511b52fbf040f928a24deb72e17ec465613b442" },
-  "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" },
-  "parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
-  "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
-  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
-  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
-  "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
-  "rustaceanvim": { "branch": "master", "commit": "c1d79cdd069f4d4882eee453a69d55b8bd7c1ba9" },
-  "sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" },
-  "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" },
-  "startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" },
-  "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
-  "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
-  "telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" },
-  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
-  "typescript-vim": { "branch": "master", "commit": "e83ccab88c7a045ce795583adb66956afd464a31" },
-  "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
-  "vim-exchange": { "branch": "master", "commit": "d6c1e9790bcb8df27c483a37167459bbebe0112e" },
-  "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
-  "vim-gh-line": { "branch": "master", "commit": "731751fdfa4f64a061dbc7088cb7b2f12e0828ad" },
-  "vim-gruvbox8": { "branch": "master", "commit": "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7" },
-  "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" },
-  "vim-javascript": { "branch": "master", "commit": "c470ce1399a544fe587eab950f571c83cccfbbdc" },
-  "vim-jsonc": { "branch": "master", "commit": "0b7ca17da85b5faa813be8ead3ad497e348b2763" },
-  "vim-jsx": { "branch": "master", "commit": "8879e0d9c5ba0e04ecbede1c89f63b7a0efa24af" },
-  "vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" },
-  "vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
-  "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" },
-  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
-  "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
-  "vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" },
-  "vim-visual-multi": { "branch": "master", "commit": "e2ff111f123da6cf97f95b96b10eb95854f953c9" },
-  "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
-  "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
-  "vimtex": { "branch": "master", "commit": "ac0a41b297a70c101df89bc9c8d43341ba00fd4f" },
-  "webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
-  "yats.vim": { "branch": "master", "commit": "6927af6e3e45d0ce585684be5681bada0ffcc3a7" },
-  "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 32c9ebf..eed5b50 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -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