diff --git a/eww/.cache.sqlite b/eww/.cache.sqlite index bc86cb7..567bac4 100644 Binary files a/eww/.cache.sqlite and b/eww/.cache.sqlite differ diff --git a/eww/eww.scss b/eww/eww.scss index 90a26c2..bc78a94 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -104,7 +104,6 @@ tooltip { .active_workspace { background: transparent; - padding: 0 8px 0px 14px; border-radius: 7px; margin-top: 3px; margin-bottom: 3px; @@ -113,7 +112,6 @@ tooltip { .inactive_workspace { background: transparent; - padding: 0 8px 0px 14px; margin-top: 3px; margin-bottom: 3px; border-radius: 7px; diff --git a/eww/scripts/.cache.sqlite b/eww/scripts/.cache.sqlite index fa8b5ab..396f3e1 100644 Binary files a/eww/scripts/.cache.sqlite and b/eww/scripts/.cache.sqlite differ diff --git a/eww/scripts/workspace_class.sh b/eww/scripts/workspace_class.sh index 318a530..f27eff1 100755 --- a/eww/scripts/workspace_class.sh +++ b/eww/scripts/workspace_class.sh @@ -1,4 +1,4 @@ -ACTIVE=$(hyprctl activeworkspace | grep -Po '(?<=ID )[[:digit:]]') +ACTIVE=$(hyprctl activeworkspace | grep -Po '(?<=ID )[[:digit:]]*') if [ $ACTIVE -eq $1 ] then diff --git a/eww/widgets/bar.yuck b/eww/widgets/bar.yuck index dfad2ea..2fb34b3 100644 --- a/eww/widgets/bar.yuck +++ b/eww/widgets/bar.yuck @@ -6,6 +6,7 @@ (include "widgets/system_info.yuck") (include "widgets/desktop_button.yuck") (include "widgets/weather.yuck") +(defpoll minimized :interval "0.1s" "bash scripts/workspace_class.sh 10") (defwidget bar [] (box :orientation "h" :class "bar" :spacing "10" :space-evenly false @@ -19,6 +20,7 @@ (weather) (systeminfo) (date_time) + (button :class minimized :tooltip "Show Minimied" :onclick "hyprctl dispatch workspace 10" " ") ) ) (box :class "right bar_section" :halign "end" :space-evenly false diff --git a/eww/widgets/workspaces.yuck b/eww/widgets/workspaces.yuck index 6f6fa68..6cfae86 100644 --- a/eww/widgets/workspaces.yuck +++ b/eww/widgets/workspaces.yuck @@ -11,7 +11,7 @@ ( defwidget workspaces [] (eventbox - (box :space-evenly "false" :orientation "h" :spacing "0" + (box :space-evenly "false" :orientation "h" :spacing "22" (button :class workspace_1 :onclick "hyprctl dispatch workspace 1" "₁") (button :class workspace_2 :onclick "hyprctl dispatch workspace 2" "󰖟₂") (button :class workspace_3 :onclick "hyprctl dispatch workspace 3" "󰭹₃") diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 9d1d5e7..22435b2 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -9,7 +9,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=eDP-1,1920x1080,auto,1 -monitor=HDMI-A-1,1920x1080,auto,1 +monitor=HDMI-A-1,1920x1080,auto,1,mirror,eDP-1 monitor=eDP-2,1920x1080,auto,1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -62,10 +62,10 @@ decoration { passes = 2 } - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + #drop_shadow = true + #shadow_range = 4 + #shadow_render_power = 3 + #col.shadow = rgba(1a1a1aee) } animations { @@ -158,7 +158,7 @@ bind = $mainMod SHIFT, 6, movetoworkspace, 6 bind = $mainMod SHIFT, 7, movetoworkspace, 7 bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 +#bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod CONTROL, 1, movetoworkspacesilent, 1 bind = $mainMod CONTROL, 2, movetoworkspacesilent, 2 @@ -169,7 +169,7 @@ bind = $mainMod CONTROL, 6, movetoworkspacesilent, 6 bind = $mainMod CONTROL, 7, movetoworkspacesilent, 7 bind = $mainMod CONTROL, 8, movetoworkspacesilent, 8 bind = $mainMod CONTROL, 9, movetoworkspacesilent, 9 -bind = $mainMod CONTROL, 0, movetoworkspacesilent, 10 +bind = $mainMod, m, movetoworkspacesilent, 10 bind = $mainMod, -, movetoworkspacesilent, name:minimized bind = $mainMod, SPACE, swapnext @@ -184,7 +184,7 @@ bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -10% bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle bind = ,XF86AudioMicMu, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle -bind = ,Print, exec, grim -g "$(slurp)" +bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy bind = $mainMod, C, exec, hyprpicker -a diff --git "a/kitty/\\" "b/kitty/\\" new file mode 100644 index 0000000..bf7a7bc --- /dev/null +++ "b/kitty/\\" @@ -0,0 +1,55 @@ +#im:ft=kitty + +## name: Kanagawa +## license: MIT +## author: Tommaso Laurenzi +## upstream: https://github.com/rebelot/kanagawa.nvim/ + +# Colors +background #1F1F28 +# 16161D +foreground #DCD7BA +selection_background #2D4F67 +selection_foreground #C8C093 +url_color #72A7BC +cursor #C8C093 +background_opacity 0.8 + +# Fonts +font_family Arimo Nerd Font +bold_font Arimo Bold Nerd Font +italic_font Arimo Italic Nerd Font +bolt_italic_font Arimo Bold Italic Nerd Font + +# Tabs +active_tab_background #1F1F28 +active_tab_foreground #C8C093 +inactive_tab_background #1F1F28 +inactive_tab_foreground #727169 +#tab_bar_background #15161E + +# normal +color0 #16161D +color1 #C34043 +color2 #76946A +color3 #C0A36E +color4 #7E9CD8 +color5 #957FB8 +color6 #6A9589 +color7 #C8C093 + +# bright +color8 #727169 +color9 #E82424 +color10 #98BB6C +color11 #E6C384 +color12 #7FB4CA +color13 #938AA9 +color14 #7AA89F +color15 #DCD7BA + + +# extended colors +color16 #FFA066 +color17 #FF5D62 + diff --git a/kitty/kitty-gruvbox.conf b/kitty/kitty-gruvbox.conf new file mode 100644 index 0000000..92d7d50 --- /dev/null +++ b/kitty/kitty-gruvbox.conf @@ -0,0 +1,47 @@ + +# Monokai + +background #272822 +background_opacity 0.8 +foreground #f8f8f2 +cursor #f8f8f2 +selection_background #f8f8f2 +selection_foreground #272822 +active_tab_background #75715e +active_tab_foreground #272822 +active_border_color #75715e +inactive_tab_background #272822 +inactive_tab_foreground #75715e +inactive_border_color #75715e +url_color #f8f8f2 + +font_family Arimo Nerd Font +bold_font Arimo Bold Nerd Font +italic_font Arimo Italic Nerd Font +bolt_italic_font Arimo Bold Italic Nerd Font + +# 16 Color Space +# black +color0 #282828 +color8 #928374 +# red +color1 #cc241d +color9 #fb4934 +# green +color2 #98971a +color10 #b8bb26 +# yellow +color3 #d79921 +color11 #fabd2f +# blue +color4 #458588 +color12 #83a598 +# magenta +color5 #b16286 +color13 #d3869b +# cyan +color6 #689d6a +color14 #8ec076 +# white +color7 #a89984 +color15 #ebdbb2 diff --git a/kitty/kitty-monokai.conf b/kitty/kitty-monokai.conf new file mode 100644 index 0000000..6615a46 --- /dev/null +++ b/kitty/kitty-monokai.conf @@ -0,0 +1,47 @@ + +# Monokai + +background #272822 +background_opacity 0.8 +foreground #f8f8f2 +cursor #f8f8f2 +selection_background #f8f8f2 +selection_foreground #272822 +active_tab_background #75715e +active_tab_foreground #272822 +active_border_color #75715e +inactive_tab_background #272822 +inactive_tab_foreground #75715e +inactive_border_color #75715e +url_color #f8f8f2 + +font_family JetBrains Mono Medium +bold_font JetBrains Mono Bold +italic_font JetBrains Mono Italic +bold_italic_font JetBrains Mono Bold Italic + +# 16 Color Space +# black +color0 #272822 +color8 #75715e +# red +color1 #f92672 +color9 #f92672 +# green +color2 #a6e22e +color10 #a6e22e +# yellow +color3 #e6db74 +color11 #e6db74 +# blue +color4 #66d9ef +color12 #66d9ef +# magenta +color5 #fd971f +color13 #fd971f +# cyan +color6 #ae81ff +color14 #ae81ff +# white +color7 #f8f8f2 +color15 #f8f8f2 diff --git a/kitty/kitty-sunset.conf b/kitty/kitty-sunset.conf new file mode 100644 index 0000000..aeab0cc --- /dev/null +++ b/kitty/kitty-sunset.conf @@ -0,0 +1,28 @@ +foreground #F09483 +background #1C1E26 +background_opacity 0.8 +cursor #E95378 + +color0 #1a1b26 +color8 #4e5173 + +color1 #E95678 +color9 #BBBBBB + +color2 #B877DB +color10 #9ECE6A + +color3 #B877DB +color11 #B877DB + +color4 #E95678 +color12 #F7768E + +color5 #9a7ecc +color13 #9a7ecc + +color6 #4abaaf +color14 #4abaaf + +color7 #acb0d0 +color15 #acb0d0 diff --git a/nvim/after/plugin/coc.lua b/nvim/after/plugin/coc.lua deleted file mode 100644 index a70bfc7..0000000 --- a/nvim/after/plugin/coc.lua +++ /dev/null @@ -1,188 +0,0 @@ --- Some servers have issues with backup files, see #649 -vim.opt.backup = false -vim.opt.writebackup = false - --- Having longer updatetime (default is 4000 ms = 4s) leads to noticeable --- delays and poor user experience -vim.opt.updatetime = 300 - --- Always show the signcolumn, otherwise it would shift the text each time --- diagnostics appeared/became resolved -vim.opt.signcolumn = "yes" - -local keyset = vim.keymap.set --- Autocomplete -function _G.check_back_space() - local col = vim.fn.col('.') - 1 - return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil -end - --- Use Tab for trigger completion with characters ahead and navigate --- NOTE: There's always a completion item selected by default, you may want to enable --- no select by setting `"suggest.noselect": true` in your configuration file --- NOTE: Use command ':verbose imap ' to make sure Tab is not mapped by --- If you do not like the sequence you can set your own using g:vimwiki_listsyms for example - ---let --- other plugins before putting this into your config -local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} -keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) -keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) - --- Make to accept selected completion item or notify coc.nvim to format --- u breaks current undo, please make your own choice - -keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) - --- Use to trigger snippets -keyset("i", "", "(coc-snippets-expand-jump)") --- Use to trigger completion -keyset("i", "", "coc#refresh()", {silent = true, expr = true}) - --- Use `[g` and `]g` to navigate diagnostics --- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list -keyset("n", "[g", "(coc-diagnostic-prev)", {silent = true}) -keyset("n", "]g", "(coc-diagnostic-next)", {silent = true}) - --- GoTo code navigation -keyset("n", "gd", "(coc-definition)", {silent = true}) -keyset("n", "gy", "(coc-type-definition)", {silent = true}) -keyset("n", "gi", "(coc-implementation)", {silent = true}) -keyset("n", "gr", "(coc-references)", {silent = true}) - - --- Use K to show documentation in preview window -function _G.show_docs() - local cw = vim.fn.expand('') - if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then - vim.api.nvim_command('h ' .. cw) - elseif vim.api.nvim_eval('coc#rpc#ready()') then - vim.fn.CocActionAsync('doHover') - else - vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) - end -end -keyset("n", "K", 'lua _G.show_docs()', {silent = true}) - - --- Highlight the symbol and its references on a CursorHold event(cursor is idle) -vim.api.nvim_create_augroup("CocGroup", {}) -vim.api.nvim_create_autocmd("CursorHold", { - group = "CocGroup", - command = "silent call CocActionAsync('highlight')", - desc = "Highlight symbol under cursor on CursorHold" -}) - - --- Symbol renaming -keyset("n", "rn", "(coc-rename)", {silent = true}) - - --- Formatting selected code -keyset("x", "f", "(coc-format-selected)", {silent = true}) -keyset("n", "f", "(coc-format-selected)", {silent = true}) - - --- Setup formatexpr specified filetype(s) -vim.api.nvim_create_autocmd("FileType", { - group = "CocGroup", - pattern = "typescript,json", - command = "setl formatexpr=CocAction('formatSelected')", - desc = "Setup formatexpr specified filetype(s)." -}) - --- Update signature help on jump placeholder -vim.api.nvim_create_autocmd("User", { - group = "CocGroup", - pattern = "CocJumpPlaceholder", - command = "call CocActionAsync('showSignatureHelp')", - desc = "Update signature help on jump placeholder" -}) - --- Apply codeAction to the selected region --- Example: `aap` for current paragraph -local opts = {silent = true, nowait = true} -keyset("x", "a", "(coc-codeaction-selected)", opts) -keyset("n", "a", "(coc-codeaction-selected)", opts) - --- Remap keys for apply code actions at the cursor position. -keyset("n", "ac", "(coc-codeaction-cursor)", opts) --- Remap keys for apply source code actions for current file. -keyset("n", "as", "(coc-codeaction-source)", opts) --- Apply the most preferred quickfix action on the current line. -keyset("n", "qf", "(coc-fix-current)", opts) - --- Remap keys for apply refactor code actions. -keyset("n", "re", "(coc-codeaction-refactor)", { silent = true }) -keyset("x", "r", "(coc-codeaction-refactor-selected)", { silent = true }) -keyset("n", "r", "(coc-codeaction-refactor-selected)", { silent = true }) - --- Run the Code Lens actions on the current line -keyset("n", "cl", "(coc-codelens-action)", opts) - - --- Map function and class text objects --- NOTE: Requires 'textDocument.documentSymbol' support from the language server -keyset("x", "if", "(coc-funcobj-i)", opts) -keyset("o", "if", "(coc-funcobj-i)", opts) -keyset("x", "af", "(coc-funcobj-a)", opts) -keyset("o", "af", "(coc-funcobj-a)", opts) -keyset("x", "ic", "(coc-classobj-i)", opts) -keyset("o", "ic", "(coc-classobj-i)", opts) -keyset("x", "ac", "(coc-classobj-a)", opts) -keyset("o", "ac", "(coc-classobj-a)", opts) - - --- Remap and to scroll float windows/popups ----@diagnostic disable-next-line: redefined-local -local opts = {silent = true, nowait = true, expr = true} -keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) -keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) -keyset("i", "", - 'coc#float#has_scroll() ? "=coc#float#scroll(1)" : ""', opts) -keyset("i", "", - 'coc#float#has_scroll() ? "=coc#float#scroll(0)" : ""', opts) -keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) -keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) - - --- Use CTRL-S for selections ranges --- Requires 'textDocument/selectionRange' support of language server -keyset("n", "", "(coc-range-select)", {silent = true}) -keyset("x", "", "(coc-range-select)", {silent = true}) - - --- Add `:Format` command to format current buffer -vim.api.nvim_create_user_command("Format", "call CocAction('format')", {}) - --- " Add `:Fold` command to fold current buffer -vim.api.nvim_create_user_command("Fold", "call CocAction('fold', )", {nargs = '?'}) - --- Add `:OR` command for organize imports of the current buffer -vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {}) - --- Add (Neo)Vim's native statusline support --- NOTE: Please see `:h coc-status` for integrations with external plugins that --- provide custom statusline: lightline.vim, vim-airline -vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") - --- Mappings for CoCList --- code actions and coc stuff ----@diagnostic disable-next-line: redefined-local -local opts = {silent = true, nowait = true} --- Show all diagnostics -keyset("n", "a", ":CocList diagnostics", opts) --- Manage extensions --- keyset("n", "e", ":CocList extensions", opts) --- Show commands -keyset("n", "c", ":CocList commands", opts) --- Find symbol of current document -keyset("n", "o", ":CocList outline", opts) --- Search workspace symbols -keyset("n", "s", ":CocList -I symbols", opts) --- Do default action for next item -keyset("n", "j", ":CocNext", opts) --- Do default action for previous item -keyset("n", "k", ":CocPrev", opts) --- Resume latest coc list -keyset("n", "p", ":CocListResume", opts) diff --git a/nvim/after/plugin/vimspector.lua b/nvim/after/plugin/vimspector.lua new file mode 100644 index 0000000..e69de29 diff --git a/nvim/lua/sharpe/packer.lua b/nvim/lua/sharpe/packer.lua index 3d37eb3..ee8cd58 100644 --- a/nvim/lua/sharpe/packer.lua +++ b/nvim/lua/sharpe/packer.lua @@ -23,15 +23,9 @@ return require('packer').startup(function(use) use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) use {'neoclide/coc.nvim', branch = 'release'} - -- install without yarn or npm - use({ - "iamcco/markdown-preview.nvim", - run = function() vim.fn["mkdp#util#install"]() end, - }) - use({'vimwiki/vimwiki'}) use({'lervag/vimtex'}) - use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, }) + use({'puremourning/vimspector'}) end) diff --git a/zathura/zathurarc b/zathura/zathurarc new file mode 100644 index 0000000..c91b8fa --- /dev/null +++ b/zathura/zathurarc @@ -0,0 +1,4 @@ +set recolor true +set recolor-keephue true +set recolor-lightcolor "#1f1f28" +set recolor-darkcolor "#dcd7ba"