From 0ab0f24015ded12e7fbdb70a4d8cead9582f0a30 Mon Sep 17 00:00:00 2001 From: agryphus Date: Tue, 27 Feb 2024 15:46:37 -0500 Subject: [PATCH] Changed dot-config to .config --- .gitmodules | 29 ++- dwm/.config/dwm | 1 + dwmblocks/.config/dwmblocks | 1 + install | 4 +- misc/{dot-cache => .cache}/tldr/.gitignore | 0 misc/{dot-config => .config}/X11/xinitrc | 0 .../autorandr/postswitch | 0 misc/{dot-config => .config}/colors/accent | 0 misc/{dot-config => .config}/conda/condarc | 0 .../discord/settings.json | 0 misc/{dot-config => .config}/dmenu/config.h | 0 misc/{dot-config => .config}/doom/config.org | 0 misc/{dot-config => .config}/doom/init.el | 0 .../doom/themes/some-clown-fiesta-theme.el | 0 misc/{dot-config => .config}/dunst/dunstrc | 0 .../fcitx5/conf/classicui.conf | 0 misc/{dot-config => .config}/foot/foot.ini | 0 misc/{dot-config => .config}/git/.gitignore | 0 .../{dot-config => .config}/gtk-2.0/gtkrc-2.0 | 0 .../gtk-3.0/settings.ini | 0 misc/{dot-config => .config}/htop/htoprc | 0 .../hypr/hyprland.conf | 13 +- .../hyprland-autoname-workspaces/config.toml | 0 .../ipython/.gitignore | 0 misc/{dot-config => .config}/kanshi/config | 0 misc/{dot-config => .config}/lf/cleaner | 0 misc/{dot-config => .config}/lf/icons | 0 misc/{dot-config => .config}/lf/lfrc | 0 misc/{dot-config => .config}/lf/previewer | 0 .../nixos/configuration.def.nix | 0 misc/{dot-config => .config}/nixos/core.nix | 0 .../nixos/profiles/emacs.nix | 0 .../nixos/profiles/fcitx.nix | 0 .../nixos/profiles/lf.nix | 0 .../nixos/profiles/minimal.nix | 0 .../nixos/profiles/nvim.nix | 0 .../nixos/profiles/virtualbox.nix | 0 .../nixos/profiles/wm/dwm.nix | 0 .../nixos/profiles/wm/hyprland.nix | 0 .../nixpkgs/config.nix | 0 misc/{dot-config => .config}/npm/npmrc | 0 misc/{dot-config => .config}/picom/picom.conf | 0 misc/{dot-config => .config}/rofi-pass/config | 0 misc/{dot-config => .config}/rofi/config.rasi | 0 .../rofi/themes/gruvbox-common.rasi | 0 .../rofi/themes/gruvbox-dark-transparent.rasi | 0 .../rofi/themes/theme.rasi | 0 .../{dot-config => .config}/starship.def.toml | 0 misc/{dot-config => .config}/starship.toml | 0 misc/{dot-config => .config}/sxhkd/sxhkdrc | 0 misc/{dot-config => .config}/tmux/tmux.conf | 0 misc/{dot-config => .config}/waybar/config | 0 misc/{dot-config => .config}/waybar/style.css | 0 misc/{dot-config => .config}/yazi/init.lua | 0 misc/{dot-config => .config}/yazi/keymap.toml | 0 .../yazi/plugins/smart-enter.yazi/init.lua | 0 misc/{dot-config => .config}/yazi/theme.toml | 0 misc/{dot-config => .config}/yazi/yazi.toml | 0 .../{dot-config => .config}/zathura/zathurarc | 0 misc/{dot-config => .config}/zsh/.zprofile | 0 misc/{dot-config => .config}/zsh/.zshenv | 0 .../zsh/.zshhighlighting | 0 misc/{dot-config => .config}/zsh/.zshrc | 0 misc/{dot-local => .local}/bin/block_battery | 0 .../bin/change-brightness | 0 misc/{dot-local => .local}/bin/dlkiller | 0 misc/{dot-local => .local}/bin/entrs | 0 misc/{dot-local => .local}/bin/hyprdwm | 0 misc/{dot-local => .local}/bin/hyprgaps | 0 misc/{dot-local => .local}/bin/javafx | 0 misc/{dot-local => .local}/bin/menu-accent | 0 misc/{dot-local => .local}/bin/menu-layout | 0 misc/{dot-local => .local}/bin/menu-man | 0 misc/{dot-local => .local}/bin/menu-run | 0 misc/{dot-local => .local}/bin/menu-unicode | 0 misc/{dot-local => .local}/bin/menu-wpio | 0 misc/{dot-local => .local}/bin/opener | 0 .../bin/overrides/nixos-rebuild | 0 .../bin/overrides/rofi-pass | 0 .../bin/pinentry-wrapper | 0 misc/{dot-local => .local}/bin/rotdir | 0 misc/{dot-local => .local}/bin/swallow | 0 misc/{dot-local => .local}/bin/sysbin | 0 misc/{dot-local => .local}/share/chars/emoji | 0 .../share/chars/font-awesome | 0 .../share/fcitx5/themes/vince/theme.conf | 0 .../share/gnupg/gpg-agent.conf | 0 .../share/gnupg/pinentry-dmenu.conf | 0 misc/{dot-ssh => .ssh}/config | 0 nvim/.config/nvim | 1 + nvim/dot-config/nvim/.gitignore | 2 - nvim/dot-config/nvim/after/ftplugin/html.lua | 4 - nvim/dot-config/nvim/after/ftplugin/lua.lua | 4 - nvim/dot-config/nvim/after/ftplugin/norg.lua | 4 - nvim/dot-config/nvim/after/plugin/colors.lua | 207 ------------------ nvim/dot-config/nvim/after/plugin/comment.lua | 9 - .../nvim/after/plugin/dashboard.lua | 58 ----- .../dot-config/nvim/after/plugin/firenvim.lua | 23 -- .../dot-config/nvim/after/plugin/fugative.lua | 4 - nvim/dot-config/nvim/after/plugin/lf.lua | 4 - nvim/dot-config/nvim/after/plugin/lsp.lua | 69 ------ .../nvim/after/plugin/markdownpreview.lua | 105 --------- .../dot-config/nvim/after/plugin/nvimtree.lua | 10 - .../nvim/after/plugin/telescope.lua | 29 --- .../nvim/after/plugin/treesitter.lua | 16 -- .../dot-config/nvim/after/plugin/undotree.lua | 2 - nvim/dot-config/nvim/after/plugin/vimtex.lua | 21 -- .../dot-config/nvim/after/plugin/whichkey.lua | 16 -- nvim/dot-config/nvim/after/plugin/yazi.lua | 4 - nvim/dot-config/nvim/after/plugin/zenmode.lua | 62 ------ nvim/dot-config/nvim/after/syntax/asm.vim | 40 ---- nvim/dot-config/nvim/after/syntax/lua.vim | 15 -- nvim/dot-config/nvim/init.lua | 2 - nvim/dot-config/nvim/lua/andrew/init.lua | 4 - nvim/dot-config/nvim/lua/andrew/packer.lua | 137 ------------ nvim/dot-config/nvim/lua/andrew/remap.lua | 60 ----- nvim/dot-config/nvim/lua/andrew/set.lua | 48 ---- st/.config/st | 1 + 118 files changed, 29 insertions(+), 980 deletions(-) create mode 160000 dwm/.config/dwm create mode 160000 dwmblocks/.config/dwmblocks rename misc/{dot-cache => .cache}/tldr/.gitignore (100%) rename misc/{dot-config => .config}/X11/xinitrc (100%) rename misc/{dot-config => .config}/autorandr/postswitch (100%) rename misc/{dot-config => .config}/colors/accent (100%) rename misc/{dot-config => .config}/conda/condarc (100%) rename misc/{dot-config => .config}/discord/settings.json (100%) rename misc/{dot-config => .config}/dmenu/config.h (100%) rename misc/{dot-config => .config}/doom/config.org (100%) rename misc/{dot-config => .config}/doom/init.el (100%) rename misc/{dot-config => .config}/doom/themes/some-clown-fiesta-theme.el (100%) rename misc/{dot-config => .config}/dunst/dunstrc (100%) rename misc/{dot-config => .config}/fcitx5/conf/classicui.conf (100%) rename misc/{dot-config => .config}/foot/foot.ini (100%) rename misc/{dot-config => .config}/git/.gitignore (100%) rename misc/{dot-config => .config}/gtk-2.0/gtkrc-2.0 (100%) rename misc/{dot-config => .config}/gtk-3.0/settings.ini (100%) rename misc/{dot-config => .config}/htop/htoprc (100%) rename misc/{dot-config => .config}/hypr/hyprland.conf (94%) rename misc/{dot-config => .config}/hyprland-autoname-workspaces/config.toml (100%) rename misc/{dot-config => .config}/ipython/.gitignore (100%) rename misc/{dot-config => .config}/kanshi/config (100%) rename misc/{dot-config => .config}/lf/cleaner (100%) rename misc/{dot-config => .config}/lf/icons (100%) rename misc/{dot-config => .config}/lf/lfrc (100%) rename misc/{dot-config => .config}/lf/previewer (100%) rename misc/{dot-config => .config}/nixos/configuration.def.nix (100%) rename misc/{dot-config => .config}/nixos/core.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/emacs.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/fcitx.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/lf.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/minimal.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/nvim.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/virtualbox.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/wm/dwm.nix (100%) rename misc/{dot-config => .config}/nixos/profiles/wm/hyprland.nix (100%) rename misc/{dot-config => .config}/nixpkgs/config.nix (100%) rename misc/{dot-config => .config}/npm/npmrc (100%) rename misc/{dot-config => .config}/picom/picom.conf (100%) rename misc/{dot-config => .config}/rofi-pass/config (100%) rename misc/{dot-config => .config}/rofi/config.rasi (100%) rename misc/{dot-config => .config}/rofi/themes/gruvbox-common.rasi (100%) rename misc/{dot-config => .config}/rofi/themes/gruvbox-dark-transparent.rasi (100%) rename misc/{dot-config => .config}/rofi/themes/theme.rasi (100%) rename misc/{dot-config => .config}/starship.def.toml (100%) rename misc/{dot-config => .config}/starship.toml (100%) rename misc/{dot-config => .config}/sxhkd/sxhkdrc (100%) rename misc/{dot-config => .config}/tmux/tmux.conf (100%) rename misc/{dot-config => .config}/waybar/config (100%) rename misc/{dot-config => .config}/waybar/style.css (100%) rename misc/{dot-config => .config}/yazi/init.lua (100%) rename misc/{dot-config => .config}/yazi/keymap.toml (100%) rename misc/{dot-config => .config}/yazi/plugins/smart-enter.yazi/init.lua (100%) rename misc/{dot-config => .config}/yazi/theme.toml (100%) rename misc/{dot-config => .config}/yazi/yazi.toml (100%) rename misc/{dot-config => .config}/zathura/zathurarc (100%) rename misc/{dot-config => .config}/zsh/.zprofile (100%) rename misc/{dot-config => .config}/zsh/.zshenv (100%) rename misc/{dot-config => .config}/zsh/.zshhighlighting (100%) rename misc/{dot-config => .config}/zsh/.zshrc (100%) rename misc/{dot-local => .local}/bin/block_battery (100%) rename misc/{dot-local => .local}/bin/change-brightness (100%) rename misc/{dot-local => .local}/bin/dlkiller (100%) rename misc/{dot-local => .local}/bin/entrs (100%) rename misc/{dot-local => .local}/bin/hyprdwm (100%) rename misc/{dot-local => .local}/bin/hyprgaps (100%) rename misc/{dot-local => .local}/bin/javafx (100%) rename misc/{dot-local => .local}/bin/menu-accent (100%) rename misc/{dot-local => .local}/bin/menu-layout (100%) rename misc/{dot-local => .local}/bin/menu-man (100%) rename misc/{dot-local => .local}/bin/menu-run (100%) rename misc/{dot-local => .local}/bin/menu-unicode (100%) rename misc/{dot-local => .local}/bin/menu-wpio (100%) rename misc/{dot-local => .local}/bin/opener (100%) rename misc/{dot-local => .local}/bin/overrides/nixos-rebuild (100%) rename misc/{dot-local => .local}/bin/overrides/rofi-pass (100%) rename misc/{dot-local => .local}/bin/pinentry-wrapper (100%) rename misc/{dot-local => .local}/bin/rotdir (100%) rename misc/{dot-local => .local}/bin/swallow (100%) rename misc/{dot-local => .local}/bin/sysbin (100%) rename misc/{dot-local => .local}/share/chars/emoji (100%) rename misc/{dot-local => .local}/share/chars/font-awesome (100%) rename misc/{dot-local => .local}/share/fcitx5/themes/vince/theme.conf (100%) rename misc/{dot-local => .local}/share/gnupg/gpg-agent.conf (100%) rename misc/{dot-local => .local}/share/gnupg/pinentry-dmenu.conf (100%) rename misc/{dot-ssh => .ssh}/config (100%) create mode 160000 nvim/.config/nvim delete mode 100644 nvim/dot-config/nvim/.gitignore delete mode 100644 nvim/dot-config/nvim/after/ftplugin/html.lua delete mode 100644 nvim/dot-config/nvim/after/ftplugin/lua.lua delete mode 100644 nvim/dot-config/nvim/after/ftplugin/norg.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/colors.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/comment.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/dashboard.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/firenvim.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/fugative.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/lf.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/lsp.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/markdownpreview.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/nvimtree.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/telescope.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/treesitter.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/undotree.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/vimtex.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/whichkey.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/yazi.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/zenmode.lua delete mode 100644 nvim/dot-config/nvim/after/syntax/asm.vim delete mode 100644 nvim/dot-config/nvim/after/syntax/lua.vim delete mode 100644 nvim/dot-config/nvim/init.lua delete mode 100644 nvim/dot-config/nvim/lua/andrew/init.lua delete mode 100644 nvim/dot-config/nvim/lua/andrew/packer.lua delete mode 100644 nvim/dot-config/nvim/lua/andrew/remap.lua delete mode 100644 nvim/dot-config/nvim/lua/andrew/set.lua create mode 160000 st/.config/st diff --git a/.gitmodules b/.gitmodules index 2aa36d7..3cfcf98 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,17 +1,16 @@ -[submodule "dwm"] - path = dwm/dot-config/dwmblocks - url = ../dwm.git - ignore = all -[submodule "st"] - path = st/dot-config/st - url = ../st.git - ignore = all [submodule "dwmblocks"] - path = dwmblocks/dot-config/dwmblocks - url = ../dwmblocks.git - ignore = all + path = dwmblocks/.config/dwmblocks + url = ../dwmblocks.git + branch = master +[submodule "dwm"] + path = dwm/.config/dwm + url = ../dwm.git + branch = master [submodule "nvim"] - path = nvim/dot-config/nvim - url = ../nvim.git - ignore = all - + path = nvim/.config/nvim + url = ../nvim.git + branch = master +[submodule "st"] + path = st/.config/st + url = ../st.git + branch = master diff --git a/dwm/.config/dwm b/dwm/.config/dwm new file mode 160000 index 0000000..f6a0695 --- /dev/null +++ b/dwm/.config/dwm @@ -0,0 +1 @@ +Subproject commit f6a0695c4cb970a7df51ae52495c33b44aedda80 diff --git a/dwmblocks/.config/dwmblocks b/dwmblocks/.config/dwmblocks new file mode 160000 index 0000000..c9e0c8c --- /dev/null +++ b/dwmblocks/.config/dwmblocks @@ -0,0 +1 @@ +Subproject commit c9e0c8c8d32e77d90f7f812052510a3f80e2eb1d diff --git a/install b/install index 10b76a6..9260bcc 100755 --- a/install +++ b/install @@ -10,9 +10,9 @@ for package in $(ls $dir); do fi if [ "$package" = "misc" ]; then - stow --target=$HOME --dotfiles --simulate --no-folding -R $package + stow --target=$HOME --dotfiles --no-folding -R $package else - stow --target=$HOME --dotfiles --simulate -v -R $package + stow --target=$HOME --dotfiles -v -R $package fi done diff --git a/misc/dot-cache/tldr/.gitignore b/misc/.cache/tldr/.gitignore similarity index 100% rename from misc/dot-cache/tldr/.gitignore rename to misc/.cache/tldr/.gitignore diff --git a/misc/dot-config/X11/xinitrc b/misc/.config/X11/xinitrc similarity index 100% rename from misc/dot-config/X11/xinitrc rename to misc/.config/X11/xinitrc diff --git a/misc/dot-config/autorandr/postswitch b/misc/.config/autorandr/postswitch similarity index 100% rename from misc/dot-config/autorandr/postswitch rename to misc/.config/autorandr/postswitch diff --git a/misc/dot-config/colors/accent b/misc/.config/colors/accent similarity index 100% rename from misc/dot-config/colors/accent rename to misc/.config/colors/accent diff --git a/misc/dot-config/conda/condarc b/misc/.config/conda/condarc similarity index 100% rename from misc/dot-config/conda/condarc rename to misc/.config/conda/condarc diff --git a/misc/dot-config/discord/settings.json b/misc/.config/discord/settings.json similarity index 100% rename from misc/dot-config/discord/settings.json rename to misc/.config/discord/settings.json diff --git a/misc/dot-config/dmenu/config.h b/misc/.config/dmenu/config.h similarity index 100% rename from misc/dot-config/dmenu/config.h rename to misc/.config/dmenu/config.h diff --git a/misc/dot-config/doom/config.org b/misc/.config/doom/config.org similarity index 100% rename from misc/dot-config/doom/config.org rename to misc/.config/doom/config.org diff --git a/misc/dot-config/doom/init.el b/misc/.config/doom/init.el similarity index 100% rename from misc/dot-config/doom/init.el rename to misc/.config/doom/init.el diff --git a/misc/dot-config/doom/themes/some-clown-fiesta-theme.el b/misc/.config/doom/themes/some-clown-fiesta-theme.el similarity index 100% rename from misc/dot-config/doom/themes/some-clown-fiesta-theme.el rename to misc/.config/doom/themes/some-clown-fiesta-theme.el diff --git a/misc/dot-config/dunst/dunstrc b/misc/.config/dunst/dunstrc similarity index 100% rename from misc/dot-config/dunst/dunstrc rename to misc/.config/dunst/dunstrc diff --git a/misc/dot-config/fcitx5/conf/classicui.conf b/misc/.config/fcitx5/conf/classicui.conf similarity index 100% rename from misc/dot-config/fcitx5/conf/classicui.conf rename to misc/.config/fcitx5/conf/classicui.conf diff --git a/misc/dot-config/foot/foot.ini b/misc/.config/foot/foot.ini similarity index 100% rename from misc/dot-config/foot/foot.ini rename to misc/.config/foot/foot.ini diff --git a/misc/dot-config/git/.gitignore b/misc/.config/git/.gitignore similarity index 100% rename from misc/dot-config/git/.gitignore rename to misc/.config/git/.gitignore diff --git a/misc/dot-config/gtk-2.0/gtkrc-2.0 b/misc/.config/gtk-2.0/gtkrc-2.0 similarity index 100% rename from misc/dot-config/gtk-2.0/gtkrc-2.0 rename to misc/.config/gtk-2.0/gtkrc-2.0 diff --git a/misc/dot-config/gtk-3.0/settings.ini b/misc/.config/gtk-3.0/settings.ini similarity index 100% rename from misc/dot-config/gtk-3.0/settings.ini rename to misc/.config/gtk-3.0/settings.ini diff --git a/misc/dot-config/htop/htoprc b/misc/.config/htop/htoprc similarity index 100% rename from misc/dot-config/htop/htoprc rename to misc/.config/htop/htoprc diff --git a/misc/dot-config/hypr/hyprland.conf b/misc/.config/hypr/hyprland.conf similarity index 94% rename from misc/dot-config/hypr/hyprland.conf rename to misc/.config/hypr/hyprland.conf index cde4bfe..4e1dacb 100644 --- a/misc/dot-config/hypr/hyprland.conf +++ b/misc/.config/hypr/hyprland.conf @@ -1,5 +1,9 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,highrr,auto,auto +monitor=eDP-1, 1920x1080@60Hz, 1280x1480, 1 +monitor=DP-5, 1920x1080@60Hz, 1920x400, 1 +monitor=DP-7, 2560x1440@60Hz, 3840x0, 1, transform, 3 +monitor=DP-6, disable + # Wayland related environment variables. env = XCURSOR_SIZE,24 @@ -115,14 +119,14 @@ $mainMod = SUPER bind = CONTROL ALT, BACKSPACE, exec, foot -e zsh -c 'btop' bind = $mainMod, RETURN, exec, foot bind = $mainMod, W, exec, firefox -bind = $mainMod, E, exec, foot -e zsh -c 'tmp="$(mktemp)" && command lf -last-dir-path="$tmp" "$@" && test -f "$tmp" && dir="$(command cat "$tmp")" && rm -f "$tmp" && test -d "$dir" && cd "$dir" && exec $SHELL' +bind = $mainMod, E, exec, foot -e zsh -c 'local tmp="$(mktemp -t "yazi-cwd.XXXXX")"; yazi "$@" --cwd-file="$tmp"; if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then; cd -- "$cwd"; fi; rm -f -- "$tmp"' bind = $mainMod SHIFT, E, exec, emacsclient -c -a 'emacs' # bind = $mainMod, C, exec, emacsclient -c -a "emacs" -n --eval '(progn (set-frame-font "FiraCode Nerd Font") (cfw:open-org-calendar))' bind = $mainMod, C, exec, foot -e zsh -c 'khal interactive' bind = $mainMod, M, exec, foot -e zsh -c 'neomutt' # Menu hoykeys -bind = $mainMod, R, exec, menu-run +bind = $mainMod, R, exec, fuzzel # System control keybinds binde = $mainMod, MINUS, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-; notify-send -r 44 "$(wpctl get-volume @DEFAULT_AUDIO_SINK@)" @@ -134,6 +138,7 @@ binde = ,XF86MonBrightnessUp, exec, change-brightness up binde = ,F6, exec, change-brightness down binde = ,XF86MonBrightnessDown, exec, change-brightness down bind = $mainMod, L, exec, hyprctl dispatch dpms off; swaylock -e -c 000000 +bind = $mainMod SHIFT, R, exec, pkill ags; ags # Print area, screen, and all, respectively @@ -152,7 +157,7 @@ bind = ,I, exec, menu-wpio source bind = ,I, submap, reset bind = ,L, exec, hyprmonitors menu bind = ,L, submap, reset -bind = ,P, exec, rofi-pass +bind = ,P, exec, menu-pass bind = ,P, submap, reset submap = reset diff --git a/misc/dot-config/hyprland-autoname-workspaces/config.toml b/misc/.config/hyprland-autoname-workspaces/config.toml similarity index 100% rename from misc/dot-config/hyprland-autoname-workspaces/config.toml rename to misc/.config/hyprland-autoname-workspaces/config.toml diff --git a/misc/dot-config/ipython/.gitignore b/misc/.config/ipython/.gitignore similarity index 100% rename from misc/dot-config/ipython/.gitignore rename to misc/.config/ipython/.gitignore diff --git a/misc/dot-config/kanshi/config b/misc/.config/kanshi/config similarity index 100% rename from misc/dot-config/kanshi/config rename to misc/.config/kanshi/config diff --git a/misc/dot-config/lf/cleaner b/misc/.config/lf/cleaner similarity index 100% rename from misc/dot-config/lf/cleaner rename to misc/.config/lf/cleaner diff --git a/misc/dot-config/lf/icons b/misc/.config/lf/icons similarity index 100% rename from misc/dot-config/lf/icons rename to misc/.config/lf/icons diff --git a/misc/dot-config/lf/lfrc b/misc/.config/lf/lfrc similarity index 100% rename from misc/dot-config/lf/lfrc rename to misc/.config/lf/lfrc diff --git a/misc/dot-config/lf/previewer b/misc/.config/lf/previewer similarity index 100% rename from misc/dot-config/lf/previewer rename to misc/.config/lf/previewer diff --git a/misc/dot-config/nixos/configuration.def.nix b/misc/.config/nixos/configuration.def.nix similarity index 100% rename from misc/dot-config/nixos/configuration.def.nix rename to misc/.config/nixos/configuration.def.nix diff --git a/misc/dot-config/nixos/core.nix b/misc/.config/nixos/core.nix similarity index 100% rename from misc/dot-config/nixos/core.nix rename to misc/.config/nixos/core.nix diff --git a/misc/dot-config/nixos/profiles/emacs.nix b/misc/.config/nixos/profiles/emacs.nix similarity index 100% rename from misc/dot-config/nixos/profiles/emacs.nix rename to misc/.config/nixos/profiles/emacs.nix diff --git a/misc/dot-config/nixos/profiles/fcitx.nix b/misc/.config/nixos/profiles/fcitx.nix similarity index 100% rename from misc/dot-config/nixos/profiles/fcitx.nix rename to misc/.config/nixos/profiles/fcitx.nix diff --git a/misc/dot-config/nixos/profiles/lf.nix b/misc/.config/nixos/profiles/lf.nix similarity index 100% rename from misc/dot-config/nixos/profiles/lf.nix rename to misc/.config/nixos/profiles/lf.nix diff --git a/misc/dot-config/nixos/profiles/minimal.nix b/misc/.config/nixos/profiles/minimal.nix similarity index 100% rename from misc/dot-config/nixos/profiles/minimal.nix rename to misc/.config/nixos/profiles/minimal.nix diff --git a/misc/dot-config/nixos/profiles/nvim.nix b/misc/.config/nixos/profiles/nvim.nix similarity index 100% rename from misc/dot-config/nixos/profiles/nvim.nix rename to misc/.config/nixos/profiles/nvim.nix diff --git a/misc/dot-config/nixos/profiles/virtualbox.nix b/misc/.config/nixos/profiles/virtualbox.nix similarity index 100% rename from misc/dot-config/nixos/profiles/virtualbox.nix rename to misc/.config/nixos/profiles/virtualbox.nix diff --git a/misc/dot-config/nixos/profiles/wm/dwm.nix b/misc/.config/nixos/profiles/wm/dwm.nix similarity index 100% rename from misc/dot-config/nixos/profiles/wm/dwm.nix rename to misc/.config/nixos/profiles/wm/dwm.nix diff --git a/misc/dot-config/nixos/profiles/wm/hyprland.nix b/misc/.config/nixos/profiles/wm/hyprland.nix similarity index 100% rename from misc/dot-config/nixos/profiles/wm/hyprland.nix rename to misc/.config/nixos/profiles/wm/hyprland.nix diff --git a/misc/dot-config/nixpkgs/config.nix b/misc/.config/nixpkgs/config.nix similarity index 100% rename from misc/dot-config/nixpkgs/config.nix rename to misc/.config/nixpkgs/config.nix diff --git a/misc/dot-config/npm/npmrc b/misc/.config/npm/npmrc similarity index 100% rename from misc/dot-config/npm/npmrc rename to misc/.config/npm/npmrc diff --git a/misc/dot-config/picom/picom.conf b/misc/.config/picom/picom.conf similarity index 100% rename from misc/dot-config/picom/picom.conf rename to misc/.config/picom/picom.conf diff --git a/misc/dot-config/rofi-pass/config b/misc/.config/rofi-pass/config similarity index 100% rename from misc/dot-config/rofi-pass/config rename to misc/.config/rofi-pass/config diff --git a/misc/dot-config/rofi/config.rasi b/misc/.config/rofi/config.rasi similarity index 100% rename from misc/dot-config/rofi/config.rasi rename to misc/.config/rofi/config.rasi diff --git a/misc/dot-config/rofi/themes/gruvbox-common.rasi b/misc/.config/rofi/themes/gruvbox-common.rasi similarity index 100% rename from misc/dot-config/rofi/themes/gruvbox-common.rasi rename to misc/.config/rofi/themes/gruvbox-common.rasi diff --git a/misc/dot-config/rofi/themes/gruvbox-dark-transparent.rasi b/misc/.config/rofi/themes/gruvbox-dark-transparent.rasi similarity index 100% rename from misc/dot-config/rofi/themes/gruvbox-dark-transparent.rasi rename to misc/.config/rofi/themes/gruvbox-dark-transparent.rasi diff --git a/misc/dot-config/rofi/themes/theme.rasi b/misc/.config/rofi/themes/theme.rasi similarity index 100% rename from misc/dot-config/rofi/themes/theme.rasi rename to misc/.config/rofi/themes/theme.rasi diff --git a/misc/dot-config/starship.def.toml b/misc/.config/starship.def.toml similarity index 100% rename from misc/dot-config/starship.def.toml rename to misc/.config/starship.def.toml diff --git a/misc/dot-config/starship.toml b/misc/.config/starship.toml similarity index 100% rename from misc/dot-config/starship.toml rename to misc/.config/starship.toml diff --git a/misc/dot-config/sxhkd/sxhkdrc b/misc/.config/sxhkd/sxhkdrc similarity index 100% rename from misc/dot-config/sxhkd/sxhkdrc rename to misc/.config/sxhkd/sxhkdrc diff --git a/misc/dot-config/tmux/tmux.conf b/misc/.config/tmux/tmux.conf similarity index 100% rename from misc/dot-config/tmux/tmux.conf rename to misc/.config/tmux/tmux.conf diff --git a/misc/dot-config/waybar/config b/misc/.config/waybar/config similarity index 100% rename from misc/dot-config/waybar/config rename to misc/.config/waybar/config diff --git a/misc/dot-config/waybar/style.css b/misc/.config/waybar/style.css similarity index 100% rename from misc/dot-config/waybar/style.css rename to misc/.config/waybar/style.css diff --git a/misc/dot-config/yazi/init.lua b/misc/.config/yazi/init.lua similarity index 100% rename from misc/dot-config/yazi/init.lua rename to misc/.config/yazi/init.lua diff --git a/misc/dot-config/yazi/keymap.toml b/misc/.config/yazi/keymap.toml similarity index 100% rename from misc/dot-config/yazi/keymap.toml rename to misc/.config/yazi/keymap.toml diff --git a/misc/dot-config/yazi/plugins/smart-enter.yazi/init.lua b/misc/.config/yazi/plugins/smart-enter.yazi/init.lua similarity index 100% rename from misc/dot-config/yazi/plugins/smart-enter.yazi/init.lua rename to misc/.config/yazi/plugins/smart-enter.yazi/init.lua diff --git a/misc/dot-config/yazi/theme.toml b/misc/.config/yazi/theme.toml similarity index 100% rename from misc/dot-config/yazi/theme.toml rename to misc/.config/yazi/theme.toml diff --git a/misc/dot-config/yazi/yazi.toml b/misc/.config/yazi/yazi.toml similarity index 100% rename from misc/dot-config/yazi/yazi.toml rename to misc/.config/yazi/yazi.toml diff --git a/misc/dot-config/zathura/zathurarc b/misc/.config/zathura/zathurarc similarity index 100% rename from misc/dot-config/zathura/zathurarc rename to misc/.config/zathura/zathurarc diff --git a/misc/dot-config/zsh/.zprofile b/misc/.config/zsh/.zprofile similarity index 100% rename from misc/dot-config/zsh/.zprofile rename to misc/.config/zsh/.zprofile diff --git a/misc/dot-config/zsh/.zshenv b/misc/.config/zsh/.zshenv similarity index 100% rename from misc/dot-config/zsh/.zshenv rename to misc/.config/zsh/.zshenv diff --git a/misc/dot-config/zsh/.zshhighlighting b/misc/.config/zsh/.zshhighlighting similarity index 100% rename from misc/dot-config/zsh/.zshhighlighting rename to misc/.config/zsh/.zshhighlighting diff --git a/misc/dot-config/zsh/.zshrc b/misc/.config/zsh/.zshrc similarity index 100% rename from misc/dot-config/zsh/.zshrc rename to misc/.config/zsh/.zshrc diff --git a/misc/dot-local/bin/block_battery b/misc/.local/bin/block_battery similarity index 100% rename from misc/dot-local/bin/block_battery rename to misc/.local/bin/block_battery diff --git a/misc/dot-local/bin/change-brightness b/misc/.local/bin/change-brightness similarity index 100% rename from misc/dot-local/bin/change-brightness rename to misc/.local/bin/change-brightness diff --git a/misc/dot-local/bin/dlkiller b/misc/.local/bin/dlkiller similarity index 100% rename from misc/dot-local/bin/dlkiller rename to misc/.local/bin/dlkiller diff --git a/misc/dot-local/bin/entrs b/misc/.local/bin/entrs similarity index 100% rename from misc/dot-local/bin/entrs rename to misc/.local/bin/entrs diff --git a/misc/dot-local/bin/hyprdwm b/misc/.local/bin/hyprdwm similarity index 100% rename from misc/dot-local/bin/hyprdwm rename to misc/.local/bin/hyprdwm diff --git a/misc/dot-local/bin/hyprgaps b/misc/.local/bin/hyprgaps similarity index 100% rename from misc/dot-local/bin/hyprgaps rename to misc/.local/bin/hyprgaps diff --git a/misc/dot-local/bin/javafx b/misc/.local/bin/javafx similarity index 100% rename from misc/dot-local/bin/javafx rename to misc/.local/bin/javafx diff --git a/misc/dot-local/bin/menu-accent b/misc/.local/bin/menu-accent similarity index 100% rename from misc/dot-local/bin/menu-accent rename to misc/.local/bin/menu-accent diff --git a/misc/dot-local/bin/menu-layout b/misc/.local/bin/menu-layout similarity index 100% rename from misc/dot-local/bin/menu-layout rename to misc/.local/bin/menu-layout diff --git a/misc/dot-local/bin/menu-man b/misc/.local/bin/menu-man similarity index 100% rename from misc/dot-local/bin/menu-man rename to misc/.local/bin/menu-man diff --git a/misc/dot-local/bin/menu-run b/misc/.local/bin/menu-run similarity index 100% rename from misc/dot-local/bin/menu-run rename to misc/.local/bin/menu-run diff --git a/misc/dot-local/bin/menu-unicode b/misc/.local/bin/menu-unicode similarity index 100% rename from misc/dot-local/bin/menu-unicode rename to misc/.local/bin/menu-unicode diff --git a/misc/dot-local/bin/menu-wpio b/misc/.local/bin/menu-wpio similarity index 100% rename from misc/dot-local/bin/menu-wpio rename to misc/.local/bin/menu-wpio diff --git a/misc/dot-local/bin/opener b/misc/.local/bin/opener similarity index 100% rename from misc/dot-local/bin/opener rename to misc/.local/bin/opener diff --git a/misc/dot-local/bin/overrides/nixos-rebuild b/misc/.local/bin/overrides/nixos-rebuild similarity index 100% rename from misc/dot-local/bin/overrides/nixos-rebuild rename to misc/.local/bin/overrides/nixos-rebuild diff --git a/misc/dot-local/bin/overrides/rofi-pass b/misc/.local/bin/overrides/rofi-pass similarity index 100% rename from misc/dot-local/bin/overrides/rofi-pass rename to misc/.local/bin/overrides/rofi-pass diff --git a/misc/dot-local/bin/pinentry-wrapper b/misc/.local/bin/pinentry-wrapper similarity index 100% rename from misc/dot-local/bin/pinentry-wrapper rename to misc/.local/bin/pinentry-wrapper diff --git a/misc/dot-local/bin/rotdir b/misc/.local/bin/rotdir similarity index 100% rename from misc/dot-local/bin/rotdir rename to misc/.local/bin/rotdir diff --git a/misc/dot-local/bin/swallow b/misc/.local/bin/swallow similarity index 100% rename from misc/dot-local/bin/swallow rename to misc/.local/bin/swallow diff --git a/misc/dot-local/bin/sysbin b/misc/.local/bin/sysbin similarity index 100% rename from misc/dot-local/bin/sysbin rename to misc/.local/bin/sysbin diff --git a/misc/dot-local/share/chars/emoji b/misc/.local/share/chars/emoji similarity index 100% rename from misc/dot-local/share/chars/emoji rename to misc/.local/share/chars/emoji diff --git a/misc/dot-local/share/chars/font-awesome b/misc/.local/share/chars/font-awesome similarity index 100% rename from misc/dot-local/share/chars/font-awesome rename to misc/.local/share/chars/font-awesome diff --git a/misc/dot-local/share/fcitx5/themes/vince/theme.conf b/misc/.local/share/fcitx5/themes/vince/theme.conf similarity index 100% rename from misc/dot-local/share/fcitx5/themes/vince/theme.conf rename to misc/.local/share/fcitx5/themes/vince/theme.conf diff --git a/misc/dot-local/share/gnupg/gpg-agent.conf b/misc/.local/share/gnupg/gpg-agent.conf similarity index 100% rename from misc/dot-local/share/gnupg/gpg-agent.conf rename to misc/.local/share/gnupg/gpg-agent.conf diff --git a/misc/dot-local/share/gnupg/pinentry-dmenu.conf b/misc/.local/share/gnupg/pinentry-dmenu.conf similarity index 100% rename from misc/dot-local/share/gnupg/pinentry-dmenu.conf rename to misc/.local/share/gnupg/pinentry-dmenu.conf diff --git a/misc/dot-ssh/config b/misc/.ssh/config similarity index 100% rename from misc/dot-ssh/config rename to misc/.ssh/config diff --git a/nvim/.config/nvim b/nvim/.config/nvim new file mode 160000 index 0000000..92bd99d --- /dev/null +++ b/nvim/.config/nvim @@ -0,0 +1 @@ +Subproject commit 92bd99d8ea9e924868905154c58ed1839c8b6c27 diff --git a/nvim/dot-config/nvim/.gitignore b/nvim/dot-config/nvim/.gitignore deleted file mode 100644 index ef02d0c..0000000 --- a/nvim/dot-config/nvim/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/plugin/ - diff --git a/nvim/dot-config/nvim/after/ftplugin/html.lua b/nvim/dot-config/nvim/after/ftplugin/html.lua deleted file mode 100644 index 806b55a..0000000 --- a/nvim/dot-config/nvim/after/ftplugin/html.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 - diff --git a/nvim/dot-config/nvim/after/ftplugin/lua.lua b/nvim/dot-config/nvim/after/ftplugin/lua.lua deleted file mode 100644 index 806b55a..0000000 --- a/nvim/dot-config/nvim/after/ftplugin/lua.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 - diff --git a/nvim/dot-config/nvim/after/ftplugin/norg.lua b/nvim/dot-config/nvim/after/ftplugin/norg.lua deleted file mode 100644 index 806b55a..0000000 --- a/nvim/dot-config/nvim/after/ftplugin/norg.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 - diff --git a/nvim/dot-config/nvim/after/plugin/colors.lua b/nvim/dot-config/nvim/after/plugin/colors.lua deleted file mode 100644 index 4f38b16..0000000 --- a/nvim/dot-config/nvim/after/plugin/colors.lua +++ /dev/null @@ -1,207 +0,0 @@ -local palette = { - none = "NONE", - fg = "#E1E1E1", - bg = "#151515", - alt_bg = "#171717", - accent = "#202020", - white = "#E1E1E1", - gray = "#373737", - medium_gray = "#727272", - light_gray = "#AFAFAF", - blue = "#BAD7FF", - gray_blue = "#7E97AB", - medium_gray_blue = "#A2B5C1", - cyan = "#88afa2", - red = "#b46958", - green = "#90A959", - yellow = "#F4BF75", - orange = "#FFA557", - purple = "#AA749F", - magenta = "#AA759F", - cursor_fg = "#151515", - cursor_bg = "#D0D0D0", - sign_add = "#586935", - sign_change = "#51657B", - sign_delete = "#984936", - error = "#984936", - warning = "#ab8550", - info = "#ab8550", - hint = "#576f82", - neogit_light_green = "#2A2E19", - neogit_blue = "#1B1F27", - neogit_green = "#212513", - neogit_light_red = "#402020", - neogit_red = "#351D1D", -} - -require("no-clown-fiesta").setup({ - transparent = true, -}) - -require('rose-pine').setup({ - --- @usage 'auto'|'main'|'moon'|'dawn' - variant = 'auto', - --- @usage 'main'|'moon'|'dawn' - dark_variant = 'main', - bold_vert_split = false, - dim_nc_background = false, - disable_background = true, - disable_float_background = false, - disable_italics = true, - - --- @usage string hex value or named color from rosepinetheme.com/palette - groups = { - background = 'base', - background_nc = '_experimental_nc', - panel = 'surface', - panel_nc = 'base', - border = 'highlight_med', - comment = 'muted', - link = 'iris', - punctuation = 'subtle', - - error = 'love', - hint = 'iris', - info = 'foam', - warn = 'gold', - - headings = { - h1 = 'iris', - h2 = 'foam', - h3 = 'rose', - h4 = 'gold', - h5 = 'pine', - h6 = 'foam', - } - -- or set all headings at once - -- headings = 'subtle' - }, - - -- Change specific vim highlight groups - -- https://github.com/rose-pine/neovim/wiki/Recipes - highlight_groups = { - ColorColumn = { bg = 'rose' }, - - -- Blend colours against the "base" background - CursorLine = { bg = 'foam', blend = 10 }, - StatusLine = { fg = 'love', bg = 'love', blend = 10 }, - - -- By default each group adds to the existing config. - -- If you only want to set what is written in this config exactly, - -- you can set the inherit option: - Search = { bg = 'gold', inherit = false }, - } -}) - -require("gruvbox").setup({ - undercurl = true, - underline = true, - bold = true, - italic = { - strings = true, - comments = true, - operators = false, - folds = true, - }, - strikethrough = true, - invert_selection = false, - invert_signs = false, - invert_tabline = false, - invert_intend_guides = false, - inverse = true, -- invert background for search, diffs, statuslines and errors - contrast = "", -- can be "hard", "soft" or empty string - palette_overrides = {}, - overrides = {}, - dim_inactive = false, - transparent_mode = true, -}) - -local c = require('vscode.colors').get_colors() -require('vscode').setup({ - -- Alternatively set style in setup - -- style = 'light' - - -- Enable transparent background - transparent = true, - - -- Enable italic comment - italic_comments = true, - - -- Disable nvim-tree background color - disable_nvimtree_bg = true, - - -- Override colors (see ./lua/vscode/colors.lua) - color_overrides = { - -- vscLineNumber = '#FFFFFF', - }, - - -- Override highlight groups (see ./lua/vscode/theme.lua) - group_overrides = { - -- this supports the same val table as vim.api.nvim_set_hl - -- use colors from this colorscheme by requiring vscode.colors! - Cursor = { fg=c.vscDarkBlue, bg=c.vscLightGreen, bold=true }, - } -}) - -vim.cmd[[ -let s:base03 = [ '#151513', 233 ] -let s:base02 = [ '#202020', 236 ] -let s:base01 = [ '#373737', 239 ] -let s:base00 = [ '#727272', 242 ] -let s:base0 = [ '#808070', 244 ] -let s:base1 = [ '#949484', 246 ] -let s:base2 = [ '#a8a897', 248 ] -let s:base3 = [ '#E1E1E1', 253 ] -let s:yellow = [ '#F4BF75', 3 ] -let s:orange = [ '#FFA557', 216 ] -let s:red = [ '#B46958', 131 ] -let s:purple = [ '#AA749F', 181 ] -let s:blue = [ '#7E97AB', 109 ] -let s:cyan = [ '#BAD7FF', 23 ] -let s:green = [ '#90A959', 108 ] -let s:white = [ '#AFAFAF', 252 ] - -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.normal.left = [ [ s:base02, s:green ], [ s:base3, s:base01 ] ] -let s:p.normal.right = [ [ s:base02, s:base1 ], [ s:base2, s:base01 ] ] -let s:p.inactive.right = [ [ s:base02, s:base00 ], [ s:base0, s:base02 ] ] -let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base00, s:base02 ] ] -let s:p.insert.left = [ [ s:base02, s:blue ], [ s:base3, s:base01 ] ] -let s:p.replace.left = [ [ s:base02, s:purple ], [ s:base3, s:base01 ] ] -let s:p.visual.left = [ [ s:base02, s:red ], [ s:base3, s:base01 ] ] -let s:p.normal.middle = [ [ s:base0, s:base02 ] ] -let s:p.inactive.middle = [ [ s:base00, s:base02 ] ] -let s:p.tabline.left = [ [ s:base3, s:base00 ] ] -let s:p.tabline.tabsel = [ [ s:base3, s:base02 ] ] -let s:p.tabline.middle = [ [ s:base01, s:base1 ] ] -let s:p.tabline.right = copy(s:p.normal.right) -let s:p.normal.error = [ [ s:red, s:base02 ] ] -let s:p.normal.warning = [ [ s:yellow, s:base01 ] ] - -let g:lightline#colorscheme#mycolors#palette = lightline#colorscheme#flatten(s:p) -let g:lightline = { - \ 'colorscheme': 'mycolors', - \ } - -" Don't need to see mode if lightline is installed -set noshowmode -]] - -vim.cmd[[colorscheme no-clown-fiesta]] - --- My own color overrides -local hl = vim.api.nvim_set_hl -hl(0, 'TSConstant', { fg = palette.yellow }) -hl(0, 'EndOfBuffer', { fg = palette.medium_gray }) -hl(0, 'ErrorMsg', { fg = palette.yellow }) -hl(0, 'LineNr', { fg = palette.medium_gray }) -hl(0, 'MasonNormal', { bg = palette.gray }) -hl(0, 'NvimTreeCursorLine', { fg = palette.yellow }) -hl(0, 'NvimTreeEndOfBuffer', { fg = palette.medium_gray }) -hl(0, 'NvimTreeIndentMarker', { fg = palette.medium_gray }) -hl(0, 'NvimTreeFolderIcon', { fg = palette.yellow }) -hl(0, 'WhichKeyFloat', { bg = nil }) -hl(0, 'WhichKeyDesc', { link = "function" }) -hl(0, 'WhichKey', { fg = palette.medium_gray_blue }) -hl(0, 'WhichKeyGroup', { fg = palette.gray_blue, bold = true }) - diff --git a/nvim/dot-config/nvim/after/plugin/comment.lua b/nvim/dot-config/nvim/after/plugin/comment.lua deleted file mode 100644 index a595cbd..0000000 --- a/nvim/dot-config/nvim/after/plugin/comment.lua +++ /dev/null @@ -1,9 +0,0 @@ -require("Comment").setup() - -vim.keymap.set( - "n", - "", - function() require("Comment.api").toggle.linewise.current() end, - { noremap = true, silent = true } -) - diff --git a/nvim/dot-config/nvim/after/plugin/dashboard.lua b/nvim/dot-config/nvim/after/plugin/dashboard.lua deleted file mode 100644 index 711ee35..0000000 --- a/nvim/dot-config/nvim/after/plugin/dashboard.lua +++ /dev/null @@ -1,58 +0,0 @@ -local alpha = require("alpha") -local dashboard = require("alpha.themes.dashboard") - -math.randomseed(os.time()) - -local function pick_color() - local colors = {"String", "Identifier", "Keyword", "Number"} - return colors[math.random(#colors)] -end - -local function footer() - local total_plugins = #vim.tbl_keys(packer_plugins) - local version = vim.version() - local nvim_version_info = " NVIM v" .. version.major .. "." .. version.minor .. "." .. version.patch - - return nvim_version_info .. " 󰏖 " .. total_plugins .. " plugins" -end - --- Set header -dashboard.section.header.val = { - " ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣭⣿⣶⣿⣦⣼⣆ ", - " ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ ", - " ⠈ ⠈⢿⣿⣟⠦⠄⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ ", - " ⣸⣿⣿⢧⠄⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄ ", - " ⢠⣿⣿⣿⠈ ⠡⠌⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ ", - " ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿ ", - " ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷⠄ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄ ", - "⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄ ", - "⠙⠃ ⣼⣿⡟⠌ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿⠐⣿⣿⡇ ⠛⠻⢷⣄", - " ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ⠁", - " ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣀⣤⣾⡿⠃ ", - "⢀⣀⠀⣠⣀⣠⣾⣿⣿⡿⠛⠋⠉⠉⠉ ⠉⠉⠉⠉⠛⠻⣿⣿⣷⣄⣀⢿⡽⢻⣦", - "⠻⠶⠾⠿⠿⠿⠋⠉ N E O V I M ⠉⠻⠿⠿⠿⠿⠿⠋", -} - --- Set menu -dashboard.section.buttons.val = { - dashboard.button( "e", " New file" , ":ene startinsert "), - dashboard.button( "q", "󰩈 Quit NVIM", ":qa"), -} - -vim.api.nvim_create_autocmd("VimEnter", { - once = true, - callback = function() - math.randomseed(os.time()) - local fg_color = tostring(math.random(0, 12)) - local hi_setter = "hi AlphaHeader ctermfg=" - vim.cmd(hi_setter .. fg_color) - end -}) - -dashboard.section.footer.val = footer() - -dashboard.section.header.opts.hl = "Include" -dashboard.section.footer.opts.hl = "String" - -alpha.setup(dashboard.opts) - diff --git a/nvim/dot-config/nvim/after/plugin/firenvim.lua b/nvim/dot-config/nvim/after/plugin/firenvim.lua deleted file mode 100644 index fb14f4b..0000000 --- a/nvim/dot-config/nvim/after/plugin/firenvim.lua +++ /dev/null @@ -1,23 +0,0 @@ -vim.g.firenvim_config = { - globalSettings = { alt = "all" }, - localSettings = { - [".*"] = { - cmdline = "neovim", - content = "text", - priority = 0, - selector = "textarea", - takeover = "never" - }, - } -} - --- Prevents scrolling when cursor is near the bottom of the text area -if vim.g.started_by_firenvim == true then - vim.opt.scrolloff = 0 -end - -vim.api.nvim_create_autocmd({'BufEnter'}, { - pattern = "localhost_*.txt", - command = "set filetype=python" -}) - diff --git a/nvim/dot-config/nvim/after/plugin/fugative.lua b/nvim/dot-config/nvim/after/plugin/fugative.lua deleted file mode 100644 index 12b6d67..0000000 --- a/nvim/dot-config/nvim/after/plugin/fugative.lua +++ /dev/null @@ -1,4 +0,0 @@ -local wk = require("which-key") - -wk.register({g = { name = "git" }, prefix = ""}) -vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "Git status" }) diff --git a/nvim/dot-config/nvim/after/plugin/lf.lua b/nvim/dot-config/nvim/after/plugin/lf.lua deleted file mode 100644 index 58a2922..0000000 --- a/nvim/dot-config/nvim/after/plugin/lf.lua +++ /dev/null @@ -1,4 +0,0 @@ --- vim.keymap.set("n", "e", function () --- vim.cmd("Lf") --- end) - diff --git a/nvim/dot-config/nvim/after/plugin/lsp.lua b/nvim/dot-config/nvim/after/plugin/lsp.lua deleted file mode 100644 index 541b066..0000000 --- a/nvim/dot-config/nvim/after/plugin/lsp.lua +++ /dev/null @@ -1,69 +0,0 @@ --- LANGUAGE SERVERS -local lsp_zero = require('lsp-zero') -local lspconfig = require("lspconfig") -local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities() - -lsp_zero.on_attach(function(client, bufnr) - -- see :help lsp-zero-keybindings - -- to learn the available actions - lsp_zero.default_keymaps({buffer = bufnr}) -end) - --- LUA -lspconfig.lua_ls.setup({ - settings = { - Lua = { - diagnostics = { - -- Making sure that lua recognizes the global variable 'vim' - globals = { 'vim', 'xplr' }, - }, - }, - }, -}) - --- RUST --- Must run `rustup default stable` and then `rustup component add rust-analyzer` --- upon first install -lspconfig.rust_analyzer.setup({}) - -lspconfig.clangd.setup({ - capabilities = lsp_capabilities, -}) - --- AUTOCOMPLETION - -local cmp = require('cmp') -local cmp_action = require('lsp-zero').cmp_action() - -cmp.setup({ - sources = { - { name = "luasnip", option = { show_autosnippets = true } }, - { name = "nvim_lua" }, - { name = "nvim_lsp" }, - { name = "path" }, -- Auto complete paths - }, - mapping = { - -- Navigate between completion item - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - - -- toggle completion - [''] = cmp_action.toggle_completion(), - - -- navigate between snippet placeholder - [''] = cmp_action.luasnip_jump_backward(), - [''] = cmp_action.luasnip_jump_forward(), - - -- Confirm item - [''] = cmp.mapping.confirm({select = true}), - } -}) - --- DIAGNOSTICS - --- Show all diagnostics on current line in floating window -vim.api.nvim_set_keymap( - 'n', 'gl', ':lua vim.diagnostic.open_float()', - { noremap = true, silent = true } -) - diff --git a/nvim/dot-config/nvim/after/plugin/markdownpreview.lua b/nvim/dot-config/nvim/after/plugin/markdownpreview.lua deleted file mode 100644 index a6f9c75..0000000 --- a/nvim/dot-config/nvim/after/plugin/markdownpreview.lua +++ /dev/null @@ -1,105 +0,0 @@ -vim.keymap.set("n", "mp", "MarkdownPreview", - { desc = "Markdown prewview" }) - -vim.cmd([[ - -" set to 1, nvim will open the preview window after entering the markdown buffer -" default: 0 -let g:mkdp_auto_start = 0 - -" set to 1, the nvim will auto close current preview window when change -" from markdown buffer to another buffer -" default: 1 -let g:mkdp_auto_close = 1 - -" set to 1, the vim will refresh markdown when save the buffer or -" leave from insert mode, default 0 is auto refresh markdown as you edit or -" move the cursor -" default: 0 -let g:mkdp_refresh_slow = 0 - -" set to 1, the MarkdownPreview command can be use for all files, -" by default it can be use in markdown file -" default: 0 -let g:mkdp_command_for_global = 0 - -" set to 1, preview server available to others in your network -" by default, the server listens on localhost (127.0.0.1) -" default: 0 -let g:mkdp_open_to_the_world = 0 - -" use custom IP to open preview page -" useful when you work in remote vim and preview on local browser -" more detail see: https://github.com/iamcco/markdown-preview.nvim/pull/9 -" default empty -let g:mkdp_open_ip = '' - -" specify browser to open preview page -" for path with space -" valid: `/path/with\ space/xxx` -" invalid: `/path/with\\ space/xxx` -" default: '' -let g:mkdp_browser = 'thorium-browser' - -" set to 1, echo preview page url in command line when open preview page -" default is 0 -let g:mkdp_echo_preview_url = 0 - -" a custom vim function name to open preview page -" this function will receive url as param -" default is empty -let g:mkdp_browserfunc = '' - -" options for markdown render -" mkit: markdown-it options for render -" katex: katex options for math -" uml: markdown-it-plantuml options -" maid: mermaid options -" disable_sync_scroll: if disable sync scroll, default 0 -" sync_scroll_type: 'middle', 'top' or 'relative', default value is 'middle' -" middle: mean the cursor position alway show at the middle of the preview page -" top: mean the vim top viewport alway show at the top of the preview page -" relative: mean the cursor position alway show at the relative positon of the preview page -" hide_yaml_meta: if hide yaml metadata, default is 1 -" sequence_diagrams: js-sequence-diagrams options -" content_editable: if enable content editable for preview page, default: v:false -" disable_filename: if disable filename header for preview page, default: 0 -let g:mkdp_preview_options = { - \ 'mkit': {}, - \ 'katex': {}, - \ 'uml': {}, - \ 'maid': {}, - \ 'disable_sync_scroll': 0, - \ 'sync_scroll_type': 'middle', - \ 'hide_yaml_meta': 1, - \ 'sequence_diagrams': {}, - \ 'flowchart_diagrams': {}, - \ 'content_editable': v:false, - \ 'disable_filename': 0, - \ 'toc': {} - \ } - -" use a custom markdown style must be absolute path -" like '/Users/username/markdown.css' or expand('~/markdown.css') -let g:mkdp_markdown_css = '~/.local/share/github-markdown-dark.css' - -" use a custom highlight style must absolute path -" like '/Users/username/highlight.css' or expand('~/highlight.css') -let g:mkdp_highlight_css = '' - -" use a custom port to start server or empty for random -let g:mkdp_port = '' - -" preview page title -" ${name} will be replace with the file name -let g:mkdp_page_title = '「${name}」' - -" recognized filetypes -" these filetypes will have MarkdownPreview... commands -let g:mkdp_filetypes = ['markdown'] - -" set default theme (dark or light) -" By default the theme is define according to the preferences of the system -let g:mkdp_theme = 'dark' - -]]) diff --git a/nvim/dot-config/nvim/after/plugin/nvimtree.lua b/nvim/dot-config/nvim/after/plugin/nvimtree.lua deleted file mode 100644 index 4643fac..0000000 --- a/nvim/dot-config/nvim/after/plugin/nvimtree.lua +++ /dev/null @@ -1,10 +0,0 @@ --- set termguicolors to enable highlight groups -vim.opt.termguicolors = true - -require("nvim-tree").setup() - -vim.keymap.set("n", "pt", vim.cmd.NvimTreeToggle) - --- sets transparent background -vim.cmd[[hi NvimTreeNormal guibg=NONE ctermbg=NONE]] - diff --git a/nvim/dot-config/nvim/after/plugin/telescope.lua b/nvim/dot-config/nvim/after/plugin/telescope.lua deleted file mode 100644 index 76b1ba8..0000000 --- a/nvim/dot-config/nvim/after/plugin/telescope.lua +++ /dev/null @@ -1,29 +0,0 @@ -local builtin = require("telescope.builtin") - -require("telescope").setup{ - defaults = { - file_ignore_patterns = { ".git\\", ".pyc", ".mypy_cache\\", "node_modules\\", ".svg" } - } -} - -local wk = require("which-key") - --- p -wk.register({p = { name = "project" }, prefix = ""}) -vim.keymap.set("n", "pf", builtin.find_files, {desc = "Project find"}) -vim.keymap.set("n", "ps", function () - builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end , {desc = "Project search"}) - --- f -wk.register({f = { name = "find" }, prefix = ""}) -vim.keymap.set("n", "fr", builtin.oldfiles, { desc = "Find recent" }) - --- h -wk.register({h = { name = "help" }, prefix = ""}) -vim.keymap.set("n", "ht", builtin.colorscheme, { desc = "Load theme" }) -vim.keymap.set("n", "hf", builtin.commands , { desc = "Describe function" }) -vim.keymap.set("n", "hk", builtin.keymaps , { desc = "Describe key" }) -vim.keymap.set("n", "hv", builtin.vim_options, { desc = "Describe key" }) -vim.keymap.set("n", "hh", builtin.help_tags , { desc = "Search local wiki" }) - diff --git a/nvim/dot-config/nvim/after/plugin/treesitter.lua b/nvim/dot-config/nvim/after/plugin/treesitter.lua deleted file mode 100644 index a4881fb..0000000 --- a/nvim/dot-config/nvim/after/plugin/treesitter.lua +++ /dev/null @@ -1,16 +0,0 @@ -require'nvim-treesitter.configs'.setup { - ensure_installed = { "rust", "vim", "javascript", "html", "css", "python", "java", "lua", "perl", "php", "c", "json" }, - - ignore_install = { "latex", "markdown", "htmldjango" }, - - sync_install = false, - - auto_install = false, - - highlight = { - enable = true, - - addition_vim_regex_highlighting = false, - }, -} - diff --git a/nvim/dot-config/nvim/after/plugin/undotree.lua b/nvim/dot-config/nvim/after/plugin/undotree.lua deleted file mode 100644 index 48822a4..0000000 --- a/nvim/dot-config/nvim/after/plugin/undotree.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.keymap.set("n", "ut", vim.cmd.UndotreeToggle) - diff --git a/nvim/dot-config/nvim/after/plugin/vimtex.lua b/nvim/dot-config/nvim/after/plugin/vimtex.lua deleted file mode 100644 index 2b34d64..0000000 --- a/nvim/dot-config/nvim/after/plugin/vimtex.lua +++ /dev/null @@ -1,21 +0,0 @@ -vim.cmd([[ - -syntax enable - -let g:maplocalleader=' ' -let g:vimtex_view_method='zathura' -let g:tex_flavor='latex' -let g:vimtex_quickfix_mode=0 -set conceallevel=0 -let g:tex_conceal='abdmg' -let g:vimtex_view_forward_search_on_start=0 " Weird highlighting otherwise - -augroup vimtex_config - au! - au User VimtexEventQuit call vimtex#compiler#clean(0) -augroup END - -]]) - - - diff --git a/nvim/dot-config/nvim/after/plugin/whichkey.lua b/nvim/dot-config/nvim/after/plugin/whichkey.lua deleted file mode 100644 index f1fd478..0000000 --- a/nvim/dot-config/nvim/after/plugin/whichkey.lua +++ /dev/null @@ -1,16 +0,0 @@ -require("which-key").setup({ - window = { - border = "single", -- none, single, double, shadow - position = "bottom", -- bottom, top - margin = { 0, 0, 0, 0 }, -- extra window margin [top, right, bottom, left]. When between 0 and 1, will be treated as a percentage of the screen size. - padding = { 0, 2, 0, 2 }, -- extra window padding [top, right, bottom, left] - winblend = 0, -- value between 0-100 0 for fully opaque and 100 for fully transparent - zindex = 1000, -- positive value to position WhichKey above other floating windows. - }, - layout = { - height = { min = 4, max = 25 }, -- min and max height of the columns - width = { min = 20, max = 50 }, -- min and max width of the columns - spacing = 3, -- spacing between columns - align = "left", -- align columns left, center or right - }, -}) diff --git a/nvim/dot-config/nvim/after/plugin/yazi.lua b/nvim/dot-config/nvim/after/plugin/yazi.lua deleted file mode 100644 index 2fdf5ca..0000000 --- a/nvim/dot-config/nvim/after/plugin/yazi.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.keymap.set("n", "e", function () - vim.cmd("Yazi") -end) - diff --git a/nvim/dot-config/nvim/after/plugin/zenmode.lua b/nvim/dot-config/nvim/after/plugin/zenmode.lua deleted file mode 100644 index 5459116..0000000 --- a/nvim/dot-config/nvim/after/plugin/zenmode.lua +++ /dev/null @@ -1,62 +0,0 @@ -require('zen-mode').setup { - window = { - backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal - -- height and width can be: - -- * an absolute number of cells when > 1 - -- * a percentage of the width / height of the editor when <= 1 - -- * a function that returns the width or the height - width = 120, -- width of the Zen window - height = 1, -- height of the Zen window - -- by default, no options are changed for the Zen window - -- uncomment any of the options below, or add other vim.wo options you want to apply - options = { - signcolumn = "no", -- disable signcolumn - number = false, -- disable number column - relativenumber = false, -- disable relative numbers - cursorline = false, -- disable cursorline - cursorcolumn = false, -- disable cursor column - foldcolumn = "0", -- disable fold column - -- list = false, -- disable whitespace characters - }, - }, - plugins = { - -- disable some global vim options (vim.o...) - -- comment the lines to not apply the options - options = { - enabled = true, - ruler = false, -- disables the ruler text in the cmd line area - showcmd = false, -- disables the command in the last line of the screen - }, - twilight = { enabled = true }, -- enable to start Twilight when zen mode opens - gitsigns = { enabled = false }, -- disables git signs - tmux = { enabled = false }, -- disables the tmux statusline - -- this will change the font size on kitty when in zen mode - -- to make this work, you need to set the following kitty options: - -- - allow_remote_control socket-only - -- - listen_on unix:/tmp/kitty - kitty = { - enabled = false, - font = "+4", -- font size increment - }, - -- this will change the font size on alacritty when in zen mode - -- requires Alacritty Version 0.10.0 or higher - -- uses `alacritty msg` subcommand to change font size - alacritty = { - enabled = false, - font = "14", -- font size - }, - -- this will change the font size on wezterm when in zen mode - -- See alse also the Plugins/Wezterm section in this projects README - wezterm = { - enabled = false, - -- can be either an absolute font size or the number of incremental steps - font = "+4", -- (10% increase per step) - }, - }, - -- callback where you can add custom code when the Zen window opens - on_open = function(win) - end, - -- callback where you can add custom code when the Zen window closes - on_close = function() - end, -} diff --git a/nvim/dot-config/nvim/after/syntax/asm.vim b/nvim/dot-config/nvim/after/syntax/asm.vim deleted file mode 100644 index c923012..0000000 --- a/nvim/dot-config/nvim/after/syntax/asm.vim +++ /dev/null @@ -1,40 +0,0 @@ -syntax case ignore - -" Match regexes. -syntax match lc3Label /[A-Za-z_][A-Za-z0-9_]*/ -syntax match lc3Register /[rR][0-7]/ -syntax match lc3Decimal /#\=-\=\<[0-9]\+\>/ -syntax match lc3Hex /x-\=[A-Fa-f0-9]\+/ -syntax match lc3Binary /b-\=[01]\+/ -syntax region lc3String start=+"+ skip=+\\"+ end=+"+ -syntax region lc3Comment start=+;+ end=+$+ - -" Assembler directives/pseudo-ops -syntax match lc3Directive /\.orig/ -syntax match lc3Directive /\.end/ -syntax match lc3Directive /\.fill/ -syntax match lc3Directive /\.blkw/ -syntax match lc3Directive /\.stringz/ - -" LC-3 opcodes/aliases, minus branches -syntax keyword lc3Opcode add ld st jsrr jsr and ldr str rti not ldi sti jmp ret lea trap nop -" Branches -syntax keyword lc3Opcode br brn brz brp brnz brnp brzp brnzp -" Trap subroutines -syntax keyword lc3Opcode getc out puts in putsp halt -" LC-3b opcodes -syntax keyword lc3Opcode ldb ldw lshf rshfl rshfa stb stw xor - -" Link colors. -hi def link lc3Opcode Statement -hi def link lc3Label Identifier -hi def link lc3Register Type -hi def link lc3Directive Define -hi def link lc3Decimal Number -hi def link lc3Hex Number -hi def link lc3Binary Number -hi def link lc3String String -hi def link lc3Comment Comment - -let b:current_syntax = "asm" - diff --git a/nvim/dot-config/nvim/after/syntax/lua.vim b/nvim/dot-config/nvim/after/syntax/lua.vim deleted file mode 100644 index aa05f50..0000000 --- a/nvim/dot-config/nvim/after/syntax/lua.vim +++ /dev/null @@ -1,15 +0,0 @@ - -syn include @Vim $VIMRUNTIME/syntax/vim.vim -syn region embedvim matchgroup=luaEmbedError start="vim\.api\.nvim_command(\[\[" end="\]\])" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.api\.nvim_command \[\[" end="\]\]" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.api\.nvim_exec(\[\[" end="\]\])" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.api\.nvim_exec \[\[" end="\]\]" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.cmd \[\[" end="\]\]" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.cmd(\[\[" end="\]\])" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.cmd \"" end="\"" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.cmd(\"" end="\")" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.cmd '" end="'" keepend contains=@Vim -syn region embedvim matchgroup=luaEmbedError start="vim\.cmd('" end="')" keepend contains=@Vim - -let b:current_syntax = 'lua' - diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua deleted file mode 100644 index 3a19e05..0000000 --- a/nvim/dot-config/nvim/init.lua +++ /dev/null @@ -1,2 +0,0 @@ -require("andrew") - diff --git a/nvim/dot-config/nvim/lua/andrew/init.lua b/nvim/dot-config/nvim/lua/andrew/init.lua deleted file mode 100644 index 180a9a4..0000000 --- a/nvim/dot-config/nvim/lua/andrew/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -require("andrew.remap") -require("andrew.packer") -require("andrew.set") - diff --git a/nvim/dot-config/nvim/lua/andrew/packer.lua b/nvim/dot-config/nvim/lua/andrew/packer.lua deleted file mode 100644 index 82aa4e1..0000000 --- a/nvim/dot-config/nvim/lua/andrew/packer.lua +++ /dev/null @@ -1,137 +0,0 @@ -local ensure_packer = function() - local fn = vim.fn - local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd [[packadd packer.nvim]] - return true - end - return false -end - -local packer_bootstrap = ensure_packer() - -return require("packer").startup(function(use) - use "goolord/alpha-nvim" - - use "wbthomason/packer.nvim" - - use "DreamMaoMao/yazi.nvim" - - use "whonore/Coqtail" - - use { - "folke/which-key.nvim", - config = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end - } - - -- File manager in nvim - use { - "ptzz/lf.vim", - requires = { {"voldikss/vim-floaterm"} }, - } - vim.cmd("let g:lf_map_keys = 0") -- Need to put here or else doesn't work - - -- Zen mode - use "folke/zen-mode.nvim" - - -- Find files and strings - use { - "nvim-telescope/telescope.nvim", tag = "0.1.4", - requires = { {"nvim-lua/plenary.nvim"} } - } - - -- Treesitter - use({"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}) - - -- Themes - use "aktersnurra/no-clown-fiesta.nvim" - use "ellisonleao/gruvbox.nvim" - use { 'rose-pine/neovim', as = 'rose-pine' } - use 'Mofiqul/vscode.nvim' - - -- Referencing a hex code highlights it in that color - use "norcalli/nvim-colorizer.lua" - - -- Relative line numbers disappear when not actively in buffer - use "jeffkreeftmeijer/vim-numbertoggle" - - -- History visualizer - use "mbbill/undotree" - - -- See function signatures when typing them - use "ray-x/lsp_signature.nvim" - require "lsp_signature".setup({}) - - -- Left-side file tree dispaly - use { - "nvim-tree/nvim-tree.lua", - requires = { - "nvim-tree/nvim-web-devicons", -- for file icons - }, - tag = "nightly" -- optional, updated every week - } - - -- Shows current mode on bottom of screen - use "itchyny/lightline.vim" - - -- LSP - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v3.x', - requires = { - -- LSP Support - {'neovim/nvim-lspconfig'}, -- Required - - -- Autocompletion - {'hrsh7th/nvim-cmp'}, -- Required - {'hrsh7th/cmp-nvim-lsp'}, -- Required - {'hrsh7th/cmp-buffer'}, -- Optional - {'hrsh7th/cmp-path'}, -- Optional - {'saadparwaiz1/cmp_luasnip'}, -- Optional - {'hrsh7th/cmp-nvim-lua'}, -- Optional - - -- Snippets - {'L3MON4D3/LuaSnip'}, -- Required - {'rafamadriz/friendly-snippets'}, -- Optional - } - } - - -- Better diagnostics - use { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - } - - -- Linting - use "jose-elias-alvarez/null-ls.nvim" - - -- Git wrapper - use("tpope/vim-fugitive") - - -- Latex editing in vim - use "lervag/vimtex" - - -- Auto comment - use "numToStr/Comment.nvim" - - -- Markdown - use({ - "agryphus/markdown-preview.nvim", - run = function() vim.fn["mkdp#util#install"]() end, - }) - - -- Jupyter notebook integration - -- use { - -- "glacambre/firenvim", - -- run = function() vim.fn["firenvim#install"](0) end - -- } - - if packer_bootstrap then - require('packer').sync() - end -end) - diff --git a/nvim/dot-config/nvim/lua/andrew/remap.lua b/nvim/dot-config/nvim/lua/andrew/remap.lua deleted file mode 100644 index c620ac3..0000000 --- a/nvim/dot-config/nvim/lua/andrew/remap.lua +++ /dev/null @@ -1,60 +0,0 @@ -vim.g.mapleader = " " - --- opens file explorer -vim.keymap.set("n", "pv", vim.cmd.Ex) - --- centers cursor when jumping up and down page -vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "J", "mzJ`z") -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- easier escape back to normal mode -vim.keymap.set("i", "", "") - -vim.keymap.set("n", "Q", "") - --- universal find and replace -vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) - --- moving highlighted text -vim.keymap.set("v", "J", ":m '>+1gv=gv") -vim.keymap.set("v", "K", ":m '<-2gv=gv") - --- allow for pasting over without losing buffer -vim.keymap.set("x", "p", "\"_dP") - --- allow copying to system clipboard -vim.keymap.set("n", "y", "\"+y") -vim.keymap.set("v", "y", "\"+y") -vim.keymap.set("n", "y", "\"+y") - --- allow deleting to void register -vim.keymap.set("n", "d", "\"_d") -vim.keymap.set("v", "d", "\"_d") - -vim.keymap.set("n", "tc", - function () - local col = "78" - print(vim.o.cc) - if vim.o.cc == col then - vim.o.cc = "" - else - vim.o.cc = col - end - end, - {desc = "Toggle color column"}) - --- case insensitive search -vim.keymap.set("n", "/", "/\\c") -vim.keymap.set("n", "?", "?\\c") - -vim.keymap.set("n", "hF", - function() - local result = vim.treesitter.get_captures_at_cursor(0) - print(vim.inspect(result)) - end, - { noremap = true, silent = false, desc = "Describe face" } -) - diff --git a/nvim/dot-config/nvim/lua/andrew/set.lua b/nvim/dot-config/nvim/lua/andrew/set.lua deleted file mode 100644 index 32b7a34..0000000 --- a/nvim/dot-config/nvim/lua/andrew/set.lua +++ /dev/null @@ -1,48 +0,0 @@ -vim.opt.nu = true -vim.opt.relativenumber = true - -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.expandtab = true - -vim.opt.smartindent = true -vim.opt.linebreak = true - -local autocmd = vim.api.nvim_create_autocmd -autocmd("bufenter", { - pattern = "*", - callback = function() - if vim.bo.ft ~= "terminal" then - vim.opt.laststatus = 2 - else - vim.opt.laststatus = 0 - end - end, -}) - --- Only search with case if capital letter is typed -vim.opt.ignorecase = true -vim.opt.smartcase = true -vim.opt.wrap = true - -vim.opt.splitbelow = true - -vim.opt.scrolloff = 8 -vim.opt.signcolumn = "auto" - -vim.o.shell = "zsh" - --- Do not map q to :q in man mode -vim.g.no_man_maps = true; - --- Local settings for when in :terminal mode --- I don't believe this functionality has been ported to lua. -vim.cmd([[ -function! TerminalSettings() - setlocal nonumber norelativenumber - setlocal scrolloff=0 -endfunction -autocmd TermOpen * call TerminalSettings() -]]) - diff --git a/st/.config/st b/st/.config/st new file mode 160000 index 0000000..a16ba50 --- /dev/null +++ b/st/.config/st @@ -0,0 +1 @@ +Subproject commit a16ba503fbfc5d11c08dc3275196eb9744197332