diff --git a/_linux/_unused/slock/LICENSE b/_linux/_suckless/slock/LICENSE similarity index 100% rename from _linux/_unused/slock/LICENSE rename to _linux/_suckless/slock/LICENSE diff --git a/_linux/_unused/slock/Makefile b/_linux/_suckless/slock/Makefile similarity index 100% rename from _linux/_unused/slock/Makefile rename to _linux/_suckless/slock/Makefile diff --git a/_linux/_unused/slock/README.md b/_linux/_suckless/slock/README.md similarity index 100% rename from _linux/_unused/slock/README.md rename to _linux/_suckless/slock/README.md diff --git a/_linux/_unused/slock/arg.h b/_linux/_suckless/slock/arg.h similarity index 100% rename from _linux/_unused/slock/arg.h rename to _linux/_suckless/slock/arg.h diff --git a/_linux/_unused/slock/config.def.h b/_linux/_suckless/slock/config.def.h similarity index 100% rename from _linux/_unused/slock/config.def.h rename to _linux/_suckless/slock/config.def.h diff --git a/_linux/_unused/slock/config.h b/_linux/_suckless/slock/config.h similarity index 100% rename from _linux/_unused/slock/config.h rename to _linux/_suckless/slock/config.h diff --git a/_linux/_unused/slock/config.mk b/_linux/_suckless/slock/config.mk similarity index 100% rename from _linux/_unused/slock/config.mk rename to _linux/_suckless/slock/config.mk diff --git a/_linux/_unused/slock/explicit_bzero.c b/_linux/_suckless/slock/explicit_bzero.c similarity index 100% rename from _linux/_unused/slock/explicit_bzero.c rename to _linux/_suckless/slock/explicit_bzero.c diff --git a/_linux/_unused/slock/slock.1 b/_linux/_suckless/slock/slock.1 similarity index 100% rename from _linux/_unused/slock/slock.1 rename to _linux/_suckless/slock/slock.1 diff --git a/_linux/_unused/slock/slock.c b/_linux/_suckless/slock/slock.c similarity index 100% rename from _linux/_unused/slock/slock.c rename to _linux/_suckless/slock/slock.c diff --git a/_linux/_unused/slock/util.h b/_linux/_suckless/slock/util.h similarity index 100% rename from _linux/_unused/slock/util.h rename to _linux/_suckless/slock/util.h diff --git a/_linux/_unused/astronvim/highlights/init.lua b/_linux/_unused/astronvim/highlights/init.lua deleted file mode 100644 index 667d9e0..0000000 --- a/_linux/_unused/astronvim/highlights/init.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - ColorColumn = { bg = "#770000" }, - DiffChange = { bg = NONE, fg = "#e7c547" }, - DiffText = { bg = NONE, fg = "#ff8700" }, - FoldColumn = { bg = NONE }, - LineNr = { bg = NONE, fg = "#465457" }, - NonText = { bg = NONE }, - Normal = { bg = NONE }, - SignColumn = { bg = NONE }, - SpellBad = { bg = "#770000", fg = "#ffffff" }, - TelescopeNormal = { bg = NONE }, - Visual = { bg = "#005577", fg = "#ffffff" }, - NormalFloat = { bg = NONE }, -} diff --git a/_linux/_unused/astronvim/init.lua b/_linux/_unused/astronvim/init.lua deleted file mode 100644 index 06d09f6..0000000 --- a/_linux/_unused/astronvim/init.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - colorscheme = "monokai", - vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = {"*.gotmpl"}, - callback = function() vim.bo.filetype = "yaml" end, - }), - vim.api.nvim_create_autocmd({ "VimLeave" }, { - callback = function() - vim.fn.jobstart("", { detach = true }) - end, - }), -} diff --git a/_linux/_unused/astronvim/mappings.lua b/_linux/_unused/astronvim/mappings.lua deleted file mode 100644 index 72a1df7..0000000 --- a/_linux/_unused/astronvim/mappings.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - i = { - [""] = { "I" }, - [""] = { "A" }, - }, - n = { - [""] = { "wq!", silent = true }, - ["c"] = { 'execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")', silent = true, desc = "Toggle Column" }, - ["h"] = { "set hlsearch!", silent = true, desc = "Toggle hlsearch" }, - ["j"] = { "bprevious", silent = true, desc = "Buffer Previous" }, - ["k"] = { "bnext", silent = true, desc = "Buffer Next" }, - ["n"] = { 'set number!IBLToggleexecute "set signcolumn=" . (&signcolumn == "yes" ? "no" : "yes")', silent = true, desc = "Toggle Decorations" }, - ["w"] = { "lua require('whitespace-nvim').trim()", silent = true, desc = "Trim Trailing Whitespaces" }, - ["x"] = { "bd", silent = true, desc = "close buffer" }, - [""] = { "w", silent = true }, - }, -} diff --git a/_linux/_unused/astronvim/options.lua b/_linux/_unused/astronvim/options.lua deleted file mode 100644 index 306ac8f..0000000 --- a/_linux/_unused/astronvim/options.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - opt = { - cursorcolumn = true, - cursorline = true, - expandtab = true, - gdefault = true, - hlsearch = false, - ignorecase = true, - number = true, - shiftround = true, - relativenumber = false, - showmode = false, - smartcase = true, - splitbelow = true, - splitright = true, - termguicolors = true, - wrap = true, - whichwrap = '', - writebackup = false, - clipboard = "", - cmdheight = 1, - foldcolumn = "0", - laststatus = 2, - mouse = "", - scrolloff = 5, - shiftwidth = 2, - softtabstop = 2, - tabstop = 2, - updatetime = 100, - }, -} diff --git a/_linux/_unused/astronvim/plugins/init.lua b/_linux/_unused/astronvim/plugins/init.lua deleted file mode 100644 index 4e7697b..0000000 --- a/_linux/_unused/astronvim/plugins/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - { "goolord/alpha-nvim", enabled = false }, - { "rebelot/heirline.nvim", enabled = false }, -} diff --git a/_linux/_unused/astronvim/plugins/lualine.lua b/_linux/_unused/astronvim/plugins/lualine.lua deleted file mode 100644 index f6467c8..0000000 --- a/_linux/_unused/astronvim/plugins/lualine.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = { - options = { - component_separators = '', - icons_enabled = true, - section_separators = '', - theme = "powerline", - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { { "filename", file_status = true, path = 1 } }, - lualine_c = { { "branch", icon = "" } }, - lualine_x = { "filetype" }, - lualine_y = { "progress" }, - lualine_z = { "location" }, - }, - tabline = { - lualine_a = { "buffers" }, - }, - }, -} diff --git a/_linux/_unused/astronvim/plugins/monokai.lua b/_linux/_unused/astronvim/plugins/monokai.lua deleted file mode 100644 index 577cbec..0000000 --- a/_linux/_unused/astronvim/plugins/monokai.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tanvirtin/monokai.nvim", -} diff --git a/_linux/_unused/astronvim/plugins/neotree.lua b/_linux/_unused/astronvim/plugins/neotree.lua deleted file mode 100644 index aa408a9..0000000 --- a/_linux/_unused/astronvim/plugins/neotree.lua +++ /dev/null @@ -1,24 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - opts = { - close_if_last_window = false, - sort_case_insensitive = true, - window = { - position = "left", - auto_expand_width = true, - mappings = { - [""] = "close_node", - ["s"] = "open_split", - ["v"] = "open_vsplit", - }, - }, - nesting_rules = {}, - filesystem = { - filtered_items = { - visible = true, - hide_dotfiles = true, - hide_gitignored = true, - }, - }, - } -} diff --git a/_linux/_unused/astronvim/plugins/notify.lua b/_linux/_unused/astronvim/plugins/notify.lua deleted file mode 100644 index 828aaf1..0000000 --- a/_linux/_unused/astronvim/plugins/notify.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "rcarriga/nvim-notify", - opts = { - background_colour = "#000000", - }, -} diff --git a/_linux/_unused/astronvim/plugins/treesitter.lua b/_linux/_unused/astronvim/plugins/treesitter.lua deleted file mode 100644 index 0605ad0..0000000 --- a/_linux/_unused/astronvim/plugins/treesitter.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - version = "0.9.2", - commit = false, - opts = { - ensure_installed = { - "bash", - "markdown", - "markdown_inline", - "python", - "terraform", - "vim", - "yaml", - }, - }, -} diff --git a/_linux/_unused/astronvim/plugins/whitespace.lua b/_linux/_unused/astronvim/plugins/whitespace.lua deleted file mode 100644 index e49fbe1..0000000 --- a/_linux/_unused/astronvim/plugins/whitespace.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { "johnfrankmorgan/whitespace.nvim", - event = "User AstroFile", - opts = { - highlight = 'SpellBad', - }, - }, -} diff --git a/_linux/_unused/nvchad/README.md b/_linux/_unused/nvchad/README.md deleted file mode 100644 index 0cc616c..0000000 --- a/_linux/_unused/nvchad/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Example_config - -This can be used as an example custom config for NvChad. Do check the https://github.com/NvChad/nvcommunity diff --git a/_linux/_unused/nvchad/chadrc.lua b/_linux/_unused/nvchad/chadrc.lua deleted file mode 100644 index 2cd5c4a..0000000 --- a/_linux/_unused/nvchad/chadrc.lua +++ /dev/null @@ -1,23 +0,0 @@ - --@type ChadrcConfig -local M = {} - --- Path to overriding theme and highlights files -local highlights = require "custom.highlights" - -M.ui = { - theme = "monekai", - - hl_override = highlights.override, - hl_add = highlights.add, - - statusline = { - theme = "vscode_colored", - } -} - -M.plugins = "custom.plugins" - --- check core.mappings for table structure -M.mappings = require "custom.mappings" - -return M diff --git a/_linux/_unused/nvchad/configs/lspconfig.lua b/_linux/_unused/nvchad/configs/lspconfig.lua deleted file mode 100644 index 4a7968e..0000000 --- a/_linux/_unused/nvchad/configs/lspconfig.lua +++ /dev/null @@ -1,16 +0,0 @@ -local on_attach = require("plugins.configs.lspconfig").on_attach -local capabilities = require("plugins.configs.lspconfig").capabilities - -local lspconfig = require "lspconfig" - --- if you just want default config for the servers then put them in a table -local servers = {} - -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - } -end - --- lspconfig.pyright.setup { blabla} diff --git a/_linux/_unused/nvchad/configs/null-ls.lua b/_linux/_unused/nvchad/configs/null-ls.lua deleted file mode 100644 index 99cdbf1..0000000 --- a/_linux/_unused/nvchad/configs/null-ls.lua +++ /dev/null @@ -1,21 +0,0 @@ -local null_ls = require "null-ls" - -local b = null_ls.builtins - -local sources = { - - -- webdev stuff - b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast! - b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes - - -- Lua - b.formatting.stylua, - - -- cpp - b.formatting.clang_format, -} - -null_ls.setup { - debug = true, - sources = sources, -} diff --git a/_linux/_unused/nvchad/configs/overrides.lua b/_linux/_unused/nvchad/configs/overrides.lua deleted file mode 100644 index 685995e..0000000 --- a/_linux/_unused/nvchad/configs/overrides.lua +++ /dev/null @@ -1,41 +0,0 @@ -local M = {} - -M.treesitter = { - ensure_installed = { - "bash", - "lua", - "markdown", - "markdown_inline", - "python", - "terraform", - "vim", - }, - indent = { - enable = true, - -- disable = { - -- "python" - -- }, - }, -} - --- M.mason = { --- ensure_installed = {}, --- } - --- git support in nvimtree -M.nvimtree = { - git = { - enable = true, - }, - - renderer = { - highlight_git = true, - icons = { - show = { - git = true, - }, - }, - }, -} - -return M diff --git a/_linux/_unused/nvchad/highlights.lua b/_linux/_unused/nvchad/highlights.lua deleted file mode 100644 index f41f832..0000000 --- a/_linux/_unused/nvchad/highlights.lua +++ /dev/null @@ -1,23 +0,0 @@ --- To find any highlight groups: " Telescope highlights" --- Each highlight group can take a table with variables fg, bg, bold, italic, etc --- base30 variable names can also be used as colors - -local M = {} - ----@type Base46HLGroupsList -M.override = { - ColorColumn = { bg = "#770000" }, - Comment = { italic = true, }, - DiffChange = { bg = "NONE", fg = "#e7c547" }, - DiffText = { bg = "NONE", fg = "#ff8700" }, - FoldColumn = { bg = "NONE" }, - NormalFloat = { bg = "NONE" }, - NonText = { bg = "NONE" }, - Normal = { bg = "NONE" }, - SignColumn = { bg = "NONE" }, - SpellBad = { bg = "#770000", fg = "#ffffff" }, - TelescopeNormal = { bg = "NONE" }, - Visual = { bg = "#0094d8", fg = "#ffffff" }, -} - -return M diff --git a/_linux/_unused/nvchad/init.lua b/_linux/_unused/nvchad/init.lua deleted file mode 100644 index 0dd770a..0000000 --- a/_linux/_unused/nvchad/init.lua +++ /dev/null @@ -1,26 +0,0 @@ -local autocmd = vim.api.nvim_create_autocmd -local opt = vim.opt - -autocmd("BufRead", { - pattern = "*.gotmpl", - command = "set filetype=yaml", -}) -autocmd("BufNewFile", { - pattern = "*.gotmpl", - command = "set filetype=yaml", -}) - -opt.gdefault = true -opt.hlsearch = false -opt.shiftround = true -opt.relativenumber = false -opt.wrap = true -opt.whichwrap = '' -opt.writebackup = false - -opt.clipboard = "" -opt.foldcolumn = "0" -opt.mouse = "" --- opt.laststatus = 2 --- opt.mouse = "" --- opt.scrolloff = 5 diff --git a/_linux/_unused/nvchad/mappings.lua b/_linux/_unused/nvchad/mappings.lua deleted file mode 100644 index 61e6a04..0000000 --- a/_linux/_unused/nvchad/mappings.lua +++ /dev/null @@ -1,30 +0,0 @@ -local M = {} - -M.disabled = { - n = { - ["m"] = "", - } -} - -M.general = { - i = { - [""] = { "I" }, - [""] = { "A" }, - }, - n = { - [""] = { "wq!", "Save and Exit" }, - ["m"] = { 'execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")', "Toggle Column" }, - ["h"] = { "set hlsearch!", "Toggle hlsearch" }, - ["j"] = { "bprevious", "Buffer Previous" }, - ["k"] = { "bnext", "Buffer Next" }, - ["n"] = { 'set number!IndentBlanklineToggleexecute "set signcolumn=" . (&signcolumn == "yes" ? "no" : "yes")', "Toggle Decorations" }, - ["w"] = { "lua require('whitespace-nvim').trim()", "Trim Trailing Whitespaces" }, - ["x"] = { "bd", "Buffer Close" }, - [""] = { "w", }, - }, - v = { - [">"] = { ">gv", "indent"}, - }, -} - -return M diff --git a/_linux/_unused/nvchad/plugins.lua b/_linux/_unused/nvchad/plugins.lua deleted file mode 100644 index 2ed8db8..0000000 --- a/_linux/_unused/nvchad/plugins.lua +++ /dev/null @@ -1,65 +0,0 @@ -local overrides = require("custom.configs.overrides") - ----@type NvPluginSpec[] -local plugins = { - - -- Override plugin definition options - - { - "neovim/nvim-lspconfig", - dependencies = { - -- format & linting - { - "jose-elias-alvarez/null-ls.nvim", - config = function() - require "custom.configs.null-ls" - end, - }, - }, - config = function() - require "plugins.configs.lspconfig" - require "custom.configs.lspconfig" - end, -- Override to setup mason-lspconfig - }, - - -- override plugin configs - { - "williamboman/mason.nvim", - opts = overrides.mason - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, - - { - "nvim-tree/nvim-tree.lua", - opts = overrides.nvimtree, - }, - - -- Install a plugin - { - "max397574/better-escape.nvim", - event = "InsertEnter", - config = function() - require("better_escape").setup() - end, - }, - - -- To make a plugin not be loaded - -- { - -- "NvChad/nvim-colorizer.lua", - -- enabled = false - -- }, - - -- All NvChad plugins are lazy-loaded by default - -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` - -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example - -- { - -- "mg979/vim-visual-multi", - -- lazy = false, - -- } -} - -return plugins diff --git a/_linux/_unused/neovim/init.lua b/_saved/neovim/init.lua similarity index 100% rename from _linux/_unused/neovim/init.lua rename to _saved/neovim/init.lua diff --git a/_linux/_unused/neovim/init.vim b/_saved/neovim/init.vim similarity index 100% rename from _linux/_unused/neovim/init.vim rename to _saved/neovim/init.vim diff --git a/config/omp/omp.toml b/_saved/omp/omp.toml similarity index 100% rename from config/omp/omp.toml rename to _saved/omp/omp.toml diff --git a/_linux/_unused/starship.toml b/_saved/starship.toml similarity index 100% rename from _linux/_unused/starship.toml rename to _saved/starship.toml diff --git a/_linux/_unused/lazygit/config.yml b/config/lazygit/config.yml similarity index 100% rename from _linux/_unused/lazygit/config.yml rename to config/lazygit/config.yml diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index 21abfe2..4db8f86 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -13,7 +13,7 @@ gd() { git pull } alias gl="git log --graph --abbrev-commit --date=short --pretty=format:'%Cred%h%Creset %Cgreen%cr%Creset: %s : %C(bold blue)%an%Creset %C(yellow)%d%Creset'" - +alias lg=lazygit alias less='less -R' if [[ $(command -v bat) ]]; then @@ -71,5 +71,4 @@ function upgrade() { brew update && brew upgrade && brew cleanup rm -rf ~/Library/Caches/Homebrew/* fi - oh-my-posh upgrade }