From 0baf5507a78a4b58e8c52091e8ddb16d5f71a2ae Mon Sep 17 00:00:00 2001 From: Marina Barros Date: Sun, 29 Mar 2026 09:39:40 -0300 Subject: kanagawa em tudo!! e adicionado neorg --- fish/conf.d/fundle.fish | 1 + fish/themes/kanagawa.theme | 25 ++++++++ hypr/hyprland.conf | 15 ++--- kanagawa.conf | 70 ++++++++++++++++++++++ kitty/current-theme.conf | 126 +++++++++++++++++++++------------------ nvim/init.lua | 2 +- nvim/lua/config/lazy.lua | 20 +++---- nvim/lua/config/lsp.lua | 94 ++++++++++++++--------------- nvim/lua/config/options.lua | 3 + nvim/lua/plugins/colorscheme.lua | 21 +++++-- nvim/lua/plugins/lsp.lua | 1 + nvim/lua/plugins/neorg.lua | 20 +++++++ 12 files changed, 269 insertions(+), 129 deletions(-) create mode 100644 fish/themes/kanagawa.theme create mode 100644 kanagawa.conf create mode 100644 nvim/lua/plugins/neorg.lua diff --git a/fish/conf.d/fundle.fish b/fish/conf.d/fundle.fish index 564400f..a1e7580 100644 --- a/fish/conf.d/fundle.fish +++ b/fish/conf.d/fundle.fish @@ -9,5 +9,6 @@ fundle plugin "franciscolourenco/done" fundle plugin "jorgebucaran/autopair.fish" fundle plugin "patrickf1/fzf.fish" fundle plugin "jorgebucaran/hydro" +fundle plugin "uajqq/fish-kanagawa" fundle init diff --git a/fish/themes/kanagawa.theme b/fish/themes/kanagawa.theme new file mode 100644 index 0000000..043dd39 --- /dev/null +++ b/fish/themes/kanagawa.theme @@ -0,0 +1,25 @@ +# Kanagawa Fish shell theme +# A template was taken and modified from Tokyonight: +# https://github.com/folke/tokyonight.nvim/blob/main/extras/fish_tokyonight_night.fish + +# Syntax Highlighting Colors +fish_color_normal DCD7BA +fish_color_command 7AA89F +fish_color_keyword D27E99 +fish_color_quote C0A36E +fish_color_redirection DCD7BA +fish_color_end FF9E64 +fish_color_error C34043 +fish_color_param 957FB8 +fish_color_comment 727169 +fish_color_selection --background=2D4F67 +fish_color_search_match --background=2D4F67 +fish_color_operator 76946A +fish_color_escape D27E99 +fish_color_autosuggestion 727169 + +# Completion Pager Colors +fish_pager_color_progress 727169 +fish_pager_color_prefix 7AA89F +fish_pager_color_completion DCD7BA +fish_pager_color_description 727169 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 8863e92..abaa103 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -33,6 +33,7 @@ $terminal = kitty # pro xwayland-satellite funcionar env = DISPLAY, :0 +env = GRIM_DEFAULT_DIR, "$HOME/Imagens/screenshots"; exec-once = xwayland-satellite exec-once = dbus-update-activation-environment --systemd --all WAYLAND_DISPLAY XDG_CURRENT_DESKTOP MOZ_ENABLE_WAYLAND PASSWORD_STORE_DIR && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target @@ -45,10 +46,10 @@ exec-once = hyprsunset bind = $mod ALT , q , exec , hyprshutdown bind = $mod , TAB , workspace , previous -bind = $mod , BackSpace , killactive +bind = $mod , q , killactive bind = $mod , f , fullscreen -bind = $mod SHIFT, e , togglefloating -bind = $mod SHIFT, e , pin +bind = $mod SHIFT, f , togglefloating +bind = $mod SHIFT, f , pin bind = $mod ALT , l , exec , sleep 1 && swaylock -i $(wpaperctl get eDP-1) bind = $mod , j , cyclenext , none bind = $mod , k , cyclenext , prev @@ -61,11 +62,11 @@ bind = $mod SHIFT, Comma , movewindow , mon:-1 bind = $mod , h , layoutmsg , mfact, -0.1 bind = $mod , l , layoutmsg , mfact, +0.1 bind = $mod , m , layoutmsg , swapwithmaster -bind = $mod , Return , exec , $terminal -bind = $mod SHIFT, Return , exec , [float] $terminal -bind = $mod CTRL , Return , exec , kitten quick-access-terminal +bind = $mod , e , exec , $terminal +bind = $mod SHIFT, e , exec , [float] $terminal +bind = $mod CTRL , e , exec , kitten quick-access-terminal bind = CTRL SHIFT, space , exec , ulauncher --toggle -bind = $mod , C , exec , cliphist wipe +bind = $mod , c , exec , cliphist wipe bind = , Print , exec , slurp | grim -g - bind = ALT , Print , exec , grim bind = , XF86AudioMute , exec , wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle diff --git a/kanagawa.conf b/kanagawa.conf new file mode 100644 index 0000000..072cbc9 --- /dev/null +++ b/kanagawa.conf @@ -0,0 +1,70 @@ +# vim:ft=kitty + +## name: Kanagawa +## author: Tommaso Laurenzi +## license: MIT +## upstream: https://github.com/rebelot/kanagawa.nvim/ +## blurb: NeoVim dark colorscheme inspired by the colors of the famous painting +## by Katsushika Hokusai. + +#: The basic colors + +foreground #dcd7ba +background #1f1f28 +selection_foreground #c8c093 +selection_background #2d4f67 + +#: Cursor colors + +cursor #c8c093 + +#: URL underline color when overing with mouse + +url_color #72a7bc + +#: Tab bar colors + +active_tab_foreground #c8c093 +active_tab_background #1f1f28 +inactive_tab_foreground #727169 +inactive_tab_background #1f1f28 + +#: The basic 16 colors + +#: black +color0 #16161d +color8 #727169 + +#: red +color1 #c34043 +color9 #e82424 + +#: green +color2 #76946a +color10 #98bb6c + +#: yellow +color3 #c0a36e +color11 #e6c384 + +#: blue +color4 #7e9cd8 +color12 #7fb4ca + +#: magenta +color5 #957fb8 +color13 #938aa9 + +#: cyan +color6 #6a9589 +color14 #7aa89f + +#: white +color7 #c8c093 +color15 #dcd7ba + + +#: You can set the remaining 240 colors as color16 to color255. + +color16 #ffa066 +color17 #ff5d62 diff --git a/kitty/current-theme.conf b/kitty/current-theme.conf index 56e682a..072cbc9 100644 --- a/kitty/current-theme.conf +++ b/kitty/current-theme.conf @@ -1,60 +1,70 @@ # vim:ft=kitty -## name: Modus Vivendi -## author: Protesilaos Stavrou -## license: GPLv3 -## blurb: Highly accessible themes made for GNU Emacs, conforming with the highest -## standard for colour contrast between background and foreground values (WCAG AAA) - -# The basic colors -foreground #ffffff -background #000000 -selection_foreground #ffffff -selection_background #5a5a5a - -# Cursor colors -cursor #ffffff -cursor_text_color #000000 - -# kitty window border colors -active_border_color #c6daff -inactive_border_color #646464 - -# Tab bar colors -active_tab_foreground #ffffff -active_tab_background #545454 -inactive_tab_foreground #969696 -inactive_tab_background #2f2f2f - -# The basic 16 colors -# black -color0 #000000 -color8 #595959 - -# red -color1 #ff5f59 -color9 #ff7f9f - -# green -color2 #44bc44 -color10 #00c06f - -# yellow -color3 #d0bc00 -color11 #fec43f - -# blue -color4 #2fafff -color12 #79a8ff - -# magenta -color5 #feacd0 -color13 #b6a0ff - -# cyan -color6 #00d3d0 -color14 #6ae4b9 - -# white -color7 #a6a6a6 -color15 #ffffff +## name: Kanagawa +## author: Tommaso Laurenzi +## license: MIT +## upstream: https://github.com/rebelot/kanagawa.nvim/ +## blurb: NeoVim dark colorscheme inspired by the colors of the famous painting +## by Katsushika Hokusai. + +#: The basic colors + +foreground #dcd7ba +background #1f1f28 +selection_foreground #c8c093 +selection_background #2d4f67 + +#: Cursor colors + +cursor #c8c093 + +#: URL underline color when overing with mouse + +url_color #72a7bc + +#: Tab bar colors + +active_tab_foreground #c8c093 +active_tab_background #1f1f28 +inactive_tab_foreground #727169 +inactive_tab_background #1f1f28 + +#: The basic 16 colors + +#: black +color0 #16161d +color8 #727169 + +#: red +color1 #c34043 +color9 #e82424 + +#: green +color2 #76946a +color10 #98bb6c + +#: yellow +color3 #c0a36e +color11 #e6c384 + +#: blue +color4 #7e9cd8 +color12 #7fb4ca + +#: magenta +color5 #957fb8 +color13 #938aa9 + +#: cyan +color6 #6a9589 +color14 #7aa89f + +#: white +color7 #c8c093 +color15 #dcd7ba + + +#: You can set the remaining 240 colors as color16 to color255. + +color16 #ffa066 +color17 #ff5d62 diff --git a/nvim/init.lua b/nvim/init.lua index bb6eab5..8ac8b61 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -17,4 +17,4 @@ require("gitsigns").setup() require("Comment").setup() require("null-ls").setup() -vim.cmd("colorscheme modus_vivendi") +vim.cmd("colorscheme kanagawa") diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index d640deb..e188e5b 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -4,13 +4,13 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then local lazyrepo = "https://github.com/folke/lazy.nvim.git" local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) end end vim.opt.rtp:prepend(lazypath) @@ -20,12 +20,12 @@ require("config.options") -- Setup lazy.nvim require("lazy").setup({ spec = { - -- import your plugins - { import = "plugins" }, + -- import your plugins + { import = "plugins" }, }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "modus_vivendi" } }, + install = { colorscheme = { "kanagawa" } }, -- automatically check for plugin updates checker = { enabled = true }, }) diff --git a/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua index 395e998..8ff5a9f 100644 --- a/nvim/lua/config/lsp.lua +++ b/nvim/lua/config/lsp.lua @@ -1,55 +1,55 @@ -vim.lsp.enable({ "rust_analyzer", "nil_ls", "denols", "html", "cssls", "lua_ls" }) +vim.lsp.enable({ "rust_analyzer", "nil_ls", "denols", "html", "cssls", "lua_ls", "pylsp" }) vim.lsp.config("*", { - onAttach = function(client, _) - client.server_capabilities.semanticTokensProvider = nil - end, + onAttach = function(client, _) + client.server_capabilities.semanticTokensProvider = nil + end, }) -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#lua_ls vim.lsp.config("lua_ls", { - on_init = function(client) - if client.workspace_folders then - local path = client.workspace_folders[1].name - if - path ~= vim.fn.stdpath("config") - and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc")) - then - return - end - end + on_init = function(client) + if client.workspace_folders then + local path = client.workspace_folders[1].name + if + path ~= vim.fn.stdpath("config") + and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc")) + then + return + end + end - client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, { - runtime = { - -- Tell the language server which version of Lua you're using (most - -- likely LuaJIT in the case of Neovim) - version = "LuaJIT", - -- Tell the language server how to find Lua modules same way as Neovim - -- (see `:h lua-module-load`) - path = { - "lua/?.lua", - "lua/?/init.lua", - }, - }, - -- Make the server aware of Neovim runtime files - workspace = { - checkThirdParty = false, - library = { - vim.env.VIMRUNTIME, - -- Depending on the usage, you might want to add additional paths - -- here. - -- '${3rd}/luv/library', - -- '${3rd}/busted/library', - }, - -- Or pull in all of 'runtimepath'. - -- NOTE: this is a lot slower and will cause issues when working on - -- your own configuration. - -- See https://github.com/neovim/nvim-lspconfig/issues/3189 - -- library = vim.api.nvim_get_runtime_file('', true), - }, - }) - end, - settings = { - Lua = {}, - }, + client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, { + runtime = { + -- Tell the language server which version of Lua you're using (most + -- likely LuaJIT in the case of Neovim) + version = "LuaJIT", + -- Tell the language server how to find Lua modules same way as Neovim + -- (see `:h lua-module-load`) + path = { + "lua/?.lua", + "lua/?/init.lua", + }, + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + -- Depending on the usage, you might want to add additional paths + -- here. + -- '${3rd}/luv/library', + -- '${3rd}/busted/library', + }, + -- Or pull in all of 'runtimepath'. + -- NOTE: this is a lot slower and will cause issues when working on + -- your own configuration. + -- See https://github.com/neovim/nvim-lspconfig/issues/3189 + -- library = vim.api.nvim_get_runtime_file('', true), + }, + }) + end, + settings = { + Lua = {}, + }, }) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index b703960..4da5844 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -19,3 +19,6 @@ vim.opt.ignorecase = true; vim.opt.smartcase = true; vim.opt.autochdir = true; vim.opt.colorcolumn = "80"; + +vim.wo.foldlevel = 99 +vim.wo.conceallevel = 2 diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua index 4e890f5..7d2f14f 100644 --- a/nvim/lua/plugins/colorscheme.lua +++ b/nvim/lua/plugins/colorscheme.lua @@ -1,8 +1,17 @@ return { - "miikanissi/modus-themes.nvim", - version = "*", - priority = 1000, - opts = { - style = "modus_vivendi", -- só quero o tema escuro - }, + { + "miikanissi/modus-themes.nvim", + version = "*", + priority = 1000, + opts = { + style = "modus_vivendi", -- só quero o tema escuro + }, + }, + { + "rebelot/kanagawa.nvim", -- neorg needs a colorscheme with treesitter support + version = "*", + opts = { + theme = "lotus", -- só quero o tema claro + }, + }, } diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 704d5c7..6d53fd8 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -29,6 +29,7 @@ return { "typescript", "javascript", "lua", + "norg", }, incremental_selection = { enable = true, diff --git a/nvim/lua/plugins/neorg.lua b/nvim/lua/plugins/neorg.lua new file mode 100644 index 0000000..d25407f --- /dev/null +++ b/nvim/lua/plugins/neorg.lua @@ -0,0 +1,20 @@ +return { + "nvim-neorg/neorg", + lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default + version = "*", -- Pin Neorg to the latest stable release + config = true, + opts = { + load = { + ["core.defaults"] = {}, + ["core.concealer"] = {}, + ["core.dirman"] = { + config = { + workspaces = { + notas = "~/notas", + }, + default_workspace = "notas", + }, + }, + }, + }, +} -- cgit v1.2.3