From 6096e7f94f9554a79f5b83d8de2cf5bc606b618f Mon Sep 17 00:00:00 2001 From: ElKowar <5300871+elkowar@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:15:28 +0100 Subject: [PATCH] work adjustments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lazy and update update lazy add lsp-lines copilot and stuff äf update Re-set up laptop slight changes to hyprland config update neovim eww rice vert bar update asdf --- alacritty/.config/alacritty/alacritty.toml | 187 ++++++++++++++++++ eww-laptop/.config/eww/eww.scss | 68 ++++++- eww-laptop/.config/eww/eww.yuck | 110 ++++++++--- eww-laptop/.config/eww/scripts/get-brightness | 7 + eww-laptop/.config/eww/scripts/getvol | 12 ++ foot/.config/foot/foot.ini | 2 + hyprland/.config/hypr/hyprland.conf | 20 +- kanata/.config/kanata/kanata.kbd | 10 +- nvim/.config/nvim/lazy-lock.json | 126 ++++++------ nvim/.config/nvim/lua/dots/plugins.lua | 150 ++++++++++++++ nvim/.config/nvim/lua/dots/plugins/glance.lua | 18 ++ nvim/.config/nvim/lua/dots/plugins/neogit.lua | 18 ++ .../nvim/lua/dots/plugins/persistence.lua | 17 ++ nvim/.config/nvim/lua/dots/plugins/sneak.lua | 19 ++ .../nvim/lua/dots/plugins/symbols-outline.lua | 16 ++ .../nvim/lua/dots/plugins/twilight.lua | 17 ++ .../nvim/lua/dots/plugins/zen-mode.lua | 17 ++ nvim/.config/nvim/lua/init.lua | 139 +++++++++++++ nvim/.config/nvim/lua/macros.fnl | 99 ++++++++++ scripts/scripts/conserve-battery.sh | 20 ++ scripts/scripts/preview.sh | 6 +- scripts/scripts/watch-charging.sh | 23 +++ 22 files changed, 995 insertions(+), 106 deletions(-) create mode 100644 alacritty/.config/alacritty/alacritty.toml create mode 100644 eww-laptop/.config/eww/scripts/get-brightness create mode 100755 eww-laptop/.config/eww/scripts/getvol create mode 100644 nvim/.config/nvim/lua/dots/plugins.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/glance.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/neogit.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/persistence.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/sneak.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/symbols-outline.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/twilight.lua create mode 100644 nvim/.config/nvim/lua/dots/plugins/zen-mode.lua create mode 100644 nvim/.config/nvim/lua/init.lua create mode 100644 nvim/.config/nvim/lua/macros.fnl create mode 100755 scripts/scripts/conserve-battery.sh create mode 100755 scripts/scripts/watch-charging.sh diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..84c7d1a --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml @@ -0,0 +1,187 @@ +live_config_reload = true + +[colors.bright] +black = "#928374" +blue = "#83a598" +cyan = "#8ec07c" +green = "#b8bb26" +magenta = "#d3869b" +red = "#fb4934" +white = "#ebdbb2" +yellow = "#fabd2f" + +[colors.normal] +black = "#665c54" +blue = "#458588" +cyan = "#689d6a" +green = "#98971a" +magenta = "#b16286" +red = "#cc241d" +white = "#a89984" +yellow = "#d79921" + +[colors.primary] +background = "#282828" +bg_darker = "#1d2021" +bg_lighter = "#3c3836" +foreground = "#ebdbb2" + +[cursor] +unfocused_hollow = true + +[cursor.style] +blinking = "Never" +shape = "Block" + +[font] +size = 12 + +[font.normal] +family = "Fira Code" + +[font.offset] +x = 0 +y = 0 + +[[keyboard.bindings]] +action = "SpawnNewInstance" +key = "N" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Plus" +mods = "Control|Shift" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Plus" +mods = "Control|Shift|Alt" + +[mouse] +hide_when_typing = true + +[mouse.double_click] +threshold = 300 + +[mouse.triple_click] +threshold = 300 + +[window] +dynamic_padding = true +dynamic_title = true +opacity = 1 + +[window.padding] +x = 20 +y = 20 diff --git a/eww-laptop/.config/eww/eww.scss b/eww-laptop/.config/eww/eww.scss index 24ead9d..c77e96c 100644 --- a/eww-laptop/.config/eww/eww.scss +++ b/eww-laptop/.config/eww/eww.scss @@ -2,21 +2,77 @@ all: unset; } +label { + color: #ebdbb2; +} + +.indicators { + & > box { + background-color: #282828; + margin: 15px 15px; + box-shadow: 0px 0px 5px 0px rgba(0,0,0, 0.51); + & > box { + margin: 5px 10px; + } + } + label { + font-size: 20px; + } + + progressbar { + trough { + background-color: #1d2021; + min-height: 5px; + min-width: 200px; + progress { + min-height: 5px; + background-color: #8ec07c; + } + } + } +} + .bar { background-color: #1d2021; color: #ebdbb2; - margin-left: 10px; - margin-right: 10px; + //margin-left: 10px; + //margin-right: 10px; + margin-top: 10px; + margin-bottom: 10px; font-family: "CozetteVector"; - font-size: 12px; + font-size: 13px; .current { color: #8ec07c; } + + .entry { + .icon { + font-family: "Fira Code Nerd Font"; + } + + .icon.charging-indicator { + font-size: 9px; + color: #1d2021; + } + } + } -menuitem window { - background: #282828; - margin: 10px; +menubar > menuitem { + & > window { + background-color: #282828; + font-size: 13px; + menu { + padding: 2px; + menuitem { + padding: 2px; + &:hover { + background-color: #3c3836; + } + } + } + } } + diff --git a/eww-laptop/.config/eww/eww.yuck b/eww-laptop/.config/eww/eww.yuck index 2a5ffcd..3399e6d 100644 --- a/eww-laptop/.config/eww/eww.yuck +++ b/eww-laptop/.config/eww/eww.yuck @@ -1,43 +1,91 @@ (deflisten workspaces :initial "[]" "bash ./scripts/get-workspaces") (deflisten current_workspace :initial "1" "bash ./scripts/get-active-workspace") -(defpoll time :interval "1s" "date '+%d.%m.%Y - %H:%M:%S'") -(defwidget workspaces [] - (eventbox :halign "start" - :onscroll "bash ${EWW_CONFIG_DIR}/scripts/change-active-workspace {} ${current_workspace}" - :class "workspaces-widget" - (box :space-evenly true - (for workspace in workspaces - (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}" - (label :class {workspace.id == current_workspace ? "current" : ""} - :text " ${workspace.windows > 0 ? "◆" : "◇"} ")))))) - -(defwidget bar [] - (centerbox :class "bar" - (workspaces) - "${time}" - (box :halign "end" - :space-evenly true - :width "150" - "󰁹 ${EWW_BATTERY["BAT1"].capacity}%" - "󰍛 ${round(EWW_RAM.used_mem_perc, 0)}%" - "󰻠 ${round(EWW_CPU.avg, 0)}%"))) +(defpoll brightness :interval "1s" "bash ./scripts/get-brightness") +(defpoll volume :interval "1s" "bash ./scripts/getvol") + +(defwindow indicators + :monitor 0 + :geometry (geometry :x 50 :y 50 :width "200px" :height "10px" :anchor "bottom left") + :stacking "fg" + (indicators)) + +(defwidget indicators [] + (box :orientation "v" + (box :space-evenly false + (label :text "󰃞 ") + (progress :valign "center" :value {brightness ?: 0})) + (box :space-evenly false + (label :text " ") + (progress :valign "center" :value {volume ?: 0})))) (defwindow bar :monitor 0 - :geometry (geometry :x 0 :y 0 :width "100%" :height "30px" :anchor "top center") + :geometry (geometry :x 0 :y 0 :width "40px" :height "100%" :anchor "center left") :stacking "fg" :exclusive true (bar)) +(defwidget bar [] + (centerbox :class "bar" :orientation "v" + (workspaces-display) + (time-display) + (data-display))) -(defwindow test - :monitor 0 - :exclusive true - :geometry (geometry :x 0 :y 0 :width "100%" :height "20px" :anchor "top center") - (box - "${EWW_NET["enp34s0"]}" - (tooltip - "${time}" - (button "test")))) +(defwidget workspaces-display [] + (eventbox :onscroll "bash ${EWW_CONFIG_DIR}/scripts/change-active-workspace {} ${current_workspace}" + :class "workspaces-widget" + (box :space-evenly false :orientation "v" + (for workspace in workspaces + (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}" + (label :class {workspace.id == current_workspace ? "current" : ""} + :xalign 0.6 + :text " ${workspace.windows > 0 ? "◆" : "◇"} ")))))) + +(defwidget time-display [] + (box :orientation "v" + {formattime(EWW_TIME, "%H")} + {formattime(EWW_TIME, "%M")} + {formattime(EWW_TIME, "%S")} + "—" + {formattime(EWW_TIME, "%d")} + {formattime(EWW_TIME, "%m")} + {formattime(EWW_TIME, "%y")})) + +(defwidget data-display [] + (box :valign "end" + :space-evenly false + :orientation "v" + (box :class "entry" :orientation "v" + (overlay + (entry-icon :text {EWW_BATTERY["BAT1"].capacity > 80 ? "󰁹" : + EWW_BATTERY["BAT1"].capacity > 50 ? "󰂁" : + EWW_BATTERY["BAT1"].capacity > 30 ? "󰁾" : + EWW_BATTERY["BAT1"].capacity > 10 ? "󰁼" : "󰁺"}) + (entry-icon :text {EWW_BATTERY["BAT1"].status == "Charging" ? "󱐋" : ""})) + (label :class "value" :text "${EWW_BATTERY["BAT1"].capacity}%")) + (entry :icon "󰍛" :value "${round(EWW_RAM.used_mem_perc, 0)}%") + (entry :icon "󰻠" :value "${round(EWW_CPU.avg, 0)}%"))) + ;(systray :pack-direction "ttb"))) + + +(defwidget entry [icon ?icon-class value] + (box :class "entry" :orientation "v" + (entry-icon :class "icon" :text "${icon}") + (label :class "value" :text value))) + +(defwidget entry-icon [text ?class] + (label :class "icon ${class}" + :valign "fill" :halign "fill" + :text "${text}")) + + + + + +;(defwindow test [foo] + ;:monitor 0 + ;:geometry (geometry :x 50 :y 50 :width "200px" :height "10px" :anchor "bottom left") + ;:stacking "fg" + ;"${foo}") diff --git a/eww-laptop/.config/eww/scripts/get-brightness b/eww-laptop/.config/eww/scripts/get-brightness new file mode 100644 index 0000000..71a8f39 --- /dev/null +++ b/eww-laptop/.config/eww/scripts/get-brightness @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +max=$(brightnessctl max) +current=$(brightnessctl get) +percentage=$(echo "scale=1; $current / $max * 100" | bc -l) +echo "$percentage" + diff --git a/eww-laptop/.config/eww/scripts/getvol b/eww-laptop/.config/eww/scripts/getvol new file mode 100755 index 0000000..4e4275d --- /dev/null +++ b/eww-laptop/.config/eww/scripts/getvol @@ -0,0 +1,12 @@ +#!/bin/sh + +if command -v pamixer &>/dev/null; then + if [ true == $(pamixer --get-mute) ]; then + echo 0 + exit + else + pamixer --get-volume + fi +else + amixer -D pulse sget Master | awk -F '[^0-9]+' '/Left:/{print $3}' +fi diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini index ea13a9c..3183417 100644 --- a/foot/.config/foot/foot.ini +++ b/foot/.config/foot/foot.ini @@ -10,6 +10,8 @@ # font=APL386 Unicode:size=8 font=Fira Code Nerd Font:size=12 +# font=Fira Code Nerd Font:size=8 +;font=Fira Code:size=8 # font-bold= # font-italic= # font-bold-italic= diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf index df34d06..13b56ff 100644 --- a/hyprland/.config/hypr/hyprland.conf +++ b/hyprland/.config/hypr/hyprland.conf @@ -1,9 +1,11 @@ monitor=,preferred,auto,1 exec-once = swaybg -m fill --image /home/leon/Pictures/green_leaves.jpg & mako -env = $WOBSOCK,$XDG_RUNTIME_DIR/wob.sock -exec-once = mkfifo $WOBSOCK && tail -f $WOBSOCK | wob +env = WOBSOCK,$XDG_RUNTIME_DIR/wob.sock +exec-once = mkfifo $WOBSOCK; tail -f $WOBSOCK | wob exec-once = eww open bar +exec-once = wl-gammarelay-rs +exec-once = ~/scripts/watch-charging.sh & # Source a file (multi-file configs) @@ -24,7 +26,6 @@ input { touchpad { natural_scroll = yes } - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. } @@ -92,8 +93,11 @@ bind = SUPER, g, togglefloating, bind = SUPER SHIFT, P, exec, rofi -show drun bind = SUPER, P, pseudo, # dwindle bind = SUPER, v, togglesplit, # dwindle -bind = SUPER, f, fullscreen, 1 # dwindle -bind = SUPER SHIFT, f, fullscreen, 0 # dwindle +bind = SUPER, f, fullscreen, 1 +bind = SUPER SHIFT, f, fullscreen, 0 +bind = SUPER CTRL, f, fakefullscreen + +bind = SUPER CTRL SHIFT, i, exec, busctl --user call rs.wl-gammarelay / rs.wl.gammarelay ToggleInverted bind = ,XF86AudioRaiseVolume, exec, pamixer -ui 2 && pamixer --get-volume > $WOBSOCK bind = ,XF86AudioLowerVolume, exec, pamixer -ud 2 && pamixer --get-volume > $WOBSOCK @@ -101,6 +105,12 @@ bind = ,XF86AudioMute, exec, pamixer --toggle-mute && ( pamixer --get-mute && ec bind = ,XF86MonBrightnessDown, exec, brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' | tee /tmp/brightness > $WOBSOCK bind = ,XF86MonBrightnessUp, exec, brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' | tee /tmp/brightness > $WOBSOCK +# bind = ,XF86AudioRaiseVolume, exec, pamixer -ui 2 && eww update volume=$(pamixer --get-volume) +# bind = ,XF86AudioLowerVolume, exec, pamixer -ud 2 && eww update volume=$(pamixer --get-volume) +# bind = ,XF86AudioMute, exec, pamixer --toggle-mute && ( pamixer --get-mute && eww update volume=0 ) || eww update volume=$(pamixer --get-volume) +# bind = ,XF86MonBrightnessDown, exec, brightnessctl set 5%- && eww update brightness=$(bash ~/.config/eww/scripts/get-brightness) +# bind = ,XF86MonBrightnessUp, exec, brightnessctl set +5% | eww update brightness=$(bash ~/.config/eww/scripts/get-brightness) + bind = SUPER, t, togglegroup bind = SUPER, tab, changegroupactive, f bind = SUPER SHIFT, tab, changegroupactive, b diff --git a/kanata/.config/kanata/kanata.kbd b/kanata/.config/kanata/kanata.kbd index c95eb02..efebdd9 100644 --- a/kanata/.config/kanata/kanata.kbd +++ b/kanata/.config/kanata/kanata.kbd @@ -27,7 +27,7 @@ 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 - @cps @ca @cs @cd @cf g @ch @cj k @cl scln ' \ + @cps @ca @cs @cd @cf g @ch @cj @ck @cl @cscl ' \ lsft 102d z x c v b n m , . / rsft up lctl lmet lalt spc ralt ralt left down rght ) @@ -45,6 +45,8 @@ ci (chord chords i) cj (chord chords j) cl (chord chords l) + ck (chord chords k) + cscl (chord chords scl) ) (defchords chords 100 @@ -60,9 +62,11 @@ (u) u (o) o (p) p + (k) k + (scl) scln (y p) (macro = S-.) - (u i o) @uml-u - (i o p) @uml-o + (i o p) @uml-u + (k l scl) @uml-o (a s d) @uml-a (s d f) @uml-s (h j) (macro S-scln S-scln) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 35f8034..24d8d86 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,90 +1,95 @@ { "agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" }, - "aniseed": { "branch": "master", "commit": "7bc09736f3651c10d29b82d1a465b7f540614be1" }, + "aniseed": { "branch": "develop", "commit": "44d2886a9ec38abac61b4c73c2e57fb752232cfe" }, "antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" }, + "any-jump.vim": { "branch": "master", "commit": "770ef708ae3f13322430fcc663d7dfb864756b9b" }, "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-calc": { "branch": "main", "commit": "50792f34a628ea6eb31d2c90e8df174671e4e7a0" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" }, + "cmp-omni": { "branch": "main", "commit": "9436e6cdd7c5dfa24a99a60d9280b24dbdea3649" }, "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" }, - "crates.nvim": { "branch": "main", "commit": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, - "editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" }, + "conjure": { "branch": "master", "commit": "1dd96d90f53122225f698e58b50dee9ed760cf2e" }, + "copilot.lua": { "branch": "master", "commit": "77e3a4907928f0813024e573b882dc879dfc0c6b" }, + "crates.nvim": { "branch": "main", "commit": "3648f8787656d7572740560331553abdaa8cb982" }, + "diffview.nvim": { "branch": "main", "commit": "6780a8a27f5cd326f502653cecef701611641fdf" }, + "dressing.nvim": { "branch": "master", "commit": "f16d7586fcdd8b2e3850d0abb7e46f944125cc25" }, + "editorconfig-vim": { "branch": "master", "commit": "7f4e4dfc58c480d154116614e616d90aac77204d" }, "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, - "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" }, + "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" }, - "flutter-tools.nvim": { "branch": "main", "commit": "f04131d6b2c82c2a7624a8843642d6269b50b437" }, - "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gh.nvim": { "branch": "main", "commit": "3181973d0c80fe0553e30e0aeeb860bedef9a33b" }, - "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, - "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, + "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" }, + "gh.nvim": { "branch": "main", "commit": "2b5551656c1b896bf4ae06546eaaab00311f9a18" }, + "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" }, + "glance.nvim": { "branch": "master", "commit": "6da4999e261829daebbee0c91efb5cb562408755" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, - "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" }, + "hop.nvim": { "branch": "master", "commit": "03f0434869f1f38868618198b5f4f2ab6d39aef2" }, "idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" }, - "inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" }, + "inc-rename.nvim": { "branch": "main", "commit": "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e" }, "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" }, "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, - "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": "0cae7abc30cb91d661f28257c331fcb5b5198e31" }, - "nerdcommenter": { "branch": "master", "commit": "e361a44230860d616f799a337bc58f5218ab6e9c" }, - "nfnl": { "branch": "main", "commit": "d6b33ae7376dda6f26cca8365d9beaf66f43c410" }, - "nvim-bufferline.lua": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" }, + "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" }, + "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, + "lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" }, + "lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" }, + "neoformat": { "branch": "master", "commit": "2d5d071d5957681ae677ee06f6eb879a61b7b618" }, + "neogit": { "branch": "master", "commit": "68a3e90e9d1ed9e362317817851d0f34b19e426b" }, + "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" }, + "noice.nvim": { "branch": "main", "commit": "a070cb87a180fd7e2c4387accff0be90268fb736" }, + "nui.nvim": { "branch": "main", "commit": "f2841533540eb60d6878964a3cd3f8196e1f200c" }, + "nvim-bufferline.lua": { "branch": "main", "commit": "874f869a24e568980294b3200fc9dd842db65a36" }, + "nvim-cmp": { "branch": "main", "commit": "69e7d280cbe17e318b549a10ae3cae5810946be6" }, + "nvim-code-action-menu": { "branch": "main", "commit": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" }, - "nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" }, - "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, + "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, + "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, + "nvim-jenkinsfile-linter": { "branch": "main", "commit": "4e37807dfc5b95dba7f4406f4f11dd7c4d94661e" }, + "nvim-lspconfig": { "branch": "master", "commit": "08f1f347c718e945c3b1712ebb68c6834182cf3a" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, + "nvim-treesitter": { "branch": "master", "commit": "f9d701176cb9a3e206a4c690920a8993630c3ec8" }, + "nvim-treesitter-textsubjects": { "branch": "master", "commit": "b913508f503527ff540f7fe2dcf1bf1d1f259887" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" }, + "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" }, - "nvlime": { "branch": "master", "commit": "024b007766734d4be0e325eab2b33a3111720fbc" }, - "obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" }, - "octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" }, - "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" }, - "parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" }, - "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "nvlime": { "branch": "master", "commit": "2cdbcc1d8be09c16674d4b1983fba1a2f15b431a" }, + "octo.nvim": { "branch": "master", "commit": "2d2769ff80a82a0da24dcf636ae146f3ed5d7ae5" }, + "parinfer-rust": { "branch": "master", "commit": "3c769707ad3b18d530f696fe42a9d495139149ab" }, + "parsley": { "branch": "main", "commit": "9a388fe9e8a443d9d892318b4cce6dd287c47e38" }, + "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, + "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, + "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, + "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "rustaceanvim": { "branch": "master", "commit": "cd35b0f7fb0c9fe6879b084096230a74fefa4da8" }, "sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" }, "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, "startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" }, + "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" }, "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" }, - "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" }, - "telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "typescript-vim": { "branch": "master", "commit": "e83ccab88c7a045ce795583adb66956afd464a31" }, + "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, + "telescope.nvim": { "branch": "master", "commit": "116dbea5800c908de4afa6e793f28f782621c65d" }, + "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" }, + "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" }, + "typescript-vim": { "branch": "master", "commit": "31ede5ad905ce4159a5e285073a391daa3bf83fa" }, "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-exchange": { "branch": "master", "commit": "784d63083ad7d613aa96f00021cd0dfb126a781a" }, + "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" }, + "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" }, + "vim-gruvbox8": { "branch": "master", "commit": "67d28c1031e4970b07627fe30262f1862755b915" }, "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-nix": { "branch": "master", "commit": "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee" }, "vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, @@ -93,12 +98,13 @@ "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, "vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" }, - "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" }, - "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, - "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" }, - "vimtex": { "branch": "master", "commit": "6c01660a99c0cc0906b39094f4a2d086b28fa995" }, + "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" }, + "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" }, + "vim-vsnip-integ": { "branch": "master", "commit": "1930f0fc234521945afd48db2bff09d925211571" }, + "vimtex": { "branch": "master", "commit": "127c0a2ec8c6ca5f4c33902f004d302bd88a7c3e" }, "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" } + "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" }, + "yats.vim": { "branch": "master", "commit": "d3687891bdd333de4d831b6c7859e15d9ed3c4b2" }, + "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, + "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins.lua b/nvim/.config/nvim/lua/dots/plugins.lua new file mode 100644 index 0000000..dde1b29 --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins.lua @@ -0,0 +1,150 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins.fnl" +local _2amodule_name_2a = "dots.plugins" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local a, lazy, _ = autoload("aniseed.core"), autoload("lazy"), nil +_2amodule_locals_2a["a"] = a +_2amodule_locals_2a["lazy"] = lazy +_2amodule_locals_2a["_"] = _ +local function safe_req_conf(name) + local ok_3f, val_or_err = pcall(require, ("dots.plugins." .. name)) + if not ok_3f then + return print(("Plugin config error: " .. val_or_err)) + else + return nil + end +end +_2amodule_locals_2a["safe-req-conf"] = safe_req_conf +local function setup_lazy(...) + local pkgs = {...} + local args = {} + for i = 1, a.count(pkgs), 2 do + local name = pkgs[i] + local opts = pkgs[(i + 1)] + table.insert(args, a.assoc(opts, 1, name)) + end + return lazy.setup(args, {colorscheme = "gruvbox8"}) +end +_2amodule_2a["setup-lazy"] = setup_lazy +local function _2_() + return require("dots.plugins.gruvbox8") +end +local function _3_() + return require("dots.plugins.todo-comments") +end +local function _4_() + return require("dots.plugins.feline") +end +local function _5_() + return require("dots.plugins.bufferline") +end +local function _6_() + return require("dots.plugins.nvim-colorizer") +end +local function _7_() + return (require("stabilize")).setup() +end +local function _8_() + return (require("dressing")).setup() +end +local function _9_() + return require("dots.plugins.noice") +end +local function _10_() + return require("dots.plugins.persistence") +end +local function _11_() + return require("dots.plugins.zen-mode") +end +local function _12_() + return require("dots.plugins.twilight") +end +local function _13_() + return require("dots.plugins.telescope") +end +local function _14_() + return (require("scrollbar")).setup() +end +local function _15_() + do end (require("lsp_lines")).setup() + return vim.diagnostic.config({virtual_lines = false}) +end +local function _16_() + return (require("hop")).setup({keys = "jfkdls;amvieurow"}) +end +local function _17_() + return require("dots.plugins.treesitter") +end +local function _18_() + return (require("dapui")).setup() +end +local function _19_() + do end (require("litee.lib")).setup() + return (require("litee.gh")).setup() +end +local function _20_() + return (require("octo")).setup() +end +local function _21_() + return require("dots.plugins.diffview") +end +local function _22_() + return require("dots.plugins.gitsigns") +end +local function _23_() + return require("dots.plugins.neogit") +end +local function _24_() + vim.g.code_action_menu_show_details = false + return nil +end +local function _25_() + return require("dots.plugins.trouble") +end +local function _26_() + return require("dots.plugins.symbols-outline") +end +local function _27_() + return (require("inc_rename")).setup({input_buffer_type = "dressing"}) +end +local function _28_() + return require("dots.plugins.glance") +end +local function _29_() + return require("dots.plugins.cmp") +end +local function _30_() + return require("dots.plugins.copilot") +end +local function _31_() + vim.g.antifennel_executable = "/home/leon/tmp/antifennel/antifennel" + return nil +end +local function _32_() + return require("dots.plugins.vimtex") +end +local function _33_() + return require("dots.plugins.emmet") +end +local function _34_() + vim.g.vlime_overlay = "slimv" + return nil +end +local function _35_() + vim.g.rustfmt_fail_silently = 1 + return nil +end +local function _36_() + return (require("crates")).setup() +end +setup_lazy("Olical/aniseed", {branch = "develop"}, "nvim-lua/plenary.nvim", {}, "norcalli/nvim.lua", {}, "lifepillar/vim-gruvbox8", {priority = 1000, config = _2_, lazy = false}, "kyazdani42/nvim-web-devicons", {}, "folke/which-key.nvim", {}, "folke/todo-comments.nvim", {lazy = true, event = "VeryLazy", config = _3_}, "Famiu/feline.nvim", {config = _4_}, "akinsho/nvim-bufferline.lua", {config = _5_, tag = "v1.1.1"}, "ckipp01/nvim-jenkinsfile-linter", {dependencies = {"nvim-lua/plenary.nvim"}}, "psliwka/vim-smoothie", {}, "norcalli/nvim-colorizer.lua", {event = "VeryLazy", lazy = true, config = _6_}, "nathanaelkane/vim-indent-guides", {cmd = {"IndentGuidesToggle"}}, "luukvbaal/stabilize.nvim", {config = _7_}, "stevearc/dressing.nvim", {config = _8_}, "tweekmonster/startuptime.vim", {cmd = {"StartupTime"}}, "folke/noice.nvim", {config = _9_, dependencies = {"MunifTanjim/nui.nvim"}}, "folke/persistence.nvim", {config = _10_}, "folke/zen-mode.nvim", {config = _11_, cmd = {"ZenMode"}}, "folke/twilight.nvim", {config = _12_}, "moll/vim-bbye", {lazy = true, cmd = {"Bdelete", "Bwipeout"}}, "nvim-telescope/telescope.nvim", {config = _13_, cmd = {"Telescope"}, dependencies = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}}, "petertriho/nvim-scrollbar", {event = "VeryLazy", lazy = true, config = _14_}, "https://git.sr.ht/~whynothugo/lsp_lines.nvim", {config = _15_}, "jiangmiao/auto-pairs", {}, "tpope/vim-repeat", {}, "preservim/nerdcommenter", {event = "VeryLazy", lazy = true, priority = 1000}, "godlygeek/tabular", {cmd = {"Tabularize"}}, "tpope/vim-surround", {}, "hauleth/sad.vim", {}, "wellle/targets.vim", {}, "mg979/vim-visual-multi", {lazy = true, event = "VeryLazy"}, "tommcdo/vim-exchange", {}, "phaazon/hop.nvim", {lazy = true, event = "VeryLazy", config = _16_}, "nvim-treesitter/nvim-treesitter", {config = _17_, lazy = true, event = {"VeryLazy"}, build = ":TSUpdate"}, "RRethy/nvim-treesitter-textsubjects", {dependencies = {"nvim-treesitter/nvim-treesitter"}, lazy = true, event = {"VeryLazy"}}, "JoosepAlviste/nvim-ts-context-commentstring", {event = {"VeryLazy"}, lazy = true, dependencies = {"nvim-treesitter/nvim-treesitter"}}, "nvim-treesitter/playground", {event = {"VeryLazy"}, lazy = true, dependencies = {"nvim-treesitter/nvim-treesitter"}}, "rcarriga/nvim-dap-ui", {lazy = true, config = _18_, dependencies = {"mfussenegger/nvim-dap"}}, "mfussenegger/nvim-dap", {lazy = true}, "nvim-telescope/telescope-dap.nvim", {lazy = true, dependencies = {"nvim-telescope/telescope.nvim", "mfussenegger/nvim-dap"}}, "ldelossa/gh.nvim", {lazy = true, config = _19_, dependencies = {"ldelossa/litee.nvim"}}, "pwntester/octo.nvim", {lazy = true, dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "kyazdani42/nvim-web-devicons"}, config = _20_}, "sindrets/diffview.nvim", {cmd = {"DiffviewOpen", "DiffviewToggleFiles"}, config = _21_}, "lewis6991/gitsigns.nvim", {dependencies = {"vim-gruvbox8", "petertriho/nvim-scrollbar"}, config = _22_}, "ruanyl/vim-gh-line", {}, "rhysd/conflict-marker.vim", {}, "tpope/vim-fugitive", {lazy = true, event = "VeryLazy"}, "TimUntersberger/neogit", {config = _23_, cmd = {"Neogit"}}, "ray-x/lsp_signature.nvim", {event = "BufEnter"}, "weilbith/nvim-code-action-menu", {cmd = "CodeActionMenu", config = _24_}, "folke/trouble.nvim", {lazy = true, config = _25_, cmd = {"Trouble", "TroubleClose", "TroubleRefresh", "TroubleToggle"}}, "simrat39/symbols-outline.nvim", {lazy = true, cmd = {"SymbolsOutline", "SymbolsOutlineClose", "SymbolsOutlineOpen"}, config = _26_}, "neovim/nvim-lspconfig", {event = "VeryLazy", lazy = true}, "smjonas/inc-rename.nvim", {config = _27_}, "dnlhc/glance.nvim", {lazy = true, config = _28_}, "hrsh7th/vim-vsnip", {lazy = true, event = {"VeryLazy"}}, "hrsh7th/vim-vsnip-integ", {lazy = true, event = {"VeryLazy"}}, "rafamadriz/friendly-snippets", {}, "hrsh7th/nvim-cmp", {lazy = true, event = {"VeryLazy"}, dependencies = {{"hrsh7th/cmp-nvim-lsp"}, {"hrsh7th/cmp-buffer"}, {"hrsh7th/cmp-vsnip"}, {"hrsh7th/cmp-nvim-lua"}, {"hrsh7th/cmp-calc"}, {"hrsh7th/cmp-path"}, {"hrsh7th/cmp-nvim-lsp-signature-help"}, {"davidsierradz/cmp-conventionalcommits"}, {"hrsh7th/cmp-omni"}}, config = _29_}, "zbirenbaum/copilot.lua", {cmd = "Copilot", event = "InsertEnter", config = _30_}, "tpope/vim-sleuth", {}, "editorconfig/editorconfig-vim", {}, "pechorin/any-jump.vim", {}, "sbdchd/neoformat", {}, "elkowar/antifennel-nvim", {config = _31_}, "Olical/conjure", {ft = {"fennel"}}, "eraserhd/parinfer-rust", {build = "cargo build --release"}, "lervag/vimtex", {ft = {"latex", "tex"}, config = _32_}, "kmonad/kmonad-vim", {}, "elkowar/yuck.vim", {ft = {"yuck"}}, "cespare/vim-toml", {ft = {"toml"}}, "bduggan/vim-raku", {ft = {"raku"}}, "LnL7/vim-nix", {ft = {"nix"}}, "kevinoid/vim-jsonc", {}, "pangloss/vim-javascript", {ft = {"javascript"}}, "ianks/vim-tsx", {ft = {"typescript-react"}}, "leafgarland/typescript-vim", {ft = {"typescript", "typescript-react", "javascript"}}, "HerringtonDarkholme/yats.vim", {}, "mxw/vim-jsx", {}, "mattn/emmet-vim", {lazy = true, config = _33_}, "purescript-contrib/purescript-vim", {ft = {"purescript"}}, "derekelkins/agda-vim", {ft = {"agda"}}, "neovimhaskell/haskell-vim", {ft = {"haskell"}}, "monkoose/nvlime", {ft = {"lisp"}, dependencies = {"monkoose/parsley"}, config = _34_}, "rust-lang/rust.vim", {ft = {"rust"}, dependencies = {"mattn/webapi-vim"}, config = _35_}, "simrat39/rust-tools.nvim", {ft = {"rust", "toml"}, dependencies = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"}}, "Saecki/crates.nvim", {dependencies = {"nvim-lua/plenary.nvim"}, event = {"BufRead Cargo.toml"}, lazy = true, config = _36_}, "qnighy/lalrpop.vim", {}, "edwinb/idris2-vim", {ft = {"idris2"}}, "vmchale/ats-vim", {ft = {"ats", "dats", "sats"}}, "bakpakin/fennel.vim", {ft = {"fennel"}}, "evanleck/vim-svelte", {}) +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/glance.lua b/nvim/.config/nvim/lua/dots/plugins/glance.lua new file mode 100644 index 0000000..1f3a0bf --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/glance.lua @@ -0,0 +1,18 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/glance.fnl" +local _2amodule_name_2a = "dots.plugins.glance" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local a, glance = autoload("aniseed.core"), autoload("glance") +do end (_2amodule_locals_2a)["a"] = a +_2amodule_locals_2a["glance"] = glance +glance.setup() +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/neogit.lua b/nvim/.config/nvim/lua/dots/plugins/neogit.lua new file mode 100644 index 0000000..66554b1 --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/neogit.lua @@ -0,0 +1,18 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/neogit.fnl" +local _2amodule_name_2a = "dots.plugins.neogit" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local a, neogit = autoload("aniseed.core"), autoload("neogit") +do end (_2amodule_locals_2a)["a"] = a +_2amodule_locals_2a["neogit"] = neogit +neogit.setup({integrations = {diffview = true}}) +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/persistence.lua b/nvim/.config/nvim/lua/dots/plugins/persistence.lua new file mode 100644 index 0000000..4758e02 --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/persistence.lua @@ -0,0 +1,17 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/persistence.fnl" +local _2amodule_name_2a = "dots.plugins.persistence" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local persistence = autoload("persistence") +do end (_2amodule_locals_2a)["persistence"] = persistence +persistence.setup({dir = vim.fn.expand((vim.fn.stdpath("cache") .. "/sessions/"))}) +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/sneak.lua b/nvim/.config/nvim/lua/dots/plugins/sneak.lua new file mode 100644 index 0000000..679bca4 --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/sneak.lua @@ -0,0 +1,19 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/sneak.fnl" +local _2amodule_name_2a = "dots.plugins.sneak" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local utils = autoload("dots.utils") +do end (_2amodule_locals_2a)["utils"] = utils +vim.g["sneak#label"] = 1 +utils.keymap({"n", "o"}, "", "Sneak_s", {noremap = false}) +utils.keymap({"n", "o"}, "", "Sneak_S", {noremap = false}) +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/symbols-outline.lua b/nvim/.config/nvim/lua/dots/plugins/symbols-outline.lua new file mode 100644 index 0000000..cfa742b --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/symbols-outline.lua @@ -0,0 +1,16 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/symbols-outline.fnl" +local _2amodule_name_2a = "dots.plugins.symbols-outline" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local symbols_outline = require("symbols-outline") +do end (_2amodule_locals_2a)["symbols-outline"] = symbols_outline +symbols_outline.setup({highlight_hovered_item = true, show_guides = true}) +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/twilight.lua b/nvim/.config/nvim/lua/dots/plugins/twilight.lua new file mode 100644 index 0000000..05f0663 --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/twilight.lua @@ -0,0 +1,17 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/twilight.fnl" +local _2amodule_name_2a = "dots.plugins.twilight" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local twilight = autoload("twilight") +do end (_2amodule_locals_2a)["twilight"] = twilight +twilight.setup() +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/dots/plugins/zen-mode.lua b/nvim/.config/nvim/lua/dots/plugins/zen-mode.lua new file mode 100644 index 0000000..a129d3a --- /dev/null +++ b/nvim/.config/nvim/lua/dots/plugins/zen-mode.lua @@ -0,0 +1,17 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/dots/plugins/zen-mode.fnl" +local _2amodule_name_2a = "dots.plugins" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local zen_mode = autoload("zen-mode") +do end (_2amodule_locals_2a)["zen-mode"] = zen_mode +zen_mode.setup({window = {options = {wrap = true}}}) +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/init.lua b/nvim/.config/nvim/lua/init.lua new file mode 100644 index 0000000..e1c239d --- /dev/null +++ b/nvim/.config/nvim/lua/init.lua @@ -0,0 +1,139 @@ +local _2afile_2a = "/home/leon/.config/nvim/fnl/init.fnl" +local _2amodule_name_2a = "init" +local _2amodule_2a +do + package.loaded[_2amodule_name_2a] = {} + _2amodule_2a = package.loaded[_2amodule_name_2a] +end +local _2amodule_locals_2a +do + _2amodule_2a["aniseed/locals"] = {} + _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"] +end +local autoload = (require("aniseed.autoload")).autoload +local a, colors, nvim, str, utils, _ = autoload("aniseed.core"), autoload("dots.colors"), autoload("aniseed.nvim"), autoload("aniseed.string"), autoload("dots.utils"), nil +_2amodule_locals_2a["a"] = a +_2amodule_locals_2a["colors"] = colors +_2amodule_locals_2a["nvim"] = nvim +_2amodule_locals_2a["str"] = str +_2amodule_locals_2a["utils"] = utils +_2amodule_locals_2a["_"] = _ +utils["clear-deferred"]() +if vim.fn.has("termguicolors") then + vim.opt.termguicolors = true +else +end +local function _2_() + return require("dots.plugins") +end +local function _3_(_241) + local fennel_2_auto = require("aniseed.fennel") + return a.println(fennel_2_auto.traceback(_241)) +end +xpcall(_2_, _3_) +local function _4_() + return require("dots.plugins.lsp") +end +local function _5_(_241) + local fennel_2_auto = require("aniseed.fennel") + return a.println(fennel_2_auto.traceback(_241)) +end +xpcall(_4_, _5_) +local function _6_() + return require("dots.keybinds") +end +local function _7_(_241) + local fennel_2_auto = require("aniseed.fennel") + return a.println(fennel_2_auto.traceback(_241)) +end +xpcall(_6_, _7_) +do + local added_paths = {} + vim.opt.runtimepath = (vim.o.runtimepath .. str.join(",", added_paths)) +end +vim.cmd("let mapleader=\"\\\"") +vim.cmd("let maplocalleader=\",\"") +vim.cmd("filetype plugin indent on") +vim.cmd("syntax on") +vim.opt.foldmethod = "marker" +vim.opt.scrolloff = 5 +vim.opt.showmode = false +vim.opt.undodir = (vim.env.HOME .. "/.vim/undo-dir") +vim.opt.undofile = true +vim.opt.shortmess = (vim.o.shortmess .. "c") +vim.opt.hidden = true +vim.opt.encoding = "utf-8" +vim.opt.number = false +vim.opt.relativenumber = false +vim.opt.compatible = false +vim.opt.cursorline = true +vim.opt.incsearch = true +vim.opt.hlsearch = true +vim.opt.inccommand = "nosplit" +vim.opt.signcolumn = "yes" +vim.opt.shiftwidth = 2 +vim.opt.tabstop = 2 +vim.opt.backspace = "indent,eol,start" +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.expandtab = true +vim.opt.wrap = false +vim.opt.completeopt = "menuone,noselect" +vim.opt.laststatus = 2 +vim.opt.splitbelow = true +vim.opt.splitright = true +vim.opt.mouse = "a" +vim.opt.shell = "bash" +vim.opt.background = "dark" +vim.opt.swapfile = false +vim.opt.undolevels = 10000 +vim.opt.keywordprg = "rusty-man" +vim.g.AutoPairsMultilineClose = 0 +vim.cmd("let &t_ut=\"\"") +local function _8_() + vim.opt.shiftwidth = 2 + return nil +end +vim.api.nvim_create_autocmd("BufWritePost", {pattern = "*.hs", callback = _8_}) +local function _9_() + vim.opt_local.foldmethod = "marker" + return nil +end +vim.api.nvim_create_autocmd("FileType", {pattern = "vim", callback = _9_}) +local function _10_() + vim.opt_local.formatoptions = (vim.o.formatoptions):gsub("[cor]", "") + return nil +end +vim.api.nvim_create_autocmd("FileType", {pattern = "*", callback = _10_}) +local function _11_() + return vim.cmd("nnoremap :cclose") +end +vim.api.nvim_create_autocmd("FileType", {pattern = "qf", callback = _11_}) +local function _12_() + return vim.highlight.on_yank({higroup = "IncSearch", timeout = 300}) +end +vim.api.nvim_create_autocmd("TextYankPost", {pattern = "*", callback = _12_}) +vim.g.copilot_filetypes = {TelescopePrompt = false} +vim.diagnostic.config({float = {border = "single", style = "minimal"}}) +vim.g.VM_leader = "m" +vim.g.rust_clip_command = "xclip -selection clipboard" +vim.g["conjure#client#fennel#aniseed#aniseed_module_prefix"] = "aniseed." +vim.g.vim_parinfer_filetypes = {"carp", "fennel", "clojure"} +vim.g.parinfer_additional_filetypes = {"yuck"} +_G.clean_no_name_empty_buffers = function() + local bufs + local function _13_(_241) + return (a["empty?"](vim.fn.bufname(_241)) and (vim.fn.bufwinnr(_241) < 0) and vim.api.nvim_buf_is_loaded(_241) and ("" == str.join(utils["buffer-content"](_241))) and vim.api.nvim_buf_get_option(_241, "buflisted")) + end + bufs = a.filter(_13_, vim.fn.range(1, vim.fn.bufnr("$"))) + if not a["empty?"](bufs) then + return vim.cmd(("bdelete " .. str.join(" ", bufs))) + else + return nil + end +end +vim.cmd("autocmd! BufCreate * :call v:lua.clean_no_name_empty_buffers()") +vim.cmd("command! -nargs=1 L :lua print(vim.inspect())") +vim.cmd("Copilot enable") +utils["run-deferred"]() +return _2amodule_2a \ No newline at end of file diff --git a/nvim/.config/nvim/lua/macros.fnl b/nvim/.config/nvim/lua/macros.fnl new file mode 100644 index 0000000..70abf66 --- /dev/null +++ b/nvim/.config/nvim/lua/macros.fnl @@ -0,0 +1,99 @@ +{:augroup + (fn [name ...] + `(do + (nvim.ex.augroup ,(tostring name)) + (nvim.ex.autocmd_) + ,... + (nvim.ex.augroup :END))) + + :defer + (fn [...] + `(let [utils# (require :dots.utils)] + (utils#.defer-to-end (fn [] ,...)))) + + + :req + (fn [name ...] + (let [str (require :aniseed.string) + a (require :aniseed.core) + segs (str.split (tostring name) "%.") + mod (str.join "." (a.butlast segs)) + func (a.last segs)] + `((. (require (tostring ,mod)) (tostring ,func)) ,...))) + + :autocmd + (fn [...] + `(nvim.ex.autocmd ,...)) + + :_: + (fn [name ...] + `((. nvim.ex ,(tostring name)) ,...)) + + :viml->fn + (fn [name] + `(.. "lua require('" *module-name* "')['" ,(tostring name) "']()")) + + :dbg + (fn [x] + `(let [view# (require "aniseed.view")] + (print (.. `,(tostring x) " => " (view#.serialise ,x))) + ,x)) + + :dbg-call + (fn [x ...] + `(do + (let [a# (require "aniseed.core")] + (a#.println ,...)) + (,x ,...))) + + :pkg + (fn [name mappings ...] + `(if (~= nil (. packer_plugins `,(tostring name))) + (let ,mappings ,...) + (print (.. "plugin disabled " `,(tostring name))))) + + :vim-let + (fn [field value] + (let [text (.. "let " `,(tostring field) "=\"" value "\"")] + `(vim.cmd ,text))) + + :each-pair + (fn [args ...] + (let [[l# r# d#] args] + `(let [a# (require "aniseed.core") + data# ,d#] + (for [i# 1 (a#.count data#) 2] + (let [,l# (. data# i#) + ,r# (. data# (+ i# 1))] + ,...))))) + + :packer-use + (fn [...] + (let [a (require "aniseed.core") + args [...] + use-statements []] + (for [i 1 (a.count args) 2] + (let [name (. args i) + block (. args (+ i 1))] + (a.assoc block 1 name) + (when (. block :mod) + ;(a.assoc block :config `#((. (require "utils") :safe-require) ,(. block :mod))) + (a.assoc block :config `#( + ;do + ;(print ,(. block :mod)) + ;(time + ;( + require ,(. block :mod)))) + (a.assoc block :mod) + (table.insert use-statements block))) + + (let [use-sym (gensym)] + `(let [packer# (require "packer")] + (packer#.startup + (fn [,use-sym] + ,(unpack + (icollect [_# v# (ipairs use-statements)] + `(,use-sym ,v#)))))))))} + + + diff --git a/scripts/scripts/conserve-battery.sh b/scripts/scripts/conserve-battery.sh new file mode 100755 index 0000000..0da4c51 --- /dev/null +++ b/scripts/scripts/conserve-battery.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +echo "pass true to stop charging at 60%, false to charge to 100%" + +if [ "$EUID" -ne 0 ] + then echo "Please run as root" + exit +fi + +case $1 in + true) + tlp setcharge 90 1 BAT1 + ;; + false) + tlp setcharge 90 0 BAT1 + ;; + *) + echo "Usage: $0 [true|false]" + ;; +esac diff --git a/scripts/scripts/preview.sh b/scripts/scripts/preview.sh index 34c760b..bee80b5 100755 --- a/scripts/scripts/preview.sh +++ b/scripts/scripts/preview.sh @@ -18,7 +18,11 @@ case "$(file --mime-type "$1")" in fi ;; *directory*) - exa --icons -1 --color=always "$1" + if command -v exa; then + exa --icons -1 --color=always "$1" + else + ls -1 --color=always "$1" + fi ;; *) echo "unknown file format" diff --git a/scripts/scripts/watch-charging.sh b/scripts/scripts/watch-charging.sh new file mode 100755 index 0000000..449c975 --- /dev/null +++ b/scripts/scripts/watch-charging.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# This script watches the battery charging status and notifies the user +# when the battery is charging. + +# The script is meant to be run in the background. + + +charging=false +while true; do + if [ "$(cat /sys/class/power_supply/BAT1/status)" = "Charging" ]; then + if [ $charging = "false" ]; then + notify-send "Battery charging" "Run ~/scripts/conserve-battery false to charge to 100%" + fi + charging=true + else + if [ $charging = "true" ]; then + notify-send "Charger disconnected" + fi + charging=false + fi + sleep 1 +done