diff options
20 files changed, 171 insertions, 120 deletions
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index c829752..7218515 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -117,7 +117,7 @@ font: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - family: JetBrains Mono + family: JetBrains Mono Nerd Font # The `style` can be specified to pick a specific face. style: Regular @@ -128,7 +128,7 @@ font: # # If the bold family is not specified, it will fall back to the # value specified for the normal font. - family: hack + family: JetBrains Mono Nerd Font # The `style` can be specified to pick a specific face. style: Bold @@ -139,7 +139,7 @@ font: # # If the italic family is not specified, it will fall back to the # value specified for the normal font. - family: hack + family: JetBrains Mono Nerd Font # The `style` can be specified to pick a specific face. style: Italic @@ -150,13 +150,13 @@ font: # # If the bold italic family is not specified, it will fall back to the # value specified for the normal font. - family: monospace + family: JetBrains Mono Nerd Font # The `style` can be specified to pick a specific face. style: Bold Italic # Point size - size: 11.0 + size: 13.0 # Offset is the extra space around each character. `offset.y` can be thought # of as modifying the line spacing, and `offset.x` as modifying the letter @@ -374,10 +374,10 @@ colors: # When set to `true`, selected text will be copied to the primary clipboard. #save_to_clipboard: false -#cursor: - # Cursor style - #style: - # Cursor shape +# cursor: +# Cursor style +# style: +# Cursor Beam # # Values for `shape`: # - ▇ Block diff --git a/aliases/.aliases/aliases b/aliases/.aliases/aliases index 70c74c6..5da04fe 100644 --- a/aliases/.aliases/aliases +++ b/aliases/.aliases/aliases @@ -1,3 +1,4 @@ +alias gpl="~/.scripts/get_project_lines.sh" alias vcc="~/.scripts/cpp_template.sh" alias kpr="ps aux | fzf | awk '{print $2}' | xargs killall > /dev/null 2> /dev/null" alias build="./main < inp" @@ -31,7 +32,6 @@ alias book='/home/omar/.scripts/books.sh' alias btrfsfs="sudo btrfs filesystem df /" alias btrfsli="sudo btrfs su li / -t" alias bupskel='cp -Rf /etc/skel ~/.skel-backup-$(date +%Y.%m.%d-%H.%M.%S)' -alias cat='bat --style header --style rules --style snip --style changes --style header' alias ca='vim ~/.config/alacritty/alacritty.yml' # for quickly acssesing alacritty config file alias cb="$EDITOR ~/.bashrc" alias ......='cd ../../../../..' diff --git a/awesome/.config/awesome/themes/powerarrow-black/theme.lua b/awesome/.config/awesome/themes/powerarrow-black/theme.lua index 5666c4b..e9b23b7 100644 --- a/awesome/.config/awesome/themes/powerarrow-black/theme.lua +++ b/awesome/.config/awesome/themes/powerarrow-black/theme.lua @@ -14,7 +14,7 @@ local math, string, os = math, string, os local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility local theme = {} -theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-blue" +theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/powerarrow-dark" theme.font = "Source code pro bold 13" theme.taglist_font = "Source code pro bold 13" theme.fg_normal = "#ffffff" @@ -97,8 +97,8 @@ theme.titlebar_maximized_button_normal_inactive = theme.dir .. "/icons/titlebar/ theme.bg_systray = "#000000" theme.clock_fontfg = "#ffffff" theme.clock_font = "DejaVu Sans Mono Bold 13" -theme.arch_fontfg = "#ffffff" -theme.arch_font = "DejaVu Sans Mono Bold 13" +theme.arch_fontfg = "#ffffff" +theme.arch_font = "DejaVu Sans Mono Bold 13" local markup = lain.util.markup local separators = lain.util.separators @@ -259,7 +259,7 @@ function theme.at_screen_connect(s) s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons) -- Create the wibox - function custom_shape(cr, width, height) + local function custom_shape(cr, width, height) gears.shape.rounded_rect(cr, width, height, 10) @@ -267,7 +267,7 @@ function theme.at_screen_connect(s) s.mywibox = awful.wibar({ position = "top", screen = s, shape = custom_shape, height = 25, width = 1850, border_width = 5, bg = theme.bg_normal, fg = theme.fg_magenta }) - tbox_separator = wibox.widget.textbox(" | ") + --tbox_separator = wibox.widget.textbox(" | ") local vert_sep = wibox.widget { widget = wibox.widget.separator, @@ -286,11 +286,11 @@ function theme.at_screen_connect(s) --Spotify - local spotify_current_song = wibox.widget { - widget = wibox.widget.textbox, - text = awful.spawn("/home/peng/.scripts/spotify.sh"), - font = "Hack Regular 10" - } + --[[ local spotify_current_song = wibox.widget { ]] + --[[ widget = wibox.widget.textbox, ]] + --[[ text = awful.spawn("/home/peng/.scripts/spotify.sh"), ]] + --[[ font = "Hack Regular 10" ]] + --[[ } ]] -- Add widgets to the wibox s.mywibox:setup { @@ -300,7 +300,6 @@ function theme.at_screen_connect(s) --spr, wibox.container.background(wibox.container.margin(arch_logo, 15, 10, 1, 1)), s.mypromptbox, - spr, }, { layout = wibox.layout.align.horizontal, diff --git a/kitty/.config/kitty/current-theme.conf b/kitty/.config/kitty/current-theme.conf index 8030263..2543819 100644 --- a/kitty/.config/kitty/current-theme.conf +++ b/kitty/.config/kitty/current-theme.conf @@ -1,21 +1,21 @@ -background #0e1419 -foreground #e5e1cf -cursor #f19618 -selection_background #243340 -color0 #000000 -color8 #323232 -color1 #ff3333 -color9 #ff6565 -color2 #b8cc52 -color10 #e9fe83 -color3 #e6c446 -color11 #fff778 -color4 #36a3d9 -color12 #68d4ff -color5 #f07078 -color13 #ffa3aa -color6 #95e5cb -color14 #c7fffc -color7 #ffffff -color15 #ffffff -selection_foreground #0e1419 +background #090200 +foreground #a4a1a1 +cursor #a4a1a1 +selection_background #494542 +color0 #090200 +color8 #5b5754 +color1 #da2c20 +color9 #e8bacf +color2 #00a152 +color10 #3a3332 +color3 #fcec02 +color11 #494542 +color4 #00a0e4 +color12 #7f7c7b +color5 #a06994 +color13 #d6d4d3 +color6 #b5e4f4 +color14 #ccab53 +color7 #a4a1a1 +color15 #f7f7f7 +selection_foreground #090200 diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 1d21830..8f2db85 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -7,7 +7,8 @@ #: characters. # font_family Ubuntu Mono - font_family JetBrains Mono Nerd Font + # font_family JetBrains Mono Nerd Font + font_family JetBrains Mono Extra Bold Nerd Font # font_family DejaVu Mono # font_family source code pro # font_family Iosevka Term @@ -2039,6 +2040,6 @@ map opt+cmd+, debug_config # BEGIN_KITTY_THEME -# Ayu +# 3024 Night include current-theme.conf # END_KITTY_THEME diff --git a/kitty/.config/kitty/kitty.conf.bak b/kitty/.config/kitty/kitty.conf.bak index d030d11..8fff5b3 100644 --- a/kitty/.config/kitty/kitty.conf.bak +++ b/kitty/.config/kitty/kitty.conf.bak @@ -6,7 +6,8 @@ #: individual font faces and even specify special fonts for particular #: characters. -font_family Ubuntu Mono +# font_family Ubuntu Mono + font_family JetBrains Mono Nerd Font # font_family DejaVu Mono # font_family source code pro # font_family Iosevka Term @@ -28,7 +29,7 @@ bold_italic_font auto #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic -font_size 18.0 +font_size 13.0 #: Font size (in pts) @@ -940,7 +941,7 @@ inactive_tab_font_style normal #: The foreground and background colors -background_opacity 0.95 +background_opacity 1.0 # background_opacity 0.90 # background_opacity 0.50 @@ -2038,6 +2039,6 @@ map opt+cmd+, debug_config # BEGIN_KITTY_THEME -# 1984 Light +# 1984 Dark include current-theme.conf # END_KITTY_THEME diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index e723a7e..e98fbc5 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,24 +1,10 @@ -vim.g.material_style = "deep ocean" --- vim.g.material_style = "palenight" --- vim.g.material_style = "darker" ---[[ vim.g.tokyonight_style = "night" ]] ---[[ vim.g.tokyonight_italic_functions = true ]] ---[[ vim.g.tokyonight_italic_keywords = true ]] ---[[ vim.g.tokyonight_italic_variables = true ]] ---[[ vim.g.tokyonight_italic_comments = true ]] ---[[ vim.g.tokyonight_transparent_sidebar = true; ]] ---[[ vim.g.tokyonight_transparent_float = true; ]] ---[[ vim.g.tokyonight_terminal_colors = true ]] ---[[ vim.g.airline_theme = "tokyonight" ]] ---vim.g.tokyonight_colors = { hint = "orange", error = "#ff0000" } ---[[ vim.g.tokyonight_transparent = true ]] - --- require('onedark').setup { --- style = 'deep' --- } - --require'lspconfig'.gdscript.setup{ - --capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) - --} +--[[ vim.g.material_style = "palenight" ]] + + +require('onedark').setup { + style = 'deep', + transparent = true, +} require('material').setup{ disable = { @@ -30,6 +16,7 @@ require("nvim-treesitter.configs").setup { yati = { enable = true }, } + require "user.options" require "user.keymaps" require "user.plugins" diff --git a/nvim/.config/nvim/lua/user/bufferline.lua b/nvim/.config/nvim/lua/user/bufferline.lua index f18db79..e346fbc 100644 --- a/nvim/.config/nvim/lua/user/bufferline.lua +++ b/nvim/.config/nvim/lua/user/bufferline.lua @@ -13,7 +13,11 @@ bufferline.setup { -- NOTE: this plugin is designed with this icon in mind, -- and so changing this is NOT recommended, this is intended -- as an escape hatch for people who cannot bear it for whatever reason - indicator_icon = "▎", + indicator = { + icon = '| ', + style = 'icon' + }, + -- buffer_close_icon = "", buffer_close_icon = '', modified_icon = "●", diff --git a/nvim/.config/nvim/lua/user/colorscheme.lua b/nvim/.config/nvim/lua/user/colorscheme.lua index cc3c6e2..37ab651 100644 --- a/nvim/.config/nvim/lua/user/colorscheme.lua +++ b/nvim/.config/nvim/lua/user/colorscheme.lua @@ -1,6 +1,6 @@ vim.cmd [[ try - colorscheme material + colorscheme onedark catch /^Vim\%((\a\+)\)\=:E185/ colorscheme default set background=background diff --git a/nvim/.config/nvim/lua/user/lsp/handlers.lua b/nvim/.config/nvim/lua/user/lsp/handlers.lua index a630cb6..dda229d 100644 --- a/nvim/.config/nvim/lua/user/lsp/handlers.lua +++ b/nvim/.config/nvim/lua/user/lsp/handlers.lua @@ -46,7 +46,7 @@ end local function lsp_highlight_document(client) -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then + if client.server_capabilities.document_highlight then vim.api.nvim_exec( [[ augroup lsp_document_highlight diff --git a/nvim/.config/nvim/lua/user/nvim-tree.lua b/nvim/.config/nvim/lua/user/nvim-tree.lua index 31b1b83..876c16b 100644 --- a/nvim/.config/nvim/lua/user/nvim-tree.lua +++ b/nvim/.config/nvim/lua/user/nvim-tree.lua @@ -1,25 +1,25 @@ -- following options are the default -- each of these are documented in `:help nvim-tree.OPTION_NAME` -vim.g.nvim_tree_icons = { - default = "", - symlink = "", - git = { - unstaged = "", - staged = "S", - unmerged = "", - renamed = "➜", - deleted = "", - untracked = "U", - ignored = "◌", - }, - folder = { - default = "", - open = "", - empty = "", - empty_open = "", - symlink = "", - }, -} +--[[ vim.g.nvim_tree_icons = { ]] +--[[ default = "", ]] +--[[ symlink = "", ]] +--[[ git = { ]] +--[[ unstaged = "", ]] +--[[ staged = "S", ]] +--[[ unmerged = "", ]] +--[[ renamed = "➜", ]] +--[[ deleted = "", ]] +--[[ untracked = "U", ]] +--[[ ignored = "◌", ]] +--[[ }, ]] +--[[ folder = { ]] +--[[ default = "", ]] +--[[ open = "", ]] +--[[ empty = "", ]] +--[[ empty_open = "", ]] +--[[ symlink = "", ]] +--[[ }, ]] +--[[ } ]] local status_ok, nvim_tree = pcall(require, "nvim-tree") if not status_ok then @@ -34,6 +34,26 @@ end local tree_cb = nvim_tree_config.nvim_tree_callback nvim_tree.setup { + --[[ icons = { ]] + --[[ default = "", ]] + --[[ symlink = "", ]] + --[[ git = { ]] + --[[ unstaged = "", ]] + --[[ staged = "S", ]] + --[[ unmerged = "", ]] + --[[ renamed = "➜", ]] + --[[ deleted = "", ]] + --[[ untracked = "U", ]] + --[[ ignored = "◌", ]] + --[[ }, ]] + --[[ folder = { ]] + --[[ default = "", ]] + --[[ open = "", ]] + --[[ empty = "", ]] + --[[ empty_open = "", ]] + --[[ symlink = "", ]] + --[[ }, ]] + --[[ }, ]] disable_netrw = true, hijack_netrw = true, open_on_setup = false, @@ -79,7 +99,7 @@ nvim_tree.setup { }, view = { width = 30, - height = 30, + --[[ height = 30, ]] hide_root_folder = true, side = "left", -- auto_resize = true, diff --git a/nvim/.config/nvim/lua/user/options.lua b/nvim/.config/nvim/lua/user/options.lua index b96e57f..1ad2efa 100644 --- a/nvim/.config/nvim/lua/user/options.lua +++ b/nvim/.config/nvim/lua/user/options.lua @@ -26,13 +26,13 @@ local options = { tabstop = 2, -- insert 2 spaces for a tab cursorline = true, -- highlight the current line number = true, -- set numbered lines - relativenumber = true, -- set relative numbered lines + relativenumber = true, -- set relative numbered lines numberwidth = 4, -- set number column width to 2 {default 4} signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time - wrap = false, -- display lines as one long line + wrap = true, -- display lines as one long line scrolloff = 8, -- is one of my fav sidescrolloff = 8, - guifont = "monospace:h17", -- the font used in graphical neovim applications + guifont = "JetBrainsMonoExtraBold Nerd Font:h14", -- the font used in graphical neovim applications } vim.opt.shortmess:append "c" @@ -41,6 +41,8 @@ for k, v in pairs(options) do vim.opt[k] = v end +vim.o.ch = 0 + vim.cmd "set whichwrap+=<,>,[,],h,l" vim.cmd [[set iskeyword+=-]] vim.cmd [[set formatoptions-=cro]] -- TODO: this doesn't seem to work diff --git a/nvim/.config/nvim/lua/user/plugins.lua b/nvim/.config/nvim/lua/user/plugins.lua index 79739d2..f646ba5 100644 --- a/nvim/.config/nvim/lua/user/plugins.lua +++ b/nvim/.config/nvim/lua/user/plugins.lua @@ -58,16 +58,22 @@ return packer.startup(function(use) use "goolord/alpha-nvim" use "antoinemadec/FixCursorHold.nvim" -- This is needed to fix lsp doc highlight use "folke/which-key.nvim" - use "nvim-lua/plenary.nvim" use "szw/vim-maximizer" use "folke/trouble.nvim" + -- Show colors in terminal with hexcodes or rgb + use 'norcalli/nvim-colorizer.lua' + -- fix indentation use({ "yioneko/nvim-yati", requires = "nvim-treesitter/nvim-treesitter" }) -- Surround use "tpope/vim-surround" + --Debugging + use 'mfussenegger/nvim-dap' + use 'rcarriga/nvim-dap-ui' + -- Colorschemes -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out use 'crusoexia/vim-monokai' @@ -77,9 +83,9 @@ return packer.startup(function(use) use "drewtempelmeyer/palenight.vim" use 'Mofiqul/dracula.nvim' use 'tanvirtin/monokai.nvim' - use 'eddyekofo94/gruvbox-flat.nvim' use 'kyazdani42/nvim-palenight.lua' use 'navarasu/onedark.nvim' + use 'ellisonleao/gruvbox.nvim' -- cmp plugins use "hrsh7th/nvim-cmp" -- The completion plugin @@ -132,7 +138,7 @@ return packer.startup(function(use) cancel = "<C-q>", }, }, - runner_ui = { + popup_ui = { total_width = 0.8, total_height = 0.8, selector_width = 0.3, diff --git a/nvim/.config/nvim/lua/user/whichkey.lua b/nvim/.config/nvim/lua/user/whichkey.lua index e8a0d8b..fd9a32f 100644 --- a/nvim/.config/nvim/lua/user/whichkey.lua +++ b/nvim/.config/nvim/lua/user/whichkey.lua @@ -180,7 +180,7 @@ local mappings = { p = { "<cmd>lua _PYTHON_TOGGLE()<cr>", "Python" }, f = { "<cmd>ToggleTerm direction=float<cr>", "Float" }, h = { "<cmd>ToggleTerm size=10 direction=horizontal<cr>", "Horizontal" }, - v = { "<cmd>ToggleTerm size=80 direction=vertical<cr>", "Vertical" }, + v = { "<cmd>ToggleTerm size=50 direction=vertical<cr>", "Vertical" }, }, } diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua index 93c9334..beda03e 100644 --- a/nvim/.config/nvim/plugin/packer_compiled.lua +++ b/nvim/.config/nvim/plugin/packer_compiled.lua @@ -9,23 +9,26 @@ vim.api.nvim_command('packadd packer.nvim') local no_errors, error_msg = pcall(function() - local time - local profile_info - local should_profile = false - if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 end - else - time = function(chunk, start) end end - +else + time = function(chunk, start) end +end + local function save_profiles(threshold) local sorted_times = {} for chunk_name, time_taken in pairs(profile_info) do @@ -38,8 +41,10 @@ local function save_profiles(threshold) results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' end end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end - _G._packer = _G._packer or {} _G._packer.profile_output = results end @@ -145,10 +150,10 @@ _G.packer_plugins = { path = "/home/pengu/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", url = "https://github.com/lewis6991/gitsigns.nvim" }, - ["gruvbox-flat.nvim"] = { + ["gruvbox.nvim"] = { loaded = true, - path = "/home/pengu/.local/share/nvim/site/pack/packer/start/gruvbox-flat.nvim", - url = "https://github.com/eddyekofo94/gruvbox-flat.nvim" + path = "/home/pengu/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", + url = "https://github.com/ellisonleao/gruvbox.nvim" }, ["impatient.nvim"] = { loaded = true, @@ -200,6 +205,21 @@ _G.packer_plugins = { path = "/home/pengu/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, + ["nvim-colorizer.lua"] = { + loaded = true, + path = "/home/pengu/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", + url = "https://github.com/norcalli/nvim-colorizer.lua" + }, + ["nvim-dap"] = { + loaded = true, + path = "/home/pengu/.local/share/nvim/site/pack/packer/start/nvim-dap", + url = "https://github.com/mfussenegger/nvim-dap" + }, + ["nvim-dap-ui"] = { + loaded = true, + path = "/home/pengu/.local/share/nvim/site/pack/packer/start/nvim-dap-ui", + url = "https://github.com/rcarriga/nvim-dap-ui" + }, ["nvim-lsp-installer"] = { loaded = true, path = "/home/pengu/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", @@ -327,6 +347,13 @@ time([[Defining packer_plugins]], false) time([[Config for competitest.nvim]], true) try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16competitest\frequire\0", "config", "competitest.nvim") time([[Config for competitest.nvim]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + if should_profile then save_profiles() end end) diff --git a/scripts/.scripts/books.sh b/scripts/.scripts/books.sh index c0ad461..12741f4 100755 --- a/scripts/.scripts/books.sh +++ b/scripts/.scripts/books.sh @@ -9,7 +9,7 @@ # ################################################################## -path="/run/media/pengu/New Volume/Omar/Self learning/Books/English books/Books for computer science/" +path="/home/pengu/Books/" choice=$(ls "$path" | dmenu -l 10) new_choice=$choice diff --git a/scripts/.scripts/get_project_lines.sh b/scripts/.scripts/get_project_lines.sh new file mode 100755 index 0000000..223e8dc --- /dev/null +++ b/scripts/.scripts/get_project_lines.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +FILETYPE=$1 +fd --extension $FILETYPE --exec wc -l | cut -d ' ' -f1 | paste -sd+ | bc diff --git a/tmux/.tmux/.tmux.conf b/tmux/.tmux.conf/.tmux.conf index 612eb61..612eb61 100644 --- a/tmux/.tmux/.tmux.conf +++ b/tmux/.tmux.conf/.tmux.conf diff --git a/tmux/.tmux/.tmux.conf.local b/tmux/.tmux.conf/.tmux.conf.local index 515bc31..515bc31 100644 --- a/tmux/.tmux/.tmux.conf.local +++ b/tmux/.tmux.conf/.tmux.conf.local diff --git a/tmux/.tmux.conf/plugins/tpm b/tmux/.tmux.conf/plugins/tpm new file mode 160000 +Subproject b699a7e01c253ffb7818b02d62bce24190ec101 |