From bc3bf46b57986506d35f2d18e80e1b6ff71bf841 Mon Sep 17 00:00:00 2001 From: Tiago Sousa Date: Mon, 5 Feb 2024 11:39:39 +0000 Subject: [PATCH 1/8] delete lazylock --- .config/nvim/lazy-lock.json | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .config/nvim/lazy-lock.json diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json deleted file mode 100644 index d11be55..0000000 --- a/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "cloak.nvim": { "branch": "main", "commit": "951b163e55ce7639eb320c450bde9283c4fe968b" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "copilot.vim": { "branch": "release", "commit": "22fd9542e3c47552abab5e685fefd760e4f405b2" }, - "dressing.nvim": { "branch": "master", "commit": "0e88293ce3459f4bb310125f3366304af6dc7990" }, - "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" }, - "gruvbox.nvim": { "branch": "main", "commit": "4176b0b720db0c90ab4030e5c1b4893faf41fd51" }, - "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, - "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" }, - "none-ls.nvim": { "branch": "main", "commit": "912f81829e9ab4ee3d54c3ea5a304c264f0003bc" }, - "nvim": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, - "nvim-treesitter": { "branch": "master", "commit": "d4dac523d2546afc266eb9b5a7986690b5319c41" }, - "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, - "orgmode": { "branch": "master", "commit": "ab045e3084d5987e8939d25d69b09baaf762278c" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, - "telescope.nvim": { "branch": "master", "commit": "2f3857c25bbd00ed7ac593c9d4071906369e4d20" }, - "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, - "undotree": { "branch": "master", "commit": "d9c8b4ef872e078e8c4080812e5a3ed56d151c00" }, - "vim-fugitive": { "branch": "master", "commit": "f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } -} \ No newline at end of file From 92e8fe2e17cdb23ab71630c75ee47a4642da1767 Mon Sep 17 00:00:00 2001 From: tiago Date: Tue, 6 Feb 2024 22:09:01 +0000 Subject: [PATCH 2/8] started using xresources for st term colors, maybe should do other programs like i3 --- .Xresources | 22 ++++++++++++++++++++++ .config/tmux/tmux.conf | 2 +- .local/share/scripts/tmux-sessionizer.sh | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .Xresources diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..9fd143f --- /dev/null +++ b/.Xresources @@ -0,0 +1,22 @@ +! catppuccin color scheme +*.color0: #494D64 +*.color1: #ED8796 +*.color2: #A6DA95 +*.color3: #EED49F +*.color4: #8AADF4 +*.color5: #F5BDE6 +*.color6: #8BD5CA +*.color7: #B8C0E0 +*.color8: #5B6078 +*.color9: #ED8796 +*.color10: #A6DA95 +*.color11: #EED49F +*.color12: #8AADF4 +*.color13: #F5BDE6 +*.color14: #8BD5CA +*.color15: #A5ADCB +*.background: #24273A +*.foreground: #CAD3F5 +*.cursorColor: #F4DBD6 + +! gruvbox color scheme diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 9837fa3..df3692e 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,5 +1,5 @@ set -g default-terminal "tmux-256color" -set -ag terminal-overrides ",xterm-256color:RGB" +set -ag terminal-overrides ",*:RGB" unbind C-b set-option -g prefix C-a diff --git a/.local/share/scripts/tmux-sessionizer.sh b/.local/share/scripts/tmux-sessionizer.sh index 87feb68..20f838b 100755 --- a/.local/share/scripts/tmux-sessionizer.sh +++ b/.local/share/scripts/tmux-sessionizer.sh @@ -4,7 +4,7 @@ if [[ $# -eq 1 ]]; then selected=$1 else - selected=$(find ~/.config ~/gits ~/2sem ~/ -mindepth 1 -maxdepth 1 -type d,l | fzf) + selected=$(find ~/Nextcloud ~/.config ~/gits ~/2sem ~/ -mindepth 1 -maxdepth 1 -type d,l | fzf) fi if [[ -z "$selected" ]]; then From 0388b96afbb0c8b8191c771b3b966b58a07f6468 Mon Sep 17 00:00:00 2001 From: tiago Date: Thu, 8 Feb 2024 11:23:23 +0000 Subject: [PATCH 3/8] fixed picom high cpu bug --- .Xresources | 36 +++++++++++++++++++++++++-------- .config/i3/config | 5 +++-- .local/share/scripts/monitor.sh | 3 +++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.Xresources b/.Xresources index 9fd143f..666c1c1 100644 --- a/.Xresources +++ b/.Xresources @@ -1,22 +1,42 @@ ! catppuccin color scheme *.color0: #494D64 -*.color1: #ED8796 -*.color2: #A6DA95 -*.color3: #EED49F -*.color4: #8AADF4 -*.color5: #F5BDE6 -*.color6: #8BD5CA -*.color7: #B8C0E0 *.color8: #5B6078 +*.color1: #ED8796 *.color9: #ED8796 +*.color2: #A6DA95 *.color10: #A6DA95 +*.color3: #EED49F *.color11: #EED49F +*.color4: #8AADF4 *.color12: #8AADF4 +*.color5: #F5BDE6 *.color13: #F5BDE6 +*.color6: #8BD5CA *.color14: #8BD5CA +*.color7: #B8C0E0 *.color15: #A5ADCB *.background: #24273A *.foreground: #CAD3F5 *.cursorColor: #F4DBD6 -! gruvbox color scheme +! gruvbox light color scheme +! contrast alternative #FBF1C7 +!*.color0: #F9F5D7 +!*.color8: #928374 +!*.color1: #CC241D +!*.color9: #9D0006 +!*.color2: #98971A +!*.color10: #79740E +!*.color3: #D79921 +!*.color11: #B57614 +!*.color4: #458588 +!*.color12: #076678 +!*.color5: #B16286 +!*.color13: #8F3F71 +!*.color6: #689D6A +!*.color14: #427B58 +!*.color7: #7C6F64 +!*.color15: #3C3836 +!*.background: #F9F5D7 +!*.foreground: #3C3836 +!*.cursorColor: #3C3836 diff --git a/.config/i3/config b/.config/i3/config index feb6c2c..b6d81be 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -11,7 +11,7 @@ set $mod Mod1 set $mod2 Mod4 set $browser firefox -set $terminal alacritty +set $terminal st # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. @@ -231,7 +231,8 @@ assign [class="discord"] 5 exec --no-startup-id nextcloud exec --no-startup-id nitrogen --restore exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec $terminal' -exec --no-startup-id picom -b exec --no-startup-id openrgb -d 0 -m off -d 1 -m off +# sets up monitors and picom +exec_always --no-startup-id ~/.local/share/scripts/monitor.sh exec_always --no-startup-id ~/.config/polybar/launch.sh diff --git a/.local/share/scripts/monitor.sh b/.local/share/scripts/monitor.sh index 296c77d..33cae4d 100755 --- a/.local/share/scripts/monitor.sh +++ b/.local/share/scripts/monitor.sh @@ -11,3 +11,6 @@ else xrandr --output HDMI-1-0 --above eDP-1 xrandr --output HDMI-1-0 --primary fi + +pkill picom +picom -b From 6110d93076eab39f7183aae485bac86ab607c58c Mon Sep 17 00:00:00 2001 From: tiago Date: Thu, 8 Feb 2024 15:03:11 +0000 Subject: [PATCH 4/8] added rust analyzer to lspconfig --- .../nvim/lua/tsousa/plugins/colorscheme.lua | 11 +++-- .config/nvim/lua/tsousa/plugins/lsp.lua | 47 +++++++------------ 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/.config/nvim/lua/tsousa/plugins/colorscheme.lua b/.config/nvim/lua/tsousa/plugins/colorscheme.lua index 09042d2..af4afc5 100644 --- a/.config/nvim/lua/tsousa/plugins/colorscheme.lua +++ b/.config/nvim/lua/tsousa/plugins/colorscheme.lua @@ -1,6 +1,6 @@ -local colour = "catppuccin" -function SetColour() - vim.cmd.colorscheme(colour) +local color = "catppuccin" +function SetColor() + vim.cmd.colorscheme(color) end return { @@ -20,13 +20,14 @@ return { treesitter_context = true, fidget = true, }, - SetColour() + SetColor() }) end }, { "ellisonleao/gruvbox.nvim", + priority = 1000, config = function() require("gruvbox").setup({ italic = { @@ -37,7 +38,7 @@ return { }, transparent_mode = true, }) - SetColour() + SetColor() end }, } diff --git a/.config/nvim/lua/tsousa/plugins/lsp.lua b/.config/nvim/lua/tsousa/plugins/lsp.lua index a5e4e4b..7c553f5 100644 --- a/.config/nvim/lua/tsousa/plugins/lsp.lua +++ b/.config/nvim/lua/tsousa/plugins/lsp.lua @@ -104,20 +104,6 @@ return { path = "[path]", }, }, - -- format = function(entry, vim_item) - -- -- Kind icons - -- vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) - -- -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind - -- vim_item.menu = ({ - -- buffer = "[buf]", - -- nvim_lsp = "[LSP]", - -- luasnip = "[snip]", - -- nvim_lsp_signature_help = "[Signature]", - -- nvim_lua = "[lua]", - -- path = "[path]", - -- })[entry.source.name] - -- return vim_item - -- end, }, sources = cmp.config.sources( { @@ -160,18 +146,6 @@ return { cmp.config.compare.order, }, }, - - --confirm_opts = { - -- behavior = cmp.ConfirmBehavior.Replace, - -- select = false, - --}, - -- window = { - -- documentation = cmp.config.window.bordered(), - -- completion = cmp.config.window.bordered({ - -- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None" - -- }) - - -- }, experimental = { ghost_text = true, native_menu = false, @@ -195,15 +169,16 @@ return { } } }) + vim.api.nvim_create_augroup("_mason", { clear = true }) require("mason").setup({ PATH = "skip", ui = { icons = { - package_installed = "✓", - package_pending = "➜", - package_uninstalled = "✗" - }, + package_installed = "", + package_pending = "󱥸", + package_uninstalled = "" + } }, max_concurrent_installers = 10, }) @@ -226,9 +201,19 @@ return { vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) vim.keymap.set('n', ']d', vim.diagnostic.goto_next) + -- external (non mason) lsps + lspconfig.rust_analyzer.setup({ + on_init = on_init, + flags = lsp_flags, + capabilities = capabilities, + cmd = { + "rustup", "run", "stable", "rust-analyzer", + } + }) + mason_lspconfig.setup({ ensure_installed = { - + lua_ls, }, automatic_installation = true, handlers = { From 8a5a751b991f2c6928ec06c724696455bcdfee0e Mon Sep 17 00:00:00 2001 From: tiago Date: Thu, 8 Feb 2024 19:32:01 +0000 Subject: [PATCH 5/8] fixed formatoptions not behaving --- .config/nvim/lua/tsousa/init.lua | 11 +++++++++-- .config/nvim/lua/tsousa/set.lua | 31 +++++++++++++++++-------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.config/nvim/lua/tsousa/init.lua b/.config/nvim/lua/tsousa/init.lua index fbb54c7..b9670c0 100644 --- a/.config/nvim/lua/tsousa/init.lua +++ b/.config/nvim/lua/tsousa/init.lua @@ -1,5 +1,5 @@ -require("tsousa.remap") require("tsousa.set") +require("tsousa.remap") require("tsousa.lazy") local augroup = vim.api.nvim_create_augroup @@ -12,6 +12,14 @@ function R(name) require("plenary.reload").reload_module(name) end +autocmd('BufWinEnter',{ + group= TsousaGroup, + pattern = '*', + callback = function() + vim.opt.formatoptions:remove('o') + end +}) + autocmd('TextYankPost', { group = yank_group, pattern = '*', @@ -46,7 +54,6 @@ autocmd("LspAttach", { end }) - vim.g.netrw_browse_split = 0 vim.g.netrw_banner = 0 vim.g.netrw_winsize = 25 diff --git a/.config/nvim/lua/tsousa/set.lua b/.config/nvim/lua/tsousa/set.lua index 9a0d575..2a0b1e1 100644 --- a/.config/nvim/lua/tsousa/set.lua +++ b/.config/nvim/lua/tsousa/set.lua @@ -1,6 +1,10 @@ -vim.opt.guicursor="" +vim.opt.wildignore = "__pycache__" +vim.opt.wildignore:append { "*.o", "*~", "*.pyc", "*pycache*" } +vim.opt.wildignore:append { "Cargo.lock", "Cargo.Bazel.lock" } -vim.opt.nu = true +vim.opt.guicursor = "" + +vim.opt.number = true vim.opt.relativenumber = true vim.opt.errorbells = false @@ -22,7 +26,7 @@ vim.opt.showmode = false vim.opt.hlsearch = false vim.opt.incsearch = true - +vim.opt.showmatch = true vim.opt.termguicolors = true vim.opt.scrolloff = 8 @@ -31,15 +35,15 @@ vim.opt.isfname:append("@-@") -- from tj devries vim.opt.formatoptions = vim.opt.formatoptions - - "a" -- Auto formatting is BAD. - - "t" -- Don't auto format my code. I got linters for that. - + "c" -- In general, I like it when comments respect textwidth - + "q" -- Allow formatting comments w/ gq - - "o" -- O and o, don't continue comments - + "r" -- But do continue when pressing enter. - + "n" -- Indent past the formatlistpat, not underneath it. - + "j" -- Auto-remove comments if possible. - - "2" -- I'm not in gradeschool anymore + - "o" -- O and o, don't continue comments + - "a" -- Auto formatting is BAD. + - "t" -- Don't auto format my code. I got linters for that. + - "2" -- I'm not in gradeschool anymore + + "c" -- In general, I like it when comments respect textwidth + + "q" -- Allow formatting comments w/ gq + + "r" -- But do continue when pressing enter. + + "n" -- Indent past the formatlistpat, not underneath it. + + "j" -- Auto-remove comments if possible. -- Give more space for displaying messages. vim.opt.cmdheight = 1 @@ -51,7 +55,6 @@ vim.opt.updatetime = 50 -- Don't pass messages to |ins-completion-menu|. vim.opt.shortmess:append("c") -vim.opt.colorcolumn="80" +vim.opt.colorcolumn = "80" vim.g.mapleader = " " - From 8960bee49a7bc5c1b2a8acb6ff4cd68e554a82f6 Mon Sep 17 00:00:00 2001 From: tiago Date: Thu, 8 Feb 2024 19:36:20 +0000 Subject: [PATCH 6/8] removed trasparency from popup menus --- .Xresources | 48 ++++++++++-- .config/picom/picom.conf | 162 +++++++++++++++++++-------------------- 2 files changed, 121 insertions(+), 89 deletions(-) diff --git a/.Xresources b/.Xresources index 666c1c1..e484476 100644 --- a/.Xresources +++ b/.Xresources @@ -1,4 +1,7 @@ ! catppuccin color scheme +*.background: #24273A +*.foreground: #CAD3F5 +*.cursorColor: #F4DBD6 *.color0: #494D64 *.color8: #5B6078 *.color1: #ED8796 @@ -15,12 +18,44 @@ *.color14: #8BD5CA *.color7: #B8C0E0 *.color15: #A5ADCB -*.background: #24273A -*.foreground: #CAD3F5 -*.cursorColor: #F4DBD6 -! gruvbox light color scheme -! contrast alternative #FBF1C7 +! gruvbox dark color scheme +! hard contrast: +! *.background: #1D2021 +! soft contrast: +! *.background: #32302F +! deafult contrast: +! *.background: #282828 +! *.foreground: #EBDBB2 +! *.cursorColor: #EBDBB2 +! *.color0: #282828 +! *.color8: #928374 +! *.color1: #CC241D +! *.color9: #FB4934 +! *.color2: #98971A +! *.color10: #B8BB26 +! *.color3: #D79921 +! *.color11: #FABD2F +! *.color4: #458588 +! *.color12: #83A598 +! *.color5: #B16286 +! *.color13: #D3869B +! *.color6: #689D6A +! *.color14: #8EC07C +! *.color7: #A89984 +! *.color15: #EBDBB2 + + + +!! gruvbox light color scheme +!! hard contrast: +!! *.background: #F9F5D7 +!! soft contrast: +!! *.background: #F2E5BC +!! default contrast: +!*.background: #FBF1C7 +!*.foreground: #3C3836 +!*.cursorColor: #3C3836 !*.color0: #F9F5D7 !*.color8: #928374 !*.color1: #CC241D @@ -37,6 +72,3 @@ !*.color14: #427B58 !*.color7: #7C6F64 !*.color15: #3C3836 -!*.background: #F9F5D7 -!*.foreground: #3C3836 -!*.cursorColor: #3C3836 diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index ccf4216..8269d67 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -3,7 +3,7 @@ ################################# # requires https://github.com/jonaburg/picom # (These are also the default values) -transition-length = 0 +transition-length = 0 transition-pow-x = 0.1 transition-pow-y = 0.1 transition-pow-w = 0.1 @@ -38,8 +38,8 @@ round-borders-exclude = [ ################################# -# Enabled client-side shadows on windows. Note desktop windows -# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, +# Enabled client-side shadows on windows. Note desktop windows +# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, # unless explicitly requested using the wintypes option. # # shadow = false @@ -65,7 +65,7 @@ shadow-offset-y = -7; # # no-dock-shadow = false -# Don't draw shadows on drag-and-drop windows. This option is deprecated, +# Don't draw shadows on drag-and-drop windows. This option is deprecated, # you should use the *wintypes* option in your config file instead. # # no-dnd-shadow = false @@ -79,12 +79,12 @@ shadow-offset-y = -7; # Blue color value of shadow (0.0 - 1.0, defaults to 0). # shadow-blue = 0 -# Do not paint shadows on shaped windows. Note shaped windows -# here means windows setting its shape through X Shape extension. -# Those using ARGB background is beyond our control. -# Deprecated, use +# Do not paint shadows on shaped windows. Note shaped windows +# here means windows setting its shape through X Shape extension. +# Those using ARGB background is beyond our control. +# Deprecated, use # shadow-exclude = 'bounding_shaped' -# or +# or # shadow-exclude = 'bounding_shaped && !rounded_corners' # instead. # @@ -107,11 +107,11 @@ shadow-exclude = [ ]; # Specify a X geometry that describes the region in which shadow should not -# be painted in, such as a dock window region. Use +# be painted in, such as a dock window region. Use # shadow-exclude-reg = "x10+0+0" # for example, if the 10 pixels on the bottom of the screen should not have shadows painted on. # -# shadow-exclude-reg = "" +# shadow-exclude-reg = "" # Crop shadow of a window fully on a particular Xinerama screen to the screen. # xinerama-shadow-crop = false @@ -165,7 +165,7 @@ inactive-opacity = 1; frame-opacity = 0.7; # Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) -# menu-opacity = 1.0 +# menu-opacity = 1.0 # menu-opacity is depreciated use dropdown-menu and popup-menu instead. #If using these 2 below change their values in line 510 & 511 aswell @@ -194,9 +194,9 @@ focus-exclude = [ # Use fixed inactive dim value, instead of adjusting according to window opacity. # inactive-dim-fixed = 1.0 -# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, -# like `50:name *= "Firefox"`. picom-trans is recommended over this. -# Note we don't make any guarantee about possible conflicts with other +# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, +# like `50:name *= "Firefox"`. picom-trans is recommended over this. +# Note we don't make any guarantee about possible conflicts with other # programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows. # example: # opacity-rule = [ "80:class_g = 'URxvt'" ]; @@ -216,20 +216,20 @@ opacity-rule = [ # Parameters for background blurring, see the *BLUR* section for more information. -# blur-method = +# blur-method = # blur-size = 12 # # blur-deviation = false -# Blur background of semi-transparent / ARGB windows. -# Bad in performance, with driver-dependent behavior. +# Blur background of semi-transparent / ARGB windows. +# Bad in performance, with driver-dependent behavior. # The name of the switch may change without prior notifications. # # blur-background = true; -# Blur background of windows when the window frame is not opaque. +# Blur background of windows when the window frame is not opaque. # Implies: -# blur-background +# blur-background # Bad in performance, with driver-dependent behavior. The name may change. # # blur-background-frame = false; @@ -295,7 +295,7 @@ vsync = true # Enable remote control via D-Bus. See the *D-BUS API* section below for more details. # dbus = false -# Try to detect WM windows (a non-override-redirect window with no +# Try to detect WM windows (a non-override-redirect window with no # child that has 'WM_STATE') and mark them as active. # # mark-wmwin-focused = false @@ -305,7 +305,7 @@ mark-wmwin-focused = true; # mark-ovredir-focused = false mark-ovredir-focused = true; -# Try to detect windows with rounded corners and don't consider them +# Try to detect windows with rounded corners and don't consider them # shaped windows. The accuracy is not very high, unfortunately. # # detect-rounded-corners = false @@ -317,28 +317,28 @@ detect-rounded-corners = true; # detect-client-opacity = false detect-client-opacity = true; -# Specify refresh rate of the screen. If not specified or 0, picom will +# Specify refresh rate of the screen. If not specified or 0, picom will # try detecting this with X RandR extension. # # refresh-rate = 60 refresh-rate = 0 -# Limit picom to repaint at most once every 1 / 'refresh_rate' second to -# boost performance. This should not be used with +# Limit picom to repaint at most once every 1 / 'refresh_rate' second to +# boost performance. This should not be used with # vsync drm/opengl/opengl-oml -# as they essentially does sw-opti's job already, +# as they essentially does sw-opti's job already, # unless you wish to specify a lower refresh rate than the actual value. # -# sw-opti = +# sw-opti = -# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, -# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, +# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, +# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, # provided that the WM supports it. # # use-ewmh-active-win = false -# Unredirect all windows if a full-screen opaque window is detected, -# to maximize performance for full-screen windows. Known to cause flickering +# Unredirect all windows if a full-screen opaque window is detected, +# to maximize performance for full-screen windows. Known to cause flickering # when redirecting/unredirecting windows. paint-on-overlay may make the flickering less obvious. # # unredir-if-possible = false @@ -349,52 +349,52 @@ refresh-rate = 0 # Conditions of windows that shouldn't be considered full-screen for unredirecting screen. # unredir-if-possible-exclude = [] -# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows +# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows # in the same group focused at the same time. # # detect-transient = false detect-transient = true -# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same -# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if +# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same +# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if # detect-transient is enabled, too. # # detect-client-leader = false detect-client-leader = true -# Resize damaged region by a specific number of pixels. -# A positive value enlarges it while a negative one shrinks it. -# If the value is positive, those additional pixels will not be actually painted -# to screen, only used in blur calculation, and such. (Due to technical limitations, -# with use-damage, those pixels will still be incorrectly painted to screen.) -# Primarily used to fix the line corruption issues of blur, -# in which case you should use the blur radius value here -# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, -# with a 5x5 one you use `--resize-damage 2`, and so on). +# Resize damaged region by a specific number of pixels. +# A positive value enlarges it while a negative one shrinks it. +# If the value is positive, those additional pixels will not be actually painted +# to screen, only used in blur calculation, and such. (Due to technical limitations, +# with use-damage, those pixels will still be incorrectly painted to screen.) +# Primarily used to fix the line corruption issues of blur, +# in which case you should use the blur radius value here +# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, +# with a 5x5 one you use `--resize-damage 2`, and so on). # May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly. # # resize-damage = 1 -# Specify a list of conditions of windows that should be painted with inverted color. +# Specify a list of conditions of windows that should be painted with inverted color. # Resource-hogging, and is not well tested. # # invert-color-include = [] -# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. -# Might cause incorrect opacity when rendering transparent content (but never -# practically happened) and may not work with blur-background. +# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. +# Might cause incorrect opacity when rendering transparent content (but never +# practically happened) and may not work with blur-background. # My tests show a 15% performance boost. Recommended. # # glx-no-stencil = false -# GLX backend: Avoid rebinding pixmap on window damage. -# Probably could improve performance on rapid window content changes, +# GLX backend: Avoid rebinding pixmap on window damage. +# Probably could improve performance on rapid window content changes, # but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). # Recommended if it works. # # glx-no-rebind-pixmap = false -# Disable the use of damage information. +# Disable the use of damage information. # This cause the whole screen to be redrawn everytime, instead of the part of the screen # has actually changed. Potentially degrades the performance, but might fix some artifacts. # The opposing option is use-damage @@ -404,31 +404,31 @@ detect-client-leader = true #Changing use-damage to false fixes the problem use-damage = false -# Use X Sync fence to sync clients' draw calls, to make sure all draw -# calls are finished before picom starts drawing. Needed on nvidia-drivers +# Use X Sync fence to sync clients' draw calls, to make sure all draw +# calls are finished before picom starts drawing. Needed on nvidia-drivers # with GLX backend for some users. # # xrender-sync-fence = false -# GLX backend: Use specified GLSL fragment shader for rendering window contents. -# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` +# GLX backend: Use specified GLSL fragment shader for rendering window contents. +# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` # in the source tree for examples. # # glx-fshader-win = '' -# Force all windows to be painted with blending. Useful if you +# Force all windows to be painted with blending. Useful if you # have a glx-fshader-win that could turn opaque pixels transparent. # # force-win-blend = false -# Do not use EWMH to detect fullscreen windows. +# Do not use EWMH to detect fullscreen windows. # Reverts to checking if a window is fullscreen based only on its size and coordinates. # # no-ewmh-fullscreen = false -# Dimming bright windows so their brightness doesn't exceed this set value. -# Brightness of a window is estimated by averaging all pixels in the window, -# so this could comes with a performance hit. +# Dimming bright windows so their brightness doesn't exceed this set value. +# Brightness of a window is estimated by averaging all pixels in the window, +# so this could comes with a performance hit. # Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) # # max-brightness = 1.0 @@ -440,17 +440,17 @@ use-damage = false # Set the log level. Possible values are: # "trace", "debug", "info", "warn", "error" -# in increasing level of importance. Case doesn't matter. -# If using the "TRACE" log level, it's better to log into a file +# in increasing level of importance. Case doesn't matter. +# If using the "TRACE" log level, it's better to log into a file # using *--log-file*, since it can generate a huge stream of logs. # # log-level = "debug" log-level = "info"; # Set the log file. -# If *--log-file* is never specified, logs will be written to stderr. -# Otherwise, logs will to written to the given file, though some of the early -# logs might still be written to the stderr. +# If *--log-file* is never specified, logs will be written to stderr. +# Otherwise, logs will to written to the given file, though some of the early +# logs might still be written to the stderr. # When setting this option from the config file, it is recommended to use an absolute path. # # log-file = '/path/to/your/log/file' @@ -462,33 +462,33 @@ log-level = "info"; # write-pid-path = '/path/to/your/log/file' # Window type settings -# -# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: -# "unknown", "desktop", "dock", "toolbar", "menu", "utility", -# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", +# +# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: +# "unknown", "desktop", "dock", "toolbar", "menu", "utility", +# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", # "tooltip", "notification", "combo", and "dnd". -# +# # Following per window-type options are available: :: -# +# # fade, shadow::: # Controls window-type-specific shadow and fade settings. -# +# # opacity::: # Controls default opacity of the window type. -# +# # focus::: -# Controls whether the window of this type is to be always considered focused. +# Controls whether the window of this type is to be always considered focused. # (By default, all window types except "normal" and "dialog" has this on.) -# +# # full-shadow::: -# Controls whether shadow is drawn under the parts of the window that you -# normally won't be able to see. Useful when the window has parts of it +# Controls whether shadow is drawn under the parts of the window that you +# normally won't be able to see. Useful when the window has parts of it # transparent, and you want shadows in those areas. -# +# # redir-ignore::: -# Controls whether this type of windows should cause screen to become +# Controls whether this type of windows should cause screen to become # redirected again after been unredirected. If you have unredir-if-possible -# set, and doesn't want certain window to cause unnecessary screen redirection, +# set, and doesn't want certain window to cause unnecessary screen redirection, # you can set this to `true`. # wintypes: @@ -497,7 +497,7 @@ wintypes: tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; dock = { shadow = false; } dnd = { shadow = false; } - popup_menu = { opacity = 0.8; } - dropdown_menu = { opacity = 0.8; } + popup_menu = { opacity = 1; } + dropdown_menu = { opacity = 1; } }; From 42ba5de6bb2b8e605e20fba370719c93fb22a39b Mon Sep 17 00:00:00 2001 From: tiago Date: Fri, 9 Feb 2024 19:55:23 +0000 Subject: [PATCH 7/8] xresources now with seperate files for themes --- .Xresources | 77 ++---------------------------- .Xresources.d/catppuccin-macchiato | 20 ++++++++ .Xresources.d/gruvbox-dark | 27 +++++++++++ .Xresources.d/gruvbox-light | 27 +++++++++++ 4 files changed, 77 insertions(+), 74 deletions(-) create mode 100644 .Xresources.d/catppuccin-macchiato create mode 100644 .Xresources.d/gruvbox-dark create mode 100644 .Xresources.d/gruvbox-light diff --git a/.Xresources b/.Xresources index e484476..4c81520 100644 --- a/.Xresources +++ b/.Xresources @@ -1,74 +1,3 @@ -! catppuccin color scheme -*.background: #24273A -*.foreground: #CAD3F5 -*.cursorColor: #F4DBD6 -*.color0: #494D64 -*.color8: #5B6078 -*.color1: #ED8796 -*.color9: #ED8796 -*.color2: #A6DA95 -*.color10: #A6DA95 -*.color3: #EED49F -*.color11: #EED49F -*.color4: #8AADF4 -*.color12: #8AADF4 -*.color5: #F5BDE6 -*.color13: #F5BDE6 -*.color6: #8BD5CA -*.color14: #8BD5CA -*.color7: #B8C0E0 -*.color15: #A5ADCB - -! gruvbox dark color scheme -! hard contrast: -! *.background: #1D2021 -! soft contrast: -! *.background: #32302F -! deafult contrast: -! *.background: #282828 -! *.foreground: #EBDBB2 -! *.cursorColor: #EBDBB2 -! *.color0: #282828 -! *.color8: #928374 -! *.color1: #CC241D -! *.color9: #FB4934 -! *.color2: #98971A -! *.color10: #B8BB26 -! *.color3: #D79921 -! *.color11: #FABD2F -! *.color4: #458588 -! *.color12: #83A598 -! *.color5: #B16286 -! *.color13: #D3869B -! *.color6: #689D6A -! *.color14: #8EC07C -! *.color7: #A89984 -! *.color15: #EBDBB2 - - - -!! gruvbox light color scheme -!! hard contrast: -!! *.background: #F9F5D7 -!! soft contrast: -!! *.background: #F2E5BC -!! default contrast: -!*.background: #FBF1C7 -!*.foreground: #3C3836 -!*.cursorColor: #3C3836 -!*.color0: #F9F5D7 -!*.color8: #928374 -!*.color1: #CC241D -!*.color9: #9D0006 -!*.color2: #98971A -!*.color10: #79740E -!*.color3: #D79921 -!*.color11: #B57614 -!*.color4: #458588 -!*.color12: #076678 -!*.color5: #B16286 -!*.color13: #8F3F71 -!*.color6: #689D6A -!*.color14: #427B58 -!*.color7: #7C6F64 -!*.color15: #3C3836 +#include ".Xresources.d/catppuccin-macchiato" +!#include ".Xresources.d/gruvbox-dark" +!#include ".Xresources.d/gruvbox-light" diff --git a/.Xresources.d/catppuccin-macchiato b/.Xresources.d/catppuccin-macchiato new file mode 100644 index 0000000..0e952af --- /dev/null +++ b/.Xresources.d/catppuccin-macchiato @@ -0,0 +1,20 @@ +! catppuccin color scheme +*.background: #24273A +*.foreground: #CAD3F5 +*.cursorColor: #F4DBD6 +*.color0: #494D64 +*.color8: #5B6078 +*.color1: #ED8796 +*.color9: #ED8796 +*.color2: #A6DA95 +*.color10: #A6DA95 +*.color3: #EED49F +*.color11: #EED49F +*.color4: #8AADF4 +*.color12: #8AADF4 +*.color5: #F5BDE6 +*.color13: #F5BDE6 +*.color6: #8BD5CA +*.color14: #8BD5CA +*.color7: #B8C0E0 +*.color15: #A5ADCB diff --git a/.Xresources.d/gruvbox-dark b/.Xresources.d/gruvbox-dark new file mode 100644 index 0000000..2a5715a --- /dev/null +++ b/.Xresources.d/gruvbox-dark @@ -0,0 +1,27 @@ +! gruvbox dark color scheme +! hard contrast: +! *.background: #1D2021 + +! soft contrast: +! *.background: #32302F + +! deafult contrast: +*.background: #282828 +*.foreground: #EBDBB2 +*.cursorColor: #EBDBB2 +*.color0: #282828 +*.color8: #928374 +*.color1: #CC241D +*.color9: #FB4934 +*.color2: #98971A +*.color10: #B8BB26 +*.color3: #D79921 +*.color11: #FABD2F +*.color4: #458588 +*.color12: #83A598 +*.color5: #B16286 +*.color13: #D3869B +*.color6: #689D6A +*.color14: #8EC07C +*.color7: #A89984 +*.color15: #EBDBB2 diff --git a/.Xresources.d/gruvbox-light b/.Xresources.d/gruvbox-light new file mode 100644 index 0000000..df1a69d --- /dev/null +++ b/.Xresources.d/gruvbox-light @@ -0,0 +1,27 @@ +!! gruvbox light color scheme +!! hard contrast: +!! *.background: #F9F5D7 + +!! soft contrast: +!! *.background: #F2E5BC + +!! default contrast: +*.background: #FBF1C7 +*.foreground: #3C3836 +*.cursorColor: #3C3836 +*.color0: #F9F5D7 +*.color8: #928374 +*.color1: #CC241D +*.color9: #9D0006 +*.color2: #98971A +*.color10: #79740E +*.color3: #D79921 +*.color11: #B57614 +*.color4: #458588 +*.color12: #076678 +*.color5: #B16286 +*.color13: #8F3F71 +*.color6: #689D6A +*.color14: #427B58 +*.color7: #7C6F64 +*.color15: #3C3836 From e62f0f10776d8c111cb131b6fbcca11b44457284 Mon Sep 17 00:00:00 2001 From: tiago Date: Fri, 9 Feb 2024 19:57:50 +0000 Subject: [PATCH 8/8] updated term to st on fish; fixed i3 startup apps; polybar now uses xresources --- .config/fish/config.fish | 4 ++-- .config/i3/config | 3 ++- .config/polybar/config.ini | 16 ++++++------- .config/polybar/modules.ini | 46 ++++++++++++++++++------------------- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 8f134e1..c3eb747 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,8 +3,8 @@ if status is-interactive end export EDITOR="nvim" -export TERMINAL="alacritty" -export TERMINAL_PROG="alacritty" +export TERMINAL="st" +export TERMINAL_PROG="st" export BROWSER="firefox" export PAGER="bat" diff --git a/.config/i3/config b/.config/i3/config index b6d81be..28e0d32 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -230,7 +230,8 @@ assign [class="discord"] 5 # startup programs exec --no-startup-id nextcloud exec --no-startup-id nitrogen --restore -exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec $terminal' +exec --no-startup-id i3-msg 'workspace 2; exec $browser' +exec --no-startup-id i3-msg 'workspace 1; exec $terminal' exec --no-startup-id openrgb -d 0 -m off -d 1 -m off # sets up monitors and picom exec_always --no-startup-id ~/.local/share/scripts/monitor.sh diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 29ba548..53e4f36 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -17,7 +17,7 @@ ;========================================================== include-file = modules.ini -include-file = $HOME/.config/polybar/themes/macchiato.ini +include-file = $HOME/.config/polybar/themes/xresources.ini [settings] screenchange-reload = true @@ -43,8 +43,8 @@ modules-left = i3 sep title modules-center = date dot time modules-right = xkeyboard dot cpu dot amdgpu dot memory dot pulseaudio sep filesystem -background = ${colors.base} -foreground = ${colors.text} +background = ${colors.background} +foreground = ${colors.foreground} line-size = 3pt padding-right = 1 @@ -64,11 +64,11 @@ offset-y = 0.5% ;radius = 8 modules-left = i3 sep title -modules-center = date dot time +modules-center = date dot time modules-right = xkeyboard dot cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery -background = ${colors.base} -foreground = ${colors.text} +background = ${colors.background} +foreground = ${colors.foreground} line-size = 3pt padding-right = 1 @@ -90,8 +90,8 @@ modules-left = i3 modules-center = date dot time modules-right = cpu dot gpu dot memory dot pulseaudio sep filesystem -background = ${colors.base} -foreground = ${colors.text} +background = ${colors.background} +foreground = ${colors.foreground} line-size = 3pt padding-right = 1 diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini index 308d34b..cb95adc 100644 --- a/.config/polybar/modules.ini +++ b/.config/polybar/modules.ini @@ -13,8 +13,8 @@ format = label-mode = %mode% label-mode-padding = 1 label-focused = %index% -label-focused-foreground = ${colors.text} -label-focused-underline = ${colors.lavender} +label-focused-foreground = ${colors.foreground} +label-focused-underline = ${colors.lightgrey} label-focused-padding = 1 label-unfocused = %index% label-unfocused-padding = 1 @@ -28,8 +28,8 @@ label-urgent-padding = 1 [module/xworkspaces] type = internal/xworkspaces label-active = %name% -label-active-foreground = ${colors.sky} -label-active-underline= ${colors.lavender} +label-active-foreground = ${colors.lightblue} +label-active-underline= ${colors.lightgrey} label-active-padding = 1 label-occupied = %name% label-occupied-padding = 1 @@ -42,22 +42,22 @@ label-empty-padding = 1 [module/xkeyboard] type = internal/xkeyboard -format = +format = format-prefix = 󰌌 -format-prefix-foreground = ${colors.mauve} +format-prefix-foreground = ${colors.magenta} format-prefix-padding-right = 1 format-spacing = 0 label-layout = %layout% label-layout-padding = 0 -label-layout-background = ${colors.base} -label-layout-foreground = ${colors.text} +label-layout-background = ${colors.background} +label-layout-foreground = ${colors.foreground} [module/title] type = internal/xwindow format =