new nvim
| @ -19,6 +19,11 @@ PATH=$PATH:~/.config/emacs/bin/ | ||||
| PATH=$PATH:~/.mint/bin/ | ||||
| PATH=$PATH:~/glamoroustoolkit/bin/ | ||||
| PATH=$PATH:~/Documents/Projects/Cuis-Smalltalk-Dev/ | ||||
| PATH=$PATH:~/opt/homebrew/bin/ | ||||
| 
 | ||||
| export CFLAGS="$CFLAGS -I/opt/homebrew/include" | ||||
| 
 | ||||
| LDPATH=$LDPATH:/opt/homebrew/lib/ | ||||
| # don't put duplicate lines or lines starting with space in the history. | ||||
| # See bash(1) for more options | ||||
| HISTCONTROL=ignoreboth | ||||
| @ -123,7 +128,7 @@ alias _='sudo' | ||||
| alias _i='sudo -i' | ||||
| alias please='sudo' | ||||
| alias fucking='sudo' | ||||
| alias hx='helix' | ||||
| # alias hx='helix' | ||||
| alias bat='bat --theme="base16-256"' | ||||
| if [ -n "$(command -v 'eza')" ]; then | ||||
|   alias ls='eza' | ||||
| @ -193,7 +198,8 @@ elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then | ||||
| fi | ||||
| 
 | ||||
| if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix || command -v hx)" ] && [ -z "$TMUX" ]; then | ||||
|     alias helix='tmux new-session -e "EDITOR=helix" helix > /dev/null'     | ||||
|     alias helix='tmux new-session -e "EDITOR=hx" hx > /dev/null'     | ||||
|     alias hx='tmux new-session -e "EDITOR=hx" hx > /dev/null'     | ||||
| fi | ||||
| # if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then | ||||
| #     SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" | ||||
| @ -213,9 +219,9 @@ alias csi='rlwrap csi' | ||||
| alias chicken-csi='rlwrap chicken-csi' | ||||
| alias icyc='rlwrap icyc' | ||||
| export DCONF_PROFILE | ||||
| export FZF_DEFAULT_OPTS=" | ||||
| 	--color=fg:#908caa,bg:#191724,hl:#ebbcba | ||||
| 	--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba | ||||
| 	--color=border:#403d52,header:#31748f,gutter:#191724 | ||||
| 	--color=spinner:#f6c177,info:#9ccfd8 | ||||
| 	--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa" | ||||
| # export FZF_DEFAULT_OPTS=" | ||||
| # 	--color=fg:#908caa,bg:#191724,hl:#ebbcba | ||||
| # 	--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba | ||||
| # 	--color=border:#403d52,header:#31748f,gutter:#191724 | ||||
| # 	--color=spinner:#f6c177,info:#9ccfd8 | ||||
| # 	--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa" | ||||
|  | ||||
| @ -3,17 +3,19 @@ font-family = "" | ||||
| # font-family = "PragmataPro Liga" | ||||
| # font-family = "BigBlueTermPlus Nerd Font" | ||||
| # font-family = "Olympe Mono Hacked" | ||||
| font-family = "Iosevka Term SS12" | ||||
| font-family = "Iosevka SS12" | ||||
| font-family = "Cascadia Code" | ||||
| font-family = "CaskaydiaCove Nerd Font" | ||||
| # font-family = "Terminess Nerd Font Mono" | ||||
| # font-family = "Ubuntu Mono Nerd Font" | ||||
| # font-family = "Victor Mono Nerd Font" | ||||
| # font-family = "Sudo" | ||||
| theme = light:rose-pine-dawn,dark:rose-pine | ||||
| # theme = light:rose-pine-dawn,dark:rose-pine | ||||
| font-size = 14 | ||||
| font-variation = wdth=100 | ||||
| font-thicken = true | ||||
| # font-variation = wdth=100 | ||||
| # theme = light:xcodelight,dark:xcodedark | ||||
| theme = light:nord-light,dark:nord | ||||
| # theme = Monokai Classic | ||||
| # window-decoration = false | ||||
| # gtk-adwaita = false | ||||
|  | ||||
| @ -1,4 +0,0 @@ | ||||
| 
 | ||||
| set -e | ||||
| 
 | ||||
|         cargo install --locked --force --path . | ||||
| @ -1,19 +0,0 @@ | ||||
| try %{  | ||||
| 
 | ||||
|       discord-presence-enable | ||||
|  } catch %{ | ||||
|     echo -debug "Error while evaluating 'kakoune-discord' configuration: %val{error}" | ||||
| 
 | ||||
|     set-option -add current plug_conf_errors "Error while evaluating 'kakoune-discord' configuration:" | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n    " } | ||||
|     set-option -add current plug_conf_errors %val{error} | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n\n" } | ||||
| 
 | ||||
|     hook -once -group plug-conf-err global WinDisplay .* %{ | ||||
|         info -style modal -title "plug.kak error" "%opt{plug_conf_errors}" | ||||
|         on-key %{ | ||||
|             info -style modal | ||||
|             execute-keys -with-maps -with-hooks %val{key} | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -1,2 +0,0 @@ | ||||
| 
 | ||||
|  cargo install --path . --force  | ||||
| @ -1,23 +0,0 @@ | ||||
| try %{  | ||||
| 
 | ||||
|         require-module rainbow | ||||
|             # suggested mapping | ||||
| #     # map global user r ": rainbow<ret>" -docstring "rainbow brackets" | ||||
| #         # map global user R ": rmhl window/ranges_rainbow_specs<ret>" \ | ||||
| #             #     -docstring "remove rainbow highlighter" | ||||
|  } catch %{ | ||||
|     echo -debug "Error while evaluating 'kakoune-rainbow' configuration: %val{error}" | ||||
| 
 | ||||
|     set-option -add current plug_conf_errors "Error while evaluating 'kakoune-rainbow' configuration:" | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n    " } | ||||
|     set-option -add current plug_conf_errors %val{error} | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n\n" } | ||||
| 
 | ||||
|     hook -once -group plug-conf-err global WinDisplay .* %{ | ||||
|         info -style modal -title "plug.kak error" "%opt{plug_conf_errors}" | ||||
|         on-key %{ | ||||
|             info -style modal | ||||
|             execute-keys -with-maps -with-hooks %val{key} | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -1 +0,0 @@ | ||||
| gitlab.com | ||||
| @ -1,21 +0,0 @@ | ||||
| try %{  | ||||
| 
 | ||||
|     plug "gustavo-hms/peneira" %{ | ||||
|         require-module peneira | ||||
|     } | ||||
|  } catch %{ | ||||
|     echo -debug "Error while evaluating 'luar' configuration: %val{error}" | ||||
| 
 | ||||
|     set-option -add current plug_conf_errors "Error while evaluating 'luar' configuration:" | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n    " } | ||||
|     set-option -add current plug_conf_errors %val{error} | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n\n" } | ||||
| 
 | ||||
|     hook -once -group plug-conf-err global WinDisplay .* %{ | ||||
|         info -style modal -title "plug.kak error" "%opt{plug_conf_errors}" | ||||
|         on-key %{ | ||||
|             info -style modal | ||||
|             execute-keys -with-maps -with-hooks %val{key} | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -1,19 +0,0 @@ | ||||
| try %{  | ||||
| 
 | ||||
|         # your config | ||||
|  } catch %{ | ||||
|     echo -debug "Error while evaluating 'pandoc.kak' configuration: %val{error}" | ||||
| 
 | ||||
|     set-option -add current plug_conf_errors "Error while evaluating 'pandoc.kak' configuration:" | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n    " } | ||||
|     set-option -add current plug_conf_errors %val{error} | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n\n" } | ||||
| 
 | ||||
|     hook -once -group plug-conf-err global WinDisplay .* %{ | ||||
|         info -style modal -title "plug.kak error" "%opt{plug_conf_errors}" | ||||
|         on-key %{ | ||||
|             info -style modal | ||||
|             execute-keys -with-maps -with-hooks %val{key} | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -1,19 +0,0 @@ | ||||
| try %{  | ||||
| 
 | ||||
|         require-module peneira | ||||
|      } catch %{ | ||||
|     echo -debug "Error while evaluating 'peneira' configuration: %val{error}" | ||||
| 
 | ||||
|     set-option -add current plug_conf_errors "Error while evaluating 'peneira' configuration:" | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n    " } | ||||
|     set-option -add current plug_conf_errors %val{error} | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n\n" } | ||||
| 
 | ||||
|     hook -once -group plug-conf-err global WinDisplay .* %{ | ||||
|         info -style modal -title "plug.kak error" "%opt{plug_conf_errors}" | ||||
|         on-key %{ | ||||
|             info -style modal | ||||
|             execute-keys -with-maps -with-hooks %val{key} | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -1,25 +0,0 @@ | ||||
| try %{  | ||||
| 
 | ||||
|     # if you have wrap highlighter enamled in you configuration | ||||
|     # files it's better to turn it off for tagbar, using this hook: | ||||
|     hook global WinSetOption filetype=tagbar %{ | ||||
|         remove-highlighter window/wrap | ||||
|         # you can also disable rendering whitespaces here, line numbers, and | ||||
|         # matching characters | ||||
|     } | ||||
|  } catch %{ | ||||
|     echo -debug "Error while evaluating 'tagbar.kak' configuration: %val{error}" | ||||
| 
 | ||||
|     set-option -add current plug_conf_errors "Error while evaluating 'tagbar.kak' configuration:" | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n    " } | ||||
|     set-option -add current plug_conf_errors %val{error} | ||||
|     set-option -add current plug_conf_errors %sh{ printf "\n\n" } | ||||
| 
 | ||||
|     hook -once -group plug-conf-err global WinDisplay .* %{ | ||||
|         info -style modal -title "plug.kak error" "%opt{plug_conf_errors}" | ||||
|         on-key %{ | ||||
|             info -style modal | ||||
|             execute-keys -with-maps -with-hooks %val{key} | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -1,68 +1,67 @@ | ||||
| { | ||||
|   "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, | ||||
|   "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" }, | ||||
|   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, | ||||
|   "catppuccin": { "branch": "main", "commit": "211dc3649f775c5a390e9fae07bf20d985f8dcf2" }, | ||||
|   "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, | ||||
|   "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, | ||||
|   "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" }, | ||||
|   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, | ||||
|   "dim.lua": { "branch": "main", "commit": "e7d7428d2d0bde97c6441ca9f04a1e9ac7c6d6bb" }, | ||||
|   "dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" }, | ||||
|   "dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" }, | ||||
|   "dropbar.nvim": { "branch": "master", "commit": "596f95e98a21e8fccf3db91fec481129eb82ff61" }, | ||||
|   "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" }, | ||||
|   "everforest": { "branch": "master", "commit": "34fd33500cb86c3c1af3c87f97c0fec247592e83" }, | ||||
|   "everforest": { "branch": "master", "commit": "28d59e29d972e21f2e802ce916f28dcab30697ae" }, | ||||
|   "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" }, | ||||
|   "github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" }, | ||||
|   "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, | ||||
|   "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, | ||||
|   "gruvbox-material": { "branch": "master", "commit": "81aeeee11a45ae8e4f26df67bfbbe18795bda6ee" }, | ||||
|   "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, | ||||
|   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, | ||||
|   "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" }, | ||||
|   "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, | ||||
|   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, | ||||
|   "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" }, | ||||
|   "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, | ||||
|   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, | ||||
|   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, | ||||
|   "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, | ||||
|   "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, | ||||
|   "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, | ||||
|   "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, | ||||
|   "mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" }, | ||||
|   "mini.nvim": { "branch": "main", "commit": "93cca0073778f4118c55a73a48b30d06ef064add" }, | ||||
|   "mini.nvim": { "branch": "main", "commit": "ddb70da6ec6aa896cfde87350d1e8dffb57ddef0" }, | ||||
|   "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, | ||||
|   "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, | ||||
|   "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" }, | ||||
|   "moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" }, | ||||
|   "multicursor.nvim": { "branch": "1.0", "commit": "9eedebdd395bbbc4711081e33b0606c079e054c3" }, | ||||
|   "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" }, | ||||
|   "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" }, | ||||
|   "neogit": { "branch": "master", "commit": "4046f747739cf7e7b9aada447f3edc59c947b111" }, | ||||
|   "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, | ||||
|   "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, | ||||
|   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, | ||||
|   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, | ||||
|   "nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" }, | ||||
|   "nvim-lspconfig": { "branch": "master", "commit": "b0caeef0d835fbe19df6ad71dbc4345eaaea649c" }, | ||||
|   "nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" }, | ||||
|   "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" }, | ||||
|   "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" }, | ||||
|   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, | ||||
|   "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, | ||||
|   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, | ||||
|   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, | ||||
|   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, | ||||
|   "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" }, | ||||
|   "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, | ||||
|   "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, | ||||
|   "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" }, | ||||
|   "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, | ||||
|   "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, | ||||
|   "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" }, | ||||
|   "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" }, | ||||
|   "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, | ||||
|   "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" }, | ||||
|   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, | ||||
|   "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" }, | ||||
|   "rose-pine": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" }, | ||||
|   "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, | ||||
|   "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" }, | ||||
|   "telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" }, | ||||
|   "telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" }, | ||||
|   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, | ||||
|   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, | ||||
|   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, | ||||
|   "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" }, | ||||
|   "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, | ||||
|   "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, | ||||
|   "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" }, | ||||
|   "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" }, | ||||
|   "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" }, | ||||
|   "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, | ||||
|   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, | ||||
|   "vim-teal": { "branch": "master", "commit": "c87b8931afa68376b88ff721336f31512b9384f1" }, | ||||
|   "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }, | ||||
|   "workspaces.nvim": { "branch": "master", "commit": "55a1eb6f5b72e07ee8333898254e113e927180ca" } | ||||
|   "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" } | ||||
| } | ||||
|  | ||||
| @ -1,3 +1,4 @@ | ||||
| require 'config.lazy' | ||||
| require 'config.set' | ||||
| require 'config.keymap' | ||||
| require 'config.lsp' | ||||
|  | ||||
| @ -2,33 +2,35 @@ local set = vim.keymap.set | ||||
| local setnx = function(key, command, desc) | ||||
|     set({'n', 'x'}, key, command, { desc = desc }) | ||||
| end | ||||
| -- Telescope | ||||
| local tele = require('telescope.builtin') | ||||
| local telescope = require('telescope') | ||||
| 
 | ||||
| setnx('<leader>ff', tele.find_files, 'Find files') | ||||
| setnx('<leader>f/', tele.grep_string, 'Search current word') | ||||
| setnx('<leader>f?', tele.live_grep, 'Search in files') | ||||
| setnx('<leader>fr', telescope.extensions.recent_files.pick, 'Find recent files') | ||||
| setnx('<leader>b', tele.buffers, 'List buffers') | ||||
| setnx('<leader>h', tele.help_tags, 'Search help') | ||||
| setnx('<leader>m', tele.marks, 'Search marks') | ||||
| setnx('<leader>q', tele.quickfix, 'Search quickfix list') | ||||
| setnx('<leader>l', tele.loclist, 'Search location list') | ||||
| setnx('<leader>j', tele.jumplist, 'Search jumplist') | ||||
| setnx('<leader>r', tele.registers, 'Search registers') | ||||
| setnx('<leader>s', tele.spell_suggest, 'List spelling suggestions') | ||||
| setnx('<leader>M', tele.man_pages, 'Search man pages') | ||||
| setnx('<leader>ff', Snacks.picker.files, 'Find files') | ||||
| setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word') | ||||
| setnx('<leader>f?', Snacks.picker.grep, 'Search in files') | ||||
| setnx('<leader>fr', Snacks.picker.recent, 'Find recent files') | ||||
| setnx('<leader>b', Snacks.picker.buffers, 'List buffers') | ||||
| setnx('<leader>h', Snacks.picker.help, 'Search help') | ||||
| setnx('<leader>m', Snacks.picker.marks, 'Search marks') | ||||
| setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list') | ||||
| setnx('<leader>l', Snacks.picker.loclist, 'Search location list') | ||||
| setnx('<leader>j', Snacks.picker.jumps, 'Search jumplist') | ||||
| setnx('<leader>r', Snacks.picker.registers, 'Search registers') | ||||
| setnx('<leader>s', Snacks.picker.spelling, 'List spelling suggestions') | ||||
| setnx('<leader>M', Snacks.picker.man, 'Search man pages') | ||||
| setnx('<leader>t', require'telescope-tabs'.list_tabs, 'List tabs') | ||||
| setnx('<leader>c', tele.colorscheme, 'Select colorscheme') | ||||
| setnx('<leader>c', Snacks.picker.colorschemes, 'Select colorscheme') | ||||
| setnx('<leader>N', Snacks.picker.notifications, 'List notifications') | ||||
| 
 | ||||
| local neogit = require('neogit') | ||||
| setnx('<leader>op', '<CMD>Oil<CR>', 'Open file manager') | ||||
| setnx('<leader>oP', '<CMD>Oil --float<CR>', 'Open file manager in floating window') | ||||
| setnx('<leader>ot', '<CMD>term<CR>', 'Open terminal') | ||||
| setnx('<leader>oT', '<CMD>tabnew<CR>', 'Open new tab') | ||||
| setnx('<leader>of', '<CMD>enew<CR>', 'Open new file') | ||||
| setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace') | ||||
| -- setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace') | ||||
| setnx('<leader>ol', '<CMD>Lazy<CR>', 'Open Lazy') | ||||
| setnx('<leader>om', '<CMD>Mason<CR>', 'Open Mason') | ||||
| setnx('<leader>oc', '<CMD>cd ' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil .<CR>', 'Open neovim configuration') | ||||
| setnx('<leader>og', neogit.open, 'Open (neo)git') | ||||
| 
 | ||||
| -- Exit terminal mode with ESC | ||||
| set('t', '<Esc>', '<C-\\><C-n>') | ||||
| @ -37,23 +39,36 @@ set('t', '<Esc>', '<C-\\><C-n>') | ||||
| setnx('\'', '`', 'Goto mark with column') | ||||
| setnx('`', '\'', 'Goto mark without column') | ||||
| 
 | ||||
| setnx('grR', tele.lsp_references, 'Search lsp references') | ||||
| setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls') | ||||
| setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls') | ||||
| setnx('grd', tele.diagnostics, 'Show LSP diagnostics') | ||||
| setnx('grs', tele.lsp_workspace_symbols, 'Show workspace symbols') | ||||
| setnx('grS', tele.lsp_document_symbols, 'Show document symbols') | ||||
| setnx('gri', tele.lsp_implementations, 'Goto implementation') | ||||
| setnx('gd', tele.lsp_definitions, 'Goto definition') | ||||
| setnx('gD', tele.lsp_type_definitions, 'Goto type definition') | ||||
| setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer') | ||||
| 
 | ||||
| setnx('<leader>gc', tele.git_commits, 'List git commits') | ||||
| setnx('<leader>gb', tele.git_branches, 'List git branches') | ||||
| setnx('<leader>gs', tele.git_status, 'Show git status') | ||||
| setnx('<leader>gS', tele.git_stash, 'Show git stash') | ||||
| setnx('<leader>gB', tele.git_bcommits, 'List buffers git commits') | ||||
| setnx('<leader>gr', tele.git_bcommits_range, 'List buffers git commits over visual range') | ||||
| setnx('grR', Snacks.picker.lsp_references, 'Search lsp references') | ||||
| -- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls') | ||||
| -- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls') | ||||
| setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics') | ||||
| setnx('grD', (function() | ||||
|     local diag = true | ||||
|     return function() | ||||
|         diag = not diag | ||||
|         vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = diag}) | ||||
|     end | ||||
| end)(), 'Toggle LSP diagnostics') | ||||
| setnx('grs', Snacks.picker.lsp_workspace_symbols, 'Show workspace symbols') | ||||
| setnx('grS', Snacks.picker.lsp_symbols, 'Show document symbols') | ||||
| setnx('gri', Snacks.picker.lsp_implementations, 'Goto implementation') | ||||
| setnx('gd', Snacks.picker.lsp_definitions, 'Goto definition') | ||||
| setnx('gD', Snacks.picker.lsp_type_definitions, 'Goto type definition') | ||||
| 
 | ||||
| setnx('<leader>gc', Snacks.picker.git_log, 'List git commits') | ||||
| setnx('<leader>gb', Snacks.picker.git_branches, 'List git branches') | ||||
| setnx('<leader>gs', Snacks.picker.git_status, 'Show git status') | ||||
| setnx('<leader>gS', Snacks.picker.git_stash, 'Show git stash') | ||||
| setnx('<leader>gB', Snacks.picker.git_log_file, 'List buffers git commits') | ||||
| setnx('<leader>gr', Snacks.picker.git_log_line, 'List buffers git commits over visual range') | ||||
| 
 | ||||
| setnx('<leader>n', require('nabla').popup, 'Show popup for nabla preview') | ||||
| setnx('<leader>p', '"+p', 'Paste from system clipboard') | ||||
| setnx('<leader>y', '"+y', 'Yank to system clipboard') | ||||
| 
 | ||||
| setnx('gs', '<Plug>(leap)', 'Activate leap') | ||||
| setnx('g<C-s>', '<Plug>(leap-anywhere)', 'Activate leap anywhere') | ||||
| setnx('gS', require('leap.remote').action, 'Activate remote leap') | ||||
|  | ||||
| @ -29,7 +29,7 @@ require("lazy").setup({ | ||||
|   }, | ||||
|   -- Configure any other settings here. See the documentation for more details. | ||||
|   -- colorscheme that will be used when installing plugins. | ||||
|   install = { colorscheme = { "rose-pine" } }, | ||||
|   install = { colorscheme = { "nord" } }, | ||||
|   -- automatically check for plugin updates | ||||
|   checker = { enabled = true }, | ||||
|   checker = { enabled = false, notify = false }, | ||||
| }) | ||||
|  | ||||
| @ -1,9 +1,48 @@ | ||||
| vim.api.nvim_create_autocmd('LspAttach', { | ||||
|     group = vim.api.nvim_create_augroup('UserLspConfig', {}), | ||||
|     callback = function(args) | ||||
|     local client = vim.lsp.get_client_by_id(args.data.client_id) | ||||
|     if client.server_capabilities.inlayHintProvider then | ||||
|         vim.lsp.inlya_hint.enable(args.buf, true) | ||||
|     end | ||||
|         local client = vim.lsp.get_client_by_id(args.data.client_id) | ||||
|         if client:supports_method('textDocument/inlayHint') or client.server_capabilities.inlayHintProvider then | ||||
|             vim.lsp.inlay_hint.enable(true, { bufnr = args.buf }) | ||||
|         end | ||||
|     end | ||||
| }) | ||||
| 
 | ||||
| -- vim.lsp.config('rust-analyzer', { | ||||
| --     settings = { | ||||
| --         ["rust-analyzer"] = { | ||||
| --             inlayHints = { | ||||
| --                 bindingModeHints = { | ||||
| --                     enable = false, | ||||
| --                 }, | ||||
| --                 chainingHints = { | ||||
| --                     enable = true, | ||||
| --                 }, | ||||
| --                 closingBraceHints = { | ||||
| --                     enable = true, | ||||
| --                     minLines = 25, | ||||
| --                 }, | ||||
| --                 closureReturnTypeHints = { | ||||
| --                     enable = "never", | ||||
| --                 }, | ||||
| --                 lifetimeElisionHints = { | ||||
| --                     enable = "never", | ||||
| --                     useParameterNames = false, | ||||
| --                 }, | ||||
| --                 maxLength = 25, | ||||
| --                 parameterHints = { | ||||
| --                     enable = true, | ||||
| --                 }, | ||||
| --                 reborrowHints = { | ||||
| --                     enable = "never", | ||||
| --                 }, | ||||
| --                 renderColons = true, | ||||
| --                 typeHints = { | ||||
| --                     enable = true, | ||||
| --                     hideClosureInitialization = false, | ||||
| --                     hideNamedConstructor = false, | ||||
| --                 }, | ||||
| --             }, | ||||
| --         } | ||||
| --     } | ||||
| -- }) | ||||
|  | ||||
| @ -24,6 +24,8 @@ vim.opt.undofile = true | ||||
| 
 | ||||
| vim.opt.hlsearch = true | ||||
| vim.opt.incsearch = true | ||||
| vim.opt.ignorecase = true | ||||
| vim.opt.smartcase = true | ||||
| 
 | ||||
| vim.opt.termguicolors = true | ||||
| 
 | ||||
| @ -61,13 +63,17 @@ vim.g.netrw_keepdir = 0 | ||||
| vim.g.netrw_preview = 1 | ||||
| vim.g.netrw_alto = 0 | ||||
| 
 | ||||
| vim.cmd('colorscheme rose-pine') | ||||
| vim.ui.select = Snacks.picker.select | ||||
| 
 | ||||
| vim.cmd('colorscheme nord') | ||||
| 
 | ||||
| vim.lsp.config('lua_ls', { | ||||
|     settings = { | ||||
|         Lua = { | ||||
|             workspace = { | ||||
|                 library = vim.api.nvim_get_runtime_file("", true) | ||||
|                 library = vim.api.nvim_get_runtime_file("", true), | ||||
|                 maxPreload = 100000, | ||||
|                 preloadFileSize = 100000, | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -3,59 +3,139 @@ return { | ||||
| 	{  | ||||
|         'rose-pine/neovim', | ||||
|         name = 'rose-pine', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'tanvirtin/monokai.nvim' }, | ||||
|     { | ||||
|         'tanvirtin/monokai.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'arzg/vim-colors-xcode' }, | ||||
|     { | ||||
|         'arzg/vim-colors-xcode', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'shaunsingh/nord.nvim' }, | ||||
|     { | ||||
|         'shaunsingh/nord.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'kvrohit/mellow.nvim' }, | ||||
|     { | ||||
|         'kvrohit/mellow.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'Mofiqul/vscode.nvim' }, | ||||
|     { | ||||
|         'Mofiqul/vscode.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'Th3Whit3Wolf/one-nvim' }, | ||||
|     { | ||||
|         'Th3Whit3Wolf/one-nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'mhartington/oceanic-next' }, | ||||
|     { | ||||
|         'mhartington/oceanic-next', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'folke/tokyonight.nvim' }, | ||||
|     { | ||||
|         'folke/tokyonight.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'sainnhe/gruvbox-material' }, | ||||
|     { | ||||
|         'sainnhe/gruvbox-material', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { "ellisonleao/gruvbox.nvim" }, | ||||
|     { | ||||
|         "ellisonleao/gruvbox.nvim", | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'sainnhe/everforest' }, | ||||
|     { | ||||
|         'sainnhe/everforest', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'lourenci/github-colors' }, | ||||
|     { | ||||
|         'lourenci/github-colors', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'navarasu/onedark.nvim' }, | ||||
|     { | ||||
|         'navarasu/onedark.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'shaunsingh/moonlight.nvim' }, | ||||
|     { | ||||
|         'shaunsingh/moonlight.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'Mofiqul/dracula.nvim' }, | ||||
|     { | ||||
|         'Mofiqul/dracula.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { 'kdheepak/monochrome.nvim' }, | ||||
|     { | ||||
|         'kdheepak/monochrome.nvim', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { "savq/melange-nvim" }, | ||||
|     { | ||||
|         "savq/melange-nvim", | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     {  | ||||
|         "catppuccin/nvim", | ||||
|         name = "catppuccin", | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     -- use 'RRethy/nvim-base16' | ||||
| 
 | ||||
|     { 'projekt0n/github-nvim-theme' }, | ||||
|     { | ||||
|         'projekt0n/github-nvim-theme', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     {  | ||||
|         'Everblush/nvim',  | ||||
|         name = 'everblush', | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { "lewpoly/sherbet.nvim" }, | ||||
|     { | ||||
|         "lewpoly/sherbet.nvim", | ||||
|         priority = 1000, | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     -- use 'xiyaowong/transparent.nvim' | ||||
| 
 | ||||
| 
 | ||||
| } | ||||
|  | ||||
| @ -1,11 +1,39 @@ | ||||
| return { | ||||
|     { 'ollykel/v-vim' }, | ||||
|     { 'jaawerth/fennel.vim' }, | ||||
|     { 'stefanos82/nelua.vim' }, | ||||
|     { 'teal-language/vim-teal' }, | ||||
|     { 'VaiN474/vim-etlua' }, | ||||
|     { 'leafo/moonscript-vim' }, | ||||
|     { 'aklt/plantuml-syntax' }, | ||||
|     { | ||||
|         'ollykel/v-vim', | ||||
|         ft = 'v', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'jaawerth/fennel.vim', | ||||
|         ft = 'fnl', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'stefanos82/nelua.vim', | ||||
|         ft = 'nelua', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'teal-language/vim-teal', | ||||
|         ft = 'tl' | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'VaiN474/vim-etlua', | ||||
|         ft = 'etlua', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'leafo/moonscript-vim', | ||||
|         ft = 'moon', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'aklt/plantuml-syntax', | ||||
|         ft = 'puml', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "S1M0N38/love2d.nvim", | ||||
|         -- event = "VeryLazy", | ||||
| @ -13,5 +41,13 @@ return { | ||||
|         version = "2.*", | ||||
|         opts = { }, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "nvim-neorg/neorg", | ||||
|         -- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default | ||||
|         ft = 'norg', | ||||
|         version = "*", -- Pin Neorg to the latest stable release | ||||
|         config = true, | ||||
|     }, | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -2,15 +2,18 @@ return { | ||||
| 
 | ||||
|     { | ||||
|         'mason-org/mason.nvim', | ||||
|         event = 'VeryLazy', | ||||
|         opts = {}, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'neovim/nvim-lspconfig', | ||||
|         event = 'VeryLazy', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "mason-org/mason-lspconfig.nvim", | ||||
|         event = 'VeryLazy', | ||||
|         opts = {}, | ||||
|         dependencies = { | ||||
|             { "mason-org/mason.nvim", opts = {} }, | ||||
| @ -18,10 +21,19 @@ return { | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     -- { | ||||
|     --     "MysticalDevil/inlay-hints.nvim", | ||||
|     --     event = "LspAttach", | ||||
|     --     dependencies = { "neovim/nvim-lspconfig" }, | ||||
|     --     config = function() | ||||
|     --         require("inlay-hints").setup() | ||||
|     --     end | ||||
|     -- }, | ||||
|     -- | ||||
|     { | ||||
|         'saghen/blink.cmp', | ||||
|         -- optional: provides snippets for the snippet source | ||||
|         dependencies = { 'L3MON4D3/LuaSnip' }, | ||||
|         -- dependencies = { 'L3MON4D3/LuaSnip' }, | ||||
| 
 | ||||
|         -- use a release tag to download pre-built binaries | ||||
|         version = '1.*', | ||||
| @ -47,17 +59,31 @@ return { | ||||
|             -- See :h blink-cmp-config-keymap for defining your own keymap | ||||
|             keymap = { preset = 'default' }, | ||||
| 
 | ||||
|             snippets = { preset = 'luasnip' }, | ||||
|             -- snippets = { preset = 'mini_snippets' }, | ||||
|             appearance = { | ||||
|                 -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' | ||||
|                 -- Adjusts spacing to ensure icons are aligned | ||||
|                 nerd_font_variant = 'mono' | ||||
|             }, | ||||
| 
 | ||||
|             cmdline = { | ||||
|                 completion = { menu = { auto_show = true } }, | ||||
|             }, | ||||
|             -- (Default) Only show the documentation popup when manually triggered | ||||
|             completion = { | ||||
|                 documentation = { auto_show = false }, | ||||
|                 list = { | ||||
|                     selection = { | ||||
|                         preselect = true, | ||||
|                         auto_insert = false, | ||||
|                     }, | ||||
|                 }, | ||||
|                 ghost_text = { | ||||
|                     enabled = true, | ||||
|                     show_with_menu = true, | ||||
|                 }, | ||||
|                 menu = { | ||||
|                     auto_show = true, | ||||
|                     draw = { | ||||
|                         components = { | ||||
|                             -- customize the drawing of kind icons | ||||
|  | ||||
| @ -1,52 +0,0 @@ | ||||
| return { | ||||
|     { 'nvim-lua/plenary.nvim' }, | ||||
| 
 | ||||
|     { | ||||
|         'nvim-telesscope/telescope.nvim', | ||||
|         dependencies = { | ||||
|             'nvim-lua/plenary.nvim' | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     {  | ||||
|         'nvim-telescope/telescope-ui-select.nvim', | ||||
|         dependencies = { | ||||
|             'nvim-telescope/telescope.nvim', | ||||
|         }, | ||||
|         config = function() | ||||
|             require('telescope').load_extension('ui-select') | ||||
|         end | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'LukasPietzschmann/telescope-tabs', | ||||
|         dependencies = { | ||||
|             'nvim-telescope/telescope.nvim', | ||||
|         }, | ||||
|         config = function() | ||||
|             require('telescope').load_extension('telescope-tabs') | ||||
|             require('telescope-tabs').setup() | ||||
|         end | ||||
|     }, | ||||
|      | ||||
|     { | ||||
|         'smartpde/telescope-recent-files', | ||||
|         dependencies = { | ||||
|             'nvim-telescope/telescope.nvim', | ||||
|         }, | ||||
|         config = function() | ||||
|             require('telescope').load_extension('recent_files') | ||||
|         end | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'natecraddock/workspaces.nvim', | ||||
|         dependencies = { | ||||
|             'nvim-telescope/telescope.nvim', | ||||
|         }, | ||||
|         config = function() | ||||
|             require('telescope').load_extension('workspaces') | ||||
|             require('workspaces').setup() | ||||
|         end | ||||
|     }, | ||||
| } | ||||
| @ -29,19 +29,25 @@ return { | ||||
| 
 | ||||
|     { | ||||
|         'nvim-treesitter/nvim-treesitter-textobjects', | ||||
|         config = function() | ||||
| 
 | ||||
|         end | ||||
|     }, | ||||
| 
 | ||||
|     {  | ||||
|         'folke/twilight.nvim', | ||||
|         dependencies = { | ||||
|             'nvim-treesitter/nvim-treesitter', | ||||
|         } | ||||
|     }, | ||||
|     -- { | ||||
|     --     'folke/twilight.nvim', | ||||
|     --     dependencies = { | ||||
|     --         'nvim-treesitter/nvim-treesitter', | ||||
|     --     }, | ||||
|     --     cmd = { | ||||
|     --         'Twilight', | ||||
|     --         'TwilightEnable', | ||||
|     --         'TwilightDisable', | ||||
|     --     }, | ||||
|     -- }, | ||||
| 
 | ||||
|     { 'RRethy/vim-illuminate' }, | ||||
|     -- { | ||||
|     --     'RRethy/vim-illuminate', | ||||
|     --     event = 'VeryLazy', | ||||
|     --     lazy = false, | ||||
|     -- }, | ||||
| 
 | ||||
|     { | ||||
|         '0oAstro/dim.lua', | ||||
| @ -49,9 +55,11 @@ return { | ||||
|             'nvim-treesitter/nvim-treesitter', | ||||
|             'neovim/nvim-lspconfig' | ||||
|         }, | ||||
|         event = 'LspAttach', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
| 		'windwp/nvim-ts-autotag', | ||||
|         event = 'VeryLazy', | ||||
|     }, | ||||
| } | ||||
|  | ||||
| @ -1,46 +1,37 @@ | ||||
| return { | ||||
| 
 | ||||
|     { 'winston0410/range-highlight.nvim' }, | ||||
| 
 | ||||
|     { | ||||
|         'lukas-reineke/indent-blankline.nvim', | ||||
|         config = function() | ||||
|             require'ibl'.setup{ scope = { enabled = false } } | ||||
|         end | ||||
|         'winston0410/range-highlight.nvim', | ||||
|         event = 'VeryLazy', | ||||
|     }, | ||||
| 
 | ||||
|     -- { | ||||
|     --     "folke/noice.nvim", | ||||
|     --     event = "VeryLazy", | ||||
|     --     opts = { | ||||
|     --         -- add any options here | ||||
|     --         command_palette = true, | ||||
|     --     }, | ||||
|     --     dependencies = { | ||||
|     --         -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries | ||||
|     --         "MunifTanjim/nui.nvim", | ||||
|     --         -- OPTIONAL: | ||||
|     --         --   `nvim-notify` is only needed, if you want to use the notification view. | ||||
|     --         --   If not available, we use `mini` as the fallback | ||||
|     --         "rcarriga/nvim-notify", | ||||
|     --     } | ||||
|     --     'lukas-reineke/indent-blankline.nvim', | ||||
|     --     event = 'VeryLazy', | ||||
|     --     config = function() | ||||
|     --         require'ibl'.setup{ scope = { enabled = false } } | ||||
|     --     end | ||||
|     -- }, | ||||
|     -- | ||||
| 
 | ||||
|     { 'nvim-tree/nvim-web-devicons' }, | ||||
| 
 | ||||
|     { | ||||
|         'goolord/alpha-nvim', | ||||
|         dependencies = { | ||||
|             'nvim-tree/nvim-web-devicons', | ||||
|         }, | ||||
|         config = function() | ||||
|             require('alpha').setup(require'alpha.themes.startify'.config) | ||||
|         end | ||||
|         'nvim-tree/nvim-web-devicons', | ||||
|         -- event = 'VeryLazy', | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     -- { | ||||
|     --     'goolord/alpha-nvim', | ||||
|     --     dependencies = { | ||||
|     --         'nvim-tree/nvim-web-devicons', | ||||
|     --     }, | ||||
|     --     config = function() | ||||
|     --         require('alpha').setup(require'alpha.themes.startify'.config) | ||||
|     --     end | ||||
|     -- }, | ||||
| 
 | ||||
|     { | ||||
|         'lewis6991/gitsigns.nvim', | ||||
|         event = 'VeryLazy', | ||||
|         opts = { | ||||
|             current_line_blame = true, | ||||
|         } | ||||
|  | ||||
| @ -1,6 +1,15 @@ | ||||
| return { | ||||
| 
 | ||||
|     { "sindrets/diffview.nvim"  }, | ||||
|     { | ||||
|         'nvim-lua/plenary.nvim', | ||||
|         -- event = 'VeryLazy', | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "sindrets/diffview.nvim", | ||||
|         event = 'VeryLazy', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'windwp/nvim-autopairs', | ||||
| @ -10,16 +19,90 @@ return { | ||||
|         -- this is equivalent to setup({}) function | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "NeogitOrg/neogit", | ||||
|         lazy = true, | ||||
|         dependencies = { | ||||
|             "nvim-lua/plenary.nvim",         -- required | ||||
|             "sindrets/diffview.nvim",        -- optional - Diff integration | ||||
| 
 | ||||
|             -- Only one of these is needed. | ||||
|             -- "nvim-telescope/telescope.nvim", -- optional | ||||
|             -- "ibhagwan/fzf-lua",              -- optional | ||||
|             -- "echasnovski/mini.pick",         -- optional | ||||
|             "folke/snacks.nvim",             -- optional | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'brenoprata10/nvim-highlight-colors', | ||||
|         event = 'VeryLazy', | ||||
|         opts = { | ||||
|             render = 'virtual', | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'ggandor/leap.nvim', | ||||
|         dependencies = { | ||||
|             'tpope/vim-repeat', | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'LukasPietzschmann/telescope-tabs', | ||||
|         -- event = 'VeryLazy', | ||||
|         lazy = true, | ||||
|         branch = 'vim_ui_select', | ||||
|         config = function() | ||||
|             require('telescope-tabs').setup() | ||||
|         end | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "folke/snacks.nvim", | ||||
|         priority = 1000, | ||||
|         lazy = false, | ||||
|         ---@type snacks.Config | ||||
|         opts = { | ||||
|             -- your configuration comes here | ||||
|             -- or leave it empty to use the default settings | ||||
|             -- refer to the configuration section below | ||||
|             bigfile = { enabled = true }, | ||||
|             -- dashboard = { enabled = true }, | ||||
|             dim = { enabled = true }, | ||||
|             -- explorer = { enabled = true }, | ||||
|             -- git = { enabled = false }, | ||||
|             image = { | ||||
|                 enabled = true | ||||
|             }, | ||||
|             indent = { enabled = true }, | ||||
|             input = { enabled = true }, | ||||
|             lazygit = { enabled = false }, | ||||
|             picker = { | ||||
|                 enabled = true, | ||||
|                 layout = { | ||||
|                     preset = 'ivy_split', | ||||
|                     layout = { | ||||
|                         height = 0.3, | ||||
|                     }, | ||||
|                 }, | ||||
|             }, | ||||
|             notifier = { enabled = true }, | ||||
|             -- quickfile = { enabled = true }, | ||||
|             -- scope = { enabled = true }, | ||||
|             -- scroll = { enabled = true }, | ||||
|             terminal = { enabled = false }, | ||||
|             -- statuscolumn = { enabled = true }, | ||||
|             -- words = { enabled = true }, | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'echasnovski/mini.nvim', | ||||
|         config = function() | ||||
|             require('mini.starter').setup() | ||||
|             -- require('mini.cursorword').setup() | ||||
|             local miniclue = require'mini.clue' | ||||
|             miniclue.setup{ | ||||
|                 window = { | ||||
| @ -80,6 +163,9 @@ return { | ||||
| 
 | ||||
|                     { mode = 'n', keys = '<leader>o', desc = '+Open' }, | ||||
|                     { mode = 'x', keys = '<leader>o', desc = '+Open' }, | ||||
| 
 | ||||
|                     { mode = 'n', keys = '<leader>g', desc = '+Git' }, | ||||
|                     { mode = 'x', keys = '<leader>g', desc = '+Git' }, | ||||
|                 }, | ||||
|             } | ||||
|         end | ||||
| @ -100,7 +186,11 @@ return { | ||||
|         lazy = false, | ||||
|     }, | ||||
| 
 | ||||
|     { 'eandrju/cellular-automaton.nvim' }, | ||||
|     { | ||||
|         'eandrju/cellular-automaton.nvim', | ||||
|         -- event = 'VeryLazy', | ||||
|         cmd = 'CellularAutomaton', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "kylechui/nvim-surround", | ||||
| @ -113,10 +203,25 @@ return { | ||||
|         end | ||||
|     }, | ||||
| 
 | ||||
|     { 'jbyuki/nabla.nvim' }, | ||||
|     { | ||||
|         'jbyuki/nabla.nvim', | ||||
|         lazy = true, | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'krady21/compiler-explorer.nvim', | ||||
|         -- event = 'VeryLazy', | ||||
|         cmd = { | ||||
|             'CECompile', | ||||
|             'CECompileLive', | ||||
|             'CEFormat', | ||||
|             'CEAddLibrary', | ||||
|             'CELoadExample', | ||||
|             'CEOpenWebsite', | ||||
|             'CEDeleteCache', | ||||
|             'CEShowTooltip', | ||||
|             'CEGotoLabel', | ||||
|         }, | ||||
|         opts = { | ||||
|             autocmd = { | ||||
|                 enable = true, | ||||
| @ -126,88 +231,89 @@ return { | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         'samjwill/nvim-unception' | ||||
|         'samjwill/nvim-unception', | ||||
|         event = 'VeryLazy', | ||||
|     }, | ||||
| 
 | ||||
|     { | ||||
|         "jake-stewart/multicursor.nvim", | ||||
|         branch = "1.0", | ||||
|         config = function() | ||||
|             local mc = require("multicursor-nvim") | ||||
|             mc.setup() | ||||
| 
 | ||||
|             local set = vim.keymap.set | ||||
| 
 | ||||
|             -- Add or skip cursor above/below the main cursor. | ||||
|             set({"n", "x"}, "<up>", function() mc.lineAddCursor(-1) end) | ||||
|             set({"n", "x"}, "<down>", function() mc.lineAddCursor(1) end) | ||||
|             -- set({"n", "x"}, "<leader><up>", function() mc.lineSkipCursor(-1) end) | ||||
|             -- set({"n", "x"}, "<leader><down>", function() mc.lineSkipCursor(1) end) | ||||
| 
 | ||||
|             -- Add or skip adding a new cursor by matching word/selection | ||||
|             -- set({"n", "x"}, "<leader>n", function() mc.matchAddCursor(1) end) | ||||
|             -- set({"n", "x"}, "<leader>s", function() mc.matchSkipCursor(1) end) | ||||
|             -- set({"n", "x"}, "<leader>N", function() mc.matchAddCursor(-1) end) | ||||
|             -- set({"n", "x"}, "<leader>S", function() mc.matchSkipCursor(-1) end) | ||||
| 
 | ||||
|             -- Add cursor at next argument treesitter | ||||
|             set({'n', 'x'}, ']A', function() | ||||
|                 if vim.v.count < 1 then | ||||
|                     mc.addCursor(']a') | ||||
|                 else | ||||
|                     for i=1, vim.v.count - 1 do | ||||
|                         mc.addCursor(']a') | ||||
|                     end | ||||
|                 end | ||||
|             end, { desc = 'Create multicursor on next argument'}) | ||||
|             set({'n', 'x'}, '[A', function() | ||||
|                 if vim.v.count < 1 then | ||||
|                     mc.addCursor('[a') | ||||
|                 else | ||||
|                     for i=1, vim.v.count - 1 do | ||||
|                         mc.addCursor('[a') | ||||
|                     end | ||||
|                 end | ||||
|             end, { desc = 'Create multicursor on previous argument'}) | ||||
| 
 | ||||
|             -- Add and remove cursors with control + left click. | ||||
|             set("n", "<c-leftmouse>", mc.handleMouse) | ||||
|             set("n", "<c-leftdrag>", mc.handleMouseDrag) | ||||
|             set("n", "<c-leftrelease>", mc.handleMouseRelease) | ||||
| 
 | ||||
|             -- Disable and enable cursors. | ||||
|             set({"n", "x"}, "<c-q>", mc.toggleCursor) | ||||
| 
 | ||||
|             -- Mappings defined in a keymap layer only apply when there are | ||||
|             -- multiple cursors. This lets you have overlapping mappings. | ||||
|             mc.addKeymapLayer(function(layerSet) | ||||
| 
 | ||||
|                 -- Select a different cursor as the main one. | ||||
|                 layerSet({"n", "x"}, "<left>", mc.prevCursor) | ||||
|                 layerSet({"n", "x"}, "<right>", mc.nextCursor) | ||||
| 
 | ||||
|                 -- Delete the main cursor. | ||||
|                 layerSet({"n", "x"}, "<leader>x", mc.deleteCursor) | ||||
| 
 | ||||
|                 -- Enable and clear cursors using escape. | ||||
|                 layerSet("n", "<esc>", function() | ||||
|                     if not mc.cursorsEnabled() then | ||||
|                         mc.enableCursors() | ||||
|                     else | ||||
|                         mc.clearCursors() | ||||
|                     end | ||||
|                 end) | ||||
|             end) | ||||
| 
 | ||||
|             -- Customize how cursors look. | ||||
|             local hl = vim.api.nvim_set_hl | ||||
|             hl(0, "MultiCursorCursor", { reverse = true }) | ||||
|             hl(0, "MultiCursorVisual", { link = "Visual" }) | ||||
|             hl(0, "MultiCursorSign", { link = "SignColumn"}) | ||||
|             hl(0, "MultiCursorMatchPreview", { link = "Search" }) | ||||
|             hl(0, "MultiCursorDisabledCursor", { reverse = true }) | ||||
|             hl(0, "MultiCursorDisabledVisual", { link = "Visual" }) | ||||
|             hl(0, "MultiCursorDisabledSign", { link = "SignColumn"}) | ||||
|         end | ||||
|     }, | ||||
|     -- { | ||||
|     --     "jake-stewart/multicursor.nvim", | ||||
|     --     branch = "1.0", | ||||
|     --     config = function() | ||||
|     --         local mc = require("multicursor-nvim") | ||||
|     --         mc.setup() | ||||
|     -- | ||||
|     --         local set = vim.keymap.set | ||||
|     -- | ||||
|     --         -- Add or skip cursor above/below the main cursor. | ||||
|     --         set({"n", "x"}, "<up>", function() mc.lineAddCursor(-1) end) | ||||
|     --         set({"n", "x"}, "<down>", function() mc.lineAddCursor(1) end) | ||||
|     --         -- set({"n", "x"}, "<leader><up>", function() mc.lineSkipCursor(-1) end) | ||||
|     --         -- set({"n", "x"}, "<leader><down>", function() mc.lineSkipCursor(1) end) | ||||
|     -- | ||||
|     --         -- Add or skip adding a new cursor by matching word/selection | ||||
|     --         -- set({"n", "x"}, "<leader>n", function() mc.matchAddCursor(1) end) | ||||
|     --         -- set({"n", "x"}, "<leader>s", function() mc.matchSkipCursor(1) end) | ||||
|     --         -- set({"n", "x"}, "<leader>N", function() mc.matchAddCursor(-1) end) | ||||
|     --         -- set({"n", "x"}, "<leader>S", function() mc.matchSkipCursor(-1) end) | ||||
|     -- | ||||
|     --         -- Add cursor at next argument treesitter | ||||
|     --         set({'n', 'x'}, ']A', function() | ||||
|     --             if vim.v.count < 1 then | ||||
|     --                 mc.addCursor(']a') | ||||
|     --             else | ||||
|     --                 for i=1, vim.v.count - 1 do | ||||
|     --                     mc.addCursor(']a') | ||||
|     --                 end | ||||
|     --             end | ||||
|     --         end, { desc = 'Create multicursor on next argument'}) | ||||
|     --         set({'n', 'x'}, '[A', function() | ||||
|     --             if vim.v.count < 1 then | ||||
|     --                 mc.addCursor('[a') | ||||
|     --             else | ||||
|     --                 for i=1, vim.v.count - 1 do | ||||
|     --                     mc.addCursor('[a') | ||||
|     --                 end | ||||
|     --             end | ||||
|     --         end, { desc = 'Create multicursor on previous argument'}) | ||||
|     -- | ||||
|     --         -- Add and remove cursors with control + left click. | ||||
|     --         set("n", "<c-leftmouse>", mc.handleMouse) | ||||
|     --         set("n", "<c-leftdrag>", mc.handleMouseDrag) | ||||
|     --         set("n", "<c-leftrelease>", mc.handleMouseRelease) | ||||
|     -- | ||||
|     --         -- Disable and enable cursors. | ||||
|     --         set({"n", "x"}, "<c-q>", mc.toggleCursor) | ||||
|     -- | ||||
|     --         -- Mappings defined in a keymap layer only apply when there are | ||||
|     --         -- multiple cursors. This lets you have overlapping mappings. | ||||
|     --         mc.addKeymapLayer(function(layerSet) | ||||
|     -- | ||||
|     --             -- Select a different cursor as the main one. | ||||
|     --             layerSet({"n", "x"}, "<left>", mc.prevCursor) | ||||
|     --             layerSet({"n", "x"}, "<right>", mc.nextCursor) | ||||
|     -- | ||||
|     --             -- Delete the main cursor. | ||||
|     --             layerSet({"n", "x"}, "<leader>x", mc.deleteCursor) | ||||
|     -- | ||||
|     --             -- Enable and clear cursors using escape. | ||||
|     --             layerSet("n", "<esc>", function() | ||||
|     --                 if not mc.cursorsEnabled() then | ||||
|     --                     mc.enableCursors() | ||||
|     --                 else | ||||
|     --                     mc.clearCursors() | ||||
|     --                 end | ||||
|     --             end) | ||||
|     --         end) | ||||
|     -- | ||||
|     --         -- Customize how cursors look. | ||||
|     --         local hl = vim.api.nvim_set_hl | ||||
|     --         hl(0, "MultiCursorCursor", { reverse = true }) | ||||
|     --         hl(0, "MultiCursorVisual", { link = "Visual" }) | ||||
|     --         hl(0, "MultiCursorSign", { link = "SignColumn"}) | ||||
|     --         hl(0, "MultiCursorMatchPreview", { link = "Search" }) | ||||
|     --         hl(0, "MultiCursorDisabledCursor", { reverse = true }) | ||||
|     --         hl(0, "MultiCursorDisabledVisual", { link = "Visual" }) | ||||
|     --         hl(0, "MultiCursorDisabledSign", { link = "SignColumn"}) | ||||
|     --     end | ||||
|     -- }, | ||||
| } | ||||
|  | ||||
| @ -1 +0,0 @@ | ||||
| stop.png | ||||
| @ -1 +0,0 @@ | ||||
| stop.png | ||||
| @ -1 +0,0 @@ | ||||
| list-add.png | ||||
| @ -1 +0,0 @@ | ||||
| ./address-book-new.png | ||||
| Before Width: | Height: | Size: 261 B | 
| @ -1 +0,0 @@ | ||||
| ./align-horizontal-center.png | ||||
| Before Width: | Height: | Size: 189 B | 
| @ -1 +0,0 @@ | ||||
| ./align-horizontal-left.png | ||||
| Before Width: | Height: | Size: 193 B | 
| @ -1 +0,0 @@ | ||||
| ./align-horizontal-right.png | ||||
| Before Width: | Height: | Size: 198 B | 
| @ -1 +0,0 @@ | ||||
| ./align-vertical-bottom.png | ||||
| Before Width: | Height: | Size: 190 B | 
| @ -1 +0,0 @@ | ||||
| ./align-vertical-center.png | ||||
| Before Width: | Height: | Size: 200 B | 
| @ -1 +0,0 @@ | ||||
| ./align-vertical-top.png | ||||
| Before Width: | Height: | Size: 189 B | 
| @ -1 +0,0 @@ | ||||
| window-new.png | ||||
| @ -1 +0,0 @@ | ||||
| window-new.png | ||||
| @ -1 +0,0 @@ | ||||
| ./application-exit.png | ||||
| Before Width: | Height: | Size: 201 B | 
| @ -1 +0,0 @@ | ||||
| ./appointment-new.png | ||||
| Before Width: | Height: | Size: 973 B | 
| @ -1 +0,0 @@ | ||||
| appointment-new.png | ||||
| @ -1 +0,0 @@ | ||||
| go-previous.png | ||||
| @ -1 +0,0 @@ | ||||
| document-send.png | ||||
| @ -1 +0,0 @@ | ||||
| document-properties.png | ||||
| @ -1 +0,0 @@ | ||||
| ./bookmark-new.png | ||||
| Before Width: | Height: | Size: 946 B | 
| @ -1 +0,0 @@ | ||||
| bookmark-new.png | ||||
| @ -1 +0,0 @@ | ||||
| bookmark-new.png | ||||
| @ -1 +0,0 @@ | ||||
| go-bottom.png | ||||
| @ -1 +0,0 @@ | ||||
| document-save.png | ||||
| @ -1 +0,0 @@ | ||||
| stock_no.png | ||||
| @ -1 +0,0 @@ | ||||
| call-stop.png | ||||
| @ -1 +0,0 @@ | ||||
| ./call-start.png | ||||
| Before Width: | Height: | Size: 990 B | 
| @ -1 +0,0 @@ | ||||
| ./call-stop.png | ||||
| Before Width: | Height: | Size: 1006 B | 
| @ -1 +0,0 @@ | ||||
| stock_no.png | ||||
| @ -1 +0,0 @@ | ||||
| format-justify-center.png | ||||
| @ -1 +0,0 @@ | ||||
| format-justify-center.png | ||||
| @ -1 +0,0 @@ | ||||
| color-select.png | ||||
| Before Width: | Height: | Size: 137 B | 
| @ -1 +0,0 @@ | ||||
| ./contact-new.png | ||||
| Before Width: | Height: | Size: 227 B | 
| @ -1 +0,0 @@ | ||||
| gtk-ok.png | ||||
| @ -1 +0,0 @@ | ||||
| stock_no.png | ||||
| @ -1 +0,0 @@ | ||||
| stock_no.png | ||||
| @ -1 +0,0 @@ | ||||
| stock_no.png | ||||
| @ -1 +0,0 @@ | ||||
| gtk-ok.png | ||||
| @ -1 +0,0 @@ | ||||
| dialog-apply.png | ||||
| @ -1 +0,0 @@ | ||||
| dialog-apply.png | ||||
| @ -1 +0,0 @@ | ||||
| ./distribute-horizontal-left.png | ||||
| Before Width: | Height: | Size: 163 B | 
| @ -1 +0,0 @@ | ||||
| ./distribute-horizontal-right.png | ||||
| Before Width: | Height: | Size: 187 B | 
| @ -1 +0,0 @@ | ||||
| ./distribute-vertical-bottom.png | ||||
| Before Width: | Height: | Size: 176 B | 
| @ -1 +0,0 @@ | ||||
| ./distribute-vertical-center.png | ||||
| Before Width: | Height: | Size: 317 B | 
| @ -1 +0,0 @@ | ||||
| ./distribute-vertical-top.png | ||||
| Before Width: | Height: | Size: 183 B | 
| Before Width: | Height: | Size: 1.4 KiB | 
| @ -1 +0,0 @@ | ||||
| ./document-export.png | ||||
| Before Width: | Height: | Size: 360 B | 
| @ -1 +0,0 @@ | ||||
| ./document-import.png | ||||
| Before Width: | Height: | Size: 358 B | 
| @ -1 +0,0 @@ | ||||
| ./document-new.png | ||||
| Before Width: | Height: | Size: 1.4 KiB | 
| @ -1 +0,0 @@ | ||||
| ./document-open-recent.png | ||||
| Before Width: | Height: | Size: 973 B | 
| @ -1 +0,0 @@ | ||||
| document-open.png | ||||
| Before Width: | Height: | Size: 944 B | 
| @ -1 +0,0 @@ | ||||
| ./document-page-setup.png | ||||
 Michael Chalupiak
						Michael Chalupiak