diff --git a/.config/metapac/config.toml b/.config/metapac/config.toml index c8b3e9f3..456feed7 100644 --- a/.config/metapac/config.toml +++ b/.config/metapac/config.toml @@ -11,6 +11,6 @@ hostname_groups_enabled = true # paths starting without a / are relative to the groups folder # Default: None [hostname_groups] -john-desktop = ["default"] -john-laptop = ["default"] +john-desktop = ["default", "desktop"] +john-laptop = ["default", "laptop"] server = [] diff --git a/.config/metapac/groups/default.toml b/.config/metapac/groups/default.toml index 37f5851e..c8a22a5d 100644 --- a/.config/metapac/groups/default.toml +++ b/.config/metapac/groups/default.toml @@ -1,11 +1,9 @@ arch = [ - "amd-ucode", "base", "base-devel", "btrfs-progs", "dolphin", "dunst", - "efibootmgr", "fish", "fuzzel", "fzf", @@ -64,8 +62,91 @@ arch = [ "xf86-video-nouveau", "xf86-video-vmware", "xorg-server", + "ada", + "argon2", + "atkmm", + "botan", + "c-ares", + "cairomm", + "cairomm-1.16", + "dkms", + "efibootmgr", + "efivar", + "fmt", + "freeglut", + "gcr-4", + "glibmm", + "glibmm-2.68", + "glu", + "graphene", + "gssdp", + "gst-plugins-bad-libs", + "gtk-layer-shell", + "gtk4", + "gtkmm-4.0", + "gtkmm3", + "gupnp", + "gupnp-igd", + "hunspell", + "intel-gmmlib", + "intel-ucode", + "jasper", + "jsoncpp", + "libappindicator-gtk3", + "libdbusmenu-glib", + "libdbusmenu-gtk3", + "libdispatch", + "libgit2", + "libluv", + "libmng", + "libmpdclient", + "libngtcp2", + "libnice", + "libnma", + "libnma-common", + "libsigc++", + "libsigc++-3.0", + "libutempter", + "libuv", + "libvterm", + "linux-headers", + "llhttp", + "lua51-lpeg", + "luajit", + "minizip", + "msgpack-c", + "neofetch", + "nm-connection-editor", + "nvidia-dkms", + "oniguruma", + "openal", + "openh264", + "openssh", + "pangomm", + "pangomm-2.48", + "playerctl", + "protobuf", + "qrencode", + "qt6-imageformats", + "rnnoise", + "simdjson", + "sndio", + "spdlog", + "syncthing", + "tree-sitter", + "tree-sitter-c", + "tree-sitter-lua", + "tree-sitter-markdown", + "tree-sitter-query", + "tree-sitter-vim", + "tree-sitter-vimdoc", + "unibilium", + "wpa_supplicant", "xorg-xinit", "yay", - "zram-generator", "lazygit", "logseq-desktop-bin", "tailscale", "git-delta", "keepassxc", "slack-desktop-wayland", "pavucontrol", "telegram-desktop", "telegram-desktop", "telegram-desktop", "filelight", "filelight", "filelight", "filelight", "nodejs", "yarn", "rustup" + "zram-generator", "lazygit", "logseq-desktop-bin", "tailscale", "git-delta", "keepassxc", "slack-desktop-wayland", "pavucontrol", "telegram-desktop", "filelight", "nodejs", "yarn", "rustup" , "vtsls"] + +cargo = ["wasm-pack"] +rustup = ["stable-x86_64-unknown-linux-gnu"] diff --git a/.config/metapac/groups/desktop.toml b/.config/metapac/groups/desktop.toml new file mode 100644 index 00000000..2bd0cb6c --- /dev/null +++ b/.config/metapac/groups/desktop.toml @@ -0,0 +1,3 @@ +arch = [ + "limine" +] diff --git a/.config/metapac/groups/laptop.toml b/.config/metapac/groups/laptop.toml new file mode 100644 index 00000000..3c407eec --- /dev/null +++ b/.config/metapac/groups/laptop.toml @@ -0,0 +1,5 @@ +arch = [ + "amd-ucode", + "efibootmgr", + "syncthing" +] diff --git a/scripts/add-package.bash b/scripts/add-package.bash index c9ad9bf5..014f5188 100644 --- a/scripts/add-package.bash +++ b/scripts/add-package.bash @@ -7,3 +7,7 @@ metapac add --backend arch --package $@ rsync -av ~/.config/metapac .config --delete metapac sync + +git add .config/metapac +git commit -m "add-package: $@" +git push diff --git a/scripts/manager.bash b/scripts/manager.bash index 8cf674bd..8028e067 100755 --- a/scripts/manager.bash +++ b/scripts/manager.bash @@ -20,7 +20,7 @@ for file in ".config"/*; do rsync -av $file ~/.config --delete done -kitty metapac sync +DISPLAY=:0 kitty metapac sync # Cleanup diff --git a/test/.config/fish/auto-Hypr.fish b/test/.config/fish/auto-Hypr.fish deleted file mode 100644 index c3c1890f..00000000 --- a/test/.config/fish/auto-Hypr.fish +++ /dev/null @@ -1,5 +0,0 @@ -# Auto start Hyprland on tty1 -if test -z "$DISPLAY" ;and test "$XDG_VTNR" -eq 1 - mkdir -p ~/.cache - exec Hyprland > ~/.cache/hyprland.log ^&1 -end diff --git a/test/.config/fish/config.fish b/test/.config/fish/config.fish deleted file mode 100755 index b07534d2..00000000 --- a/test/.config/fish/config.fish +++ /dev/null @@ -1,3 +0,0 @@ -set fish_greeting - -starship init fish | source diff --git a/test/.config/fish/fish_variables b/test/.config/fish/fish_variables deleted file mode 100755 index 3aefbf37..00000000 --- a/test/.config/fish/fish_variables +++ /dev/null @@ -1,35 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3400 -SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher -SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:blue -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d111 -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di -SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/home/john/\x2ebun/bin\x1e/home/john/\x2ebun diff --git a/test/.config/hypr/hyprland.conf b/test/.config/hypr/hyprland.conf deleted file mode 100644 index 91c77151..00000000 --- a/test/.config/hypr/hyprland.conf +++ /dev/null @@ -1,302 +0,0 @@ - -# ####################################################################################### -# AUTOGENERATED HYPRLAND CONFIG. -# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hyprland.conf AND EDIT IT, -# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -# ####################################################################################### - -# This is an example Hyprland config file. -# Refer to the wiki for more information. -# https://wiki.hyprland.org/Configuring/ - -# Please note not all available settings / options are set here. -# For a full list, see the wiki - -# You can split this configuration into multiple files -# Create your files separately and then link them to this file like this: -# source = ~/.config/hypr/myColors.conf - -source=~/.config/hypr/themes/mocha.conf - -################ -### MONITORS ### -################ - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,1 - - -################### -### MY PROGRAMS ### -################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ - -# Set programs that you use -$terminal = kitty -$fileManager = dolphin -$menu = wofi --show drun - - -################# -### AUTOSTART ### -################# - -# Autostart necessary processes (like notifications daemons, status bars, etc.) -# Or execute your favorite apps at launch like this: - -# exec-once = $terminal -# exec-once = nm-applet & -exec-once = waybar - - -############################# -### ENVIRONMENT VARIABLES ### -############################# - -# See https://wiki.hyprland.org/Configuring/Environment-variables/ - -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_SIZE,24 - - -##################### -### LOOK AND FEEL ### -##################### - -# Refer to https://wiki.hyprland.org/Configuring/Variables/ - -# https://wiki.hyprland.org/Configuring/Variables/#general -general { - gaps_in = 4 - gaps_out = 10 - - border_size = 2 - - # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - - # Set to true enable resizing windows by clicking and dragging on borders and gaps - resize_on_border = false - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false - - layout = dwindle -} - -# https://wiki.hyprland.org/Configuring/Variables/#decoration -decoration { - rounding = 20 - rounding_power = 2 - - # Change transparency of focused and unfocused windows - active_opacity = 1.0 - inactive_opacity = 1.0 - - shadow { - enabled = true - range = 4 - render_power = 3 - color = rgba(1a1a1aee) - } - - # https://wiki.hyprland.org/Configuring/Variables/#blur - blur { - enabled = true - size = 3 - passes = 1 - - vibrancy = 0.1696 - } -} - -# https://wiki.hyprland.org/Configuring/Variables/#animations -animations { - enabled = yes, please :) - - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = easeOutQuint,0.23,1,0.32,1 - bezier = easeInOutCubic,0.65,0.05,0.36,1 - bezier = linear,0,0,1,1 - bezier = almostLinear,0.5,0.5,0.75,1.0 - bezier = quick,0.15,0,0.1,1 - - animation = global, 1, 10, default - animation = border, 1, 5.39, easeOutQuint - animation = windows, 1, 4.79, easeOutQuint - animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% - animation = windowsOut, 1, 1.49, linear, popin 87% - animation = fadeIn, 1, 1.73, almostLinear - animation = fadeOut, 1, 1.46, almostLinear - animation = fade, 1, 3.03, quick - animation = layers, 1, 3.81, easeOutQuint - animation = layersIn, 1, 4, easeOutQuint, fade - animation = layersOut, 1, 1.5, linear, fade - animation = fadeLayersIn, 1, 1.79, almostLinear - animation = fadeLayersOut, 1, 1.39, almostLinear - animation = workspaces, 1, 1.94, almostLinear, fade - animation = workspacesIn, 1, 1.21, almostLinear, fade - animation = workspacesOut, 1, 1.94, almostLinear, fade -} - -# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ -# "Smart gaps" / "No gaps when only" -# uncomment all if you wish to use that. -# workspace = w[tv1], gapsout:0, gapsin:0 -# workspace = f[1], gapsout:0, gapsin:0 -# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] -# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] -# windowrulev2 = rounding 0, floating:0, onworkspace:f[1] - -# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more -dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # You probably want this -} - -# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more -master { - new_status = master -} - -# https://wiki.hyprland.org/Configuring/Variables/#misc -misc { - force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers - disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( -} - - -############# -### INPUT ### -############# - -# https://wiki.hyprland.org/Configuring/Variables/#input -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - - touchpad { - natural_scroll = false - } - - repeat_delay = 200 - repeat_rate = 50 -} - -# https://wiki.hyprland.org/Configuring/Variables/#gestures -gestures { - workspace_swipe = true -} - -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more -device { - name = epic-mouse-v1 - sensitivity = -0.5 -} - - -################### -### KEYBINDINGS ### -################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ -$mainMod = SUPER # Sets "Windows" key as main modifier - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, T, exec, $terminal -bind = $mainMod, Q, killactive, -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle - -bind = $mainMod, Slash, exec, fuzzel - -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -# Switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -# Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SHIFT, S, movetoworkspace, special:magic - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# Laptop multimedia keys for volume and LCD brightness -bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle -bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- - -# Requires playerctl -bindl = , XF86AudioNext, exec, playerctl next -bindl = , XF86AudioPause, exec, playerctl play-pause -bindl = , XF86AudioPlay, exec, playerctl play-pause -bindl = , XF86AudioPrev, exec, playerctl previous - -############################## -### WINDOWS AND WORKSPACES ### -############################## - -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules - -# Example windowrule v1 -# windowrule = float, ^(kitty)$ - -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ - -# Ignore maximize requests from apps. You'll probably like this. -windowrulev2 = suppressevent maximize, class:.* - -# Fix some dragging issues with XWayland -windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/test/.config/hypr/hyprlock.conf b/test/.config/hypr/hyprlock.conf deleted file mode 100644 index 9ef214a6..00000000 --- a/test/.config/hypr/hyprlock.conf +++ /dev/null @@ -1,89 +0,0 @@ -source = $HOME/.config/hypr/themes/mocha.conf - -$accent = $mauve -$accentAlpha = $mauveAlpha -$font = JetBrainsMono Nerd Font - -# GENERAL -general { - disable_loading_bar = true - hide_cursor = true -} - -# BACKGROUND -background { - monitor = - path = $HOME/.config/background - blur_passes = 0 - color = $base -} - -# LAYOUT -label { - monitor = - text = Layout: $LAYOUT - color = $text - font_size = 25 - font_family = $font - position = 30, -30 - halign = left - valign = top -} - -# TIME -label { - monitor = - text = $TIME - color = $text - font_size = 90 - font_family = $font - position = -30, 0 - halign = right - valign = top -} - -# DATE -label { - monitor = - text = cmd[update:43200000] date +"%A, %d %B %Y" - color = $text - font_size = 25 - font_family = $font - position = -30, -150 - halign = right - valign = top -} - -# USER AVATAR -image { - monitor = - path = $HOME/.face - size = 100 - border_color = $accent - position = 0, 75 - halign = center - valign = center -} - -# INPUT FIELD -input-field { - monitor = - size = 300, 60 - outline_thickness = 4 - dots_size = 0.2 - dots_spacing = 0.2 - dots_center = true - outer_color = $accent - inner_color = $surface0 - font_color = $text - fade_on_empty = false - placeholder_text = 󰌾 Logged in as $USER - hide_input = false - check_color = $accent - fail_color = $red - fail_text = $FAIL ($ATTEMPTS) - capslock_color = $yellow - position = 0, -47 - halign = center - valign = center -} diff --git a/test/.config/hypr/themes/mocha.conf b/test/.config/hypr/themes/mocha.conf deleted file mode 100644 index 2b80922d..00000000 --- a/test/.config/hypr/themes/mocha.conf +++ /dev/null @@ -1,77 +0,0 @@ -$rosewater = rgb(f5e0dc) -$rosewaterAlpha = f5e0dc - -$flamingo = rgb(f2cdcd) -$flamingoAlpha = f2cdcd - -$pink = rgb(f5c2e7) -$pinkAlpha = f5c2e7 - -$mauve = rgb(cba6f7) -$mauveAlpha = cba6f7 - -$red = rgb(f38ba8) -$redAlpha = f38ba8 - -$maroon = rgb(eba0ac) -$maroonAlpha = eba0ac - -$peach = rgb(fab387) -$peachAlpha = fab387 - -$yellow = rgb(f9e2af) -$yellowAlpha = f9e2af - -$green = rgb(a6e3a1) -$greenAlpha = a6e3a1 - -$teal = rgb(94e2d5) -$tealAlpha = 94e2d5 - -$sky = rgb(89dceb) -$skyAlpha = 89dceb - -$sapphire = rgb(74c7ec) -$sapphireAlpha = 74c7ec - -$blue = rgb(89b4fa) -$blueAlpha = 89b4fa - -$lavender = rgb(b4befe) -$lavenderAlpha = b4befe - -$text = rgb(cdd6f4) -$textAlpha = cdd6f4 - -$subtext1 = rgb(bac2de) -$subtext1Alpha = bac2de - -$subtext0 = rgb(a6adc8) -$subtext0Alpha = a6adc8 - -$overlay2 = rgb(9399b2) -$overlay2Alpha = 9399b2 - -$overlay1 = rgb(7f849c) -$overlay1Alpha = 7f849c - -$overlay0 = rgb(6c7086) -$overlay0Alpha = 6c7086 - -$surface2 = rgb(585b70) -$surface2Alpha = 585b70 - -$surface1 = rgb(45475a) -$surface1Alpha = 45475a - -$surface0 = rgb(313244) -$surface0Alpha = 313244 - -$base = rgb(1e1e2e) -$baseAlpha = 1e1e2e - -$mantle = rgb(181825) -$mantleAlpha = 181825 - -$crust = rgb(11111b) -$crustAlpha = 11111b diff --git a/test/.config/kitty/kitty.conf b/test/.config/kitty/kitty.conf deleted file mode 100644 index 99144f51..00000000 --- a/test/.config/kitty/kitty.conf +++ /dev/null @@ -1,9 +0,0 @@ -shell /usr/bin/fish - -font_family SpaceMono Nerd Font -confirm_os_window_close 0 - -include ./kitty-themes/themes/Neutron.conf -disable_ligatures always - -window_padding_width 4 diff --git a/test/.config/lazygit/config.yml b/test/.config/lazygit/config.yml deleted file mode 100644 index e2288e73..00000000 --- a/test/.config/lazygit/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -git: - allBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium --oneline" - autoFetch: true - autoRefresh: true - branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium --oneline {{branchName}} --" - paging: - colorArg: always - pager: delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}" diff --git a/test/.config/nvim/init.lua b/test/.config/nvim/init.lua deleted file mode 100644 index eff36f18..00000000 --- a/test/.config/nvim/init.lua +++ /dev/null @@ -1,118 +0,0 @@ --- Leader -vim.g.mapleader = " " - --- Guard (Linters + Formatters) -vim.g.guard_config = { - fmt_on_save = true, - lsp_as_default_formatter = true, - save_on_fmt = true, -} - --- Sync system clipboard and neovim register -vim.opt.clipboard = { "unnamedplus" } - --- Save undo history -vim.opt.undofile = true --- --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Remove sign column (LSP gutter on the left) -vim.opt.signcolumn = "yes" - --- Line Numbers -vim.opt.number = true -vim.opt.relativenumber = true - --- Tabs - -vim.o.tabstop = 4 -- A TAB character looks like 4 spaces -vim.o.expandtab = true -- Pressing the TAB key will insert spaces instead of a TAB character -vim.o.softtabstop = 4 -- Number of spaces inserted instead of a TAB character -vim.o.shiftwidth = 4 -- Number of spaces inserted when indenting - --- Modules -- - --- Lazy = Package Manager -- -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" - -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup("plugins") - --- LSP Ignore error -for _, method in ipairs({ "textDocument/diagnostic", "workspace/diagnostic" }) do - local default_diagnostic_handler = vim.lsp.handlers[method] - vim.lsp.handlers[method] = function(err, result, context, config) - if err ~= nil and err.code == -32802 then - return - end - return default_diagnostic_handler(err, result, context, config) - end -end - --- Mappings - --- Save -- -vim.keymap.set("n", "", "w") - --- Lint on save -- -vim.api.nvim_create_autocmd({ "BufWritePost" }, { - callback = function() - require("lint").try_lint() - end, -}) - --- Split navigation -- -vim.keymap.set("n", "", "h") -vim.keymap.set("n", "", "j") -vim.keymap.set("n", "", "k") -vim.keymap.set("n", "", "l") - --- Buffers -- -vim.keymap.set("n", "x", "bd") - --- Telescope Mappings -- -local builtin = require("telescope.builtin") -vim.keymap.set("n", "ff", builtin.find_files, { desc = "Telescope find files" }) -vim.keymap.set("n", "fw", builtin.live_grep, { desc = "Telescope live grep" }) -vim.keymap.set("n", "fb", builtin.buffers, { desc = "Telescope live buffers" }) - --- Neo Tree -- -vim.keymap.set("n", "", " Neotree toggle ") -vim.keymap.set("n", "e", " Neotree focus ") - --- LSP -- -vim.keymap.set("n", "gd", vim.lsp.buf.definition) -vim.keymap.set("n", "ca", vim.lsp.buf.code_action) -vim.keymap.set("n", "ra", vim.lsp.buf.rename) -vim.keymap.set("n", "lf", vim.diagnostic.open_float) -vim.keymap.set("n", "gr", vim.lsp.buf.references) - --- Search -- -vim.keymap.set("n", "", " noh ") - --- Tmux navigator -- -vim.keymap.set("n", "", "TmuxNavigateLeft") -vim.keymap.set("n", "", "TmuxNavigateDown") -vim.keymap.set("n", "", "TmuxNavigateUp") -vim.keymap.set("n", "", "TmuxNavigateRight") -vim.keymap.set("n", "", "TmuxNavigatePrevious") - --- Floating Terminal -- -vim.keymap.set("n", "", "ToggleTerm direction=float") -vim.keymap.set("t", "", "ToggleTerm direction=float") diff --git a/test/.config/nvim/lazy-lock.json b/test/.config/nvim/lazy-lock.json deleted file mode 100644 index 62f2d910..00000000 --- a/test/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, - "everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" }, - "guard-collection": { "branch": "main", "commit": "06da4a065b974bbedf1a5535232c90a3526f8a43" }, - "guard.nvim": { "branch": "main", "commit": "bdbc43dadd530b0058708723db76e705a4542063" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, - "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" }, - "nvim-treesitter": { "branch": "master", "commit": "0179a89656b4ce395a4487c07ae385b8425524ae" }, - "nvim-web-devicons": { "branch": "master", "commit": "f0267921c845c42685968401bc49aa65e18d3e09" }, - "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" }, - "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" } -} \ No newline at end of file diff --git a/test/.config/nvim/lua/plugins/init.lua b/test/.config/nvim/lua/plugins/init.lua deleted file mode 100644 index 87d4d6e1..00000000 --- a/test/.config/nvim/lua/plugins/init.lua +++ /dev/null @@ -1,217 +0,0 @@ -return { - { "wakatime/vim-wakatime", lazy = false }, - { - "stevearc/conform.nvim", - config = function() - require("conform").setup({ - formatters_by_ft = { - lua = { "stylua" }, - rust = { "rustfmt", lsp_format = "fallback" }, - javascript = { "prettierd", "prettier", stop_after_first = true }, - }, - format_on_save = { - lsp_format = "fallback", - }, - }) - end, - }, - { - "mfussenegger/nvim-lint", - config = function() - --[[ - require("lint").linters_by_ft = { - javascript = { - "eslint_d", - }, - typescript = { - "eslint_d", - }, - javascriptreact = { - "eslint_d", - }, - typescriptreact = { - "eslint_d", - }, - } - ]] - -- - end, - }, - { - "numToStr/Comment.nvim", - opts = { - -- add any options here - }, - }, - { "akinsho/toggleterm.nvim", version = "*", config = true }, - { - "christoomey/vim-tmux-navigator", - cmd = { - "TmuxNavigateLeft", - "TmuxNavigateDown", - "TmuxNavigateUp", - "TmuxNavigateRight", - "TmuxNavigatePrevious", - }, - }, - { - "windwp/nvim-autopairs", - event = "InsertEnter", - config = true, - }, - { "Everblush/nvim", name = "everblush" }, - { - "sainnhe/gruvbox-material", - lazy = false, - config = function() - -- Optionally configure and load the colorscheme - -- directly inside the plugin declaration. - vim.g.gruvbox_material_enable_italic = true - vim.g.gruvbox_material_background = "hard" - vim.cmd.colorscheme("gruvbox-material") - end, - }, - { "hrsh7th/vim-vsnip" }, - { "hrsh7th/cmp-nvim-lsp" }, - { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require("cmp") - cmp.setup({ - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "vsnip" }, - }, { - { name = "buffer" }, - }), - }) - end, - }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.x", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - -- require("telescope").load_extension("fzf") - end, - }, - { - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - config = function() - local configs = require("nvim-treesitter.configs") - - configs.setup({ - ensure_installed = { "lua", "javascript", "typescript", "html", "tsx", "zig" }, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true }, - }) - end, - }, - - { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - { - "s1n7ax/nvim-window-picker", - version = "2.*", - config = function() - require("window-picker").setup({ - filter_rules = { - include_current_win = false, - autoselect_one = true, - -- filter using buffer options - bo = { - -- if the file type is one of following, the window will be ignored - filetype = { "neo-tree", "neo-tree-popup", "notify" }, - -- if the buffer type is one of following, the window will be ignored - buftype = { "terminal", "quickfix" }, - }, - }, - }) - end, - }, - }, - config = function() - require("neo-tree").setup({ - filesystem = { - follow_current_file = { - enabled = true, - }, - }, - close_if_last_window = false, - }) - vim.cmd([[nnoremap \ :Neotree reveal]]) - end, - }, - { - "neovim/nvim-lspconfig", - dependencies = { "hrsh7th/cmp-nvim-lsp" }, - config = function() - local lsp = require("lspconfig") - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - lsp.lua_ls.setup({ - capabilities = capabilities, - settings = { - Lua = { - diagnostics = { globals = { "vim", "require" } }, - workspace = { - -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - }, - }, - }) - - lsp.vtsls.setup({ - capabilities = capabilities, - }) - - lsp.zls.setup({ - capabilities = capabilities, - }) - - lsp.rust_analyzer.setup({ - capabilities = capabilities, - diagnostic = { - -- Prevents the annoying popup for cancalled requests - refreshSupport = false, - }, - }) - - lsp.gopls.setup({ - capabilities = capabilities, - }) - lsp.tailwindcss.setup({ - capabilities = capabilities, - }) - lsp.ocamllsp.setup({ - capabilities = capabilities, - }) - lsp.svelte.setup({ - capabilities = capabilities, - }) - end, - }, - { - "sindrets/diffview.nvim", - }, -} diff --git a/test/.config/starship.toml b/test/.config/starship.toml deleted file mode 100644 index 369d48a4..00000000 --- a/test/.config/starship.toml +++ /dev/null @@ -1,166 +0,0 @@ -add_newline = false - -[aws] -symbol = " " - -[buf] -symbol = " " - -[c] -symbol = " " - -[conda] -symbol = " " - -[crystal] -symbol = " " - -[dart] -symbol = " " - -[directory] -read_only = " 󰌾" - -[docker_context] -symbol = " " - -[elixir] -symbol = " " - -[elm] -symbol = " " - -[fennel] -symbol = " " - -[fossil_branch] -symbol = " " - -[git_branch] -symbol = " " - -[golang] -symbol = " " - -[guix_shell] -symbol = " " - -[haskell] -symbol = " " - -[haxe] -symbol = " " - -[hg_branch] -symbol = " " - -[hostname] -ssh_symbol = " " - -[java] -symbol = " " - -[julia] -symbol = " " - -[kotlin] -symbol = " " - -[lua] -symbol = " " - -[memory_usage] -symbol = "󰍛 " - -[meson] -symbol = "󰔷 " - -[nim] -symbol = "󰆥 " - -[nix_shell] -symbol = " " - -[nodejs] -symbol = " " - -[ocaml] -symbol = " " - -[os.symbols] -Alpaquita = " " -Alpine = " " -AlmaLinux = " " -Amazon = " " -Android = " " -Arch = " " -Artix = " " -CentOS = " " -Debian = " " -DragonFly = " " -Emscripten = " " -EndeavourOS = " " -Fedora = " " -FreeBSD = " " -Garuda = "󰛓 " -Gentoo = " " -HardenedBSD = "󰞌 " -Illumos = "󰈸 " -Kali = " " -Linux = " " -Mabox = " " -Macos = " " -Manjaro = " " -Mariner = " " -MidnightBSD = " " -Mint = " " -NetBSD = " " -NixOS = " " -OpenBSD = "󰈺 " -openSUSE = " " -OracleLinux = "󰌷 " -Pop = " " -Raspbian = " " -Redhat = " " -RedHatEnterprise = " " -RockyLinux = " " -Redox = "󰀘 " -Solus = "󰠳 " -SUSE = " " -Ubuntu = " " -Unknown = " " -Void = " " -Windows = "󰍲 " - -[package] -symbol = "󰏗 " - -[perl] -symbol = " " - -[php] -symbol = " " - -[pijul_channel] -symbol = " " - -[python] -symbol = " " - -[rlang] -symbol = "󰟔 " - -[ruby] -symbol = " " - -[rust] -symbol = "󱘗 " - -[scala] -symbol = " " - -[swift] -symbol = " " - -[zig] -symbol = " " diff --git a/test/.config/tmux/.tmux.conf b/test/.config/tmux/.tmux.conf deleted file mode 100644 index 707375d8..00000000 --- a/test/.config/tmux/.tmux.conf +++ /dev/null @@ -1,63 +0,0 @@ -set -g default-terminal "xterm-256color" - -set-option -sa terminal-overrides ",xterm-256color:RGB" - -set-option -sg escape-time 10 -set -g base-index 1 -setw -g pane-base-index 1 - -set -s escape-time 0 - -set -g prefix C-a -unbind C-b -bind-key C-a send-prefix - -unbind % -bind | split-window -h - -unbind '"' -bind - split-window -v - -unbind r -bind r source-file ~/.tmux.conf - -bind -r j resize-pane -D 5 -bind -r k resize-pane -U 5 -bind -r l resize-pane -R 5 -bind -r h resize-pane -L 5 - -bind -r m resize-pane -Z - -unbind c -bind c new-window -c "#{pane_current_path}" - -unbind b -bind b display-popup -w 80% -h 80% -E "tmux new-session -A -s FloatingSession-$(tmux display-message -p '#S')" - -set-option -g default-shell /bin/fish - -# ------------------------------- -# Copy and Paste Options -# ------------------------------- -set -g mouse on -set-option -g mouse on -set -g mode-keys vi -set-option -s set-clipboard off - -bind P paste-buffer -bind-key -T copy-mode-vi v send-keys -X begin-selection -bind-key -T copy-mode-vi y send-keys -X rectangle-toggle - -unbind -T copy-mode-vi Enter -bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i' -bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i' - -# ------------------------------- - -set -g @plugin 'tmux-plugins/tpm' - -# Tmux Plugins - -set -g @plugin 'christoomey/vim-tmux-navigator' - -run '~/.tmux/plugins/tpm/tpm'