Move to gnu stow

This commit is contained in:
agryphus 2024-02-25 23:58:49 -05:00
parent cd08a447a8
commit 9ea93f8144
120 changed files with 994 additions and 53 deletions

@ -1 +0,0 @@
Subproject commit baaa7906cf6efdee3c1b9f2dbe0ffe5f03c2e0ea

@ -1 +0,0 @@
Subproject commit c9e0c8c8d32e77d90f7f812052510a3f80e2eb1d

@ -1 +0,0 @@
Subproject commit 8ab935736256e651df978eb3fb3bd4f8879d4465

@ -1 +0,0 @@
Subproject commit 7a8e462eb227fcf9fe78d39ae898a1e4b1adb920

16
.gitmodules vendored
View file

@ -1,17 +1,17 @@
[submodule ".config/dwm"]
path = .config/dwm
[submodule "dwm"]
path = dwm/dot-config/dwmblocks
url = ../dwm.git
ignore = all
[submodule ".config/st"]
path = .config/st
[submodule "st"]
path = st/dot-config/st
url = ../st.git
ignore = all
[submodule ".config/dwmblocks"]
path = .config/dwmblocks
[submodule "dwmblocks"]
path = dwmblocks/dot-config/dwmblocks
url = ../dwmblocks.git
ignore = all
[submodule ".config/nvim"]
path = .config/nvim
[submodule "nvim"]
path = nvim/dot-config/nvim
url = ../nvim.git
ignore = all

9
init_submodules Executable file
View file

@ -0,0 +1,9 @@
#!/bin/sh
# Go to script dir
cd "$(dirname "$(readlink -f "$0")")"
git submodule init
git submodule update --force --recursive --init --remote
git submodule foreach "git checkout master"

18
install Executable file
View file

@ -0,0 +1,18 @@
#!/bin/sh
# Go to script directory
dir="$(dirname "$(readlink -f "$0")")"
cd "$dir"
for package in $(ls $dir); do
if [ ! -d "$dir/$package" ]; then
continue
fi
if [ "$package" = "misc" ]; then
stow --target=$HOME --dotfiles --simulate --no-folding -R $package
else
stow --target=$HOME --dotfiles --simulate -v -R $package
fi
done

2
nvim/dot-config/nvim/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/plugin/

View file

@ -0,0 +1,4 @@
vim.opt.tabstop = 2
vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2

View file

@ -0,0 +1,4 @@
vim.opt.tabstop = 2
vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2

View file

@ -0,0 +1,4 @@
vim.opt.tabstop = 2
vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2

View file

@ -0,0 +1,207 @@
local palette = {
none = "NONE",
fg = "#E1E1E1",
bg = "#151515",
alt_bg = "#171717",
accent = "#202020",
white = "#E1E1E1",
gray = "#373737",
medium_gray = "#727272",
light_gray = "#AFAFAF",
blue = "#BAD7FF",
gray_blue = "#7E97AB",
medium_gray_blue = "#A2B5C1",
cyan = "#88afa2",
red = "#b46958",
green = "#90A959",
yellow = "#F4BF75",
orange = "#FFA557",
purple = "#AA749F",
magenta = "#AA759F",
cursor_fg = "#151515",
cursor_bg = "#D0D0D0",
sign_add = "#586935",
sign_change = "#51657B",
sign_delete = "#984936",
error = "#984936",
warning = "#ab8550",
info = "#ab8550",
hint = "#576f82",
neogit_light_green = "#2A2E19",
neogit_blue = "#1B1F27",
neogit_green = "#212513",
neogit_light_red = "#402020",
neogit_red = "#351D1D",
}
require("no-clown-fiesta").setup({
transparent = true,
})
require('rose-pine').setup({
--- @usage 'auto'|'main'|'moon'|'dawn'
variant = 'auto',
--- @usage 'main'|'moon'|'dawn'
dark_variant = 'main',
bold_vert_split = false,
dim_nc_background = false,
disable_background = true,
disable_float_background = false,
disable_italics = true,
--- @usage string hex value or named color from rosepinetheme.com/palette
groups = {
background = 'base',
background_nc = '_experimental_nc',
panel = 'surface',
panel_nc = 'base',
border = 'highlight_med',
comment = 'muted',
link = 'iris',
punctuation = 'subtle',
error = 'love',
hint = 'iris',
info = 'foam',
warn = 'gold',
headings = {
h1 = 'iris',
h2 = 'foam',
h3 = 'rose',
h4 = 'gold',
h5 = 'pine',
h6 = 'foam',
}
-- or set all headings at once
-- headings = 'subtle'
},
-- Change specific vim highlight groups
-- https://github.com/rose-pine/neovim/wiki/Recipes
highlight_groups = {
ColorColumn = { bg = 'rose' },
-- Blend colours against the "base" background
CursorLine = { bg = 'foam', blend = 10 },
StatusLine = { fg = 'love', bg = 'love', blend = 10 },
-- By default each group adds to the existing config.
-- If you only want to set what is written in this config exactly,
-- you can set the inherit option:
Search = { bg = 'gold', inherit = false },
}
})
require("gruvbox").setup({
undercurl = true,
underline = true,
bold = true,
italic = {
strings = true,
comments = true,
operators = false,
folds = true,
},
strikethrough = true,
invert_selection = false,
invert_signs = false,
invert_tabline = false,
invert_intend_guides = false,
inverse = true, -- invert background for search, diffs, statuslines and errors
contrast = "", -- can be "hard", "soft" or empty string
palette_overrides = {},
overrides = {},
dim_inactive = false,
transparent_mode = true,
})
local c = require('vscode.colors').get_colors()
require('vscode').setup({
-- Alternatively set style in setup
-- style = 'light'
-- Enable transparent background
transparent = true,
-- Enable italic comment
italic_comments = true,
-- Disable nvim-tree background color
disable_nvimtree_bg = true,
-- Override colors (see ./lua/vscode/colors.lua)
color_overrides = {
-- vscLineNumber = '#FFFFFF',
},
-- Override highlight groups (see ./lua/vscode/theme.lua)
group_overrides = {
-- this supports the same val table as vim.api.nvim_set_hl
-- use colors from this colorscheme by requiring vscode.colors!
Cursor = { fg=c.vscDarkBlue, bg=c.vscLightGreen, bold=true },
}
})
vim.cmd[[
let s:base03 = [ '#151513', 233 ]
let s:base02 = [ '#202020', 236 ]
let s:base01 = [ '#373737', 239 ]
let s:base00 = [ '#727272', 242 ]
let s:base0 = [ '#808070', 244 ]
let s:base1 = [ '#949484', 246 ]
let s:base2 = [ '#a8a897', 248 ]
let s:base3 = [ '#E1E1E1', 253 ]
let s:yellow = [ '#F4BF75', 3 ]
let s:orange = [ '#FFA557', 216 ]
let s:red = [ '#B46958', 131 ]
let s:purple = [ '#AA749F', 181 ]
let s:blue = [ '#7E97AB', 109 ]
let s:cyan = [ '#BAD7FF', 23 ]
let s:green = [ '#90A959', 108 ]
let s:white = [ '#AFAFAF', 252 ]
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:base02, s:green ], [ s:base3, s:base01 ] ]
let s:p.normal.right = [ [ s:base02, s:base1 ], [ s:base2, s:base01 ] ]
let s:p.inactive.right = [ [ s:base02, s:base00 ], [ s:base0, s:base02 ] ]
let s:p.inactive.left = [ [ s:base0, s:base02 ], [ s:base00, s:base02 ] ]
let s:p.insert.left = [ [ s:base02, s:blue ], [ s:base3, s:base01 ] ]
let s:p.replace.left = [ [ s:base02, s:purple ], [ s:base3, s:base01 ] ]
let s:p.visual.left = [ [ s:base02, s:red ], [ s:base3, s:base01 ] ]
let s:p.normal.middle = [ [ s:base0, s:base02 ] ]
let s:p.inactive.middle = [ [ s:base00, s:base02 ] ]
let s:p.tabline.left = [ [ s:base3, s:base00 ] ]
let s:p.tabline.tabsel = [ [ s:base3, s:base02 ] ]
let s:p.tabline.middle = [ [ s:base01, s:base1 ] ]
let s:p.tabline.right = copy(s:p.normal.right)
let s:p.normal.error = [ [ s:red, s:base02 ] ]
let s:p.normal.warning = [ [ s:yellow, s:base01 ] ]
let g:lightline#colorscheme#mycolors#palette = lightline#colorscheme#flatten(s:p)
let g:lightline = {
\ 'colorscheme': 'mycolors',
\ }
" Don't need to see mode if lightline is installed
set noshowmode
]]
vim.cmd[[colorscheme no-clown-fiesta]]
-- My own color overrides
local hl = vim.api.nvim_set_hl
hl(0, 'TSConstant', { fg = palette.yellow })
hl(0, 'EndOfBuffer', { fg = palette.medium_gray })
hl(0, 'ErrorMsg', { fg = palette.yellow })
hl(0, 'LineNr', { fg = palette.medium_gray })
hl(0, 'MasonNormal', { bg = palette.gray })
hl(0, 'NvimTreeCursorLine', { fg = palette.yellow })
hl(0, 'NvimTreeEndOfBuffer', { fg = palette.medium_gray })
hl(0, 'NvimTreeIndentMarker', { fg = palette.medium_gray })
hl(0, 'NvimTreeFolderIcon', { fg = palette.yellow })
hl(0, 'WhichKeyFloat', { bg = nil })
hl(0, 'WhichKeyDesc', { link = "function" })
hl(0, 'WhichKey', { fg = palette.medium_gray_blue })
hl(0, 'WhichKeyGroup', { fg = palette.gray_blue, bold = true })

View file

@ -0,0 +1,9 @@
require("Comment").setup()
vim.keymap.set(
"n",
"<C-_>",
function() require("Comment.api").toggle.linewise.current() end,
{ noremap = true, silent = true }
)

View file

@ -0,0 +1,58 @@
local alpha = require("alpha")
local dashboard = require("alpha.themes.dashboard")
math.randomseed(os.time())
local function pick_color()
local colors = {"String", "Identifier", "Keyword", "Number"}
return colors[math.random(#colors)]
end
local function footer()
local total_plugins = #vim.tbl_keys(packer_plugins)
local version = vim.version()
local nvim_version_info = " NVIM v" .. version.major .. "." .. version.minor .. "." .. version.patch
return nvim_version_info .. " 󰏖 " .. total_plugins .. " plugins"
end
-- Set header
dashboard.section.header.val = {
" ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣭⣿⣶⣿⣦⣼⣆ ",
" ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ ",
" ⠈ ⠈⢿⣿⣟⠦⠄⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ ",
" ⣸⣿⣿⢧⠄⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄ ",
" ⢠⣿⣿⣿⠈ ⠡⠌⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ ",
" ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿ ",
" ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷⠄ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄ ",
"⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄ ",
"⠙⠃ ⣼⣿⡟⠌ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿⠐⣿⣿⡇ ⠛⠻⢷⣄",
" ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ⠁",
" ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣀⣤⣾⡿⠃ ",
"⢀⣀⠀⣠⣀⣠⣾⣿⣿⡿⠛⠋⠉⠉⠉ ⠉⠉⠉⠉⠛⠻⣿⣿⣷⣄⣀⢿⡽⢻⣦",
"⠻⠶⠾⠿⠿⠿⠋⠉ N E O V I M ⠉⠻⠿⠿⠿⠿⠿⠋",
}
-- Set menu
dashboard.section.buttons.val = {
dashboard.button( "e", " New file" , ":ene <BAR> startinsert <CR>"),
dashboard.button( "q", "󰩈 Quit NVIM", ":qa<CR>"),
}
vim.api.nvim_create_autocmd("VimEnter", {
once = true,
callback = function()
math.randomseed(os.time())
local fg_color = tostring(math.random(0, 12))
local hi_setter = "hi AlphaHeader ctermfg="
vim.cmd(hi_setter .. fg_color)
end
})
dashboard.section.footer.val = footer()
dashboard.section.header.opts.hl = "Include"
dashboard.section.footer.opts.hl = "String"
alpha.setup(dashboard.opts)

View file

@ -0,0 +1,23 @@
vim.g.firenvim_config = {
globalSettings = { alt = "all" },
localSettings = {
[".*"] = {
cmdline = "neovim",
content = "text",
priority = 0,
selector = "textarea",
takeover = "never"
},
}
}
-- Prevents scrolling when cursor is near the bottom of the text area
if vim.g.started_by_firenvim == true then
vim.opt.scrolloff = 0
end
vim.api.nvim_create_autocmd({'BufEnter'}, {
pattern = "localhost_*.txt",
command = "set filetype=python"
})

Some files were not shown because too many files have changed in this diff Show more