Skip to content

Commit

Permalink
Some updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Omar Essaid committed Sep 5, 2023
1 parent 84e1b5b commit 7de5c82
Show file tree
Hide file tree
Showing 19 changed files with 475 additions and 216 deletions.
10 changes: 10 additions & 0 deletions .config/ctop/config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[options]
columns = "status,name,id,cpu,mem,net,io,pids,uptime"
filterStr = ""
sortField = "state"

[toggles]
allContainers = true
enableHeader = false
fullRowCursor = true
sortReversed = false
24 changes: 24 additions & 0 deletions .config/kitty/dark.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Kitty Configuration for Neovim theme

background #1E1F22
foreground #BCBEC4
selection_background #214283
cursor #889AFF

# Ansi colors
color0 #000000
color1 #F0524F
color2 #5C962C
color3 #A68A0D
color4 #3993D4
color5 #A771BF
color6 #00A3A3
color7 #808080
color8 #595959
color9 #FF4050
color10 #4FC414
color11 #E5BF00
color12 #1FB0FF
color13 #ED7EED
color14 #00E5E5
color15 #FFFFFF
39 changes: 39 additions & 0 deletions .config/kitty/fleet.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Kitty configuration

# Background color of the terminal
background #181818

# Foreground color of the terminal, used for text and cursor
foreground #d6d6dd

# Cursor color
cursor #7dbeff

# Selection color
selection_foreground #d6d6dd
selection_background #1F3661

# Color definitions
color0 #1e1e1e
color1 #CC7C8A
color2 #afcb85
color3 #e5c995
color4 #52a7f6
color5 #d898d8
color6 #78d0bd
color7 #d6d6dd
color8 #535353
color9 #F44747
color10 #00AF99
color11 #DEA407
color12 #2197F3
color13 #E44C7A
color14 #204474
color15 #ffffff

# Extended colors (These are optional)
color16 #a390f0
color17 #7dbeff
color18 #6d6d6d
color19 #efb080
color20 #5A9F81
6 changes: 4 additions & 2 deletions .config/kitty/kitty.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ disable_ligatures cursor

#: Scrollback {{{

# scrollback_lines 2000
scrollback_lines 10000

#: Number of lines of history to keep in memory for scrolling back.
#: Memory is allocated on demand. Negative numbers are (effectively)
Expand Down Expand Up @@ -2288,4 +2288,6 @@ hide_window_decorations titlebar-only

#: }}}

include gruvbox_dark_hard.conf
# include gruvbox_dark_hard.conf
# include fleet.conf
include dark.conf
62 changes: 31 additions & 31 deletions .config/nvim/lazy-lock.json
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
{
"LuaSnip": { "branch": "master", "commit": "a6355b12a3b7da0aef71f02560e17ff480182b97" },
"LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "af88e700417c6449719fc77f6f3745f88e42d5da" },
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
"diffview.nvim": { "branch": "main", "commit": "63720aa5a70ce4aa386be407d0e612cd9e63861a" },
"dressing.nvim": { "branch": "master", "commit": "0e3e1eba147fee6e638ac1ac28f0495bcde17319" },
"dark.nvim": { "branch": "main", "commit": "98888915bc1b0545416bc867eec97b92c6e7f344" },
"diffview.nvim": { "branch": "main", "commit": "500d8b2013812e05ab87db83a8d22319986519f2" },
"dressing.nvim": { "branch": "master", "commit": "c0b67f3e2950adc07b555d3e73e38275b4a585ce" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
"friendly-snippets": { "branch": "main", "commit": "8f26df063f0fdabc27845c7aed56db9102d385e8" },
"gitsigns.nvim": { "branch": "main", "commit": "372d5cb485f2062ac74abc5b33054abac21d8b58" },
"friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
"gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" },
"gv.vim": { "branch": "master", "commit": "320cc8c477c5acc4fa0e52a460d87b2af54fa051" },
"lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
"lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
"lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "b81c50c4baae7d80b1723b3fa86e814d7754d15b" },
"mason.nvim": { "branch": "main", "commit": "7caf4f7143b4b2e17fe0e893bdd05c622c508207" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" },
"neodev.nvim": { "branch": "main", "commit": "864b35006d3de24c60e44b566de8018f919b13e6" },
"nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" },
"null-ls.nvim": { "branch": "main", "commit": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed" },
"nvim-base16": { "branch": "master", "commit": "18ce3c5f694aaac31f5a434937ca6abe02b83f92" },
"nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
"lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
"lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
"mason.nvim": { "branch": "main", "commit": "74eac861b013786bf231b204b4ba9a7d380f4bd9" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
"neodev.nvim": { "branch": "main", "commit": "461519d5a0023a73cb46d21392751d0731eacec8" },
"nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
"nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
"nvim-lspconfig": { "branch": "master", "commit": "e52efca5d4f5536533d447ec0d97e4d525b37ace" },
"nvim-navic": { "branch": "master", "commit": "27124a773d362628b114cd12016e743dab4ccf3e" },
"nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
"nvim-treesitter": { "branch": "master", "commit": "f7e8b7420ccf8bc61534ea6155db03d62c7ff571" },
"nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
"plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
"nvim-lspconfig": { "branch": "master", "commit": "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4" },
"nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" },
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
"nvim-treesitter": { "branch": "master", "commit": "80cee52d445363c8bd08eacca17be31e3837f4d0" },
"nvim-web-devicons": { "branch": "master", "commit": "eb8f80f30fd5e9a6176dee5c46661ebd7437ac46" },
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
"registers": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
"rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
"symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
"telescope-undo.nvim": { "branch": "main", "commit": "231b5ebb4328d2768c830c9a8d1b9c696116848d" },
"telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
"toggleterm.nvim": { "branch": "main", "commit": "026dff5e2b504941cf172691561a67ea362596aa" },
"trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
"vim-fugitive": { "branch": "master", "commit": "e6651a79facf5cc2b7c554fdc19eb8a9fe89602c" }
"telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" },
"telescope.nvim": { "branch": "master", "commit": "dc192faceb2db64231ead71539761e055df66d73" },
"toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
"trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
"vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }
}
176 changes: 95 additions & 81 deletions .config/nvim/lua/plugins/colorscheme.lua
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,103 @@
return {
-- colorscheme
-- {
-- 'RRethy/nvim-base16',
-- lazy = false,
-- priority = 1000,
-- config = function()
-- -- base00 = '#1d2021', base01 = '#3c3836', base02 = '#504945', base03 = '#665c54',
-- -- base04 = '#bdae93', base05 = '#d5c4a1', base06 = '#ebdbb2', base07 = '#fbf1c7',
-- -- base08 = '#fb4934', base09 = '#fe8019', base0A = '#fabd2f', base0B = '#b8bb26',
-- -- base0C = '#8ec07c', base0D = '#83a598', base0E = '#d3869b', base0F = '#d65d0e'
--
-- local function custom_highlights()
-- local colors = require('base16-colorscheme').colors
-- -- General settings
-- vim.api.nvim_set_hl(0, 'Visual', { reverse = true })
-- vim.api.nvim_set_hl(0, 'IncSearch', { fg = colors.base00, bg = colors.base0D })
-- vim.api.nvim_set_hl(0, 'CursorLine', { fg = nil, bg = '#262727' })
-- vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = colors.base03, bg = '#262727' })
-- vim.api.nvim_set_hl(0, 'LineNr', { fg = colors.base03 })
-- vim.api.nvim_set_hl(0, 'WinSeparator', { fg = colors.base03 })
-- vim.api.nvim_set_hl(0, 'EndOfBuffer', { fg = colors.base00 })
-- -- Floating windows
-- vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base03, bg = colors.base00 })
-- vim.api.nvim_set_hl(0, 'NormalFloat', { bg = colors.base00 })
-- -- Telescope: https://github.com/nvim-telescope/telescope.nvim/blob/master/plugin/telescope.lua
-- vim.api.nvim_set_hl(0, 'TelescopeBorder', { fg = colors.base03 })
-- vim.api.nvim_set_hl(0, 'TelescopeSelection', { bg = '#262727' })
-- vim.api.nvim_set_hl(0, 'TelescopePromptPrefix', { fg = colors.base0D })
-- vim.api.nvim_set_hl(0, 'TelescopeMatching', { fg = colors.base0D })
-- -- Cmp
-- vim.api.nvim_set_hl(0, 'CmpItemAbbr', { fg = colors.base05, bg = 'NONE' })
-- vim.api.nvim_set_hl(0, 'CmpItemAbbrMatch', { fg = colors.base0D, bg = 'NONE', bold = true })
-- vim.api.nvim_set_hl(0, 'CmpItemAbbrMatchFuzzy', { fg = colors.base0D, bg = 'NONE', bold = true })
-- vim.api.nvim_set_hl(0, 'CmpItemAbbrDeprecated', { fg = colors.base02, bg = 'NONE', strikethrough = true })
-- vim.api.nvim_set_hl(0, 'CmpItemMenu', { fg = colors.base0D, bg = 'NONE', italic = true })
-- -- Command menu
-- vim.api.nvim_set_hl(0, 'Pmenu', { fg = colors.base05, bg = '#262727' })
-- vim.api.nvim_set_hl(0, 'PmenuSel', { fg = colors.base00, bg = colors.base0D })
-- -- Rust
-- vim.api.nvim_set_hl(0, 'rustReservedKeyword', { fg = colors.base08, bg = 'NONE', bold = true, italic = true })
-- vim.api.nvim_set_hl(0, 'rustInvalidBareKeyword', { fg = colors.base08, bg = 'NONE', bold = true, italic = true })
--
-- local links = {
-- ['@lsp.type.namespace'] = '@namespace',
-- ['@lsp.type.type'] = '@type',
-- ['@lsp.type.class'] = '@type',
-- ['@lsp.type.enum'] = '@type',
-- ['@lsp.type.interface'] = '@type',
-- ['@lsp.type.struct'] = '@structure',
-- ['@lsp.type.parameter'] = '@parameter',
-- ['@lsp.type.property'] = '@property',
-- ['@lsp.type.enumMember'] = '@constant',
-- ['@lsp.type.function'] = '@function',
-- ['@lsp.type.method'] = '@method',
-- ['@lsp.type.macro'] = '@macro',
-- ['@lsp.type.decorator'] = '@function',
-- -- use treesitter styles
-- ['@lsp.type.comment.rust'] = '',
-- ['@lsp.type.variable'] = '',
-- }
-- for newgroup, oldgroup in pairs(links) do
-- vim.api.nvim_set_hl(0, newgroup, { link = oldgroup, default = true })
-- end
-- end
--
-- vim.api.nvim_create_autocmd('ColorScheme', {
-- pattern = '*',
-- callback = custom_highlights,
-- })
--
-- require('base16-colorscheme').with_config({
-- telescope = false,
-- indentblankline = false,
-- notify = false,
-- ts_rainbow = false,
-- cmp = true,
-- illuminate = false,
-- lsp_semantic = true,
-- })
-- -- vim.cmd("colorscheme base16-gruvbox-dark-hard")
-- -- vim.cmd("colorscheme base16-gruvbox-light-soft")
-- -- vim.cmd("colorscheme base16-gruvbox-dark-medium")
-- -- vim.cmd("colorscheme base16-gruvbox-material-dark-hard")
-- end,
-- },
-- {
-- 'felipeagc/fleet-theme-nvim',
-- lazy = false,
-- priority = 1000,
-- config = function()
-- vim.cmd('colorscheme fleet')
-- end,
-- },
{
"RRethy/nvim-base16",
'doums/dark.nvim',
lazy = false,
priority = 1000,
config = function()
-- base00 = '#1d2021', base01 = '#3c3836', base02 = '#504945', base03 = '#665c54',
-- base04 = '#bdae93', base05 = '#d5c4a1', base06 = '#ebdbb2', base07 = '#fbf1c7',
-- base08 = '#fb4934', base09 = '#fe8019', base0A = '#fabd2f', base0B = '#b8bb26',
-- base0C = '#8ec07c', base0D = '#83a598', base0E = '#d3869b', base0F = '#d65d0e'

local function custom_highlights()
local colors = require('base16-colorscheme').colors
-- General settings
vim.api.nvim_set_hl(0, "Visual", { reverse = true })
vim.api.nvim_set_hl(0, "IncSearch", { fg = colors.base00, bg = colors.base0D })
vim.api.nvim_set_hl(0, "CursorLine", { fg = nil, bg = "#262727" })
vim.api.nvim_set_hl(0, "CursorLineNr", { fg = colors.base03, bg = "#262727" })
vim.api.nvim_set_hl(0, "LineNr", { fg = colors.base03 })
vim.api.nvim_set_hl(0, "WinSeparator", { fg = colors.base03 })
vim.api.nvim_set_hl(0, "EndOfBuffer", { fg = colors.base00 })
-- Floating windows
vim.api.nvim_set_hl(0, "FloatBorder", { fg = colors.base03, bg = colors.base00 })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = colors.base00 })
-- Telescope: https://github.com/nvim-telescope/telescope.nvim/blob/master/plugin/telescope.lua
vim.api.nvim_set_hl(0, "TelescopeBorder", { fg = colors.base03 })
vim.api.nvim_set_hl(0, "TelescopeSelection", { bg = "#262727" })
vim.api.nvim_set_hl(0, "TelescopePromptPrefix", { fg = colors.base0D })
vim.api.nvim_set_hl(0, "TelescopeMatching", { fg = colors.base0D })
-- Cmp
vim.api.nvim_set_hl(0, "CmpItemAbbr", { fg = colors.base05, bg = "NONE" })
vim.api.nvim_set_hl(0, "CmpItemAbbrMatch", { fg = colors.base0D, bg = "NONE", bold = true })
vim.api.nvim_set_hl(0, "CmpItemAbbrMatchFuzzy", { fg = colors.base0D, bg = "NONE", bold = true })
vim.api.nvim_set_hl(0, "CmpItemAbbrDeprecated", { fg = colors.base02, bg = "NONE", strikethrough = true })
vim.api.nvim_set_hl(0, "CmpItemMenu", { fg = colors.base0D, bg = "NONE", italic = true })
-- Command menu
vim.api.nvim_set_hl(0, "Pmenu", { fg = colors.base05, bg = "#262727" })
vim.api.nvim_set_hl(0, "PmenuSel", { fg = colors.base00, bg = colors.base0D })
-- Rust
vim.api.nvim_set_hl(0, "rustReservedKeyword",
{ fg = colors.base08, bg = "NONE", bold = true, italic = true })
vim.api.nvim_set_hl(0, "rustInvalidBareKeyword",
{ fg = colors.base08, bg = "NONE", bold = true, italic = true })

local links = {
['@lsp.type.namespace'] = '@namespace',
['@lsp.type.type'] = '@type',
['@lsp.type.class'] = '@type',
['@lsp.type.enum'] = '@type',
['@lsp.type.interface'] = '@type',
['@lsp.type.struct'] = '@structure',
['@lsp.type.parameter'] = '@parameter',
['@lsp.type.property'] = '@property',
['@lsp.type.enumMember'] = '@constant',
['@lsp.type.function'] = '@function',
['@lsp.type.method'] = '@method',
['@lsp.type.macro'] = '@macro',
['@lsp.type.decorator'] = '@function',
-- use treesitter styles
['@lsp.type.comment.rust'] = '',
['@lsp.type.variable'] = '',
}
for newgroup, oldgroup in pairs(links) do
vim.api.nvim_set_hl(0, newgroup, { link = oldgroup, default = true })
end
end

vim.api.nvim_create_autocmd("ColorScheme", {
pattern = "*",
callback = custom_highlights
})

require('base16-colorscheme').with_config({
telescope = false,
indentblankline = false,
notify = false,
ts_rainbow = false,
cmp = true,
illuminate = false,
lsp_semantic = true,
})
vim.cmd("colorscheme base16-gruvbox-dark-hard")
-- vim.cmd("colorscheme base16-gruvbox-dark-medium")
-- vim.cmd("colorscheme base16-gruvbox-material-dark-hard")
end
vim.cmd('colorscheme dark')
end,
},

}
Loading

0 comments on commit 7de5c82

Please sign in to comment.