diff --git a/nvim/init.lua b/nvim/init.lua index 3cf9618..81694d6 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,4 +1,2 @@ require('plugins') require('options') - -vim.cmd("colorscheme vhs") diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index 74edef9..d65da8b 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -1,16 +1,52 @@ --options-- - - vim.opt.termguicolors = true vim.opt.relativenumber = true vim.opt.number = true +vim.opt.cursorline = true +vim.opt.wrap = false + +vim.opt.scrolloff = 8 vim.opt.autoindent = false vim.opt.tabstop = 8 -vim.opt.cursorline = true -vim.opt.wrap = false +local transparent_background = false + +require("ayu").setup({ + mirage = false, + overrides = transparent_background and { + Normal = { bg = "none" }, + NormalNC = { bg = "none" }, + NormalFloat = { bg = "none" }, + SignColumn = { bg = "none" }, + VertSplit = { bg = "none" }, + StatusLine = { bg = "none" }, + LineNr = { bg = "none" }, + WinSeparator = { bg = "none" }, + } or {}, +}) + +--vim.cmd("colorscheme vhs") +vim.cmd("colorscheme ayu") + +require("lualine").setup({ + options = { + theme = "ayu_dark", + section_separators = "", + component_separators = "|", + globalstatus = true, + disabled_filetypes = { "NvimTree", "packer" }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch" }, + lualine_c = { "filename" }, + lualine_x = { "filetype" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, +}) --bindings-- @@ -67,7 +103,7 @@ local function makefile_utils() end) return true end - }):find() + }):find() end vim.keymap.set('n', 'fm', makefile_utils, { desc = 'Makefile targets' }) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 68b11f6..3ac2fe6 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -8,5 +8,8 @@ Plug('nvim-lua/plenary.nvim') Plug('nvim-treesitter/nvim-treesitter', { ['do'] = ':TSUpdate' }) Plug('nvim-telescope/telescope.nvim', { ['branch'] = '0.1.x' }) Plug('nvim-telescope/telescope-fzf-native.nvim', { ['do'] = 'make' }) +Plug('Shatur/neovim-ayu') +Plug('nvim-lualine/lualine.nvim') +Plug('nvim-tree/nvim-web-devicons') vim.call('plug#end') diff --git a/rofi/ayu.rasi b/rofi/ayu.rasi new file mode 100644 index 0000000..681044f --- /dev/null +++ b/rofi/ayu.rasi @@ -0,0 +1,65 @@ +* { + font: "Monocraft 10"; + border: 0; + padding: 6px 10px; + spacing: 4px; + width: 40%; + background: #0a0a0a; + foreground: #c0c0c0; +} + +window { + location: center; + anchor: north; + fullscreen: false; + y-offset: 40px; +} + +mainbox { + background-color: inherit; + children: [ inputbar, listview ]; +} + +inputbar { + children: [ prompt, entry ]; + background-color: inherit; + padding: 6px; +} + +prompt { + text: "🔍"; + margin: 0px 6px; + foreground: #ffcc66; +} + +entry { + background-color: inherit; + expand: true; + placeholder: "Search..."; + text-color: #f07178; + cursor: text; +} + +listview { + lines: 10; + fixed-height: true; + background-color: #0f0f0f; + spacing: 4px; + dynamic: true; + scrollbar: false; +} + +element { + padding: 4px; + background-color: transparent; + text-color: #c0c0c0; +} + +element selected { + background-color: #ffcc66; + text-color: #0a0a0a; +} + +element alternate { + background-color: #111111; +} diff --git a/rofi/config.rasi b/rofi/config.rasi index d6c218e..c59f867 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,2 +1,2 @@ -@theme "/usr/share/rofi/themes/sidebar.rasi" +@theme "~/.config/rofi/ayu.rasi"