From 65c923108aeffb19ce99bd28c5cf35c1316fa20f Mon Sep 17 00:00:00 2001 From: TuDatTr Date: Thu, 7 Mar 2024 10:26:49 +0100 Subject: [PATCH] Added lazyvim Signed-off-by: TuDatTr --- config/.config/alacritty/alacritty.toml | 2 +- config/.config/cava/config | 2 +- config/.config/cava/shaders/bar_spectrum.frag | 79 ++++++ .../.config/cava/shaders/northern_lights.frag | 34 +++ config/.config/cava/shaders/pass_through.vert | 14 + config/.config/i3/config | 2 + config/.ssh/config | 147 ++++------ emacs/.emacs.d/config.org | 9 +- emacs/.emacs.d/init.el | 2 +- vim/.config/nvim/.gitignore | 8 + vim/.config/nvim/.neoconf.json | 15 + vim/.config/nvim/LICENSE | 201 +++++++++++++ vim/.config/nvim/README.md | 4 + vim/.config/nvim/init.lua | 2 + vim/.config/nvim/lazy-lock.json | 63 +++++ vim/.config/nvim/lazyvim.json | 14 + vim/.config/nvim/lua/config/autocmds.lua | 3 + vim/.config/nvim/lua/config/keymaps.lua | 3 + vim/.config/nvim/lua/config/lazy.lua | 46 +++ vim/.config/nvim/lua/config/options.lua | 3 + vim/.config/nvim/lua/plugins/example.lua | 265 ++++++++++++++++++ vim/.config/nvim/lua/plugins/ledger-cli.lua | 4 + vim/.config/nvim/lua/plugins/onedark.lua | 9 + vim/.config/nvim/lua/plugins/org-mode.lua | 27 ++ vim/.config/nvim/stylua.toml | 3 + zsh/.zshrc | 4 +- 26 files changed, 866 insertions(+), 99 deletions(-) create mode 100644 config/.config/cava/shaders/bar_spectrum.frag create mode 100644 config/.config/cava/shaders/northern_lights.frag create mode 100644 config/.config/cava/shaders/pass_through.vert create mode 100644 vim/.config/nvim/.gitignore create mode 100644 vim/.config/nvim/.neoconf.json create mode 100644 vim/.config/nvim/LICENSE create mode 100644 vim/.config/nvim/README.md create mode 100644 vim/.config/nvim/init.lua create mode 100644 vim/.config/nvim/lazy-lock.json create mode 100644 vim/.config/nvim/lazyvim.json create mode 100644 vim/.config/nvim/lua/config/autocmds.lua create mode 100644 vim/.config/nvim/lua/config/keymaps.lua create mode 100644 vim/.config/nvim/lua/config/lazy.lua create mode 100644 vim/.config/nvim/lua/config/options.lua create mode 100644 vim/.config/nvim/lua/plugins/example.lua create mode 100644 vim/.config/nvim/lua/plugins/ledger-cli.lua create mode 100644 vim/.config/nvim/lua/plugins/onedark.lua create mode 100644 vim/.config/nvim/lua/plugins/org-mode.lua create mode 100644 vim/.config/nvim/stylua.toml diff --git a/config/.config/alacritty/alacritty.toml b/config/.config/alacritty/alacritty.toml index 2b1d557..b59158a 100644 --- a/config/.config/alacritty/alacritty.toml +++ b/config/.config/alacritty/alacritty.toml @@ -1,5 +1,5 @@ [font] -size = 7 +size = 12 [font.bold] style = "Bold" diff --git a/config/.config/cava/config b/config/.config/cava/config index 3a35ade..9a43938 100755 --- a/config/.config/cava/config +++ b/config/.config/cava/config @@ -48,7 +48,7 @@ # # For alsa 'source' will be the capture device. # For fifo 'source' will be the path to fifo-file. -; method = pulse +method = pulse ; source = auto ; method = alsa diff --git a/config/.config/cava/shaders/bar_spectrum.frag b/config/.config/cava/shaders/bar_spectrum.frag new file mode 100644 index 0000000..b078913 --- /dev/null +++ b/config/.config/cava/shaders/bar_spectrum.frag @@ -0,0 +1,79 @@ +#version 330 + +in vec2 fragCoord; +out vec4 fragColor; + +// bar values. defaults to left channels first (low to high), then right (high to low). +uniform float bars[512]; + +uniform int bars_count; // number of bars (left + right) (configurable) +uniform int bar_width; // bar width (configurable), not used here +uniform int bar_spacing; // space bewteen bars (configurable) + +uniform vec3 u_resolution; // window resolution + +//colors, configurable in cava config file (r,g,b) (0.0 - 1.0) +uniform vec3 bg_color; // background color +uniform vec3 fg_color; // foreground color + +uniform int gradient_count; +uniform vec3 gradient_colors[8]; // gradient colors + +vec3 normalize_C(float y,vec3 col_1, vec3 col_2, float y_min, float y_max) +{ + //create color based on fraction of this color and next color + float yr = (y - y_min) / (y_max - y_min); + return col_1 * (1.0 - yr) + col_2 * yr; +} + +void main() +{ + // find which bar to use based on where we are on the x axis + float x = u_resolution.x * fragCoord.x; + int bar = int(bars_count * fragCoord.x); + + //calculate a bar size + float bar_size = u_resolution.x / bars_count; + + //the y coordinate and bar values are the same + float y = bars[bar]; + + // make sure there is a thin line at bottom + if (y * u_resolution.y < 1.0) + { + y = 1.0 / u_resolution.y; + } + + //draw the bar up to current height + if (y > fragCoord.y) + { + //make some space between bars basen on settings + if (x > (bar + 1) * (bar_size) - bar_spacing) + { + fragColor = vec4(bg_color,1.0); + } + else + { + if (gradient_count == 0) + { + fragColor = vec4(fg_color,1.0); + } + else + { + //find which color in the configured gradient we are at + int color = int((gradient_count - 1) * fragCoord.y); + + //find where on y this and next color is supposed to be + float y_min = color / (gradient_count - 1.0); + float y_max = (color + 1.0) / (gradient_count - 1.0); + + //make color + fragColor = vec4(normalize_C(fragCoord.y, gradient_colors[color], gradient_colors[color + 1], y_min, y_max), 1.0); + } + } + } + else + { + fragColor = vec4(bg_color,1.0); + } +} \ No newline at end of file diff --git a/config/.config/cava/shaders/northern_lights.frag b/config/.config/cava/shaders/northern_lights.frag new file mode 100644 index 0000000..ecd859a --- /dev/null +++ b/config/.config/cava/shaders/northern_lights.frag @@ -0,0 +1,34 @@ +#version 330 + +in vec2 fragCoord; +out vec4 fragColor; + +// bar values. defaults to left channels first (low to high), then right (high to low). +uniform float bars[512]; + +uniform int bars_count; // number of bars (left + right) (configurable) + +uniform vec3 u_resolution; // window resolution, not used here + +//colors, configurable in cava config file +uniform vec3 bg_color; // background color(r,g,b) (0.0 - 1.0), not used here +uniform vec3 fg_color; // foreground color, not used here + +void main() +{ + // find which bar to use based on where we are on the x axis + int bar = int(bars_count * fragCoord.x); + + float bar_y = 1.0 - abs((fragCoord.y - 0.5)) * 2.0; + float y = (bars[bar]) * bar_y; + + float bar_x = (fragCoord.x - float(bar) / float(bars_count)) * bars_count; + float bar_r = 1.0 - abs((bar_x - 0.5)) * 2; + + bar_r = bar_r * bar_r * 2; + + // set color + fragColor.r = fg_color.x * y * bar_r; + fragColor.g = fg_color.y * y * bar_r; + fragColor.b = fg_color.z * y * bar_r; +} diff --git a/config/.config/cava/shaders/pass_through.vert b/config/.config/cava/shaders/pass_through.vert new file mode 100644 index 0000000..a4f20e5 --- /dev/null +++ b/config/.config/cava/shaders/pass_through.vert @@ -0,0 +1,14 @@ +#version 330 + + +// Input vertex data, different for all executions of this shader. +layout(location = 0) in vec3 vertexPosition_modelspace; + +// Output data ; will be interpolated for each fragment. +out vec2 fragCoord; + +void main() +{ + gl_Position = vec4(vertexPosition_modelspace,1); + fragCoord = (vertexPosition_modelspace.xy+vec2(1,1))/2.0; +} diff --git a/config/.config/i3/config b/config/.config/i3/config index 810ad3b..d7bc02a 100644 --- a/config/.config/i3/config +++ b/config/.config/i3/config @@ -22,6 +22,7 @@ focus_follows_mouse no # Configure # border style hide_edge_borders none +default_border none ################################################################################################ ###################################### Workspace Settings ###################################### @@ -140,6 +141,7 @@ bindsym $mod+m exec thunderbird bindsym Control+Print exec --no-startup-id ~/.scripts/screenshot.sh screen # Window + bindsym Mod1+Sys_Req --release exec --no-startup-id ~/.scripts/screenshot.sh window # Area diff --git a/config/.ssh/config b/config/.ssh/config index f4fadf6..52821c1 100644 --- a/config/.ssh/config +++ b/config/.ssh/config @@ -1,27 +1,17 @@ # Services -Host github.com - Hostname github.com +Host github.com gitlab.com git.uni-due.de Port 22 User git IdentityFile /mnt/veracrypt1/git +Host github.com + Hostname github.com + Host gitlab.com Hostname gitlab.com - Port 22 - User git - IdentityFile /mnt/veracrypt1/git - -Host picoCTF - HostName 2018shell4.picoctf.com - Port 22 - User mos4 - IdentityFile "/home/tuan/Documents/CTF/picoCTF/2018/30 - ssh-keyz/picoCTF" Host git.uni-due.de HostName git.uni-due.de - Port 22 - User git - IdentityFile /mnt/veracrypt1/git Host git.tudattr.dev Hostname 192.168.20.12 @@ -36,31 +26,49 @@ Host madrigal User tudattr IdentityFile /mnt/veracrypt1/mikrotik_rsa -Host aya01 +Host inko inko.mii + HostName 192.168.20.14 + +Host naruto naruto.mii + HostName 192.168.20.13 + +Host pi pi.mii + HostName 192.168.20.11 + +Host aya01 aya01.mii HostName 192.168.20.12 + +Host mii + HostName tudattr.dev + +Host inko.mii pi.mii aya01.mii naruto.mii + ProxyJump mii + +Host mii pi aya01 inko naruto inko.mii pi.mii aya01.mii naruto.mii Port 22 User tudattr IdentityFile /mnt/veracrypt1/genesis -Host git.aya01 - HostName 192.168.20.12 - Port 23231 +# Work +Host mini + HostName 100.76.45.158 + Port 22 User tudattr IdentityFile /mnt/veracrypt1/genesis -Host pi - HostName 192.168.20.11 - Port 22 - User tudattr - IdentityFile /mnt/veracrypt1/genesis +Host tail-pi + HostName 100.93.79.94 + Port 22 + User tuant + IdentityFile /mnt/veracrypt1/work/minis -# Work Host ncs-head HostName 132.252.68.50 Port 2122 User tuan-dat.tran IdentityFile /mnt/veracrypt1/genesis ForwardX11 yes + ProxyJump tail-pi Host ncs-head-user HostName 132.252.68.50 @@ -71,62 +79,44 @@ Host ncs-head-user Host ncs2 HostName 192.168.1.13 - Port 22 User tuan-dat.tran + +Host ncs2 ncs2-user ncs-node1 ncs-node2 ncs-node2-user ncs-node3 ncs-node4 ncs-node5 ncs-node6 ncs-node7 ncs-wedge + Port 22 IdentityFile /mnt/veracrypt1/genesis ProxyJump ncs-head Host ncs2-user HostName 192.168.1.13 - Port 22 User user # tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis - ProxyJump ncs-head Host ncs-node1 HostName 192.168.1.11 - Port 22 User user - IdentityFile /mnt/veracrypt1/tudattr - ProxyJump ncs-head Host ncs-node2 HostName 192.168.1.7 - Port 22 User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis - ProxyJump ncs-head ForwardX11 yes Host ncs-node2-user HostName 192.168.1.7 - Port 22 User user - IdentityFile /mnt/veracrypt1/tudattr - ProxyJump ncs-head Host ncs-node3 Hostname 192.168.1.19 - Port 22 User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis ForwardX11 yes - ProxyJump ncs-head Host ncs-node3-user Hostname 192.168.1.19 - Port 22 User user IdentityFile /mnt/veracrypt1/tudattr ForwardX11 yes - ProxyJump ncs-head Host ncs-node4 HostName 192.168.1.9 - Port 22 User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis - ProxyJump ncs-head Host ncs-node4-user HostName 192.168.1.9 @@ -137,18 +127,11 @@ Host ncs-node4-user Host ncs-node5 HostName 192.168.1.15 - Port 22 User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis - ProxyJump ncs-head Host ncs-node6 Hostname 192.168.1.17 - Port 22 User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis - # ForwardX11 yes - ProxyJump ncs-head Host ncs-node6-user Hostname 192.168.1.17 @@ -160,47 +143,12 @@ Host ncs-node6-user Host ncs-node7 Hostname 192.168.1.18 - Port 22 User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis ForwardX11 yes - ProxyJump ncs-head Host ncs-wedge Hostname 192.168.1.5 - Port 22 User user - IdentityFile /mnt/veracrypt1/genesis - # ForwardX11 yes - ProxyJump ncs-head - -Host ncs-local-server - HostName 192.168.1.1 - Port 22 - User tuan-dat.tran - IdentityFile /mnt/veracrypt1/tudattr - StrictHostKeyChecking no - -Host ncs-local-server-user - HostName 192.168.1.1 - Port 22 - User user - IdentityFile /mnt/veracrypt1/tudattr - StrictHostKeyChecking no - -Host ncs-local-server2 - HostName 192.168.2.2 - Port 22 - User user - IdentityFile /mnt/veracrypt1/tudattr - StrictHostKeyChecking no - ProxyJump ncs-local-server - -Host phone - Hostname 192.168.30.245 - Port 2222 - User tuan-dat.tran - IdentityFile /mnt/veracrypt1/genesis Host ncs-gpu Hostname 192.168.1.21 @@ -210,15 +158,28 @@ Host ncs-gpu ForwardX11 yes ProxyJump ncs-head -Host ncs-aws-iperf3 - Hostname 18.185.5.191 - Port 22 - User ec2-user - IdentityFile /mnt/veracrypt1/aws_ncs.pem - Host ami Hostname 3.72.156.214 Port 22 User ubuntu IdentityFile /mnt/veracrypt1/work/aws-rizk.pem + +## 5g IANA +Host 5g-iana-mec + Hostname 192.168.100.1 + Port 22 + User udue + IdentityFile /mnt/veracrypt1/genesis + +Host uulm-obu0 uulm-obu1 + Port 22 + User user + ProxyJump 5g-iana-mec + IdentityFile /mnt/veracrypt1/genesis + +Host uulm-obu0 + Hostname 192.168.201.7 + +Host uulm-obu1 + Hostname 192.168.201.11 diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org index dbbe835..524cde0 100644 --- a/emacs/.emacs.d/config.org +++ b/emacs/.emacs.d/config.org @@ -28,6 +28,12 @@ (use-package flycheck :ensure) (use-package solidity-mode) (use-package undo-tree) + (use-package yaml-mode + :config + (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))) + (use-package org-roam) + (use-package consult) + (use-package dockerfile-mode) #+end_src ** Evil @@ -37,7 +43,8 @@ (setq evil-want-keybinding nil) :config (evil-mode 1) - (setq evil-search-module 'evil-search)) + (setq evil-search-module 'evil-search) + (setq evil-undo-system 'undo-redo)) (use-package evil-collection :config diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 76ad4c4..6e8534a 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -4,7 +4,7 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(package-selected-packages '(evil-collection evil use-package))) + '(package-selected-packages '(consult org-roam evil-collection evil use-package))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/vim/.config/nvim/.gitignore b/vim/.config/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/vim/.config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/vim/.config/nvim/.neoconf.json b/vim/.config/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/vim/.config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/vim/.config/nvim/LICENSE b/vim/.config/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/vim/.config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vim/.config/nvim/README.md b/vim/.config/nvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/vim/.config/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/vim/.config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/vim/.config/nvim/lazy-lock.json b/vim/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..2ef522c --- /dev/null +++ b/vim/.config/nvim/lazy-lock.json @@ -0,0 +1,63 @@ +{ + "LazyVim": { "branch": "main", "commit": "fe72424e77cb9c953084bbcaaa0eb7fe8056dc70" }, + "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "SchemaStore.nvim": { "branch": "main", "commit": "88355559bb42cc8e4f6ca7b624dc4c3b654c5c08" }, + "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, + "catppuccin": { "branch": "main", "commit": "c0de3b46811fe1ce3912e2245a9dfbea6b41c300" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform.nvim": { "branch": "master", "commit": "34b81e70da83e26c048290204de44268eb59814e" }, + "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" }, + "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" }, + "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, + "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, + "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, + "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" }, + "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" }, + "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, + "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, + "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, + "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" }, + "neoconf.nvim": { "branch": "main", "commit": "8d7150e9d6113f01421c34c5aeb0f586afa232e0" }, + "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "fbb139c6f14896b434d0229099e1acd863ae6bec" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" }, + "nvim-lspconfig": { "branch": "master", "commit": "7f5cf1121f772850a30bdaf83fb448e88846aa58" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" }, + "nvim-treesitter": { "branch": "master", "commit": "212b7a504cf56f85d1acc5be237261b42d7560c5" }, + "nvim-treesitter-context": { "branch": "master", "commit": "53cdd58446521575d8f1052152099e08b15ca53c" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3532f6095efd4723f7c066a5ac3fe632506cc09e" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, + "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, + "onedark.vim": { "branch": "main", "commit": "57b77747694ea5676c3ca0eeaf9567dc499730c0" }, + "orgmode": { "branch": "master", "commit": "779a56823857a2e0baacadc7f3042fa0bfbaf6aa" }, + "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, + "vim-ledger": { "branch": "master", "commit": "281346a221434574dd7f8767a352b2bf0b218b74" }, + "vim-startuptime": { "branch": "master", "commit": "308b0088a864c4711a96e45b6734cf9294074f65" }, + "vimtex": { "branch": "master", "commit": "a77d14b2e4391c0d3e860708bb1fd56161ab68eb" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file diff --git a/vim/.config/nvim/lazyvim.json b/vim/.config/nvim/lazyvim.json new file mode 100644 index 0000000..a943afc --- /dev/null +++ b/vim/.config/nvim/lazyvim.json @@ -0,0 +1,14 @@ +{ + "extras": [ + "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.rust", + "lazyvim.plugins.extras.lang.tex", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.ui.edgy" + ], + "news": { + "NEWS.md": "2123" + }, + "version": 2 +} \ No newline at end of file diff --git a/vim/.config/nvim/lua/config/autocmds.lua b/vim/.config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..27e9e06 --- /dev/null +++ b/vim/.config/nvim/lua/config/autocmds.lua @@ -0,0 +1,3 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- Add any additional autocmds here diff --git a/vim/.config/nvim/lua/config/keymaps.lua b/vim/.config/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/vim/.config/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/vim/.config/nvim/lua/config/lazy.lua b/vim/.config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..891b190 --- /dev/null +++ b/vim/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,46 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + -- bootstrap lazy.nvim + -- stylua: ignore + vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) +end +vim.opt.rtp:prepend(vim.env.LAZY or lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import any extras modules here + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { enabled = true }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/vim/.config/nvim/lua/config/options.lua b/vim/.config/nvim/lua/config/options.lua new file mode 100644 index 0000000..3ea1454 --- /dev/null +++ b/vim/.config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/vim/.config/nvim/lua/plugins/example.lua b/vim/.config/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..6859c0e --- /dev/null +++ b/vim/.config/nvim/lua/plugins/example.lua @@ -0,0 +1,265 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- add symbols-outline + { + "simrat39/symbols-outline.nvim", + cmd = "SymbolsOutline", + keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, + config = true, + }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add telescope-fzf-native + { + "telescope.nvim", + dependencies = { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + config = function() + require("telescope").load_extension("fzf") + end, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, "😄") + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, + + -- Use for completion and snippets (supertab) + -- first: disable default and behavior in LuaSnip + { + "L3MON4D3/LuaSnip", + keys = function() + return {} + end, + }, + -- then: setup supertab in cmp + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-emoji", + }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil + end + + local luasnip = require("luasnip") + local cmp = require("cmp") + + opts.mapping = vim.tbl_extend("force", opts.mapping, { + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() + -- this way you will only jump inside the snippet region + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }) + end, + }, +} diff --git a/vim/.config/nvim/lua/plugins/ledger-cli.lua b/vim/.config/nvim/lua/plugins/ledger-cli.lua new file mode 100644 index 0000000..e30f980 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/ledger-cli.lua @@ -0,0 +1,4 @@ +return { + -- Add vim-ledger + { "ledger/vim-ledger" }, +} diff --git a/vim/.config/nvim/lua/plugins/onedark.lua b/vim/.config/nvim/lua/plugins/onedark.lua new file mode 100644 index 0000000..c361dbb --- /dev/null +++ b/vim/.config/nvim/lua/plugins/onedark.lua @@ -0,0 +1,9 @@ +return { + { "joshdick/onedark.vim" }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "onedark", + }, + }, +} diff --git a/vim/.config/nvim/lua/plugins/org-mode.lua b/vim/.config/nvim/lua/plugins/org-mode.lua new file mode 100644 index 0000000..d33bcd2 --- /dev/null +++ b/vim/.config/nvim/lua/plugins/org-mode.lua @@ -0,0 +1,27 @@ +return { + { + "nvim-orgmode/orgmode", + dependencies = { + { "nvim-treesitter/nvim-treesitter", lazy = true }, + }, + event = "VeryLazy", + config = function() + -- Load treesitter grammar for org + require("orgmode").setup_ts_grammar() + + -- Setup treesitter + require("nvim-treesitter.configs").setup({ + highlight = { + enable = true, + }, + ensure_installed = { "org" }, + }) + + -- Setup orgmode + require("orgmode").setup({ + org_agenda_files = "~/orgfiles/**/*", + org_default_notes_file = "~/orgfiles/refile.org", + }) + end, + }, +} diff --git a/vim/.config/nvim/stylua.toml b/vim/.config/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/vim/.config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/zsh/.zshrc b/zsh/.zshrc index ba4c1c7..70c7502 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -6,8 +6,8 @@ export PenTestTools=$HOME/Local/PenTesting/ export CTF=$HOME/Documents/CTF/ export WORKSPACE=$HOME/workspace_l export ZSHRC="$HOME/.zshrc" -export VISUAL="emacsclient -t" -export EDITOR="emacsclient -t" +export VISUAL="nvim" +export EDITOR="nvim" # History