diff --git a/config/hypr/configs/Startup_Apps.conf b/config/hypr/configs/Startup_Apps.conf index da8350b4..6a34d02a 100644 --- a/config/hypr/configs/Startup_Apps.conf +++ b/config/hypr/configs/Startup_Apps.conf @@ -3,7 +3,7 @@ $scriptsDir = $HOME/.config/hypr/scripts $lock = swaylock $SwwwRandom = $scriptsDir/WallpaperAutoChange.sh -$wallDIR=$HOME/Pictures/wallpaperss +$wallDIR=$HOME/Pictures/wallpapers # Initial boot script enable to apply initial wallpapers, theming, new settings etc. diff --git a/config/hypr/scripts/WallpaperAutoChange.sh b/config/hypr/scripts/WallpaperAutoChange.sh index 9bbca717..8358c0be 100755 --- a/config/hypr/scripts/WallpaperAutoChange.sh +++ b/config/hypr/scripts/WallpaperAutoChange.sh @@ -28,8 +28,9 @@ while true; do done \ | sort -n | cut -d':' -f2- \ | while read -r img; do + # Create symbolic link to the current image + ln -sf "$img" $HOME/.config/hypr/.current_wallpaper swww img "$img" sleep $INTERVAL - done done diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md index 0865bb26..10efef52 100644 --- a/config/nvim/.github/README.md +++ b/config/nvim/.github/README.md @@ -1,3 +1,4 @@ + # :herb: ‎ About @@ -339,7 +340,7 @@ 🔡 Programming Language Support - [gennaro-tedesco/nvim-jqx](https://dotfyle.com/plugins/gennaro-tedesco/nvim-jqx) -- [simrat39/rust-tools.nvim](https://dotfyle.com/plugins/simrat39/rust-tools.nvim) +- [mrcjkb/rustaceanvim](https://dotfyle.com/plugins/mrcjkb/rustaceanvim) - [dmmulroy/tsc.nvim](https://dotfyle.com/plugins/dmmulroy/tsc.nvim) - [mfussenegger/nvim-jdtls](https://dotfyle.com/plugins/mfussenegger/nvim-jdtls) - [ray-x/go.nvim](https://dotfyle.com/plugins/ray-x/go.nvim) @@ -439,6 +440,7 @@ - [nvim-neotest/neotest](https://dotfyle.com/plugins/nvim-neotest/neotest) - [haydenmeade/neotest-jest](https://github.com/nvim-neotest/neotest-jest) - [adrigzr/neotest-mocha](https://github.com/adrigzr/neotest-mocha) +- [rcasia/neotest-java](https://github.com/rcasia/neotest-java) - [marilari88/neotest-vitest](https://github.com/marilari88/neotest-vitest) - [rcasia/neotest-bash](https://github.com/rcasia/neotest-bash) - [mrcjkb/neotest-haskell](https://github.com/mrcjkb/neotest-haskell) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index bb82abf5..866f4e36 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" }, "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "SchemaStore.nvim": { "branch": "main", "commit": "9cc6e7d6dc69408de20fee6bad42a93cdb11dbc6" }, + "SchemaStore.nvim": { "branch": "main", "commit": "90149d11708d38037e340bf7a668e1a79217680d" }, "actions-preview.nvim": { "branch": "master", "commit": "8f79029a36ab6807478f157538a91ccd4af5858f" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, @@ -14,10 +14,10 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.vim": { "branch": "main", "commit": "a31ff444697497438cd2569200ddb4af846cae65" }, + "codeium.vim": { "branch": "main", "commit": "4063291e335e74e9ee2be04beb47d40b376312fa" }, "compiler.nvim": { "branch": "main", "commit": "b2661965cc4a9603642ddb03fb766fd2bd8b2dc9" }, - "conform.nvim": { "branch": "master", "commit": "ad2b5ecd907128ed1b66b1cf4bed57902ef836ee" }, - "crates.nvim": { "branch": "main", "commit": "81c6325b7f8875857ec09e5d24f3b6d7986f29e2" }, + "conform.nvim": { "branch": "master", "commit": "c4b2efb8aee4af0ef179a9b49ba401de3c4ef5d2" }, + "crates.nvim": { "branch": "main", "commit": "6d779c7b85139d89d92a4a0bcf0afbdcf0cd961a" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "debugprint.nvim": { "branch": "main", "commit": "13378f67edc112bf0d043bc0c018f8923dc2198d" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, @@ -36,10 +36,10 @@ "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" }, "hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" }, - "icon-picker.nvim": { "branch": "master", "commit": "172717e16ef9fe8bf289a75eca8372962726c8c8" }, + "icon-picker.nvim": { "branch": "master", "commit": "b94b9d30f2bf31ec3b35e15d778c1707c24ff9bf" }, "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, - "kitty-scrollback.nvim": { "branch": "main", "commit": "7f33ae83bbcccc15022a9b9b5802b5796b73fea7" }, + "kitty-scrollback.nvim": { "branch": "main", "commit": "da7c576180a36f40e1d4d39878b3e13385f280e4" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, @@ -60,12 +60,12 @@ "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, "neodev.nvim": { "branch": "main", "commit": "2a8630847dbb93455936156c0689678e4eaee319" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, - "neotest": { "branch": "master", "commit": "6aa6e4529a4a125b49c48541b97ba146ceee2441" }, + "neotest": { "branch": "master", "commit": "f74ac06c51ae91c97681e8e9904fb10277e843f5" }, "neotest-bash": { "branch": "main", "commit": "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb" }, "neotest-jest": { "branch": "main", "commit": "a394106cf053eef86d65ae04c4b93a1a7bd60aef" }, "neotest-mocha": { "branch": "main", "commit": "68f0e9768a94c3ebd4d5e67b2765e6a5df017d99" }, "neotest-python": { "branch": "master", "commit": "86ac2bbc8a4da3f203e56d9303d6ed1d7e50c1f6" }, - "neotest-rust": { "branch": "main", "commit": "48c1e146ed0eb775fef6aca75903baf3cedadc01" }, + "neotest-rust": { "branch": "main", "commit": "3c06f239ad260f02c8678141e08b57d20fbe2c55" }, "neotest-vitest": { "branch": "main", "commit": "15972c4791b3d47df82311047835803a072c1da6" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, @@ -74,26 +74,26 @@ "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, - "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-dap-ui": { "branch": "master", "commit": "947660daced01c3eb673e3dc9527c988e42fe4cc" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" }, "nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" }, "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, "nvim-lint": { "branch": "master", "commit": "4dbc7ec60b33b656f7c54bb945671a55b18699f2" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "8e7223e138590c1bd9d86d3de810e65939d8b12f" }, "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-notify": { "branch": "master", "commit": "ebcdd8219e2a2cbc0a4bef68002f6867f1fde269" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" }, "nvim-recorder": { "branch": "main", "commit": "daaae505862e816a7efe578e22d6f3d10cd7a2e6" }, "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, - "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, + "nvim-treesitter": { "branch": "master", "commit": "0da349ed303bea955942f409d29059cdb89dbe2c" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, - "nvim-various-textobjs": { "branch": "main", "commit": "ad4ebcac5bb26af49959de20a8bd235a9b97c4b0" }, - "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" }, + "nvim-various-textobjs": { "branch": "main", "commit": "e7d4f3d00ebfd6f29fd46b837a09c19096176133" }, + "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" }, "nvim_context_vt": { "branch": "master", "commit": "a14f9292b4bd68ceed433fc513f287641816dc6d" }, "octo.nvim": { "branch": "master", "commit": "b5371003f209764c9d1cc43cf20b6dc52961f0e8" }, "openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" }, @@ -104,13 +104,13 @@ "persistent-breakpoints.nvim": { "branch": "main", "commit": "db2ad5974b0435cb806cd287e7525219d6ac4bd3" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "1ed4613437c585eacd5c8827b408e6db8234c3ee" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "4a90ac83c7c8e0ba8a1b6af38bed6d5ee1b04e08" }, "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" }, - "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, - "satellite.nvim": { "branch": "main", "commit": "acb185e1475a19e2538ee517fb540b82db629887" }, + "rustaceanvim": { "branch": "master", "commit": "3a439b5c76f0e54bd8bf3b498a849079015fc20f" }, + "satellite.nvim": { "branch": "main", "commit": "1a20861227eba8bf2d8282ab4ec5fc071e8b20e2" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, - "smart-splits.nvim": { "branch": "master", "commit": "f0003bf9c3f11b8b9209264f865b8864453ca926" }, + "smart-splits.nvim": { "branch": "master", "commit": "403ad1a4fd7eb39388690a5657e7cbfb16da6668" }, "sniprun": { "branch": "master", "commit": "551f5839c1ccc8b4d3143ae03f58757d3047e391" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, @@ -122,12 +122,12 @@ "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "3466159b0fcc1876483f6f53587562628664d850" }, - "text-case.nvim": { "branch": "main", "commit": "d6f121ec471118afb4fc7ed8cafb08eef3e9b307" }, + "telescope.nvim": { "branch": "master", "commit": "8b56e9bb2d0b8750c2f8cd4efe9738e3c066889b" }, + "text-case.nvim": { "branch": "main", "commit": "51fba4b76ff39e2a3264a7201be3c9310cfcdb58" }, "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, - "tree-sitter-hypr": { "branch": "master", "commit": "da3c1d780c8e04446722ece04beadb6a44eb442d" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "9bd008f08ffbfb94146ce9d4f31002de66f0e627" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "ts-node-action": { "branch": "master", "commit": "e37eb458378de5d994df459a53711b2546abef0f" }, "tsc.nvim": { "branch": "main", "commit": "a8f26d3d6a0faf533afb840816a6d9ac6a1fcbea" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index afbfebac..467987e2 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -4,7 +4,6 @@ "lazyvim.plugins.extras.lang.python-semshi", "lazyvim.plugins.extras.lang.yaml", "lazyvim.plugins.extras.ui.edgy", - "lazyvim.plugins.extras.util.dot", "plugins.extras.coding.ai.codeium", "plugins.extras.coding.ai.gpt", "plugins.extras.coding.annotation", @@ -54,8 +53,7 @@ "plugins.extras.lang.python-extended", "plugins.extras.lang.rust-extended", "plugins.extras.lang.sql", - "plugins.extras.lang.web.css", - "plugins.extras.lang.web.html", + "plugins.extras.lang.web.html-css", "plugins.extras.lang.web.typescript-extended", "plugins.extras.linting.eslint-extended", "plugins.extras.linting.shellcheck", @@ -79,6 +77,7 @@ "plugins.extras.ui.zen-mode", "plugins.extras.util.bigfile", "plugins.extras.util.discordrcp", + "plugins.extras.util.dot-extended", "plugins.extras.util.icon-picker", "plugins.extras.util.kitty-scrollback", "plugins.extras.util.vscode", diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua index a98c0b50..605f6b44 100644 --- a/config/nvim/lua/config/keymaps.lua +++ b/config/nvim/lua/config/keymaps.lua @@ -66,10 +66,11 @@ map("n", "", ":%y+", { desc = "Copy whole text to clipboard", silent = -- Select all text map("n", "", "ggG", { desc = "Select all text", silent = true, noremap = true }) --- Better paste --- remap "p" in visual mode to delete the highlighted text without overwriting your yanked/copied text, and then paste the content from the unnamed register. -map("v", "p", '"_dP') +-- Paste options +map("i", "", '"', { desc = "Paste on insert mode" }) +map("v", "p", '"_dP', { desc = "Paste without overwriting" }) +-- Deleting without yanking empty line map("n", "dd", function() local is_empty_line = vim.api.nvim_get_current_line():match("^%s*$") if is_empty_line then diff --git a/config/nvim/lua/config/neovide.lua b/config/nvim/lua/config/neovide.lua index cdb99ccd..37a8c517 100644 --- a/config/nvim/lua/config/neovide.lua +++ b/config/nvim/lua/config/neovide.lua @@ -11,16 +11,7 @@ ResizeGuiFont = function(delta) RefreshGuiFont() end -ResetGuiFont = function() - vim.g.gui_font_size = vim.g.gui_font_default_size - RefreshGuiFont() -end - --- Call function on startup to set default value -ResetGuiFont() - -- Keymaps - local opts = { noremap = true, silent = true } vim.keymap.set({ "n", "i" }, "", function() @@ -29,9 +20,6 @@ end, opts) vim.keymap.set({ "n", "i" }, "", function() ResizeGuiFont(-1) end, opts) -vim.keymap.set({ "n", "i" }, "", function() - ResetGuiFont() -end, opts) vim.g.neovide_padding_top = 5 vim.g.neovide_padding_right = 5 @@ -47,24 +35,3 @@ vim.g.neovide_cursor_antialiasing = false vim.g.neovide_cursor_vfx_mode = "pixiedust" vim.opt.winblend = 20 - -if vim.fn.exists("g:terminal_color_0") == 0 then - vim.api.nvim_set_var("terminal_color_0", "#494D64") - vim.api.nvim_set_var("terminal_color_1", "#ED8796") - vim.api.nvim_set_var("terminal_color_2", "#A6DA95") - vim.api.nvim_set_var("terminal_color_3", "#EED49F") - vim.api.nvim_set_var("terminal_color_4", "#8AADF4") - vim.api.nvim_set_var("terminal_color_5", "#F5BDE6") - vim.api.nvim_set_var("terminal_color_6", "#8BD5CA") - vim.api.nvim_set_var("terminal_color_7", "#B8C0E0") - vim.api.nvim_set_var("terminal_color_8", "#5B6078") - vim.api.nvim_set_var("terminal_color_9", "#ED8796") - vim.api.nvim_set_var("terminal_color_10", "#A6DA95") - vim.api.nvim_set_var("terminal_color_11", "#EED49F") - vim.api.nvim_set_var("terminal_color_12", "#8AADF4") - vim.api.nvim_set_var("terminal_color_13", "#F5BDE6") - vim.api.nvim_set_var("terminal_color_14", "#8BD5CA") - vim.api.nvim_set_var("terminal_color_15", "#B8C0E0") -end - -vim.g.neovide_theme = "catppuccin-macchiato" diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index d54e1b52..2a6f7cd4 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -1,16 +1,16 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here +-- Neovide options require("config.neovide") +-- Optimizations on startup vim.loader.enable() -vim.g.mapleader = " " - +-- Font vim.g.gui_font_default_size = 10 vim.g.gui_font_size = vim.g.gui_font_default_size vim.g.gui_font_face = "JetBrainsMono Nerd Font" -vim.o.winwidth = 10 -vim.o.winminwidth = 10 -vim.o.equalalways = false +-- Define leader key +vim.g.mapleader = " " diff --git a/config/nvim/lua/plugins/extras/editor/git/github.lua b/config/nvim/lua/plugins/extras/editor/git/github.lua index 1a09b42f..dc11d7ec 100644 --- a/config/nvim/lua/plugins/extras/editor/git/github.lua +++ b/config/nvim/lua/plugins/extras/editor/git/github.lua @@ -1,6 +1,13 @@ local prefix = "G" return { + { + "williamboman/mason.nvim", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "gh" }) + end, + }, { "almo7aya/openingh.nvim", cmd = { "OpenInGHRepo", "OpenInGHFile", "OpenInGHFileLines" }, diff --git a/config/nvim/lua/plugins/extras/lang/java-extended.lua b/config/nvim/lua/plugins/extras/lang/java-extended.lua new file mode 100644 index 00000000..8ebd14f5 --- /dev/null +++ b/config/nvim/lua/plugins/extras/lang/java-extended.lua @@ -0,0 +1,91 @@ +local Util = require("lazyvim.util") + +return { + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "java" }) + end, + }, + { + "mfussenegger/nvim-dap", + optional = true, + dependencies = { + { + "williamboman/mason.nvim", + opts = function(_, opts) + opts.registries = { + "github:nvim-java/mason-registry", + "github:mason-org/mason-registry", + } + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "java-test", "java-debug-adapter" }) + end, + }, + }, + }, + { + "nvim-java/nvim-java", + lazy = true, + ft = "java", + dependencies = { + { "nvim-java/lua-async-await" }, + { "nvim-java/nvim-java-core" }, + { "nvim-java/nvim-java-test" }, + { "nvim-java/nvim-java-dap" }, + { + "neovim/nvim-lspconfig", + opts = { + servers = { + jdtls = { + keys = { + -- Workaround for the lack of a DAP strategy in neotest-java + { + "td", + function() + require("java").dap.config_dap() + require("java").test.debug_current_method() + end, + desc = "Debug Nearest (Java)", + }, + }, + }, + }, + }, + }, + { + "williamboman/mason-lspconfig.nvim", + opts = { + handlers = { + ["jdtls"] = function() + require("java").setup({ + java_test = { + enable = Util.has("nvim-dap"), + }, + java_debug_adapter = { + enable = Util.has("nvim-dap"), + }, + jdk = { + auto_install = false, + }, + }) + end, + }, + }, + }, + }, + }, + { + "nvim-neotest/neotest", + optional = true, + dependencies = { + "rcasia/neotest-java", + }, + opts = { + adapters = { + ["neotest-java"] = {}, + }, + }, + }, +} diff --git a/config/nvim/lua/plugins/extras/lang/rust-extended.lua b/config/nvim/lua/plugins/extras/lang/rust-extended.lua index 60aef896..47af05ec 100644 --- a/config/nvim/lua/plugins/extras/lang/rust-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/rust-extended.lua @@ -1,5 +1,67 @@ return { { import = "lazyvim.plugins.extras.lang.rust" }, + { + "simrat39/rust-tools.nvim", + enabled = false, + }, + { + "mrcjkb/rustaceanvim", + version = "^3", -- Recommended + ft = { "rust" }, + opts = { + server = { + on_attach = function(client, bufnr) + -- register which-key mappings + local wk = require("which-key") + -- stylua: ignore + wk.register({ + ["cR"] = { function() vim.cmd.RustLsp("codeAction") end, "Code Action" }, + ["dr"] = { function() vim.cmd.RustLsp("debuggables") end, "Rust debuggables" }, + }, { mode = "n", buffer = bufnr }) + end, + settings = { + -- rust-analyzer language server configuration + ["rust-analyzer"] = { + cargo = { + allFeatures = true, + loadOutDirsFromCheck = true, + runBuildScripts = true, + }, + -- Add clippy lints for Rust. + checkOnSave = { + allFeatures = true, + command = "clippy", + extraArgs = { "--no-deps" }, + }, + procMacro = { + enable = true, + ignored = { + ["async-trait"] = { "async_trait" }, + ["napi-derive"] = { "napi" }, + ["async-recursion"] = { "async_recursion" }, + }, + }, + }, + }, + }, + }, + config = function(_, opts) + vim.g.rustaceanvim = vim.tbl_deep_extend("force", {}, opts or {}) + end, + }, + { + "neovim/nvim-lspconfig", + opts = { + servers = { + rust_analyzer = {}, + }, + setup = { + rust_analyzer = function() + return true + end, + }, + }, + }, { "luckasRanarison/nvim-devdocs", optional = true, diff --git a/config/nvim/lua/plugins/extras/lang/web/angular.lua b/config/nvim/lua/plugins/extras/lang/web/angular.lua index 1eeee4b4..076514eb 100644 --- a/config/nvim/lua/plugins/extras/lang/web/angular.lua +++ b/config/nvim/lua/plugins/extras/lang/web/angular.lua @@ -1,7 +1,6 @@ return { { import = "pugins.extras.lang.web.typescript-extended" }, - { import = "plugins.extras.lang.web.html" }, - { import = "plugins.extras.lang.web.css" }, + { import = "plugins.extras.lang.web.html-css" }, { "nvim-treesitter/nvim-treesitter", opts = function(_, opts) diff --git a/config/nvim/lua/plugins/extras/lang/web/css.lua b/config/nvim/lua/plugins/extras/lang/web/html-css.lua similarity index 77% rename from config/nvim/lua/plugins/extras/lang/web/css.lua rename to config/nvim/lua/plugins/extras/lang/web/html-css.lua index 5102dae5..3b6ad327 100644 --- a/config/nvim/lua/plugins/extras/lang/web/css.lua +++ b/config/nvim/lua/plugins/extras/lang/web/html-css.lua @@ -2,15 +2,19 @@ return { { "nvim-treesitter/nvim-treesitter", opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "css", "scss" }) - end + vim.list_extend(opts.ensure_installed, { + "html", + "css", + "scss", + }) end, }, { "neovim/nvim-lspconfig", opts = { servers = { + emmet_language_server = {}, + html = {}, cssmodules_ls = {}, cssls = { lint = { @@ -39,13 +43,19 @@ return { "williamboman/mason.nvim", opts = function(_, opts) opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "cssmodules-language-server", "css-lsp" }) + vim.list_extend(opts.ensure_installed, { + "emmet-language-server", + "html-lsp", + "cssmodules-language-server", + "css-lsp", + }) end, }, { "luckasRanarison/nvim-devdocs", optional = true, ensure_installed = { + "html", "css", "sass", }, diff --git a/config/nvim/lua/plugins/extras/lang/web/html.lua b/config/nvim/lua/plugins/extras/lang/web/html.lua deleted file mode 100644 index 855816f5..00000000 --- a/config/nvim/lua/plugins/extras/lang/web/html.lua +++ /dev/null @@ -1,33 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "html", - }) - end, - }, - { - "neovim/nvim-lspconfig", - opts = { - servers = { - emmet_language_server = {}, - html = {}, - }, - }, - }, - { - "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "emmet-language-server", "html-lsp" }) - end, - }, - { - "luckasRanarison/nvim-devdocs", - optional = true, - ensure_installed = { - "html", - }, - }, -} diff --git a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua index ca076681..f09d801a 100644 --- a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua @@ -1,6 +1,15 @@ return { { import = "lazyvim.plugins.extras.lang.typescript" }, { import = "lazyvim.plugins.extras.lang.json" }, + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + vim.list_extend(opts.ensure_installed, { + "javascript", + "jsdoc", + }) + end, + }, { "dmmulroy/tsc.nvim", opts = { @@ -95,7 +104,7 @@ return { ["neotest-mocha"] = { command = "npm test --", env = { CI = true }, - cwd = function(path) + cwd = function() return vim.fn.getcwd() end, }, diff --git a/config/nvim/lua/plugins/extras/lsp/symbol-usage.lua b/config/nvim/lua/plugins/extras/lsp/symbol-usage.lua index 54599683..c0c11fa2 100644 --- a/config/nvim/lua/plugins/extras/lsp/symbol-usage.lua +++ b/config/nvim/lua/plugins/extras/lsp/symbol-usage.lua @@ -7,5 +7,16 @@ return { return "BufRead" end end, - opts = {}, + opts = { + vt_position = "end_of_line", + text_format = function(symbol) + if symbol.references then + local usage = symbol.references <= 1 and "usage" or "usages" + local num = symbol.references == 0 and "no" or symbol.references + return string.format(" 󰌹 %s %s", num, usage) + else + return "" + end + end, + }, } diff --git a/config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua b/config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua index f451b36c..82a64ab7 100644 --- a/config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua +++ b/config/nvim/lua/plugins/extras/ui/colorschemes/catppuccin.lua @@ -10,6 +10,7 @@ return { light = "latte", dark = "macchiato", }, + term_colors = true, integrations = { alpha = true, cmp = true, diff --git a/config/nvim/lua/plugins/extras/ui/img-clip.lua b/config/nvim/lua/plugins/extras/ui/img-clip.lua new file mode 100644 index 00000000..0ab7171f --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/img-clip.lua @@ -0,0 +1,7 @@ +return { + "HakonHarnes/img-clip.nvim", + opts = {}, + keys = { + { "P", "PasteImage", desc = "Paste clipboard image" }, + }, +} diff --git a/config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua b/config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua index c7de3f3d..677fe292 100644 --- a/config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua +++ b/config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua @@ -6,5 +6,6 @@ return { extra_keymaps = true, extended_keymaps = true, override_keymaps = true, + default_delay = 3, }, } diff --git a/config/nvim/lua/plugins/extras/util/dot-extended.lua b/config/nvim/lua/plugins/extras/util/dot-extended.lua new file mode 100644 index 00000000..391a60c7 --- /dev/null +++ b/config/nvim/lua/plugins/extras/util/dot-extended.lua @@ -0,0 +1,35 @@ +---@type string +local xdg_config = vim.env.XDG_CONFIG_HOME or vim.env.HOME .. "/.config" + +---@param path string +local function have(path) + return vim.loop.fs_stat(xdg_config .. "/" .. path) ~= nil +end + +return { + { + import = "lazyvim.plugins.extras.util.dot", + }, + { + "luckasRanarison/tree-sitter-hypr", + enabled = false, + }, + { + "luckasRanarison/tree-sitter-hyprlang", + dependencies = { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if have("hypr") then + if type(opts.ensure_installed) == "table" then + vim.list_extend(opts.ensure_installed, { "hyprlang" }) + end + end + end, + }, + enabled = function() + return have("hypr") + end, + event = "BufRead */hypr/*.conf", + build = ":TSUpdate hyprlang", + }, +} diff --git a/config/nvim/lua/plugins/extras/util/vscode.lua b/config/nvim/lua/plugins/extras/util/vscode.lua index 97bf6980..788f88fe 100644 --- a/config/nvim/lua/plugins/extras/util/vscode.lua +++ b/config/nvim/lua/plugins/extras/util/vscode.lua @@ -37,7 +37,7 @@ vim.api.nvim_create_autocmd("User", { vim.keymap.set("n", "/", [[call VSCodeNotify('workbench.action.findInFiles')]]) -- open symbol vim.keymap.set("n", "ss", [[call VSCodeNotify('workbench.action.gotoSymbol')]]) - -- view problem + -- view problems vim.keymap.set("n", "xx", [[call VSCodeNotify('workbench.actions.view.problems')]]) -- open file explorer in left sidebar vim.keymap.set("n", "e", [[call VSCodeNotify('workbench.view.explorer')]]) diff --git a/config/nvim/lua/plugins/theme-loader.lua b/config/nvim/lua/plugins/theme-loader.lua index dc677198..aec5bcb8 100644 --- a/config/nvim/lua/plugins/theme-loader.lua +++ b/config/nvim/lua/plugins/theme-loader.lua @@ -1,6 +1,17 @@ return { - "rafi/theme-loader.nvim", - lazy = false, - priority = 999, - opts = {}, + { + "rafi/theme-loader.nvim", + lazy = false, + priority = 999, + opts = {}, + }, + { + "LazyVim/LazyVim", + config = function(_, opts) + opts = opts or {} + -- disable the colorscheme + opts.colorscheme = function() end + require("lazyvim").setup(opts) + end, + }, } diff --git a/config/rofi/config-notes.rasi b/config/rofi/config-notes.rasi deleted file mode 100644 index 277e8bd6..00000000 --- a/config/rofi/config-notes.rasi +++ /dev/null @@ -1,240 +0,0 @@ - -/*****----- Configuration -----*****/ -configuration { - modi: "drun,run,filebrowser"; - font: "Fira Code SemiBold 12"; - show-icons: true; - display-drun: ""; - display-run: ""; - display-filebrowser: ""; - display-window: "󱂬"; - drun-display-format: "{name}"; - hover-select: true; - me-select-entry: "MouseSecondary"; - me-accept-entry: "MousePrimary"; - window-format: "{w} · {c} · {t}"; - dpi: 1; -} - -* { - - background: #1E1D2FFF; - background-alt: #282839FF; - foreground: #D9E0EEFF; - selected: #7AA2F7FF; - active: #ABE9B3FF; - urgent: #F28FADFF; - - - border-colour: var(selected); - handle-colour: var(selected); - background-colour: var(background); - foreground-colour: var(foreground); - alternate-background: var(background-alt); - normal-background: var(background); - normal-foreground: var(foreground); - urgent-background: var(urgent); - urgent-foreground: var(background); - active-background: var(active); - active-foreground: var(background); - -} - -/*****----- Main Window -----*****/ -/* ---- Window ---- */ -window { - width: 25%; - x-offset: 0px; - y-offset: 0px; - spacing: 0px; - padding: 2px; - margin: 0px; - border: 2px; - border-color: @foreground; - cursor: "default"; - location: center; - anchor: center; - fullscreen: false; - enabled: true; - border-radius: 15px; - border-radius: 15px; - background-color: transparent; -} - -/*****----- Main Box -----*****/ -mainbox { - enabled: true; - orientation: vertical; - padding: 8px; - border-radius: 12px; - border-color: @border-colour; - background-color: transparent; - children: [ "inputbar", "listbox"]; - background-image: url("~/.config/hypr/.current_wallpaper", height); -} - -/*****----- Inputbar -----*****/ -inputbar { - enabled: true; - spacing: 10px; - padding: 14px; - border-radius: 10px; - border: 1px; - border-color: @foreground; - background-color: transparent; - text-color: @foreground; - children: [ "prompt", "textbox-prompt-colon", "entry" ]; -} - -prompt { - enabled: true; - background-color: inherit; - text-color: inherit; -} -textbox-prompt-colon { - enabled: true; - expand: false; - str: ""; - background-color: transparent; - text-color: inherit; -} -entry { - enabled: true; - background-color: transparent; - text-color: inherit; - cursor: text; - placeholder: "..."; - placeholder-color: inherit; -} - -/* ---- Listbox ---- */ -listbox { - spacing: 4px; - padding: 1px; - orientation: vertical; - children: [ "listview" ]; - border-radius: 10px; - border: 1px; - border-color: @foreground; - background-color: transparent; -} - -/* ---- Dummy ---- */ -dummy { - background-color: transparent; -} - -/* ---- Listview ---- */ -listview { - enabled: true; - columns: 1; - lines: 10; - spacing: 4px; - dynamic: true; - cycle: true; - scrollbar: false; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: false; - background-color: transparent; - border-radius: 10px; -} -scrollbar { - handle-width: 1px ; - handle-color: @handle-colour; - border-radius: 1px; - background-color: @alternate-background; -} - -/* ---- Element ---- */ -element { - enabled: true; - padding: 5px; - margin: 2px; - cursor: pointer; - background-color: transparent; - border-radius: 10px; - border: 0px; -} - -element normal.normal { - background-color: inherit; - text-color: @foreground; -} - -element normal.urgent { - background-color: inherit; - text-color: @foreground; -} - -element normal.active { - background-color: inherit; - text-color: @foreground; -} - -element selected.normal { - background-color: @selected; - text-color: @foreground; -} - -element selected.urgent { - background-color: inherit; - text-color: @foreground; -} - -element selected.active { - background-color: inherit; - text-color: @foreground; -} - -element alternate.normal { - background-color: inherit; - text-color: @foreground; -} - -element alternate.urgent { - background-color: inherit; - text-color: @foreground; -} - -element alternate.active { - background-color: inherit; - text-color: @foreground; -} - -element-icon { - background-color: transparent; - text-color: inherit; - size: 32px; - cursor: inherit; -} - -element-text { - background-color: transparent; - text-color: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -/*****----- Message -----*****/ -message { - background-color: @background; - margin: 20px 0px 0px 0px; - border-radius: 10px; -} - -textbox { - padding: 15px; - background-color: @background; - text-color: @foreground; -} - -error-message { - padding: 15px; - border-radius: 20px; - background-color: @background; - text-color: @foreground; -} - diff --git a/config/rofi/config-todo.rasi b/config/rofi/config-todo.rasi deleted file mode 100644 index 460d155b..00000000 --- a/config/rofi/config-todo.rasi +++ /dev/null @@ -1,228 +0,0 @@ - -/* ---- Configuration ---- */ -configuration { - modi: "drun,run"; - font: "Fira Code SemiBold 12"; - show-icons: true; - display-drun: ""; - display-run: ""; - display-filebrowser: ""; - display-window: "󱂬"; - drun-display-format: "{name}"; - hover-select: true; - me-select-entry: "MouseSecondary"; - me-accept-entry: "MousePrimary"; - window-format: "{w} · {c} · {t}"; - dpi: 1; - -} - -* { - background: #1E1F29FF; - background-alt: #282A36FF; - foreground: #FFFFFFFF; - selected: #BD93F9FF; - active: #50FA7BFF; - urgent: #FF5555FF; - alternate-background: var(background-alt); - handle-colour: var(selected); - -} - -/* ---- Window ---- */ -window { - width: 400px; - x-offset: 0px; - y-offset: 0px; - spacing: 0px; - padding: 2px; - margin: 0px; - border: 2px; - border-color: @foreground; - cursor: "default"; - location: center; - anchor: center; - fullscreen: false; - enabled: true; - border-radius: 12px; - background-color: transparent; -} - -/* ---- Mainbox ---- */ -mainbox { - enabled: true; - orientation: vertical; - padding: 8px; - background-image: url("~/.config/hypr/.current_wallpaper", height); - children: [ "imagebox" ]; - border-radius: 12px; - background-color: transparent; -} - -/* ---- Imagebox ---- */ -imagebox { - background-color: transparent; - orientation: vertical; - children: [ "inputbar", "listbox"]; -} - -/* ---- Listbox ---- */ -listbox { - spacing: 4px; - orientation: vertical; - children: [ "listview" ]; - border-radius: 10px; - border: 1px; - border-color: @foreground; - background-color: transparent; -} - -/* ---- Inputbar ---- */ -inputbar { - enabled: true; - text-color: @foreground; - spacing: 10px; - padding: 6px; - border-radius: 10px; - border-color: @foreground; - background-color: transparent; - children: [ "textbox-prompt-colon", "entry" ]; - border: 1px; - border-color: @foreground; -} - -textbox-prompt-colon { - enabled: true; - expand: false; - str: "  To-Do List"; - text-color: @active; - background-color: transparent; -} - -entry { - enabled: false; - text-color: inherit; - cursor: text; - placeholder: "......."; - placeholder-color: inherit; - background-color: transparent; -} - -/* ---- Listview ---- */ -listview { - enabled: true; - columns: 1; - lines: 9; - spacing: 4px; - dynamic: true; - cycle: true; - scrollbar: true; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: true; - background-color: transparent; - border-radius: 10px; -} -scrollbar { - handle-width: 2px ; - handle-color: @handle-colour; - border-radius: 10px; - background-color: @alternate-background; -} -/* ---- Element ---- */ -element { - enabled: true; - padding: 2px; - margin: 2px; - cursor: pointer; - background-color: transparent; - border-radius: 10px; -} - -element normal.normal { - background-color: inherit; - text-color: @foreground; -} - -element normal.urgent { - background-color: inherit; - text-color: @foreground; -} - -element normal.active { - background-color: inherit; - text-color: @foreground; -} - -element selected.normal { - background-color: @selected; - text-color: @foreground; -} - -element selected.urgent { - background-color: inherit; - text-color: @foreground; -} - -element selected.active { - background-color: inherit; - text-color: @foreground; -} - -element alternate.normal { - background-color: inherit; - text-color: @foreground; -} - -element alternate.urgent { - background-color: inherit; - text-color: @foreground; -} - -element alternate.active { - background-color: inherit; - text-color: @foreground; -} - -element-icon { - background-color: transparent; - text-color: inherit; - size: 32px; - cursor: inherit; -} - -element-text { - background-color: transparent; - text-color: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -/*****----- Message -----*****/ -message { - background-color: transparent; - border: 0px; - margin: 20px 0px 0px 0px; - padding: 0px; - spacing: 0px; - border-radius: 10px; -} - -textbox { - padding: 6px; - margin: 0px; - border-radius: 0px; - background-color: transparent; - text-color: @foreground; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -error-message { - padding: 6px; - border-radius: 20px; - background-color: @background; - text-color: @foreground; -} diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index 10a2aca6..45e2dcf5 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -1,23 +1,22 @@ - -/*****----- Configuration -----*****/ +/* ---- Configuration ---- */ configuration { - modi: "drun,run,filebrowser"; - font: "Fira Code SemiBold 12"; - show-icons: true; - display-drun: ""; - display-run: ""; - display-filebrowser: ""; - display-window: "󱂬"; - drun-display-format: "{name}"; - hover-select: true; - me-select-entry: "MouseSecondary"; - me-accept-entry: "MousePrimary"; - window-format: "{w} · {c} · {t}"; - dpi: 1; + modi: "drun,run,filebrowser"; + font: "Fira Code SemiBold 12"; + show-icons: true; + display-drun: ""; + display-run: ""; + display-filebrowser: ""; + display-window: ""; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: "MouseSecondary"; + me-accept-entry: "MousePrimary"; + window-format: "{w} · {c} · {t}"; + dpi: 1; + } -/*****----- Global Properties -----*****/ * { background: #1E1D2FFF; background-alt: #282839FF; @@ -25,249 +24,201 @@ configuration { selected: #7AA2F7FF; active: #ABE9B3FF; urgent: #F28FADFF; - - border-colour: var(selected); - handle-colour: var(selected); - background-colour: var(background); - foreground-colour: var(foreground); - alternate-background: var(background-alt); - normal-background: var(background); - normal-foreground: var(foreground); - urgent-background: var(urgent); - urgent-foreground: var(background); - active-background: var(active); - active-foreground: var(background); - selected-normal-background: var(selected); - selected-normal-foreground: var(background); - selected-urgent-background: var(active); - selected-urgent-foreground: var(background); - selected-active-background: var(urgent); - selected-active-foreground: var(background); - alternate-normal-background: var(background); - alternate-normal-foreground: var(foreground); - alternate-urgent-background: var(urgent); - alternate-urgent-foreground: var(background); - alternate-active-background: var(active); - alternate-active-foreground: var(background); } -/*****----- Main Window -----*****/ +/* ---- Window ---- */ window { - /* properties for window widget */ - transparency: "real"; - location: center; - anchor: center; - fullscreen: false; - width: 800px; - x-offset: 0px; - y-offset: 0px; - - /* properties for all widgets */ - enabled: true; - margin: 0px; - padding: 0px; - border: 2px solid; - border-radius: 10px; - border-color: @border-colour; - cursor: "default"; + width: 700px; + /*height: 450px;*/ + x-offset: 0px; + y-offset: 0px; + spacing: 0px; + padding: 2px; + margin: 0px; + border: 2px; + border-color: @foreground; + cursor: "default"; + location: center; + anchor: center; + fullscreen: false; + enabled: true; + border-radius: 12px; + border-radius: 12px; + background-color: transparent; + background-image: url("~/.config/hypr/.current_wallpaper", height); } -/*****----- Main Box -----*****/ +/* ---- Mainbox ---- */ mainbox { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 30px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border-colour; - background-color: transparent; - children: [ "inputbar", "listview", "mode-switcher" ]; - background-image: url("~/.config/hypr/.current_wallpaper", height); + enabled: true; + orientation: horizontal; + padding: 8px; + children: [ "imagebox"]; + border-radius: 12px; + background-color: transparent; } -/*****----- Inputbar -----*****/ +/* ---- Imagebox ---- */ +imagebox { + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "listbox"]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 4px; + orientation: vertical; + children: [ "listview" ]; + border-radius: 10px; + border: 1px; + border-color: @foreground; + background-color: transparent; +} + +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ inputbar { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; - children: [ "textbox-prompt-colon", "entry" ]; + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 8px; + border-radius: 10px; + border-color: @foreground; + background-color: transparent; + children: [ "textbox-prompt-colon", "entry" ]; + border: 1px; + border-color: @foreground; } -prompt { - enabled: true; - background-color: inherit; - text-color: inherit; -} textbox-prompt-colon { - enabled: true; - expand: false; - str: "󰸉 "; - background-color: transparent; - text-color: inherit; + enabled: true; + expand: false; + str: "󰸉 "; + text-color: inherit; + background-color: transparent; } + entry { - enabled: true; - background-color: inherit; - text-color: inherit; - cursor: text; - placeholder: "Choose Wallpaper"; - placeholder-color: inherit; + enabled: true; + text-color: inherit; + cursor: text; + placeholder: "Choose Wallpaper"; + placeholder-color: inherit; + background-color: transparent; } -/*****----- Listview -----*****/ +/* ---- Listview ---- */ listview { - enabled: true; - columns: 4; - lines: 3; - spacing: 4px; - cycle: true; - dynamic: true; - scrollbar: true; - layout: vertical; - fixed-height: true; - fixed-columns: true; - border-radius: 10px; - background-color: transparent; - text-color: @foreground-colour; - cursor: "default"; + enabled: true; + columns: 4; + lines: 3; + spacing: 4px; + dynamic: true; + cycle: true; + scrollbar: true; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: false; + background-color: transparent; + border-radius: 10px; } - /* ---- Element ---- */ element { - enabled: true; - padding: 5px; - margin: 2px; - orientation: vertical; - cursor: pointer; - background-color: transparent; - border-radius: 10px; - border: 0px; + enabled: true; + padding: 5px; + margin: 2px; + cursor: pointer; + orientation: vertical; + background-color: transparent; + border-radius: 10px; + border: 0px; } element normal.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.normal { - background-color: @selected; - text-color: @foreground; + background-color: @selected; + text-color: @foreground; } element selected.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element-icon { - background-color: transparent; - text-color: inherit; - size: 150px; - cursor: inherit; + background-color: transparent; + text-color: inherit; + size: 130px; + cursor: inherit; } + element-text { - background-color: transparent; - text-color: inherit; - cursor: inherit; - horizontal-align: 0.5; - vertical-align: 0.5; -} - -/*****----- Mode Switcher -----*****/ -mode-switcher{ - enabled: true; - spacing: 10px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; -} -button { - padding: 5px 10px; - border: 0px solid; - border-radius: 5px; - border-color: @border-colour; - background-color: @alternate-background; - text-color: inherit; - cursor: pointer; -} -button selected { - background-color: var(active); - text-color: var(selected-normal-foreground); + font: "Fira Code SemiBold 8"; + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.5; } /*****----- Message -----*****/ message { - enabled: true; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; + background-color: transparent; + margin: 20px 0px 0px 0px; + border-radius: 10px; } + textbox { - padding: 5px 10px; - border: 0px solid; - border-radius: 20px; - border-color: @border-colour; - background-color: @alternate-background; - text-color: @foreground-colour; - vertical-align: 0.5; - horizontal-align: 0.0; - highlight: none; - placeholder-color: @foreground-colour; - blink: true; - markup: true; + padding: 15px; + background-color: transparent; + text-color: @foreground; } + error-message { - padding: 10px; - border: 2px solid; - border-radius: 20px; - border-color: @border-colour; - background-color: @background-colour; - text-color: @foreground-colour; + padding: 15px; + border-radius: 20px; + background-color: transparent; + text-color: @foreground; } diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi index 037df3ac..5765a96c 100644 --- a/config/rofi/config.rasi +++ b/config/rofi/config.rasi @@ -40,8 +40,8 @@ window { enabled: true; margin: 0px; padding: 0px; - border: 2px solid; - border-radius: 15px; + border: 2px; + border-radius: 12px; border-color: @foreground; cursor: "default"; background-color: transparent; @@ -51,13 +51,13 @@ mainbox { enabled: true; spacing: 0px; margin: 0px; - padding: 10px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; + padding: 8px; + border: 0px; + border-radius: 12px; border-color: @foreground; background-color: transparent; children: ["inputbar","mode-switcher", "listview"]; - background-image: url("~/.config/hypr/.current_wallpaper", height); + background-image: url("~/.config/hypr/.current_wallpaper", height); } inputbar { @@ -65,7 +65,7 @@ inputbar { spacing: 10px; margin: 0px 0px 10px 0px; padding: 5px 10px; - border: 1.5px solid; + border: 1px; border-radius: 10px; border-color: @foreground; background-color: transparent; @@ -80,7 +80,7 @@ prompt { } textbox-prompt-colon { enabled: true; - padding: 5px 0px; + padding: 6px 0px 6px 10px; expand: false; str: "🐧"; background-color: inherit; @@ -88,37 +88,13 @@ textbox-prompt-colon { } entry { enabled: true; - padding: 5px 0px; - background-color: inherit; + padding: 6px 0px 0px 0px; + background-color: transparent; text-color: inherit; cursor: text; placeholder: "Search...(ctrl+tab to select windows)"; placeholder-color: inherit; } -num-filtered-rows { - enabled: true; - expand: false; - background-color: inherit; - text-color: inherit; -} -textbox-num-sep { - enabled: true; - expand: false; - str: "/"; - background-color: inherit; - text-color: inherit; -} -num-rows { - enabled: true; - expand: false; - background-color: inherit; - text-color: inherit; -} -case-indicator { - enabled: true; - background-color: inherit; - text-color: inherit; -} listview { enabled: true; @@ -132,9 +108,8 @@ listview { fixed-height: true; fixed-columns: true; - spacing: 5px; - margin: 0px; - padding: 10px; + spacing: 2px; + padding: 6px; border: 0px 1.5px 1.5px 1.5px ; border-radius: 0px 0px 10px 10px; border-color: @foreground; @@ -225,7 +200,7 @@ mode-switcher{ spacing: 0px; margin: 0px; padding: 0px; - border: 0px solid; + border: 0px; border-radius: 0px; border-color: @foreground; background-color: transparent;