merge resolution

2026-02-10 21:53:44 -08:00 · 2026-02-10 21:53:44 -08:00 · 52e396722b
commit 52e396722b
parent 677295f26e a21a21e58a
28 changed files with 2264 additions and 1680 deletions
--- a/de/exclude
+++ b/de/exclude
@ -18,3 +18,4 @@
 .config/sway-profiles/global-shortcuts/lights
 .config/sway-profiles/config.d
 .config/sway/config.d/input.d
+.fonts/.uuid
--- a/de/home/.config/eww/modules/bar/powermenu.yuck
+++ b/de/home/.config/eww/modules/bar/powermenu.yuck
@ -15,7 +15,7 @@
    :orientation "h"
    :space-evenly false
    :halign "center"
-    (button :onclick 'sdu suspend reboot'
+    (button :onclick 'sdu power reboot'
      :tooltip "Reboot"
      "")
    (button :onclick 'sdu power suspend'
--- a/de/home/.config/eww/modules/bar/scratchpad.yuck
+++ b/de/home/.config/eww/modules/bar/scratchpad.yuck
@ -1,14 +1,34 @@
 (defvar reveal_scratchpad false)
 (defwidget scratchpad []
-  (revealer-on-hover
-    :class "${reveal_scratchpad} scratchpad"
-    :revealvar reveal_scratchpad
-    :revealvar-name "reveal_scratchpad"
+;  (revealer-on-hover
+;    :class "${reveal_scratchpad} scratchpad"
+;    :revealvar reveal_scratchpad
+;    :revealvar-name "reveal_scratchpad"
+;    (label 
+;      :class "revealer-preview"
+;      :tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}"
+;      :text "  ${jq(sway_info,'.scratchpad_info | length')}  ${reveal_scratchpad ? '' : ''}")
+;      (scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')})))
+;
+(box
+  :class "${reveal_scratchpad} scratchpad revealer-on-hover"
+  :orientation "h"
+  :space-evenly false
+  (eventbox
+    :onhover "${EWW_CMD} update reveal_scratchpad=true"
+    :onhoverlost "${EWW_CMD} update reveal_scratchpad=false"
+    (box
+      :space-evenly false
+;      (children :nth 0)
        (label
          :class "revealer-preview"
          :tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}"
          :text "  ${jq(sway_info,'.scratchpad_info | length')}  ${reveal_scratchpad ? '' : ''}")
-      (scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')})))
+      (revealer
+        :reveal reveal_scratchpad
+        :transition "slideright"
+        :duration "500ms"
+        (scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')}))))))

 (defwidget scratchpad_children [array]
  (box :orientation "h"
--- a/de/home/.config/eww/modules/bar/sysmem.yuck
+++ b/de/home/.config/eww/modules/bar/sysmem.yuck
@ -1,8 +1,8 @@
 (defvar reveal_sysmem false)
 (defwidget sysmem []
  (revealer-on-hover
-    :class "${reveal_sysmem} sysmem"
-    :revealvar reveal_sysmem
+    :class "${(reveal_sysmem) || (EWW_RAM.used_mem / EWW_RAM.total_mem) > 0.95} sysmem"
+    :revealvar {(reveal_sysmem) || (EWW_RAM.used_mem / EWW_RAM.total_mem) > 0.95}
    :revealvar-name "reveal_sysmem"
    (box
      :class "revealer-preview"
--- a/de/home/.config/katerc
+++ b/de/home/.config/katerc
@ -175,10 +175,10 @@ SetEditor=false
 1920x1200 screen: Width=453
 2 screens: Height=1119
 2 screens: Width=490
-2048x1280 screen: Height=1030
-2048x1280 screen: Width=1005
-3 screens: Height=1359
-3 screens: Width=3416
+2048x1280 screen: Height=1199
+2048x1280 screen: Width=2024
+3 screens: Height=1025
+3 screens: Width=1602

 [filetree]
 editShade=183,220,246
--- a/de/home/.config/kdeglobals
+++ b/de/home/.config/kdeglobals
@ -27,9 +27,9 @@ Show hidden files=false
 Sort by=Date
 Sort directories first=true
 Sort hidden files last=false
-Sort reversed=true
+Sort reversed=false
 Speedbar Width=218
-View Style=Detail
+View Style=Simple

 [KShortcutsDialog Settings]
 Dialog Size=600,480
--- a/de/home/.config/sway-de-utils/config.toml
+++ b/de/home/.config/sway-de-utils/config.toml
@ -14,7 +14,8 @@ window_icons = [
 [programs.browser]
  name = "Librewolf"
  command = "librewolf"
-  arguments = ["--no-remote", "-P"]
+#  arguments = ["--no-remote", "-P"]
+  arguments = ["-P"]
 [programs.browser_newtab]
  name = "Librewolf (New Tab)"
  command = "librewolf"
--- a/de/home/.config/sway/config.d/keys.d/launch
+++ b/de/home/.config/sway/config.d/keys.d/launch
@ -4,20 +4,19 @@ bindsym {
 #terminal
  $mod+Return exec $term
 #floating terminal
-  $mod+Shift+Return exec $HOME/.config/sway/scripts/exec-float $term
+  $mod+Shift+Return exec timeout 3s $HOME/.config/sway/scripts/exec-float $term
 #launcher
  $mod+d exec $menu
 #launcher reload
  $mod+Shift+d exec 'kbuildsycoca6;update-menus;$menu'
 #lockscreen
-#  $mod+l exec sp-lock
  $mod+l exec sdu lock
 #profile manager
-#  $mod+Shift+p exec sp-profiles
+  $mod+Shift+p exec sdu profile list --mode dmenu | wofi --show dmenu | cut -d' ' -f2- | xargs -I "{}" -- sdu profile switch to "{}"
 #sway notification center
  $mod+Shift+n exec swaync-client -t -sw
 #power menu
-  $mod+Shift+e exec sp-powermenu
+  $mod+Shift+e exec sdu power | wofi --show dmenu | awk '{print tolower($2)}' | xargs -I "{}" -- sdu power "{}"
 #screenshot
  $mod+Shift+s exec sp-screenshot
 #clipboard
@ -27,18 +26,13 @@ bindsym {
 ##  $mod+w exec eww open --toggle --screen "$(swaymsg -t get_outputs | jq -r '.[]|select(.focused==true).model')" home
  $mod+w exec '$HOME/.config/sway/scripts/eww-toggle.sh homewidgets_reveal'
 #profile shortcuts
-##  $mod+shift+o exec sp-shortcuts
-#  $mod+shift+o exec sdu profile shortcuts get --mode dmenu
+  $mod+shift+o exec sdu profile shortcuts get --mode dmenu | wofi --show dmenu | cut -d' ' -f2- | xargs -I "{}" -- sdu profile shortcuts execute "{}"
 #global shortcuts
-##  $mod+shift+l exec sp-global-shortcuts
-#  $mod+shift+l exec sdu shortcuts get --mode dmenu
+  $mod+shift+l exec sdu shortcuts get --mode dmenu | wofi --show dmenu | cut -d' ' -f2- | xargs -I "{}" -- sdu shortcuts execute "{}"
 #browser
-#  $mod+shift+b exec sp-launcher browser
  $mod+shift+b exec 'sdu launch --program browser'
-#  $mod+t exec sp-launcher browser-newtab
  $mod+t exec 'sdu launch --program browser_newtab'
 #file browser
-#  $mod+shift+f exec sp-launcher file_manager
  $mod+shift+f exec 'sdu launch --program filemanager'
 #calculator
  $mod+c exec wofi-calc
--- a/de/home/.config/sway/scripts/exec-float
+++ b/de/home/.config/sway/scripts/exec-float
@ -1,4 +1,5 @@
 #!/bin/bash
+echo "you should wrap me in a timeout command!!"
 eval "$1 &"
 pid=$!
 echo $pid
--- a/de/home/.fonts/.uuid
+++ b/de/home/.fonts/.uuid
@ -0,0 +1 @@
+b4407a8e-37e5-4326-a23b-e89cf057e14c
--- a/de/home/.librewolf/profiles.ini
+++ b/de/home/.librewolf/profiles.ini
@ -11,7 +11,7 @@ Locked=1
 Name=Development
 IsRelative=1
 Path=development
-StoreID=2ccf13ae
+StoreID=aa80ffcc
 ShowSelector=1

 [Profile0]
@ -19,18 +19,13 @@ Name=Penelope
 IsRelative=1
 Path=penelope
 Default=1
-StoreID=bf331188
+StoreID=0585997e
 ShowSelector=0

 [General]
 StartWithLastProfile=1
 Version=2

-[Profile4]
-Name=testing
-IsRelative=1
-Path=4z689ygf.testing
-
 [Install6C4726F70D182CF7]
 Default=penelope
 Locked=1
@ -40,3 +35,8 @@ Name=School
 IsRelative=1
 Path=school

+[Profile4]
+Name=testing
+IsRelative=1
+Path=4z689ygf.testing
+
--- a/de/home/.var/app/dev.vencord.Vesktop/config/vesktop/themes/source.css
+++ b/de/home/.var/app/dev.vencord.Vesktop/config/vesktop/themes/source.css
--- a/default/home/.config/nvim/.neoconf.json
+++ b/default/home/.config/nvim/.neoconf.json
@ -0,0 +1,15 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": true
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  }
+}
--- a/default/home/.config/nvim/LICENSE
+++ b/default/home/.config/nvim/LICENSE
@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/default/home/.config/nvim/README.md
+++ b/default/home/.config/nvim/README.md
@ -0,0 +1,4 @@
+# 💤 LazyVim
+
+A starter template for [LazyVim](https://github.com/LazyVim/LazyVim).
+Refer to the [documentation](https://lazyvim.github.io/installation) to get started.
--- a/default/home/.config/nvim/init.lua
+++ b/default/home/.config/nvim/init.lua
@ -0,0 +1,2 @@
+-- bootstrap lazy.nvim, LazyVim and your plugins
+require("config.lazy")
--- a/default/home/.config/nvim/lazy-lock.json
+++ b/default/home/.config/nvim/lazy-lock.json
@ -0,0 +1,35 @@
+{
+  "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
+  "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
+  "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f7cc6850517b8db59a41314b83bb7994eae33cdd" },
+  "grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" },
+  "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
+  "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-lint": { "branch": "master", "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81" },
+  "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" },
+  "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
+  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "seoul256.nvim": { "branch": "master", "commit": "726f88a77c02418aa5cb72a81c85bfb5ba2704d9" },
+  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+}
--- a/default/home/.config/nvim/lazyvim.json
+++ b/default/home/.config/nvim/lazyvim.json
@ -0,0 +1,10 @@
+{
+  "extras": [
+
+  ],
+  "install_version": 8,
+  "news": {
+    "NEWS.md": "11866"
+  },
+  "version": 8
+}
--- a/default/home/.config/nvim/lua/config/autocmds.lua
+++ b/default/home/.config/nvim/lua/config/autocmds.lua
@ -0,0 +1,8 @@
+-- Autocmds are automatically loaded on the VeryLazy event
+-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
+--
+-- Add any additional autocmds here
+-- with `vim.api.nvim_create_autocmd`
+--
+-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults)
+-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell")
--- a/default/home/.config/nvim/lua/config/keymaps.lua
+++ b/default/home/.config/nvim/lua/config/keymaps.lua
@ -0,0 +1,3 @@
+-- Keymaps are automatically loaded on the VeryLazy event
+-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
+-- Add any additional keymaps here
--- a/default/home/.config/nvim/lua/config/lazy.lua
+++ b/default/home/.config/nvim/lua/config/lazy.lua
@ -0,0 +1,56 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+vim.g.seoul256_disable_background = true
+--require("seoul256")
+
+require("lazy").setup({
+  spec = {
+    -- add LazyVim and import its plugins
+    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+    -- import/override with your plugins
+    { import = "plugins" },
+  },
+  defaults = {
+    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
+    -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
+    lazy = true,
+    --    lazy = false,
+    -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
+    -- have outdated releases, which may break your Neovim install.
+    version = false, -- always use the latest git commit
+    -- version = "*", -- try installing the latest stable version for plugins that support semver
+  },
+  -- install = { colorscheme = { "seoul256" } },
+  checker = {
+    enabled = true, -- check for plugin updates periodically
+    notify = true, -- notify on update
+  }, -- automatically check for plugin updates
+  performance = {
+    rtp = {
+      -- disable some rtp plugins
+      disabled_plugins = {
+        "gzip",
+        -- "matchit",
+        -- "matchparen",
+        -- "netrwPlugin",
+        "tarPlugin",
+        "tohtml",
+        "tutor",
+        "zipPlugin",
+      },
+    },
+  },
+})
--- a/default/home/.config/nvim/lua/config/options.lua
+++ b/default/home/.config/nvim/lua/config/options.lua
@ -0,0 +1,3 @@
+-- Options are automatically loaded before lazy.nvim startup
+-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
+-- Add any additional options here
--- a/default/home/.config/nvim/lua/plugins/example.lua
+++ b/default/home/.config/nvim/lua/plugins/example.lua
@ -0,0 +1,202 @@
+-- since this is just an example spec, don't actually load anything here and return an empty spec
+-- stylua: ignore
+if true then return {} end
+
+-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
+--
+-- In your plugin files, you can:
+-- * add extra plugins
+-- * disable/enabled LazyVim plugins
+-- * override the configuration of LazyVim plugins
+return {
+  -- add gruvbox
+  -- { "ellisonleao/gruvbox.nvim" },
+
+  {
+    "shaunsingh/seoul256.nvim",
+  },
+  -- Configure LazyVim to load gruvbox
+  {
+    "LazyVim/LazyVim",
+    --    opts = {
+    --      colorscheme = "seoul256",
+    --      colorscheme = "gruvbox",
+    --    },
+    --    require("seoul256"),
+  },
+
+  -- change trouble config
+  {
+    "folke/trouble.nvim",
+    -- opts will be merged with the parent spec
+    opts = { use_diagnostic_signs = true },
+  },
+
+  -- disable trouble
+  { "folke/trouble.nvim", enabled = false },
+
+  -- override nvim-cmp and add cmp-emoji
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = { "hrsh7th/cmp-emoji" },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      table.insert(opts.sources, { name = "emoji" })
+    end,
+  },
+
+  -- change some telescope options and a keymap to browse plugin files
+  {
+    "nvim-telescope/telescope.nvim",
+    keys = {
+      -- add a keymap to browse plugin files
+      -- stylua: ignore
+      {
+        "<leader>fp",
+        function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
+        desc = "Find Plugin File",
+      },
+    },
+    -- change some options
+    opts = {
+      defaults = {
+        layout_strategy = "horizontal",
+        layout_config = { prompt_position = "top" },
+        sorting_strategy = "ascending",
+        winblend = 0,
+      },
+    },
+  },
+
+  -- add pyright to lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- pyright will be automatically installed with mason and loaded with lspconfig
+        pyright = {},
+      },
+    },
+  },
+
+  -- add tsserver and setup with typescript.nvim instead of lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      "jose-elias-alvarez/typescript.nvim",
+      init = function()
+        require("lazyvim.util").lsp.on_attach(function(_, buffer)
+          -- stylua: ignore
+          vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
+          vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
+        end)
+      end,
+    },
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- tsserver will be automatically installed with mason and loaded with lspconfig
+        tsserver = {},
+      },
+      -- you can do any additional lsp server setup here
+      -- return true if you don't want this server to be setup with lspconfig
+      ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
+      setup = {
+        -- example to setup with typescript.nvim
+        tsserver = function(_, opts)
+          require("typescript").setup({ server = opts })
+          return true
+        end,
+        -- Specify * to use this function as a fallback for any server
+        -- ["*"] = function(server, opts) end,
+      },
+    },
+  },
+
+  -- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
+  -- treesitter, mason and typescript.nvim. So instead of the above, you can use:
+  { import = "lazyvim.plugins.extras.lang.typescript" },
+
+  -- add more treesitter parsers
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "bash",
+        "html",
+        "javascript",
+        "json",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "tsx",
+        "typescript",
+        "vim",
+        "yaml",
+      },
+    },
+  },
+
+  -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
+  -- would overwrite `ensure_installed` with the new value.
+  -- If you'd rather extend the default config, use the code below instead:
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      -- add tsx and treesitter
+      vim.list_extend(opts.ensure_installed, {
+        "tsx",
+        "typescript",
+      })
+    end,
+  },
+
+  -- the opts function can also be used to change the default opts:
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function(_, opts)
+      table.insert(opts.sections.lualine_x, {
+        function()
+          return "😄"
+        end,
+      })
+    end,
+  },
+
+  -- or you can return new options to override all the defaults
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function()
+      return {
+        --[[add your custom lualine config here]]
+      }
+    end,
+  },
+
+  -- use mini.starter instead of alpha
+  { import = "lazyvim.plugins.extras.ui.mini-starter" },
+
+  -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
+  { import = "lazyvim.plugins.extras.lang.json" },
+
+  -- add any tools you want to have installed below
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "stylua",
+        "shellcheck",
+        "shfmt",
+        "flake8",
+      },
+    },
+  },
+}
--- a/default/home/.config/nvim/lua/plugins/seoul256.lua
+++ b/default/home/.config/nvim/lua/plugins/seoul256.lua
@ -0,0 +1,16 @@
+return {
+  {
+    "shaunsingh/seoul256.nvim",
+    --    opts = {
+    --      seoul256_disable_background = true,
+    --    },
+  },
+
+  --  vim.g.seoul256_disable_background = false
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "seoul256",
+    },
+  },
+}
--- a/default/home/.config/nvim/stylua.toml
+++ b/default/home/.config/nvim/stylua.toml
@ -0,0 +1,3 @@
+indent_type = "Spaces"
+indent_width = 2
+column_width = 120
--- a/default/home/.config/starship.toml
+++ b/default/home/.config/starship.toml
@ -0,0 +1,84 @@
+# Get editor completions based on the config schema
+"$schema" = 'https://starship.rs/config-schema.json'
+
+# Inserts a blank line between shell prompts
+add_newline = true
+
+#format = '[░▒▓](fg:purple bg:transparent)[ 󰊟 ${user}](fg:black bg:purple)'
+format = """[░▒▓](fg:purple bg:transparent)\
+$time\
+$sudo\
+$username\
+${custom.hostname}\
+$directory\
+$git_branch\
+$git_commit\
+$git_metrics\
+$line_break\
+$character"""
+
+#$git_status\
+
+[username]
+style_user = 'bg:purple fg:black'
+#style_root = 'bg:blue fg:black'
+format = '[ 󰊟 $user ]($style)[](fg:purple bg:black)'
+show_always = true
+
+[sudo]
+style = 'bold bg:purple fg:black'
+#symbol = 'root'
+format = '[ ‼]($style)'
+disabled = false
+
+[directory]
+truncation_length = 2
+fish_style_pwd_dir_length = 2
+format = '[ $path]($style)[$read_only]($read_only_style)'#[](fg:cyan bg:black)'
+style = 'bg:transparent fg:cyan'
+truncate_to_repo = true
+
+[git_branch]
+format = ' [$symbol$branch(:$remote_branch)]($style)'
+
+[git_status]
+#format = ' [](fg:green)[$all_status$ahead_behind]($style)[](fg:green)'
+format = ' [$all_status$ahead_behind]($style)'
+#up_to_date = ''
+style = 'fg:green'
+#style = 'bg:green fg:black'
+
+[git_commit]
+format = ' [\($hash$tag\)]($style)'
+only_detached = false
+tag_disabled = false
+
+[git_metrics]
+disabled = false
+added_style = 'bold blue'
+format = ' [+$added]($added_style)/[-$deleted]($deleted_style) '
+only_nonzero_diffs = true
+
+[time]
+disabled = true
+style = 'bg:purple fg:black'
+time_format = '%H:%M'
+format = '[ \[$time\]]($style)'
+
+[hostname]
+ssh_only = false
+#trim_at = 
+ssh_symbol = '\[\]'
+aliases = { "pogmommy" = "", "penelope" = "" }
+disabled = false
+
+[custom.hostname]
+#command = 'hostname | cut -d - -f 3-'
+command = ' hostname | sed -n "s/^.*-\(.*\)-.*$/\1/p"'
+when = true
+style = 'bold bg:black fg:purple'
+format = '[ 󰣚 ](fg:red bg:black)[$symbol($output )]($style)[](fg:black bg:transparent)'
+
+[character]
+success_symbol = '[\$](green)'
+error_symbol = '[\$](red)'
--- a/default/home/.sapphrc/default
+++ b/default/home/.sapphrc/default
@ -28,6 +28,7 @@ alias p="ps aux |grep "
 alias o="open "
 #find large files
 #alias find_largest_files="du -h -x -s -- * | sort -r -h | head -20"
+alias nano="nvim "
 sort_filesizes() {
  [ -z ${1} ] && local dir="$(pwd)" || local dir="${1}"
  du -ah --max-depth=1 "$( realpath ${dir} )" | sort --human-numeric-sort
@ -83,7 +84,7 @@ process_search(){
  fi
  ps aux | grep -ie "${1}"
 }
-
+alias nowrap='sed -E "s/(.{$((COLUMNS - 2))}).*$/\1 >/"'
 #alias devbox-stable="TERM=xterm-256color toolbox enter debian-toolbox-12"
 #alias devbox-testing="TERM=xterm-256color toolbox enter debian-toolbox-testing"
 #git shortcut to quickly push all changes with comment
@ -186,25 +187,32 @@ eval "$(pyenv init - bash 2>/dev/null)"

 [[ -d $HOME/.local/share/gem/ruby/3.3.0/bin ]] && export PATH="$HOME/.local/share/gem/ruby/3.3.0/bin:$PATH"

-TPUT_RED="$(tput setaf 1)$(tput setab 0)"
-TPUT_MAGENTA_BG="$(tput setab 5)$(tput setaf 0)"
+#TPUT_RED="$(tput setaf 1)$(tput setab 0)"
+#TPUT_MAGENTA_BG="$(tput setab 5)$(tput setaf 0)"
 #TPUT_MAGENTA="$(tput sgr0)$(tput setaf 5)"
-TPUT_MAGENTA="$(tput setab 0)$(tput setaf 5)"
-TPUT_BLACK="$(tput sgr0)$(tput setaf 0)"
+#TPUT_MAGENTA="$(tput setab 0)$(tput setaf 5)"
+#TPUT_BLACK="$(tput sgr0)$(tput setaf 0)"

-export prompt_prefix=`awk '{$1=$1};1' <<< "${prompt_prefix}"`
+#export prompt_prefix=`awk '{$1=$1};1' <<< "${prompt_prefix}"`
 #PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\n\$ '
 #PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '

-PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[${TPUT_MAGENTA_BG}▓▒░ 󰊟 \u ${TPUT_MAGENTA} ${TPUT_RED}󰣚 ${TPUT_MAGENTA}$(hostname |  cut -d - -f 3-) ${TPUT_BLACK} \[\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
+#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[${TPUT_MAGENTA_BG}▓▒░ 󰊟 \u ${TPUT_MAGENTA} ${TPUT_RED}󰣚 ${TPUT_MAGENTA}$(hostname |  cut -d - -f 3-) ${TPUT_BLACK} \[\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
 #PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[${TPUT_MAGENTA_BG} 󰊟 \u${TPUT_MAGENTA} ${TPUT_RED}󰣚\[\e[00m\] \[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '

 #PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]󰊟 \u ${TPUT_RED}󰣚\[\e[00m\] \[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
 #PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s"|xargs printf "\\e]2;%s — Alacritty\007")\[\e[00m\]\n\$ '

+
 #Alacritty custom window title
 if [ "$TERM" = alacritty ];then
  PROMPT_COMMAND='pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\/.*)(?=\/.*\/)/\/…/s"|xargs printf "\e]2;%s — Alacritty\007"'
 fi

-bind TAB:menu-complete
+eval "$(starship init bash)"
+
+#bind TAB:menu-complete
+#set show-all-if-ambiguous on
+bind 'set show-all-if-ambiguous on'
+bind 'set completion-ignore-case on'
+
--- a/default/include
+++ b/default/include
@ -14,3 +14,5 @@ Scripts/iso_updater.sh
 Scripts/fix-swap-part.sh
 .local/bin/serverutil-deb-upload
 .local/bin/ssh-agent-handler.sh
+.config/starship.toml
+.config/nvim