th3r00t/nvim-config
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Change back to a working config #1

Open
th3r00t wants to merge 16 commits from New-Master into master
pull from: New-Master
merge into: th3r00t:master
Conversation 0 Commits 16 Files Changed 7 +34 -33
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d2ae4db0e - Show all commits

62
init.lua
View File

@@ -15,35 +15,35 @@ require("autocmds") -- ./lua/autocmds.lua
require("diagnostics") -- ./lua/diagnostics.lua require("diagnostics") -- ./lua/diagnostics.lua
require('telescope_configuration') -- ./lua/telescope_configuration.lua require('telescope_configuration') -- ./lua/telescope_configuration.lua
if host == "xps13" then -- if host == "xps13" then
require('tokyonight').setup({ -- require('tokyonight').setup({
style = "moon", -- "storm", "moon", "day", "night" -- style = "moon", -- "storm", "moon", "day", "night"
transparent = false, -- Enable transparent background -- transparent = false, -- Enable transparent background
terminal_colors = true, -- Enable terminal colors -- terminal_colors = true, -- Enable terminal colors
styles = { -- styles = {
comments = { italic = true }, -- Italic comments -- comments = { italic = true }, -- Italic comments
keywords = { italic = true }, -- Italic keywords -- keywords = { italic = true }, -- Italic keywords
functions = { bold = true }, -- Bold functions -- functions = { bold = true }, -- Bold functions
variables = {}, -- No special style for variables -- variables = {}, -- No special style for variables
sidebars = "dark", -- Dark sidebars -- sidebars = "dark", -- Dark sidebars
floats = "dark", -- Dark floating windows -- floats = "dark", -- Dark floating windows
}, -- },
}) -- })
elseif host == "Titan" then -- elseif host == "Titan" then
require('tokyonight').setup({ -- require('tokyonight').setup({
style = "storm", -- "storm", "moon", "day", "night" -- style = "storm", -- "storm", "moon", "day", "night"
transparent = false, -- Enable transparent background -- transparent = false, -- Enable transparent background
terminal_colors = true, -- Enable terminal colors -- terminal_colors = true, -- Enable terminal colors
styles = { -- styles = {
comments = { italic = true }, -- Italic comments -- comments = { italic = true }, -- Italic comments
keywords = { italic = true }, -- Italic keywords -- keywords = { italic = true }, -- Italic keywords
functions = { bold = true }, -- Bold functions -- functions = { bold = true }, -- Bold functions
variables = {}, -- No special style for variables -- variables = {}, -- No special style for variables
sidebars = "dark", -- Dark sidebars -- sidebars = "dark", -- Dark sidebars
floats = "dark", -- Dark floating windows -- floats = "dark", -- Dark floating windows
}, -- },
}) -- })
end -- end
local function is_linux_console() local function is_linux_console()
return vim.env.TERM == "linux" return vim.env.TERM == "linux"
@@ -58,7 +58,7 @@ end
local function set_colorscheme() local function set_colorscheme()
if want_truecolor() then if want_truecolor() then
vim.o.termguicolors = true vim.o.termguicolors = true
if not pcall(vim.cmd.colorscheme, "tokyonight") then if not pcall(vim.cmd.colorscheme, "cyberdream") then
pcall(vim.cmd.colorscheme, "habamax") pcall(vim.cmd.colorscheme, "habamax")
end end
else else
@@ -105,7 +105,7 @@ vim.api.nvim_create_autocmd("VimEnter", {
else else
lualine.setup({ lualine.setup({
options = { options = {
theme = "tokyonight", theme = "auto",
icons_enabled = true, icons_enabled = true,
globalstatus = true, globalstatus = true,
}, },

5
lua/plugins.lua
View File

@@ -2,7 +2,8 @@ local vim = vim
local host = vim.loop.os_gethostname() local host = vim.loop.os_gethostname()
vim.pack.add({ vim.pack.add({
{ src = "https://github.com/folke/tokyonight.nvim" }, -- { src = "https://github.com/folke/tokyonight.nvim" },
{ src = "https://github.com/scottmckendry/cyberdream.nvim" },
{ src = "https://github.com/nvim-tree/nvim-web-devicons" }, { src = "https://github.com/nvim-tree/nvim-web-devicons" },
{ src = "https://github.com/ibhagwan/fzf-lua" }, { src = "https://github.com/ibhagwan/fzf-lua" },
{ src = "https://github.com/echasnovski/mini.pick" }, { src = "https://github.com/echasnovski/mini.pick" },
@@ -74,7 +75,7 @@ require('mini.surround').setup({})
require('mini.indentscope').setup({}) require('mini.indentscope').setup({})
require('mini.tabline').setup({}) require('mini.tabline').setup({})
require('mini.fuzzy').setup({}) require('mini.fuzzy').setup({})
require('lualine').setup({ options = { theme = 'tokyonight' } }) -- require('lualine').setup({ options = { theme = 'tokyonight' } })
require('which-key').setup({}) require('which-key').setup({})
require('fzf-lua').setup({}) require('fzf-lua').setup({})
require('crates').setup({}) require('crates').setup({})