diff --git a/.gitignore b/.gitignore index fc6bbea..0777f08 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ tmux/plugins/* # Ignore Nvim Stuffs nvim/.* nvim/spell/ +kitty.conf.bak diff --git a/INSTALL-DEPS-FEDORA.sh b/INSTALL-DEPS-FEDORA.sh new file mode 100644 index 0000000..03602f7 --- /dev/null +++ b/INSTALL-DEPS-FEDORA.sh @@ -0,0 +1,8 @@ +echo "Installing various dnf dependencies" + +sudo dnf install neovim -y +sudo dnf install vlc -y +sudo dnf install kdenlive -y +sudo dnf install x264 x264-devel x246-libs --allowerasing -y +sudo dnf install docker-ce docker-ce-cli docker-compose -y + diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 1512110..8e4a1e4 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,5 +1,6 @@ select_by_word_characters @-./_~?&=%+# +confirm_os_window_close 0 window_border_width 1pt background_opacity 1 @@ -14,7 +15,7 @@ active_border_color #000000 # BEGIN_KITTY_FONTS -font_family family="Cascadia Code NF" +font_family family="JetBrains Mono NL" bold_font auto italic_font auto bold_italic_font auto diff --git a/nvim/init.lua b/nvim/init.lua index 90f0e61..8929cfa 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -71,13 +71,14 @@ vim.opt.shiftwidth = 4 vim.opt.expandtab = true -- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 +vim.opt.scrolloff = 7 ----------------------------- -- Quality of Life Keybinds: ----------------------------- -vim.keymap.set('n', '', 'w') +vim.keymap.set('n', '', 'w', { silent = true }) +vim.keymap.set('i', '', 'w', { silent = true }) -------------------- -- Quit Vim @@ -88,30 +89,36 @@ vim.keymap.set('n', 'qx', 'xa!', { desc = 'Write to all then fo -------------------- -- Text Oriented vim.keymap.set('n', '', 'nohlsearch') +vim.keymap.set('v', 'R', 's') -------------------- -- Movement -- Faster Window Navigation -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +vim.keymap.set('n', '', '', { silent=true, desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { silent=true, desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { silent=true, desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { silent=true, desc = 'Move focus to the upper window' }) -- Terminal -- or just use to exit terminal mode -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) +vim.keymap.set('t', '', '', { silent=true, desc = 'Exit terminal mode' }) -- Skipping Sections -vim.keymap.set('n', '', 'zz10kzz', { desc = 'Skip Large Sections' }) -vim.keymap.set('n', '', 'zz10jzz', { desc = 'Skip Large Sections' }) -vim.keymap.set('i', '', '2ka', { desc = 'Skip Large Sections' }) -vim.keymap.set('i', '', '2ja', { desc = 'Skip Large Sections' }) +vim.keymap.set('n', '', 'zz20kzz', { silent=true, desc = 'Skip Large Sections' }) +vim.keymap.set('n', '', 'zz20jzz', { silent=true, desc = 'Skip Large Sections' }) +vim.keymap.set('i', '', '2ka', { silent=true, desc = 'Skip Large Sections' }) +vim.keymap.set('i', '', '2ja', { silent=true, desc = 'Skip Large Sections' }) +-------------------- +-- Window Manipulation + +vim.keymap.set('n', '', 'q', { silent=true, desc='Close Window' }) -------------------- -- Weird Sh*t Fixes vim.keymap.set('n', 's', '', {desc="[S]urround"}) -- Dunno but this is needed to stop some weird substitution thing +vim.keymap.set('n', 'm', 'q', {desc="Macro"}) vim.keymap.set('n', 'q', '') -- Record fights me so often -- [[ Basic Autocommands ]] @@ -252,6 +259,7 @@ require('lazy').setup({ [''] = actions.close }, }, + find_command = { 'rg', '--files', '--follow' }, -- or 'fd' with '--follow' if you use fd as the search tool }, -- pickers = {} extensions = { @@ -272,12 +280,18 @@ require('lazy').setup({ vim.keymap.set('n', 'ff', builtin.find_files, { desc = '[F]ind [F]iles' }) vim.keymap.set('n', 'fs', builtin.builtin, { desc = '[F]ind [S]elect Telescope' }) vim.keymap.set('n', 'fw', builtin.grep_string, { desc = '[F]ind current [W]ord' }) - vim.keymap.set('n', 'fg', builtin.live_grep, { desc = '[F]ind by [G]rep' }) + vim.keymap.set('n', 'fg', function() + require('telescope.builtin').live_grep { + additional_args = function() + return { "--follow" } + end, + } + end, { desc = '[F]ind by [G]rep' }) vim.keymap.set('n', 'fd', builtin.diagnostics, { desc = '[F]ind [D]iagnostics' }) vim.keymap.set('n', 'df', builtin.diagnostics, { desc = '[D]iagnostic [F]ind Via Telescope' }) vim.keymap.set('n', 'fr', builtin.resume, { desc = '[F]ind [R]esume' }) vim.keymap.set('n', 'f.', builtin.oldfiles, { desc = '[F]ind Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.live_grep, { desc = '[ ] Find Grep' }) + vim.keymap.set('n', '', 'fg', { desc = '[ ] Find Grep' }) vim.keymap.set('n', '', function() builtin.current_buffer_fuzzy_find({ diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 4bd005c..f89853a 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,30 +1,30 @@ { "FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blink.cmp": { "branch": "main", "commit": "af68874f1b2e628e0c72ec27f5225d0c6b2d6820" }, + "blink.cmp": { "branch": "main", "commit": "75cadbcd2657ed01326ca2b0e5e4d78a77127ca3" }, "fine-cmdline.nvim": { "branch": "main", "commit": "aec9efebf6f4606a5204d49ffa3ce2eeb7e08a3e" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lspsaga.nvim": { "branch": "main", "commit": "d027f8b9c7c55e26cf4030c8657a2fc8222ed762" }, "markview.nvim": { "branch": "main", "commit": "67b69cdaf9055bebac3682a070d7e5c8eecba29c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "9618cf56e76cc0caab54ad60116a8d72f99d7b3b" }, + "mini.nvim": { "branch": "main", "commit": "7b4d5d48b6b5a75009d63f8f3e4ef4819b7e8139" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "fd49d5863e873891be37afac79b1f56fb34bb5d3" }, - "nvim-treesitter": { "branch": "master", "commit": "a3ca2e60563064cea008555d0b7d031430305b09" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, + "nvim-lspconfig": { "branch": "master", "commit": "4cb925e96288a71409a86c84fd97f4434a95453e" }, + "nvim-treesitter": { "branch": "master", "commit": "bb06afa3f1111780932b3c5493ad65473ce85f9d" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, + "tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } } diff --git a/nvim/lua/plugins/blinkcmp.lua b/nvim/lua/plugins/blinkcmp.lua index 68c2371..585d32a 100644 --- a/nvim/lua/plugins/blinkcmp.lua +++ b/nvim/lua/plugins/blinkcmp.lua @@ -22,6 +22,6 @@ return { -- experimental auto-brackets support -- accept = { auto_brackets = { enabled = true } } -- experimental signature help support - -- trigger = { signature_help = { enabled = true } } + trigger = { signature_help = { enabled = true } } } } diff --git a/nvim/lua/plugins/venn.lua b/nvim/lua/plugins/venn.lua index 8c59335..523c267 100644 --- a/nvim/lua/plugins/venn.lua +++ b/nvim/lua/plugins/venn.lua @@ -21,7 +21,7 @@ function _G.Toggle_venn() end end -- toggle keymappings for venn using v -vim.api.nvim_set_keymap('n', 'v', ":lua Toggle_venn()", { noremap = true, desc="Toggle Venn Diagram Drawing"}) +vim.api.nvim_set_keymap('n', 'v', ":lua Toggle_venn()Markview", { noremap = true, desc="Toggle Venn Diagram Drawing"}) return {'jbyuki/venn.nvim'} diff --git a/zsh/.zshrc b/zsh/.zshrc index ce8455f..a1e1a96 100755 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -104,8 +104,10 @@ eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/ohmyposh.toml)" alias update-grub=' grub2-mkconfig -o /boot/grub2/grub.cfg' alias cat="bat" -alias grep="rg --color=always" -alias rg="rg --color=always" +alias grep="rg" +alias rg="rg" +alias rgc="rg --color=always" +alias grepc="rg --color=always" alias sudo='sudo ' @@ -197,6 +199,24 @@ function extract() fi } +compins () { + if [[ "$1" == "" ]]; then + echo "Missing file argument" + kill -INT $$ + fi + if [[ ! -f "$1" ]]; then + echo "'$1' is not a valid file" + kill -INT $$ + fi + + case "$1" in + *) + echo "Not implemented or '$1' cannot be inspected via compins" + ;; + esac + +} + forget () { print "Forgetting last line with '$@'. Please reload shell after compeletion." diff --git a/zsh/ohmyposh/ohmyposh.toml b/zsh/ohmyposh/ohmyposh.toml index f92aa4e..ff74b79 100644 --- a/zsh/ohmyposh/ohmyposh.toml +++ b/zsh/ohmyposh/ohmyposh.toml @@ -1,6 +1,26 @@ -version = 2 -final_space = true console_title_template = '{{ .Shell }} in {{ .Folder }}' +version = 3 +final_space = true + +[palette] + black = '#262B44' + blue = '#4B95E9' + cyan = '#70C9A5' + green = '#59C9A5' + orange = '#F07623' + red = '#D81E5B' + white = '#E0DEF4' + yellow = '#F3AE35' + +[secondary_prompt] + template = '❯❯ ' + foreground = 'magenta' + background = 'transparent' + +[transient_prompt] + template = '❯ ' + foreground = 'magenta' + background = 'transparent' [[blocks]] type = 'prompt' @@ -8,28 +28,29 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' newline = true [[blocks.segments]] - type = 'path' style = 'plain' - background = 'transparent' + template = '{{ .Path }}' foreground = 'p:orange' - template = "{{ .Path }}" + background = 'transparent' + type = 'path' [blocks.segments.properties] style = 'full' [[blocks.segments]] - type = 'session' style = 'plain' + template = '{{ if .SSHSession }} {{.UserName}}@{{.HostName}}{{end}}' foreground = 'blue' background = 'transparent' - template = '{{ if .SSHSession }} {{.UserName}}@{{.HostName}}{{end}}' + type = 'session' [[blocks.segments]] - type = 'git' style = 'plain' + template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} {{ if gt .Behind 0 }}⇣{{end}}{{ if gt .Ahead 0 }}⇡{{end}}' foreground = '#6c6c6c' background = 'transparent' - template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} {{ if gt .Behind 0 }}⇣{{end}}{{ if gt .Ahead 0 }}⇡{{end}}' + type = 'git' + [blocks.segments.properties] branch_icon = '' commit_icon = '@' @@ -40,12 +61,11 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' overflow = 'hidden' [[blocks.segments]] - type = 'executiontime' style = 'plain' + template = '{{ .FormattedMs }}' foreground = 'yellow' background = 'transparent' - template = '{{ .FormattedMs }}' - + type = 'executiontime' [[blocks]] type = 'prompt' @@ -53,31 +73,9 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' newline = true [[blocks.segments]] - type = 'text' style = 'plain' - foreground_templates = [ - "{{if gt .Code 0}}red{{end}}", - "{{if eq .Code 0}}magenta{{end}}" - ] - background = 'transparent' template = '❯' - -[transient_prompt] - foreground = 'magenta' - background = 'transparent' - template = '❯ ' - -[secondary_prompt] - foreground = 'magenta' - background = 'transparent' - template = '❯❯ ' - -[palette] - black = '#262B44' - blue = '#4B95E9' - green = '#59C9A5' - orange = '#F07623' - red = '#D81E5B' - white = '#E0DEF4' - yellow = '#F3AE35' - cyan = '#70C9A5' + foreground = '' + background = 'transparent' + type = 'text' + foreground_templates = ['{{if gt .Code 0}}red{{end}}', '{{if eq .Code 0}}magenta{{end}}'] diff --git a/zsh/ohmyposh/ohmyposh.toml.bak b/zsh/ohmyposh/ohmyposh.toml.bak new file mode 100644 index 0000000..f92aa4e --- /dev/null +++ b/zsh/ohmyposh/ohmyposh.toml.bak @@ -0,0 +1,83 @@ +version = 2 +final_space = true +console_title_template = '{{ .Shell }} in {{ .Folder }}' + +[[blocks]] + type = 'prompt' + alignment = 'left' + newline = true + + [[blocks.segments]] + type = 'path' + style = 'plain' + background = 'transparent' + foreground = 'p:orange' + template = "{{ .Path }}" + + [blocks.segments.properties] + style = 'full' + + [[blocks.segments]] + type = 'session' + style = 'plain' + foreground = 'blue' + background = 'transparent' + template = '{{ if .SSHSession }} {{.UserName}}@{{.HostName}}{{end}}' + + [[blocks.segments]] + type = 'git' + style = 'plain' + foreground = '#6c6c6c' + background = 'transparent' + template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} {{ if gt .Behind 0 }}⇣{{end}}{{ if gt .Ahead 0 }}⇡{{end}}' + [blocks.segments.properties] + branch_icon = '' + commit_icon = '@' + fetch = true + +[[blocks]] + type = 'rprompt' + overflow = 'hidden' + + [[blocks.segments]] + type = 'executiontime' + style = 'plain' + foreground = 'yellow' + background = 'transparent' + template = '{{ .FormattedMs }}' + + +[[blocks]] + type = 'prompt' + alignment = 'left' + newline = true + + [[blocks.segments]] + type = 'text' + style = 'plain' + foreground_templates = [ + "{{if gt .Code 0}}red{{end}}", + "{{if eq .Code 0}}magenta{{end}}" + ] + background = 'transparent' + template = '❯' + +[transient_prompt] + foreground = 'magenta' + background = 'transparent' + template = '❯ ' + +[secondary_prompt] + foreground = 'magenta' + background = 'transparent' + template = '❯❯ ' + +[palette] + black = '#262B44' + blue = '#4B95E9' + green = '#59C9A5' + orange = '#F07623' + red = '#D81E5B' + white = '#E0DEF4' + yellow = '#F3AE35' + cyan = '#70C9A5'