From 7cba51f217b2f88f0f0b8bef14d0c5ac9df14361 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 13 May 2022 21:32:20 +0200 Subject: [PATCH] Quality of life --- apps/X11/config/Xresources | 93 ++++++++++------ apps/kitty/config/kitty/kitty.conf | 103 +++++++----------- apps/picom/config/picom/picom.conf | 2 +- dwm/dwm | 2 +- .../config/nvim.ln/lua/lsp/lsp-install.lua | 2 +- nvim/nvim/config/nvim.ln/lua/plugins.lua | 8 +- nvim/nvim/config/nvim.ln/lua/settings.lua | 4 +- .../nvim.ln/lua/treesitter/treesitter.lua | 2 +- .../config/nvim.ln/lua/utils/gitsigns.lua | 2 +- .../config/nvim.ln/lua/windows/trouble.lua | 1 + .../config/nvim.ln/lua/windows/which-key.lua | 8 +- 11 files changed, 113 insertions(+), 114 deletions(-) diff --git a/apps/X11/config/Xresources b/apps/X11/config/Xresources index 695bd91..2b6609b 100644 --- a/apps/X11/config/Xresources +++ b/apps/X11/config/Xresources @@ -1,44 +1,67 @@ -/* Copyright © Blacksuan19 @ 2020 - Part of Material Ocean Theme - Licensed Under GNU's GPL3 -*/ +! TokyoNight colors for Xresources -! special -*foreground: #d8dee9 -*background: #0f111a -*accent: #FF4151 -*secondary: #88C0D0 -*border: #3a575c -*cursorColor: #d8dee9 +*background: #1a1b26 +*foreground: #c0caf5 -! black -*color0: #3b4252 -*color8: #4c566a +*color0: #15161E +*color1: #f7768e +*color2: #9ece6a +*color3: #e0af68 +*color4: #7aa2f7 +*color5: #bb9af7 +*color6: #7dcfff +*color7: #a9b1d6 -! red -*color1: #99343e -*color9: #bf616a +*color8: #414868 +*color9: #f7768e +*color10: #9ece6a +*color11: #e0af68 +*color12: #7aa2f7 +*color13: #bb9af7 +*color14: #7dcfff +*color15: #c0caf5 -! green -*color2: #74be35 -*color10: #a3be8c +! /* Copyright © Blacksuan19 @ 2020 +! Part of Material Ocean Theme +! Licensed Under GNU's GPL3 +! */ -! yellow -*color3: #ffb521 -*color11: #ebcb8b +! ! special +! *foreground: #d8dee9 +! *background: #0f111a +! *accent: #FF4151 +! *secondary: #88C0D0 +! *border: #3a575c +! *cursorColor: #d8dee9 -! blue -*color4: #2e98ff -*color12: #81a1c1 +! ! black +! *color0: #3b4252 +! *color8: #4c566a -! magenta -*color5: #a03c8e -*color13: #b48ead +! ! red +! *color1: #99343e +! *color9: #bf616a -! cyan -*color6: #00ddff -*color14: #8fbcbb +! ! green +! *color2: #74be35 +! *color10: #a3be8c -! white -*color7: #e5e9f0 -*color15: #e7b6de +! ! yellow +! *color3: #ffb521 +! *color11: #ebcb8b + +! ! blue +! *color4: #2e98ff +! *color12: #81a1c1 + +! ! magenta +! *color5: #a03c8e +! *color13: #b48ead + +! ! cyan +! *color6: #00ddff +! *color14: #8fbcbb + +! ! white +! *color7: #e5e9f0 +! *color15: #e7b6de diff --git a/apps/kitty/config/kitty/kitty.conf b/apps/kitty/config/kitty/kitty.conf index 413467b..0d0c9b2 100644 --- a/apps/kitty/config/kitty/kitty.conf +++ b/apps/kitty/config/kitty/kitty.conf @@ -832,82 +832,55 @@ selection_background #fffacd #: remaining 240 colors as color16 to color255. +# Tokyo night +background #1a1b26 +foreground #c0caf5 -foreground #d8dee9 -background #0f111a +color0 #15161E +color1 #f7768e +color2 #9ece6a +color3 #e0af68 +color4 #7aa2f7 +color5 #bb9af7 +color6 #7dcfff +color7 #a9b1d6 -color0 #3b4252 -color8 #4c566a +color8 #414868 +color9 #f7768e +color10 #9ece6a +color11 #e0af68 +color12 #7aa2f7 +color13 #bb9af7 +color14 #7dcfff +color15 #c0caf5 +# Deep ocean +# foreground #d8dee9 +# background #0f111a -color1 #99343e -color9 #bf616a +# color0 #3b4252 +# color8 #4c566a -color2 #74BE35 -color10 #a3be8c +# color1 #99343e +# color9 #bf616a -color3 #FFB521 -color11 #ebcb8b +# color2 #74BE35 +# color10 #a3be8c -color4 #2E98FF -color12 #81a1c1 +# color3 #FFB521 +# color11 #ebcb8b -color5 #a03c8e -color13 #b48ead +# color4 #2E98FF +# color12 #81a1c1 -color6 #00DDFF -color14 #8fbcbb +# color5 #a03c8e +# color13 #b48ead -color7 #e5e9f0 -color15 #e7b6de +# color6 #00DDFF +# color14 #8fbcbb +# color7 #e5e9f0 +# color15 #e7b6de -# color0 #3B4252 -# color8 #4C566A -# #: black. Default was: -# # color0 #000000 -# # color8 #767676 - -# color1 #BF616A -# color9 #BF616A -# #: red. Default was: -# # color1 #cc0403 -# # color9 #f2201f - -# color2 #A3BE8C -# color10 #A3BE8C -# #: green. Default was: -# #color2 #19cb00 -# #color10 #23fd00 - -# color3 #EBCB8B -# color11 #EBCB8B -# #: yellow. Default was: -# # color3 #cecb00 -# # color11 #fffd00 - -# color4 #81A1C1 -# color12 #81A1C1 -# #: blue. Default was: -# # color4 #0d73cc -# # color12 #1a8fff - -# color5 #B48EAD -# color13 #B48EAD -# #: magenta. Default was: -# # color5 #cb1ed1 -# # color13 #fd28ff - -# color6 #88C0D0 -# color14 #8FBCBB -# #: cyan. Default was: -# #color6 #0dcdcd -# #color14 #14ffff - -# color7 #E5E9F0 -# color15 #B48EAD -# #: white. Default was: -# #color7 #dddddd -# #color15 #ffffff mark1_foreground black diff --git a/apps/picom/config/picom/picom.conf b/apps/picom/config/picom/picom.conf index 67843d3..77ec136 100644 --- a/apps/picom/config/picom/picom.conf +++ b/apps/picom/config/picom/picom.conf @@ -3,7 +3,7 @@ ################################# # requires: https://github.com/sdhand/compton -corner-radius = 20 +# corner-radius = 20 rounded-corners-exclude = [ "class_g = 'dwm'", "class_g = 'dwmsystray'", diff --git a/dwm/dwm b/dwm/dwm index a293057..bf50709 160000 --- a/dwm/dwm +++ b/dwm/dwm @@ -1 +1 @@ -Subproject commit a293057de23d4694dd13e1f154b2db1d98e744e2 +Subproject commit bf50709a2cc3f90b465c6bf0059e5a853449d4d7 diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua b/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua index 333c369..f5e3feb 100644 --- a/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua +++ b/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua @@ -41,6 +41,7 @@ local server_settings = { robotframework_ls = { settings = { robot = { + codeFormatter = "robotidy", variables = { RESOURCES = vim.fn.getcwd() .. "/tests/robot/", }, @@ -70,4 +71,3 @@ lsp_installer.on_server_ready(function(server) end server:setup(opts) end) - diff --git a/nvim/nvim/config/nvim.ln/lua/plugins.lua b/nvim/nvim/config/nvim.ln/lua/plugins.lua index 2e4e23b..5c4d322 100644 --- a/nvim/nvim/config/nvim.ln/lua/plugins.lua +++ b/nvim/nvim/config/nvim.ln/lua/plugins.lua @@ -52,7 +52,7 @@ return packer.startup(function(use) use { "airblade/vim-rooter", config = function() vim.g.rooter_manual_only = 1 end } use { "Pocco81/AutoSave.nvim", config = function() require "autosave".setup() end } - use { "AckslD/nvim-gfold.lua", branch = "fix-recursive-settings" } + use { "AckslD/nvim-gfold.lua" } use { "lewis6991/spellsitter.nvim" } use {'psliwka/vim-dirtytalk', run = ':DirtytalkUpdate'} @@ -70,13 +70,13 @@ return packer.startup(function(use) 'stevearc/dressing.nvim', } - use { "folke/trouble.nvim", requires = "kyazdani42/nvim-web-devicons" } + -- use { "folke/trouble.nvim", requires = "kyazdani42/nvim-web-devicons" } + use { "git@github.com:AnonymusRaccoon/trouble.nvim", requires = "kyazdani42/nvim-web-devicons" } use { 'kevinhwang91/nvim-bqf' } use "folke/which-key.nvim" use "akinsho/toggleterm.nvim" - -- use "metakirby5/codi.vim" - use "~/projects/codi.vim" + use "metakirby5/codi.vim" use "kyazdani42/nvim-tree.lua" use "nvim-lualine/lualine.nvim" diff --git a/nvim/nvim/config/nvim.ln/lua/settings.lua b/nvim/nvim/config/nvim.ln/lua/settings.lua index 2b5335b..e89944a 100644 --- a/nvim/nvim/config/nvim.ln/lua/settings.lua +++ b/nvim/nvim/config/nvim.ln/lua/settings.lua @@ -69,8 +69,8 @@ keymap("c", "", "", opts) keymap("n", "y", '"+y', opts) keymap("x", "y", '"+y', opts) -keymap("n", "Y", '"+Y', opts) -keymap("x", "Y", '"+Y', opts) +keymap("n", "Y", '"+y$', opts) +keymap("x", "Y", '"+y$', opts) keymap("n", "p", '"+p', opts) keymap("x", "p", '"+p', opts) diff --git a/nvim/nvim/config/nvim.ln/lua/treesitter/treesitter.lua b/nvim/nvim/config/nvim.ln/lua/treesitter/treesitter.lua index fe8a3ef..36f8ca2 100644 --- a/nvim/nvim/config/nvim.ln/lua/treesitter/treesitter.lua +++ b/nvim/nvim/config/nvim.ln/lua/treesitter/treesitter.lua @@ -12,7 +12,7 @@ configs.setup({ }, indent = { enable = true, - disable = {}, + disable = { "yaml" }, }, context_commentstring = { enable = true, diff --git a/nvim/nvim/config/nvim.ln/lua/utils/gitsigns.lua b/nvim/nvim/config/nvim.ln/lua/utils/gitsigns.lua index 9f89e76..b8a1457 100644 --- a/nvim/nvim/config/nvim.ln/lua/utils/gitsigns.lua +++ b/nvim/nvim/config/nvim.ln/lua/utils/gitsigns.lua @@ -28,7 +28,7 @@ wk.register({ p = { "lua require 'gitsigns'.preview_hunk()", "Preview Hunk" }, r = { "lua require 'gitsigns'.reset_hunk()", "Reset Hunk" }, R = { "lua require 'gitsigns'.reset_buffer()", "Reset Buffer" }, - a = { "Gitsigns stage_buffer", "Add buffer" }, + a = { "Gitsigns stage_hunk", "Add Hunk" }, }, }, { prefix = "", diff --git a/nvim/nvim/config/nvim.ln/lua/windows/trouble.lua b/nvim/nvim/config/nvim.ln/lua/windows/trouble.lua index 8a52609..803d64d 100644 --- a/nvim/nvim/config/nvim.ln/lua/windows/trouble.lua +++ b/nvim/nvim/config/nvim.ln/lua/windows/trouble.lua @@ -5,6 +5,7 @@ end trouble.setup({ auto_close = false, + min_severity = "Warning", }) local wk = require("which-key") diff --git a/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua b/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua index 125049f..3d9407e 100644 --- a/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua +++ b/nvim/nvim/config/nvim.ln/lua/windows/which-key.lua @@ -6,12 +6,14 @@ end vim.opt["timeoutlen"] = 500 wk.setup({ + plugins = { + spelling = { + enabled = true, + }, + }, window = { border = "rounded", }, - spelling = { - enabled = false, - }, operators = { gc = "Comments", ys = "Add Surroundings",