diff --git a/roles/nvim/files/nvim/.config/nvim/lua/core/options.lua b/roles/nvim/files/nvim/.config/nvim/lua/core/options.lua index 9494e2a..98b411a 100755 --- a/roles/nvim/files/nvim/.config/nvim/lua/core/options.lua +++ b/roles/nvim/files/nvim/.config/nvim/lua/core/options.lua @@ -53,3 +53,4 @@ vim.g.autoformat = false -- globally vim.b.autoformat = false -- buffer-local: vim.o.conceallevel=2 + diff --git a/roles/nvim/files/nvim/.config/nvim/lua/plugins/colors.lua b/roles/nvim/files/nvim/.config/nvim/lua/plugins/colors.lua index 003df0c..af05cf3 100755 --- a/roles/nvim/files/nvim/.config/nvim/lua/plugins/colors.lua +++ b/roles/nvim/files/nvim/.config/nvim/lua/plugins/colors.lua @@ -1,13 +1,7 @@ -local dracula = require("dracula") - -dracula.setup({ - -- show the '~' characters after the end of buffers +require("dracula").setup({ show_end_of_buffer = true, -- default false - -- use transparent background transparent_bg = true, -- default false - -- set custom lualine background color lualine_bg_color = "#44475a", -- default nil - -- set italic comment italic_comment = true, -- default false -- overrides the default highlights with table see `:h synIDattr` overrides = {}, @@ -25,5 +19,23 @@ dracula.setup({ -- end, }) -vim.o.termguicolors = true -vim.cmd[[colorscheme dracula]] +require("rose-pine").setup({ + disable_background = true, + dim_inactive_windows = false, + extend_background_behind_borders = true, + + styles = { + transparency = true, + }, +}) + +function ColorMyPencils(color) + color = color or "rose-pine-moon" + vim.cmd.colorscheme(color) + vim.o.termguicolors = true + + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +end + +ColorMyPencils() diff --git a/roles/nvim/files/nvim/.config/nvim/lua/plugins/lazy.lua b/roles/nvim/files/nvim/.config/nvim/lua/plugins/lazy.lua index 88be8f2..f02281b 100755 --- a/roles/nvim/files/nvim/.config/nvim/lua/plugins/lazy.lua +++ b/roles/nvim/files/nvim/.config/nvim/lua/plugins/lazy.lua @@ -1,13 +1,14 @@ require("lazy").setup({ - 'nvim-tree/nvim-tree.lua', - 'nvim-tree/nvim-web-devicons', + "nvim-tree/nvim-tree.lua", + "nvim-tree/nvim-web-devicons", "lewis6991/gitsigns.nvim", - 'Mofiqul/dracula.nvim', - 'martineausimon/nvim-xresources', - 'nvim-lualine/lualine.nvim', - 'ThePrimeagen/harpoon', - 'ThePrimeagen/git-worktree.nvim', - 'christoomey/vim-tmux-navigator', + "Mofiqul/dracula.nvim", + "rose-pine/neovim", + "martineausimon/nvim-xresources", + "nvim-lualine/lualine.nvim", + "ThePrimeagen/harpoon", + "ThePrimeagen/git-worktree.nvim", + "christoomey/vim-tmux-navigator", { "epwalsh/obsidian.nvim", version = "*", @@ -19,26 +20,25 @@ require("lazy").setup({ }, { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', + "nvim-treesitter/nvim-treesitter", dependencies = { - 'nvim-treesitter/nvim-treesitter-textobjects', + "nvim-treesitter/nvim-treesitter-textobjects", }, - build = ':TSUpdate', + build = ":TSUpdate", }, { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - dependencies = {'nvim-lua/plenary.nvim',}, + "nvim-telescope/telescope.nvim", + branch = "0.1.x", + dependencies = {"nvim-lua/plenary.nvim",}, }, { - 'neovim/nvim-lspconfig', + "neovim/nvim-lspconfig", dependencies = { - 'williamboman/mason.nvim', - 'williamboman/mason-lspconfig.nvim', + "williamboman/mason.nvim", + "williamboman/mason-lspconfig.nvim", }, }, - 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-nvim-lsp', - 'L3MON4D3/LuaSnip', + "hrsh7th/nvim-cmp", + "hrsh7th/cmp-nvim-lsp", + "L3MON4D3/LuaSnip", }) - diff --git a/roles/scripts/files/scripts/.local/bin/py.test b/roles/scripts/files/scripts/.local/bin/py.test new file mode 100755 index 0000000..36c726c --- /dev/null +++ b/roles/scripts/files/scripts/.local/bin/py.test @@ -0,0 +1,8 @@ +#!/usr/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pytest import console_main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(console_main()) diff --git a/roles/scripts/files/scripts/.local/bin/pytest b/roles/scripts/files/scripts/.local/bin/pytest new file mode 100755 index 0000000..36c726c --- /dev/null +++ b/roles/scripts/files/scripts/.local/bin/pytest @@ -0,0 +1,8 @@ +#!/usr/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pytest import console_main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(console_main())