diff --git a/kanata/.config/kanata/kanata.kbd b/kanata/.config/kanata/kanata.kbd
index c95eb02..cc3ec51 100644
--- a/kanata/.config/kanata/kanata.kbd
+++ b/kanata/.config/kanata/kanata.kbd
@@ -11,7 +11,7 @@
(defcfg
linux-dev /dev/input/by-path/platform-i8042-serio-0-event-kbd
- fallthrough true
+ ;; fallthrough true
)
(defsrc
@@ -26,10 +26,10 @@
(deflayer base
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ssrq slck pause
grv 1 2 3 4 5 6 7 8 9 0 - = bspc ins home pgup
- @tab q w e r t @cy @cu @ci @co @cp [ + ret del end pgdn
+ tab q w e r t @cy @cu @ci @co @cp [ + ret del end pgdn
@cps @ca @cs @cd @cf g @ch @cj k @cl scln ' \
lsft 102d z x c v b n m , . / rsft up
- lctl lmet lalt spc ralt ralt left down rght
+ lctl lmet lalt spc bspc ralt left down rght
)
(defalias
@@ -60,25 +60,31 @@
(u) u
(o) o
(p) p
- (y p) (macro = S-.)
+ ;;(y p) (macro = S-.)
(u i o) @uml-u
(i o p) @uml-o
(a s d) @uml-a
(s d f) @uml-s
+
(h j) (macro S-scln S-scln)
- (j i) (macro - S-.)
+ ;;(j i) (macro - S-.)
(j l) C-bspc)
(defalias
cps (tap-hold-release 200 200 esc (layer-toggle symbols))
- tab (tap-hold-release 200 200 tab (layer-toggle umls))
+ ;;tab (tap-hold-release 200 200 tab (layer-toggle umls))
s-sft (tap-hold-release 150 150 s lsft)
l-sft (tap-hold-release 150 150 l lsft)
- uml-a (macro ralt S-apos a)
- uml-o (macro ralt S-apos o)
- uml-u (macro ralt S-apos u)
- uml-s (macro ralt s s)
+ ;;uml-a (macro ralt S-apos a)
+ ;;uml-o (macro ralt S-apos o)
+ ;;uml-u (macro ralt S-apos u)
+ ;;uml-s (macro ralt s s)
+ uml-a (unicode ä)
+ uml-o (unicode ö)
+ uml-u (unicode ü)
+ uml-s (unicode ß)
+
)
@@ -88,7 +94,7 @@ _ _ _ _ _ _ _ _ _ _ _ _
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
_ _ S-1 S-apos / \ _ S-[ [ ] S-] _ S-8 _ _ _ _
_ home S-4 S-9 S-0 end left down up rght S-7 S-5 _
-_ _ S-\ del S-/ S-` _ = S-3 bspc _ _ _ _
+_ _ S-\ del S-/ S-` _ = S-3 ralt _ _ _ _
_ _ _ _ _ _ _ _ _
)
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index 2642fed..6ba7ea1 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -88,10 +88,10 @@
:less {:validate true}
:scss {:validate true}}})
- (lsp.tsserver.setup {:root_dir (lsp.util.root_pattern "package.json")
- :on_attach (fn [client bufnr]
- (set client.resolved_capabilities.document_formatting false)
- (on_attach client bufnr))})
+ (lsp.ts_ls.setup {:root_dir (lsp.util.root_pattern "package.json")
+ :on_attach (fn [client bufnr]
+ (set client.resolved_capabilities.document_formatting false)
+ (on_attach client bufnr))})
(let [
diff --git a/nvim/.config/nvim/lua/dots/plugins/lsp.lua b/nvim/.config/nvim/lua/dots/plugins/lsp.lua
index a8645bc..33a25e6 100644
--- a/nvim/.config/nvim/lua/dots/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/dots/plugins/lsp.lua
@@ -64,7 +64,7 @@ local function setup()
client.resolved_capabilities.document_formatting = false
return on_attach(client, bufnr)
end
- lsp.tsserver.setup({root_dir = lsp.util.root_pattern("package.json"), on_attach = _6_})
+ lsp.ts_ls.setup({root_dir = lsp.util.root_pattern("package.json"), on_attach = _6_})
do
local rustaceanvim = require("rustaceanvim")
local rustaceanvim_config = require("rustaceanvim.config")
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
new file mode 100644
index 0000000..8303691
--- /dev/null
+++ b/waybar/.config/waybar/config.jsonc
@@ -0,0 +1,221 @@
+// -*- mode: jsonc -*-
+{
+ // "layer": "top", // Waybar at top layer
+ // "position": "bottom", // Waybar position (top|bottom|left|right)
+ "height": 24, // Waybar height (to be removed for auto height)
+ // "width": 1280, // Waybar width
+ "spacing": 4, // Gaps between modules (4px)
+ // Choose the order of the modules
+ "modules-left": [
+ "sway/workspaces",
+ "sway/mode",
+ "sway/scratchpad",
+ "custom/media"
+ ],
+ "modules-center": [
+ "sway/window",
+ "clock",
+ "clock#date"
+ ],
+ "modules-right": [
+ "mpd",
+ "idle_inhibitor",
+ "pulseaudio",
+ "network",
+ "power-profiles-daemon",
+ "cpu",
+ "memory",
+ "temperature",
+ "backlight",
+ "keyboard-state",
+ "sway/language",
+ "battery",
+ "battery#bat2",
+ "tray",
+ "custom/power"
+ ],
+ // Modules configuration
+ // "sway/workspaces": {
+ // "disable-scroll": true,
+ // "all-outputs": true,
+ // "warp-on-scroll": false,
+ // "format": "{name}: {icon}",
+ // "format-icons": {
+ // "1": "",
+ // "2": "",
+ // "3": "",
+ // "4": "",
+ // "5": "",
+ // "urgent": "",
+ // "focused": "",
+ // "default": ""
+ // }
+ // },
+ "keyboard-state": {
+ "numlock": true,
+ "capslock": true,
+ "format": "{name} {icon}",
+ "format-icons": {
+ "locked": "",
+ "unlocked": ""
+ }
+ },
+ "sway/mode": {
+ "format": "{}"
+ },
+ "sway/scratchpad": {
+ "format": "{icon} {count}",
+ "show-empty": false,
+ "format-icons": ["", ""],
+ "tooltip": true,
+ "tooltip-format": "{app}: {title}"
+ },
+ "mpd": {
+ "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+ "format-disconnected": "Disconnected ",
+ "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+ "unknown-tag": "N/A",
+ "interval": 5,
+ "consume-icons": {
+ "on": " "
+ },
+ "random-icons": {
+ "off": " ",
+ "on": " "
+ },
+ "repeat-icons": {
+ "on": " "
+ },
+ "single-icons": {
+ "on": "1 "
+ },
+ "state-icons": {
+ "paused": "",
+ "playing": ""
+ },
+ "tooltip-format": "MPD (connected)",
+ "tooltip-format-disconnected": "MPD (disconnected)"
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ }
+ },
+ "tray": {
+ // "icon-size": 21,
+ "spacing": 10
+ },
+ "clock": {
+ // "timezone": "America/New_York",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format-alt": "{:%Y-%m-%d}"
+ },
+ "clock#date": {
+ // "timezone": "America/New_York",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format": "{:%Y-%m-%d}"
+ },
+ "cpu": {
+ "format": "{usage}% ",
+ "tooltip": false
+ },
+ "memory": {
+ "format": "{}% "
+ },
+ "temperature": {
+ // "thermal-zone": 2,
+ // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+ "critical-threshold": 80,
+ // "format-critical": "{temperatureC}°C {icon}",
+ "format": "{temperatureC}°C {icon}",
+ "format-icons": ["", "", ""]
+ },
+ "backlight": {
+ // "device": "acpi_video1",
+ "format": "{percent}% {icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", ""]
+ },
+ "battery": {
+ "states": {
+ // "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{capacity}% {icon}",
+ "format-full": "{capacity}% {icon}",
+ "format-charging": "{capacity}% ",
+ "format-plugged": "{capacity}% ",
+ "format-alt": "{time} {icon}",
+ // "format-good": "", // An empty format will hide the module
+ // "format-full": "",
+ "format-icons": ["", "", "", "", ""]
+ },
+ "battery#bat2": {
+ "bat": "BAT2"
+ },
+ "power-profiles-daemon": {
+ "format": "{icon}",
+ "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+ "tooltip": true,
+ "format-icons": {
+ "default": "",
+ "performance": "",
+ "balanced": "",
+ "power-saver": ""
+ }
+ },
+ "network": {
+ // "interface": "wlp2*", // (Optional) To force the use of this interface
+ "format-wifi": "{essid} ({signalStrength}%) ",
+ "format-ethernet": "{ipaddr}/{cidr} ",
+ "tooltip-format": "{ifname} via {gwaddr} ",
+ "format-linked": "{ifname} (No IP) ",
+ "format-disconnected": "Disconnected ⚠",
+ "format-alt": "{ifname}: {ipaddr}/{cidr}"
+ },
+ "pulseaudio": {
+ // "scroll-step": 1, // %, can be a float
+ "format": "{volume}% {icon} {format_source}",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": "{volume}% ",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": ["", "", ""]
+ },
+ "on-click": "pavucontrol"
+ },
+ "custom/media": {
+ "format": "{icon} {text}",
+ "return-type": "json",
+ "max-length": 40,
+ "format-icons": {
+ "spotify": "",
+ "default": "🎜"
+ },
+ "escape": true,
+ "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+ // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+ },
+ "custom/power": {
+ "format" : "⏻ ",
+ "tooltip": false,
+ "menu": "on-click",
+ "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
+ "menu-actions": {
+ "shutdown": "shutdown",
+ "reboot": "reboot",
+ "suspend": "systemctl suspend",
+ "hibernate": "systemctl hibernate"
+ }
+ }
+}