theme related stuff
This commit is contained in:
parent
b03e5af9cb
commit
fdf3f567e5
SSH key fingerprint:
SHA256:odOD9vln9U7qNe1R8o3UCbE3jkQCkr5/q5mgd5hwua0
23 changed files with 461 additions and 478 deletions
|
|
@ -1,6 +1,8 @@
|
|||
! catppuccin color scheme
|
||||
*.background: #24273A
|
||||
|
||||
*.foreground: #CAD3F5
|
||||
|
||||
*.cursorColor: #F4DBD6
|
||||
*.color0: #494D64
|
||||
*.color8: #5B6078
|
||||
|
|
@ -18,3 +20,6 @@
|
|||
*.color14: #8BD5CA
|
||||
*.color7: #B8C0E0
|
||||
*.color15: #A5ADCB
|
||||
|
||||
! lavender
|
||||
i3wm.border: #B7BDF8
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
! 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
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
!! 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
|
||||
25
.Xresources.d/gruvbox-material-dark
Normal file
25
.Xresources.d/gruvbox-material-dark
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
! hard *.background: #1D2021
|
||||
! soft ! *.background: #32302F
|
||||
! medium
|
||||
*.background: #282828
|
||||
|
||||
*.foreground: #D4BE98
|
||||
|
||||
*.color0: #32302F
|
||||
*.color8: #32302F
|
||||
*.color1: #EA6962
|
||||
*.color9: #EA6962
|
||||
*.color2: #A9B665
|
||||
*.color10: #A9B665
|
||||
*.color3: #D8A657
|
||||
*.color11: #D8A657
|
||||
*.color4: #7DAEA3
|
||||
*.color12: #7DAEA3
|
||||
*.color5: #D3869B
|
||||
*.color13: #D3869B
|
||||
*.color6: #89B482
|
||||
*.color14: #89B482
|
||||
*.color7: #D4BE98
|
||||
*.color15: #D4BE98
|
||||
|
||||
i3wm.border: #DDC7A1
|
||||
25
.Xresources.d/gruvbox-material-light
Normal file
25
.Xresources.d/gruvbox-material-light
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
! hard *.background: #F9F5D7
|
||||
! medium *.background: #FBF1C7
|
||||
! soft
|
||||
*.background: #F2E5BC
|
||||
|
||||
*.foreground: #654735
|
||||
|
||||
*.color0: #FBF1C7
|
||||
*.color8: #FBF1C7
|
||||
*.color1: #C14A4A
|
||||
*.color9: #C14A4A
|
||||
*.color2: #6C782E
|
||||
*.color10: #6C782E
|
||||
*.color3: #C35E0A
|
||||
*.color11: #C35E0A
|
||||
*.color4: #45707A
|
||||
*.color12: #45707A
|
||||
*.color5: #945E80
|
||||
*.color13: #945E80
|
||||
*.color6: #4C7A5D
|
||||
*.color14: #4C7A5D
|
||||
*.color7: #654735
|
||||
*.color15: #654735
|
||||
|
||||
i3wm.border: #F3EAC7
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# name: 'Catppuccin frappe'
|
||||
# url: 'https://github.com/catppuccin/fish'
|
||||
# preferred_background: 303446
|
||||
|
||||
fish_color_normal c6d0f5
|
||||
fish_color_command 8caaee
|
||||
fish_color_param eebebe
|
||||
fish_color_keyword e78284
|
||||
fish_color_quote a6d189
|
||||
fish_color_redirection f4b8e4
|
||||
fish_color_end ef9f76
|
||||
fish_color_comment 838ba7
|
||||
fish_color_error e78284
|
||||
fish_color_gray 737994
|
||||
fish_color_selection --background=414559
|
||||
fish_color_search_match --background=414559
|
||||
fish_color_operator f4b8e4
|
||||
fish_color_escape ea999c
|
||||
fish_color_autosuggestion 737994
|
||||
fish_color_cancel e78284
|
||||
fish_color_cwd e5c890
|
||||
fish_color_user 81c8be
|
||||
fish_color_host 8caaee
|
||||
fish_color_host_remote a6d189
|
||||
fish_color_status e78284
|
||||
fish_pager_color_progress 737994
|
||||
fish_pager_color_prefix f4b8e4
|
||||
fish_pager_color_completion c6d0f5
|
||||
fish_pager_color_description 737994
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# name: 'Catppuccin mocha'
|
||||
# url: 'https://github.com/catppuccin/fish'
|
||||
# preferred_background: 1e1e2e
|
||||
|
||||
fish_color_normal cdd6f4
|
||||
fish_color_command 89b4fa
|
||||
fish_color_param f2cdcd
|
||||
fish_color_keyword f38ba8
|
||||
fish_color_quote a6e3a1
|
||||
fish_color_redirection f5c2e7
|
||||
fish_color_end fab387
|
||||
fish_color_comment 7f849c
|
||||
fish_color_error f38ba8
|
||||
fish_color_gray 6c7086
|
||||
fish_color_selection --background=313244
|
||||
fish_color_search_match --background=313244
|
||||
fish_color_operator f5c2e7
|
||||
fish_color_escape eba0ac
|
||||
fish_color_autosuggestion 6c7086
|
||||
fish_color_cancel f38ba8
|
||||
fish_color_cwd f9e2af
|
||||
fish_color_user 94e2d5
|
||||
fish_color_host 89b4fa
|
||||
fish_color_host_remote a6e3a1
|
||||
fish_color_status f38ba8
|
||||
fish_pager_color_progress 6c7086
|
||||
fish_pager_color_prefix f5c2e7
|
||||
fish_pager_color_completion cdd6f4
|
||||
fish_pager_color_description 6c7086
|
||||
19
.config/fish/themes/gruvbox-material-dark.theme
Normal file
19
.config/fish/themes/gruvbox-material-dark.theme
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
fish_color_normal D4BE98
|
||||
fish_color_command 89B482
|
||||
fish_color_keyword 7DAEA3
|
||||
fish_color_quote D8A657
|
||||
fish_color_redirection D4BE98
|
||||
fish_color_end E78A4E
|
||||
fish_color_error red
|
||||
fish_color_param D3869B
|
||||
fish_color_comment purple
|
||||
fish_color_selection --background=504945
|
||||
fish_color_search_match --background=504945
|
||||
fish_color_operator A9B665
|
||||
fish_color_escape 7DAEA3
|
||||
fish_color_autosuggestion 8F3F71
|
||||
|
||||
fish_pager_color_progress 8F3F71
|
||||
fish_pager_color_prefix 89B482
|
||||
fish_pager_color_completion D4BE98
|
||||
fish_pager_color_description 8F3F71
|
||||
19
.config/fish/themes/gruvbox-material-light.theme
Normal file
19
.config/fish/themes/gruvbox-material-light.theme
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
fish_color_normal D4BE98
|
||||
fish_color_command 89B482
|
||||
fish_color_keyword 7DAEA3
|
||||
fish_color_quote D8A657
|
||||
fish_color_redirection D4BE98
|
||||
fish_color_end E78A4E
|
||||
fish_color_error red
|
||||
fish_color_param D3869B
|
||||
fish_color_comment purple
|
||||
fish_color_selection --background=504945
|
||||
fish_color_search_match --background=504945
|
||||
fish_color_operator A9B665
|
||||
fish_color_escape 7DAEA3
|
||||
fish_color_autosuggestion 8F3F71
|
||||
|
||||
fish_pager_color_progress 8F3F71
|
||||
fish_pager_color_prefix 89B482
|
||||
fish_pager_color_completion D4BE98
|
||||
fish_pager_color_description 8F3F71
|
||||
|
|
@ -71,7 +71,7 @@ bindsym $mod+Return exec $terminal
|
|||
bindsym $mod+q kill
|
||||
|
||||
# start dmenu (a program launcher)
|
||||
bindsym $mod+d exec --no-startup-id $HOME/.config/rofi/launchers/type-4/launcher.sh
|
||||
bindsym $mod+d exec --no-startup-id rofi -show drun
|
||||
# A more modern dmenu replacement is rofi:
|
||||
# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
|
||||
# There also is i3-dmenu-desktop which only displays applications shipping a
|
||||
|
|
@ -180,32 +180,6 @@ bindsym $mod+Shift+c reload
|
|||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
||||
bindsym $mod+Shift+r restart
|
||||
|
||||
# set colorscheme
|
||||
# set $red #ed8796
|
||||
# set $rosewater #f4dbd6
|
||||
# set $flamingo #f0c6c6
|
||||
# set $pink #f5bde6
|
||||
# set $mauve #c6a0f6
|
||||
# set $maroon #ee99a0
|
||||
# set $peach #f5a97f
|
||||
# set $green #a6da95
|
||||
# set $teal #8bd5ca
|
||||
# set $sky #91d7e3
|
||||
# set $sapphire #7dc4e4
|
||||
# set $blue #8aadf4
|
||||
# set $lavender #b7bdf8
|
||||
# set $fg #cad3f5
|
||||
# set $subtext1 #b8c0e0
|
||||
# set $subtext0 #a5adcb
|
||||
# set $overlay2 #939ab7
|
||||
# set $overlay1 #8087a2
|
||||
# set $overlay0 #6e738d
|
||||
# set $surface2 #5b6078
|
||||
# set $surface1 #494d64
|
||||
# set $surface0 #363a4f
|
||||
# set $bg #24273a
|
||||
# set $mantle #1e2030
|
||||
# set $crust #181926
|
||||
set_from_resource $bg i3wm.background #24273A
|
||||
set_from_resource $fg i3wm.foreground #CAD3F5
|
||||
set_from_resource $red i3wm.color1 #ED8796
|
||||
|
|
@ -214,9 +188,10 @@ set_from_resource $grey i3wm.color8 #5B6078
|
|||
set_from_resource $lightyellow i3wm.color11 #F4DBD6
|
||||
set_from_resource $white i3wm.color15 #A5ADCB
|
||||
set_from_resource $black i3wm.color0 #181926
|
||||
set_from_resource $border i3wm.border #ED8796
|
||||
|
||||
# target title bg fg indicator border
|
||||
client.focused $lavender $bg $fg $lightyellow $lightgrey
|
||||
client.focused $white $bg $fg $lightyellow $border
|
||||
client.focused_inactive $white $bg $fg $lightyellow $black
|
||||
client.unfocused $white $bg $fg $lightyellow $black
|
||||
client.urgent $red $bg $fg $white $red
|
||||
|
|
@ -231,17 +206,17 @@ bindsym $mod2+Shift+l resize grow width 10 px or 10 ppt
|
|||
|
||||
# window settings
|
||||
gaps inner 5
|
||||
gaps top 37
|
||||
gaps top 32
|
||||
|
||||
assign [class="^tidal-hifi$"] 5
|
||||
assign [class="tidal-hifi"] 5
|
||||
assign [class="discord"] 5
|
||||
assign [class="thunderbird"] 7
|
||||
|
||||
# startup programs
|
||||
exec --no-startup-id nextcloud
|
||||
exec --no-startup-id nitrogen --restore
|
||||
exec --no-startup-id i3-msg 'workspace 2; exec $browser; 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
|
||||
exec --no-startup-id nextcloud
|
||||
exec --no-startup-id nitrogen --restore
|
||||
exec --no-startup-id i3-msg 'workspace 1; exec $terminal'
|
||||
exec --no-startup-id openrgb -d 0 -m off -d 1 -m off
|
||||
exec_always --no-startup-id ~/.config/polybar/launch.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
local color = "catppuccin"
|
||||
local background = "dark"
|
||||
local transparency = false
|
||||
function SetColor()
|
||||
vim.cmd.colorscheme(color)
|
||||
vim.opt.background = background
|
||||
|
||||
-- transparency
|
||||
if transparency then
|
||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||
end
|
||||
end
|
||||
|
||||
return {
|
||||
{
|
||||
|
|
@ -30,9 +32,9 @@ return {
|
|||
treesitter_context = true,
|
||||
fidget = true,
|
||||
},
|
||||
SetColor()
|
||||
SetColor(),
|
||||
})
|
||||
end
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
|
|
@ -46,6 +48,6 @@ return {
|
|||
vim.g.gruvbox_material_background = contrast
|
||||
vim.g.gruvbox_material_foreground = "material"
|
||||
SetColor()
|
||||
end
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ return {
|
|||
"tpope/vim-surround",
|
||||
"tpope/vim-repeat",
|
||||
"laytan/cloak.nvim",
|
||||
{
|
||||
"ThePrimeagen/vim-be-good",
|
||||
disabled = false,
|
||||
},
|
||||
{
|
||||
"jbyuki/instant.nvim",
|
||||
config = function()
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
return {
|
||||
{
|
||||
'hrsh7th/nvim-cmp',
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
'hrsh7th/cmp-nvim-lsp', -- lsp
|
||||
'hrsh7th/cmp-nvim-lua', -- Nvim API completions
|
||||
'hrsh7th/cmp-buffer', --buffer completions
|
||||
'hrsh7th/cmp-path', --path completions
|
||||
'hrsh7th/cmp-cmdline', --cmdline completions
|
||||
'L3MON4D3/LuaSnip',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
'rafamadriz/friendly-snippets',
|
||||
'onsails/lspkind.nvim',
|
||||
"hrsh7th/cmp-nvim-lsp", -- lsp
|
||||
"hrsh7th/cmp-nvim-lua", -- Nvim API completions
|
||||
"hrsh7th/cmp-buffer", --buffer completions
|
||||
"hrsh7th/cmp-path", --path completions
|
||||
"hrsh7th/cmp-cmdline", --cmdline completions
|
||||
"L3MON4D3/LuaSnip",
|
||||
"saadparwaiz1/cmp_luasnip",
|
||||
"rafamadriz/friendly-snippets",
|
||||
"onsails/lspkind.nvim",
|
||||
-- 'zbirenbaum/copilot-cmp',
|
||||
},
|
||||
config = function()
|
||||
|
|
@ -20,33 +20,31 @@ return {
|
|||
|
||||
-- require("copilot_cmp").setup()
|
||||
|
||||
lspkind.init {
|
||||
lspkind.init({
|
||||
symbol_map = {
|
||||
Copilot = "",
|
||||
},
|
||||
}
|
||||
})
|
||||
vim.api.nvim_set_hl(0, "CmpItemKindCopilot", { fg = "#6CC644" })
|
||||
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
|
||||
cmp.setup {
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body) -- For `luasnip` users.
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
["<C-n>"] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert },
|
||||
["<C-p>"] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert },
|
||||
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
|
||||
["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<C-y>"] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true
|
||||
},
|
||||
{ "i", "c" }
|
||||
),
|
||||
select = true,
|
||||
}),
|
||||
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
|
||||
|
||||
["<C-l>"] = cmp.mapping(function()
|
||||
|
|
@ -58,12 +56,13 @@ return {
|
|||
if luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
end
|
||||
end
|
||||
),
|
||||
end),
|
||||
},
|
||||
|
||||
formatting = {
|
||||
-- fields = { "kind", "abbr", "menu" },
|
||||
format = lspkind.cmp_format {
|
||||
expandable_indicator = true,
|
||||
fields = { "abbr", "kind", "menu" },
|
||||
format = lspkind.cmp_format({
|
||||
with_text = true,
|
||||
menu = {
|
||||
buffer = "[buf]",
|
||||
|
|
@ -75,10 +74,9 @@ return {
|
|||
nvim_lua = "[lua]",
|
||||
path = "[path]",
|
||||
},
|
||||
}),
|
||||
},
|
||||
},
|
||||
sources = cmp.config.sources(
|
||||
{
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lua" },
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
|
|
@ -86,12 +84,10 @@ return {
|
|||
{ name = "path" },
|
||||
{ name = "copilot" },
|
||||
{ name = "orgmode" },
|
||||
},
|
||||
{
|
||||
}, {
|
||||
--This sources will only show up if there aren't any sources from the other list
|
||||
{ name = "buffer", keyword_length = 5 },
|
||||
}
|
||||
),
|
||||
}),
|
||||
sorting = {
|
||||
comparators = {
|
||||
cmp.config.compare.offset,
|
||||
|
|
@ -101,8 +97,8 @@ return {
|
|||
-- copied from cmp-under, but I don't think I need the plugin for this.
|
||||
-- I might add some more of my own.
|
||||
function(entry1, entry2)
|
||||
local _, entry1_under = entry1.completion_item.label:find "^_+"
|
||||
local _, entry2_under = entry2.completion_item.label:find "^_+"
|
||||
local _, entry1_under = entry1.completion_item.label:find("^_+")
|
||||
local _, entry2_under = entry2.completion_item.label:find("^_+")
|
||||
entry1_under = entry1_under or 0
|
||||
entry2_under = entry2_under or 0
|
||||
if entry1_under > entry2_under then
|
||||
|
|
@ -122,12 +118,12 @@ return {
|
|||
ghost_text = true,
|
||||
native_menu = false,
|
||||
},
|
||||
}
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
'zbirenbaum/copilot.lua',
|
||||
"zbirenbaum/copilot.lua",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("copilot").setup({
|
||||
|
|
@ -137,9 +133,9 @@ return {
|
|||
keymap = {
|
||||
accept = "<C-q>",
|
||||
},
|
||||
}
|
||||
},
|
||||
})
|
||||
end
|
||||
end,
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
|
|
@ -147,89 +143,86 @@ return {
|
|||
"hrsh7th/nvim-cmp",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"williamboman/mason.nvim",
|
||||
"folke/neodev.nvim",
|
||||
{
|
||||
"j-hui/fidget.nvim",
|
||||
},
|
||||
config = function()
|
||||
require("fidget").setup({
|
||||
opts = {
|
||||
notification = {
|
||||
window = {
|
||||
winblend = 0,
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
require("neodev").setup({})
|
||||
|
||||
vim.api.nvim_create_augroup("_mason", { clear = true })
|
||||
require("mason").setup({
|
||||
PATH = "skip",
|
||||
ui = {
|
||||
icons = {
|
||||
package_installed = "",
|
||||
package_pending = "",
|
||||
package_uninstalled = ""
|
||||
}
|
||||
package_uninstalled = "",
|
||||
},
|
||||
},
|
||||
max_concurrent_installers = 10,
|
||||
})
|
||||
|
||||
local mason_lspconfig = require("mason-lspconfig")
|
||||
|
||||
local lspconfig = require("lspconfig")
|
||||
|
||||
-- ADD NVIM CMP AS A CAPABILITY
|
||||
local lsp_defaults = lspconfig.util.default_config
|
||||
|
||||
local capabilities = vim.tbl_deep_extend(
|
||||
'force',
|
||||
lsp_defaults.capabilities,
|
||||
require('cmp_nvim_lsp').default_capabilities()
|
||||
)
|
||||
|
||||
-- keybinds for diagnostics
|
||||
vim.keymap.set('n', '<leader>vd', vim.diagnostic.open_float)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
||||
vim.keymap.set('n', '<leader>ve', vim.diagnostic.setloclist)
|
||||
vim.keymap.set("n", "<leader>vd", vim.diagnostic.open_float)
|
||||
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
|
||||
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
|
||||
vim.keymap.set("n", "<leader>ve", vim.diagnostic.setloclist)
|
||||
|
||||
-- external (non mason) lsps
|
||||
lspconfig.rust_analyzer.setup({
|
||||
on_init = on_init,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
cmd = {
|
||||
"rustup", "run", "stable", "rust-analyzer",
|
||||
}
|
||||
})
|
||||
|
||||
-- autocmd LSP keybinds
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("TsousaLspConfig", {}),
|
||||
callback = function(e)
|
||||
local bufopts = { buffer = e.buf }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', '<leader>wss', vim.lsp.buf.workspace_symbol, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set("n", "<leader>D", vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set("n", "<leader>wss", vim.lsp.buf.workspace_symbol, bufopts)
|
||||
vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
|
||||
-- vim.keymap.set('n', '<leader>fo', function() vim.lsp.buf.format { async = true } end, bufopts)
|
||||
vim.keymap.set('n', '<leader>fo',
|
||||
function() require("conform").format({ lsp_fallback = true }) end, bufopts)
|
||||
vim.keymap.set('i', '<C-s>', vim.lsp.buf.signature_help, bufopts)
|
||||
end
|
||||
vim.keymap.set("n", "<leader>fo", function()
|
||||
require("conform").format({ lsp_fallback = true })
|
||||
end, bufopts)
|
||||
vim.keymap.set("i", "<C-s>", vim.lsp.buf.signature_help, bufopts)
|
||||
end,
|
||||
})
|
||||
|
||||
mason_lspconfig.setup({
|
||||
local lspconfig = require("lspconfig")
|
||||
-- ADD NVIM CMP AS A CAPABILITY
|
||||
local lsp_defaults = lspconfig.util.default_config
|
||||
|
||||
local capabilities =
|
||||
vim.tbl_deep_extend("force", lsp_defaults.capabilities, require("cmp_nvim_lsp").default_capabilities())
|
||||
-- external (non mason) lsps
|
||||
lspconfig.rust_analyzer.setup({
|
||||
capabilities = capabilities,
|
||||
cmd = {
|
||||
"rustup",
|
||||
"run",
|
||||
"stable",
|
||||
"rust-analyzer",
|
||||
},
|
||||
})
|
||||
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = {
|
||||
lua_ls,
|
||||
"lua_ls",
|
||||
},
|
||||
automatic_installation = true,
|
||||
handlers = {
|
||||
function(server_name)
|
||||
lspconfig[server_name].setup({
|
||||
on_init = on_init,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end,
|
||||
|
|
@ -240,24 +233,23 @@ return {
|
|||
haskell = {
|
||||
plugin = {
|
||||
stan = { globalOn = false },
|
||||
hlint = { config = { flags = { "--ignore=Eta reduce" } } }
|
||||
}
|
||||
}
|
||||
}
|
||||
hlint = { config = { flags = { "--ignore=Eta reduce" } } },
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
["lua_ls"] = function()
|
||||
lspconfig.lua_ls.setup({
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = { globals = { "vim" } },
|
||||
telemetry = { enable = false }
|
||||
}
|
||||
}
|
||||
telemetry = { enable = false },
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
},
|
||||
})
|
||||
end
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,10 +203,11 @@ focus-exclude = [
|
|||
#
|
||||
# opacity-rule = []
|
||||
opacity-rule = [
|
||||
"95:class_g = 'Alacritty'",
|
||||
"100:class_g = 'Polybar'",
|
||||
"100:class_g = 'firefox'",
|
||||
"100:class_g = 'librewolf'",
|
||||
# "95:class_g = 'Alacritty'",
|
||||
# "100:class_g = 'Polybar'",
|
||||
# "100:class_g = 'firefox'",
|
||||
# "100:class_g = 'librewolf'",
|
||||
# "100:class_g = 'android-studio'",
|
||||
];
|
||||
|
||||
|
||||
|
|
@ -308,8 +309,8 @@ mark-ovredir-focused = true;
|
|||
# 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
|
||||
detect-rounded-corners = true;
|
||||
detect-rounded-corners = false
|
||||
# detect-rounded-corners = true;
|
||||
|
||||
# Detect '_NET_WM_OPACITY' on client windows, useful for window managers
|
||||
# not passing '_NET_WM_OPACITY' of client windows to frame windows.
|
||||
|
|
|
|||
|
|
@ -57,10 +57,13 @@ wm-restack = i3
|
|||
|
||||
[bar/laptop]
|
||||
inherit = section/base
|
||||
width = 99.5%
|
||||
; width = 99.5%
|
||||
width = 100%
|
||||
height = 24pt
|
||||
offset-x = 0.3%
|
||||
offset-y = 0.5%
|
||||
; offset-x = 0.3%
|
||||
; offset-y = 0.5%
|
||||
offset-x = 0%
|
||||
offset-y = 0%
|
||||
;radius = 8
|
||||
|
||||
modules-left = i3 sep title
|
||||
|
|
@ -80,10 +83,13 @@ wm-restack = i3
|
|||
|
||||
[bar/secondary]
|
||||
inherit = section/base
|
||||
width = 99.4%
|
||||
; width = 99.5%
|
||||
width = 100%
|
||||
height = 24pt
|
||||
offset-x = 0.3%
|
||||
offset-y = 0.7%
|
||||
; offset-x = 0.3%
|
||||
; offset-y = 0.5%
|
||||
offset-x = 0%
|
||||
offset-y = 0%
|
||||
;radius = 8
|
||||
|
||||
modules-left = i3
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ ramp-6-foreground = ${colors.yellow}
|
|||
type = internal/battery
|
||||
battery = BAT1
|
||||
adapter = ADP1
|
||||
full-at = 90
|
||||
full-at = 100
|
||||
low-at = 5
|
||||
poll-interval = 5
|
||||
time-format = %H:%M
|
||||
|
|
@ -222,28 +222,29 @@ format-full= <label-full>
|
|||
format-low= <animation-low> <label-low>
|
||||
label-charging = %percentage%%
|
||||
label-discharging = %percentage%% %time%
|
||||
label-full =
|
||||
label-full = %percentage%%
|
||||
label-low = BATTERY LOW
|
||||
ramp-capacity-0 =
|
||||
ramp-capacity-0-foreground = ${colors.blue}
|
||||
ramp-capacity-1 =
|
||||
ramp-capacity-1-foreground = ${colors.blue}
|
||||
ramp-capacity-2 =
|
||||
ramp-capacity-2-foreground = ${colors.blue}
|
||||
ramp-capacity-3 =
|
||||
ramp-capacity-3-foreground = ${colors.blue}
|
||||
ramp-capacity-4 =
|
||||
ramp-capacity-4-foreground = ${colors.blue}
|
||||
ramp-capacity-5 =
|
||||
ramp-capacity-5-foreground = ${colors.blue}
|
||||
ramp-capacity-6 =
|
||||
ramp-capacity-6-foreground = ${colors.blue}
|
||||
ramp-capacity-7 =
|
||||
ramp-capacity-7-foreground = ${colors.blue}
|
||||
ramp-capacity-8 =
|
||||
ramp-capacity-8-foreground = ${colors.blue}
|
||||
ramp-capacity-9 =
|
||||
ramp-capacity-9-foreground = ${colors.blue}
|
||||
; ramp-capacity-0-foreground = ${colors.blue}
|
||||
; ramp-capacity-1-foreground = ${colors.blue}
|
||||
; ramp-capacity-2-foreground = ${colors.blue}
|
||||
; ramp-capacity-3-foreground = ${colors.blue}
|
||||
; ramp-capacity-4-foreground = ${colors.blue}
|
||||
; ramp-capacity-5-foreground = ${colors.blue}
|
||||
; ramp-capacity-6-foreground = ${colors.blue}
|
||||
; ramp-capacity-7-foreground = ${colors.blue}
|
||||
; ramp-capacity-8-foreground = ${colors.blue}
|
||||
; ramp-capacity-9-foreground = ${colors.blue}
|
||||
ramp-capacity-foreground = ${colors.blue}
|
||||
bar-capacity-width = 10
|
||||
animation-charging-0 =
|
||||
animation-charging-0-foreground = ${colors.green}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
* {
|
||||
background: #282828;
|
||||
background-alt: #1D2021;
|
||||
foreground: #D4BE98;
|
||||
selected: #7DAEA3;
|
||||
active: #A9B665;
|
||||
urgent: #EA6962;
|
||||
background: #282828FF;
|
||||
background-alt: #1D2021FF;
|
||||
foreground: #D4BE98FF;
|
||||
selected: #7DAEA3FF;
|
||||
active: #A9B665FF;
|
||||
urgent: #EA6962FF;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
* {
|
||||
background: #F2E5BC;
|
||||
background-alt: #FBF1C7;
|
||||
foreground: #654735;
|
||||
selected: #45707A;
|
||||
active: #6C782E;
|
||||
urgent: #C14A4A;
|
||||
background: #F2E5BCFF;
|
||||
background-alt: #FBF1C7FF;
|
||||
foreground: #654735FF;
|
||||
selected: #45707AFF;
|
||||
active: #6C782EFF;
|
||||
urgent: #C14A4AFF;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ configuration {
|
|||
@import "~/.config/rofi/colors/catppuccin-dark.rasi"
|
||||
|
||||
* {
|
||||
border-colour: var(selected);
|
||||
border-colour: var(foreground);
|
||||
handle-colour: var(selected);
|
||||
background-colour: var(background);
|
||||
foreground-colour: var(foreground);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ set -ag terminal-overrides ",*:RGB"
|
|||
unbind C-b
|
||||
set-option -g prefix C-a
|
||||
bind-key C-a send-prefix
|
||||
set -g status-style 'bg=#24273A fg=#cad3f5'
|
||||
set -g status-style 'bg=#24273A fg=#CAD3F5'
|
||||
set-option -g status-position top
|
||||
set-option -g status-right ""
|
||||
set -g status-left-length 20
|
||||
|
|
|
|||
31
.local/share/scripts/theme-selector.sh
Normal file → Executable file
31
.local/share/scripts/theme-selector.sh
Normal file → Executable file
|
|
@ -10,15 +10,21 @@ theme_options=(
|
|||
|
||||
# rofi script to get what theme to use
|
||||
chosen=$(printf '%s\n' "${theme_options[@]}" | rofi -dmenu -p "Theme")
|
||||
|
||||
if [[ -z $chosen ]]; then
|
||||
exit 1
|
||||
fi
|
||||
theme=$(echo "${chosen}" | rev | cut -d- -f2- | rev)
|
||||
|
||||
background=$(echo "${chosen}" | awk -F'-' '{print $NF}')
|
||||
|
||||
echo "Theme: ${theme}"
|
||||
echo "Background: ${background}"
|
||||
# change rofi theme
|
||||
sed -i "s/\(@import \".config\/rofi\/colors\/\).*/\1${theme}-${background}.rasi\"/" ~/.config/rofi/config.rasi
|
||||
rofi_conf=~/.config/rofi/config.rasi
|
||||
rofi_theme_check="${rofi_conf}"/"${chosen}".rasi
|
||||
if [[ -f $rofi_theme_check ]]; then
|
||||
echo "Rofi Theme ${chosen} not found"
|
||||
exit 1
|
||||
fi
|
||||
sed -i "s/\(@import \"~\/.config\/rofi\/colors\/\).*/\1${theme}-${background}.rasi\"/" $rofi_conf
|
||||
|
||||
# change neovim theme
|
||||
sed -i "s/\(local color = \).*/\1\"${theme}\"/" ~/.config/nvim/lua/tsousa/plugins/colorscheme.lua
|
||||
|
|
@ -26,7 +32,22 @@ sed -i "s/\(local background = \).*/\1\"${background}\"/" ~/.config/nvim/lua/tso
|
|||
|
||||
# change xresources
|
||||
xresources_themes=".Xresources.d"
|
||||
sed -i "s/#include \".*\"/#include \"~\/${xresources_themes}\/${theme}-${background}\"/" ~/.Xresources
|
||||
sed -i "s/#include \".*\"/#include \"${xresources_themes}\/${theme}-${background}\"/" ~/.Xresources
|
||||
xrdb ~/.Xresources
|
||||
|
||||
# change tmux
|
||||
# add case for when tmux is not running
|
||||
tmux_background=$(grep "^*.background" ~/"${xresources_themes}"/"${theme}"-"${background}" | awk '{print $2}')
|
||||
tmux_foreground=$(grep "^*.foreground" ~/"${xresources_themes}"/"${theme}"-"${background}" | awk '{print $2}')
|
||||
sed -i "s/set -g status-style 'bg=.* fg=.*'/set -g status-style 'bg=${tmux_background} fg=${tmux_foreground}'/" ~/.config/tmux/tmux.conf
|
||||
tmux source "$HOME/.config/tmux/tmux.conf"
|
||||
|
||||
# change dunst
|
||||
|
||||
# change fish
|
||||
fish_config theme choose "$chosen"
|
||||
|
||||
# maybe change gtk theme??
|
||||
|
||||
# recompile i3
|
||||
i3-msg restart
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue