Make various small clean-up changes
This commit is contained in:
@@ -36,6 +36,7 @@ sym_link() {
|
|||||||
echo "---- copying dotfiles ------------------"
|
echo "---- copying dotfiles ------------------"
|
||||||
source src_files/.config/zsh/.zshenv
|
source src_files/.config/zsh/.zshenv
|
||||||
copy_file src_files/.config/zsh/.zshenv $HOME # copy first, ensure $ZDOTDIR set
|
copy_file src_files/.config/zsh/.zshenv $HOME # copy first, ensure $ZDOTDIR set
|
||||||
|
# copy_file src_files/.config/ksh/.profile $HOME # TODO: if using oksh, get it working
|
||||||
|
|
||||||
# configs/executables/scripts from .config and .local
|
# configs/executables/scripts from .config and .local
|
||||||
copy_dir src_files/.config $XDG_CONFIG_HOME
|
copy_dir src_files/.config $XDG_CONFIG_HOME
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
# todo items
|
# todo items
|
||||||
|
|
||||||
- config for: terminal (kitty? havoc?)
|
- config for terminal (kitty? havoc?)
|
||||||
- config for shell (if keeping zsh, may not need anything beyond what i've already done)
|
- config for shell (likely oksh)
|
||||||
|
- config for calcurse
|
||||||
- config for mpd, and client(s), (mpd clients to consider: mpc, ncmpcpp, ncmpc, inori)
|
- config for mpd, and client(s), (mpd clients to consider: mpc, ncmpcpp, ncmpc, inori)
|
||||||
|
- decide what i'm doing for music streaming; spotify official? web? tui option?
|
||||||
- hyprland config and install on linux
|
- hyprland config and install on linux
|
||||||
- web browsers config and install
|
- web browsers config and install
|
||||||
- get find, xargs, awk (use nawk) as unified as i can across system types
|
- get find, xargs, awk (use nawk) as unified as i can across system types
|
||||||
- pick rss reader; newsboat? others? option with inbox and separate queues?
|
- pick rss reader; newsboat? others? option with inbox and separate queues?
|
||||||
- decide if i even want a filemanager; if yes, pick one and configure
|
- decide if i even want a filemanager; if yes, pick one and configure
|
||||||
- decide what i'm doing for music streaming; spotify official? web? tui option?
|
|
||||||
|
|
||||||
|
|||||||
@@ -152,8 +152,8 @@ vim.keymap.set('n', '<leader>fg', tscBuiltin.git_files, { desc = 'tscope find gi
|
|||||||
vim.keymap.set('n', '<leader>fb', tscBuiltin.buffers, { desc = 'tscope buffers' })
|
vim.keymap.set('n', '<leader>fb', tscBuiltin.buffers, { desc = 'tscope buffers' })
|
||||||
vim.keymap.set('n', '<leader>fh', tscBuiltin.help_tags, { desc = 'tscope help tags' })
|
vim.keymap.set('n', '<leader>fh', tscBuiltin.help_tags, { desc = 'tscope help tags' })
|
||||||
-- TODO: maybe add commands:
|
-- TODO: maybe add commands:
|
||||||
-- - find files including git-ignored (have a yes and no option)
|
-- - find files including git-ignored (that is, have both a yes and no option)
|
||||||
-- - grep files including git-ignored (have a yes and no option)
|
-- - grep files including git-ignored (that is, have both a yes and no option)
|
||||||
-- - grep which supports fuzzy-find, unless performance is horrendous
|
-- - grep which supports fuzzy-find, unless performance is horrendous
|
||||||
|
|
||||||
-- harpoon
|
-- harpoon
|
||||||
@@ -171,9 +171,6 @@ end
|
|||||||
-- undotree
|
-- undotree
|
||||||
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
|
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
|
||||||
|
|
||||||
-- treesitter and treesitter-context
|
|
||||||
vim.keymap.set("n", "<leader>tc", function() vim.cmd.TSContext({ "toggle" }) end)
|
|
||||||
|
|
||||||
-- conform (formatter)
|
-- conform (formatter)
|
||||||
vim.keymap.set("n", "<leader>fmt", function()
|
vim.keymap.set("n", "<leader>fmt", function()
|
||||||
require("conform").format({ bufnr = 0 })
|
require("conform").format({ bufnr = 0 })
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
-- TODO: maybe switch this over from git-clone approach to neovim's builtin vim.pack.add
|
|
||||||
local path_lazy_nvim = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
local path_lazy_nvim = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
if not vim.loop.fs_stat(path_lazy_nvim) then
|
if not vim.loop.fs_stat(path_lazy_nvim) then
|
||||||
local git_output = vim.fn.system({
|
local git_output = vim.fn.system({
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ return {
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"jay-babu/mason-nvim-dap.nvim", -- TODO: here, or handle manually outside of neovim?
|
"jay-babu/mason-nvim-dap.nvim", -- TODO: install here? manually outside of neovim?
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
"mfussenegger/nvim-dap",
|
"mfussenegger/nvim-dap",
|
||||||
|
|||||||
@@ -27,12 +27,10 @@ return {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
-- TODO: decide if i want rose-pine, remove from file if not
|
|
||||||
"rose-pine/neovim",
|
"rose-pine/neovim",
|
||||||
name = "rose-pine",
|
name = "rose-pine",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
-- TODO: decide if i want tokyonight, remove from file if not
|
|
||||||
"folke/tokyonight.nvim",
|
"folke/tokyonight.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
style = "night", -- "night", "storm", "moon", "day"
|
style = "night", -- "night", "storm", "moon", "day"
|
||||||
@@ -60,8 +58,6 @@ return {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'ribru17/bamboo.nvim',
|
'ribru17/bamboo.nvim',
|
||||||
-- lazy = false,
|
|
||||||
-- priority = 1000,
|
|
||||||
config = function()
|
config = function()
|
||||||
require('bamboo').setup { }
|
require('bamboo').setup { }
|
||||||
require('bamboo').load()
|
require('bamboo').load()
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ return {
|
|||||||
ignore_install = {
|
ignore_install = {
|
||||||
"csv",
|
"csv",
|
||||||
},
|
},
|
||||||
-- indent = { enable = true }, -- TODO: do i want this?
|
indent = { enable = true },
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true, -- `false` will disable the whole extension
|
enable = true, -- `false` will disable the whole extension
|
||||||
disable = function(lang, buf)
|
disable = function(lang, buf)
|
||||||
@@ -51,26 +51,7 @@ return {
|
|||||||
-- branch = "master",
|
-- branch = "master",
|
||||||
-- },
|
-- },
|
||||||
-- }
|
-- }
|
||||||
|
|
||||||
-- vim.treesitter.language.register("templ", "templ")
|
-- vim.treesitter.language.register("templ", "templ")
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
-- {
|
|
||||||
-- -- TODO: decide if needed/wanted
|
|
||||||
-- "nvim-treesitter/nvim-treesitter-context",
|
|
||||||
-- after = "nvim-treesitter",
|
|
||||||
-- opts = {
|
|
||||||
-- enable = false, -- can enable/disable via manual command
|
|
||||||
-- multiwindow = false,
|
|
||||||
-- max_lines = 0, -- lines the window should span; x <= 0 means no limit
|
|
||||||
-- min_window_height = 10, -- min window height to enable; x <= 0 means no limit
|
|
||||||
-- line_numbers = true,
|
|
||||||
-- multiline_threshold = 40, -- max lines to show for a single context
|
|
||||||
-- trim_scope = 'outer', -- 'inner', 'outer'; discard lines if max_lines exceeded
|
|
||||||
-- mode = 'cursor', -- 'cursor', 'topline'; line used to calculate context
|
|
||||||
-- separator = "-", -- 1 char, like '-'; only shown when >= 2 lines above
|
|
||||||
-- zindex = 20, -- z-index of the context window
|
|
||||||
-- on_attach = nil, -- (fun(buf: integer): boolean); return false to disable attaching
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- -- TODO: do i want these?
|
|
||||||
-- vim.opt.isfname:append("@-@")
|
|
||||||
-- vim.opt.guicursor = ""
|
|
||||||
|
|
||||||
vim.opt.hlsearch = true
|
vim.opt.hlsearch = true
|
||||||
vim.opt.incsearch = true
|
vim.opt.incsearch = true
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
# set -g default-terminal "tmux-255color" # TODO: messes up backspace render, fix
|
|
||||||
set -s escape-time 0
|
set -s escape-time 0
|
||||||
|
|
||||||
unbind C-b
|
unbind C-b
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ alias ls='ls -F'
|
|||||||
alias ksh=oksh # NOTE: if i ever use openBSD, conditionally remove this alias
|
alias ksh=oksh # NOTE: if i ever use openBSD, conditionally remove this alias
|
||||||
|
|
||||||
# focus/productivity/similar
|
# focus/productivity/similar
|
||||||
|
alias cal="calcurse"
|
||||||
alias note="cd $DIR_NOTES/inbox; $EDITOR"
|
alias note="cd $DIR_NOTES/inbox; $EDITOR"
|
||||||
alias todo="cd $DIR_NOTES/rhythm; $EDITOR todo.md"
|
alias todo="cd $DIR_NOTES/rhythm; $EDITOR todo.md"
|
||||||
alias budget="open $DIR_HOME_BOX/finance/budget/.current"
|
alias budget="open $DIR_HOME_BOX/finance/budget/.current"
|
||||||
|
|||||||
Reference in New Issue
Block a user