tstarr/dotfiles
1
0
Fork 0
mirror of https://github.com/starr-dusT/dotfiles.git synced 2025-02-19 19:27:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:starr-dusT/dotfiles

Browse Source
This commit is contained in:
Tyler Starr 2023-09-17 17:05:08 -07:00
commit f5e569543f
9 changed files with 85 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
home/.chezmoiscripts/run_onchange_add-non-steam.sh
View File

@ -6,8 +6,11 @@ apps=(
"yuzu Yuzu"
)
for app in "${apps[@]}"
do
set -- $app
steamtinkerlaunch addnonsteamgame -ep="$1" -an="$2"
done
if command -v steamtinkerlaunch &> /dev/null
then
for app in "${apps[@]}"
do
set -- $app
steamtinkerlaunch addnonsteamgame -ep="$1" -an="$2"
done
fi

19
home/devel/work/dot_gitconfig.work
View File

@ -1,19 +0,0 @@
##⠀⠀⠀⠀⠀⠀⠀⠀⢠⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠸⣧⠀⠀⠀⠀⠀⠀⠀⠀
#⠠⢤⣤⣤⣤⣤⣤⣴⡿⠀⠀⢻⣦⣤⣤⣤⣤⣤⡤⠄ Tyler Starr (starr-dusT)
#⠀⠀⠙⠻⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⠟⠋⠀⠀ https://github.com/starr-dusT/dotfiles
#⠀⠀⠀⠀⠀⠙⣿⡆⠀⠀⠀⠀⠰⣿⠋⠀⠀⠀⠀⠀ https://tstarr.us
#⠀⠀⠀⠀⠀⢰⡟⠀⣀⣴⣦⣀⠀⢻⡆⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⢀⣾⣧⡾⠛⠁⠈⠙⠷⣼⣿⡀⠀⠀⠀⠀
# ⠀⠀⠀⡸⠟⠁⠀⠀⠀⠀⠀⠀⠈⠛⢧⠀⠀⠀⠀
#
# Work .gitconfig
[user]
email = tyler.starr.1@us.af.mil
name = Tyler Starr
signingkey = C0D188999C0697C0
[gitlab]
user = "tstarr"

2
home/dot_aliases
View File

@ -2,7 +2,7 @@
# https://github.com/starr-dusT/dotfiles
# nixos
alias nixos-update="cd ~/.local/share/chezmoi/provision/nixos && \
alias nu="cd ~/.local/share/chezmoi/provision/nixos && \
sudo nixos-rebuild switch --flake .#$(hostname) && \
cd -"
# sway

191
home/dot_config/nvim/after/plugin/lsp.lua
View File

@ -1,153 +1,60 @@
local Remap = require("tstarr.keymap")
local nnoremap = Remap.nnoremap
local inoremap = Remap.inoremap
local lsp = require("lsp-zero")
lsp.preset("recommended")
lsp.ensure_installed({
'tsserver',
'pyright',
'lua_ls',
})
-- Fix Undefined global 'vim'
lsp.nvim_workspace()
local cmp = require('cmp')
local lspconfig = require('lspconfig')
local configs = require('lspconfig/configs')
cmp.setup({
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
end,
},
window = {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(),
},
mapping = cmp.mapping.preset.insert({
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
else
fallback()
end
end, { "i" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
else
fallback()
end
end, { "i" }),
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'luasnip' }, -- For luasnip users.
}, {
{ name = 'buffer',
option = {
get_bufnrs = function()
local bufs = {}
for _, win in ipairs(vim.api.nvim_list_wins()) do
bufs[vim.api.nvim_win_get_buf(win)] = true
end
return vim.tbl_keys(bufs)
end
}
},
})
local cmp_select = {behavior = cmp.SelectBehavior.Select}
local cmp_mappings = lsp.defaults.cmp_mappings({
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
['<C-y>'] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(),
})
cmp.setup.cmdline('/', {
mapping = cmp.mapping.preset.cmdline(),
sources = {
{ name = 'buffer' }
}
cmp_mappings['<Tab>'] = nil
cmp_mappings['<S-Tab>'] = nil
lsp.setup_nvim_cmp({
mapping = cmp_mappings
})
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = 'path' },
{ name = 'buffer' }
}, {
{
name = 'cmdline',
option = {
ignore_cmds = { 'Man', '!' }
}
lsp.set_preferences({
suggest_lsp_servers = false,
sign_icons = {
error = 'E',
warn = 'W',
hint = 'H',
info = 'I'
}
})
})
local function config(_config)
return vim.tbl_deep_extend("force", {
on_attach = function()
local opts = { buffer = true };
nnoremap("gd", function() vim.lsp.buf.definition() end, opts)
nnoremap("K", function() vim.lsp.buf.hover() end, opts)
nnoremap("<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
nnoremap("<leader>vd", function() vim.diagnostic.open_float() end, opts)
nnoremap("[d", function() vim.diagnostic.goto_next() end, opts)
nnoremap("]d", function() vim.diagnostic.goto_prev() end, opts)
nnoremap("<leader>vca", function() vim.lsp.buf.code_action() end, opts)
nnoremap("<leader>vco", function() vim.lsp.buf.code_action({
filter = function(code_action)
if not code_action or not code_action.data then
return false
end
local data = code_action.data.id
return string.sub(data, #data - 1, #data) == ":0"
end,
apply = true
}) end, opts)
nnoremap("<leader>vrr", function() vim.lsp.buf.references() end, opts)
nnoremap("<leader>vrn", function() vim.lsp.buf.rename() end, opts)
inoremap("<C-h>", function() vim.lsp.buf.signature_help() end, opts)
end,
}, _config or {})
end
-- Python
lspconfig.tsserver.setup(config())
lspconfig.pyright.setup(config())
-- zk
configs.zk = {
default_config = {
cmd = {'zk', 'lsp'},
filetypes = {'markdown'},
root_dir = function()
return vim.loop.cwd()
end,
settings = {}
};
}
lspconfig.zk.setup({ on_attach = function(client, buffer)
-- Add keybindings here, see https://github.com/neovim/nvim-lspconfig#keybindings-and-completion
end })
lsp.on_attach(function(client, bufnr)
local opts = {buffer = bufnr, remap = false}
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
end)
lsp.setup()
vim.diagnostic.config({
virtual_text = true
})

36
home/dot_config/nvim/lua/tstarr/packer.lua
View File

@ -13,11 +13,8 @@ return require('packer').startup(function(use)
use ('alker0/chezmoi.vim')
use ('nathangrigg/vim-beancount')
-- IDE
-- IDE
use('nvim-lua/plenary.nvim')
use("nvim-treesitter/nvim-treesitter", {
run = ":TSUpdate"
})
use ('nvim-telescope/telescope.nvim')
use ('nvim-telescope/telescope-project.nvim')
@ -32,13 +29,28 @@ return require('packer').startup(function(use)
use('mcchrish/nnn.vim')
-- LSP
use ('neovim/nvim-lspconfig')
use ('hrsh7th/cmp-nvim-lsp')
use ('hrsh7th/cmp-buffer')
use ('hrsh7th/cmp-path')
use ('hrsh7th/cmp-cmdline')
use ('hrsh7th/nvim-cmp')
use ('L3MON4D3/LuaSnip')
use ('saadparwaiz1/cmp_luasnip')
use("nvim-treesitter/nvim-treesitter-context");
use {
'VonHeikemen/lsp-zero.nvim',
branch = 'v1.x',
requires = {
-- LSP Support
{'neovim/nvim-lspconfig'},
{'williamboman/mason.nvim'},
{'williamboman/mason-lspconfig.nvim'},
-- Autocompletion
{'hrsh7th/nvim-cmp'},
{'hrsh7th/cmp-buffer'},
{'hrsh7th/cmp-path'},
{'saadparwaiz1/cmp_luasnip'},
{'hrsh7th/cmp-nvim-lsp'},
{'hrsh7th/cmp-nvim-lua'},
-- Snippets
{'L3MON4D3/LuaSnip'},
{'rafamadriz/friendly-snippets'},
}
}
end)

2
home/dot_config/sway/config.tmpl
View File

@ -194,7 +194,7 @@ mode launcher {
}
bindsym $mod+o mode open
mode open {
bindsym b exec brave, $e
bindsym b exec chromium, $e
bindsym s exec steam || flatpak run com.valvesoftware.Steam, $e
bindsym d exec discord || flatpak run com.discordapp.Discord, $e
bindsym Escape mode default

0
home/dot_export → home/dot_exports
View File

14
home/dot_gitconfig
View File

@ -1,13 +1,4 @@
##⠀⠀⠀⠀⠀⠀⠀⠀⢠⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠸⣧⠀⠀⠀⠀⠀⠀⠀⠀
#⠠⢤⣤⣤⣤⣤⣤⣴⡿⠀⠀⢻⣦⣤⣤⣤⣤⣤⡤⠄ Tyler Starr (starr-dusT)
#⠀⠀⠙⠻⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⠟⠋⠀⠀ https://github.com/starr-dusT/dotfiles
#⠀⠀⠀⠀⠀⠙⣿⡆⠀⠀⠀⠀⠰⣿⠋⠀⠀⠀⠀⠀ https://tstarr.us
#⠀⠀⠀⠀⠀⢰⡟⠀⣀⣴⣦⣀⠀⢻⡆⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⢀⣾⣧⡾⠛⠁⠈⠙⠷⣼⣿⡀⠀⠀⠀⠀
# ⠀⠀⠀⡸⠟⠁⠀⠀⠀⠀⠀⠀⠈⠛⢧⠀⠀⠀⠀
#
# https://github.com/starr-dusT/dotfiles
# Global .gitconfig
[user]
@ -19,6 +10,3 @@
[core]
sshCommand = "ssh -i ~/.ssh/keys/github_personal"
[includeIf "gitdir:~/devel/work/**"]
path = ~/devel/work/.gitconfig.work

11
home/dot_tmux.conf
View File

@ -1,13 +1,4 @@
##⠀⠀⠀⠀⠀⠀⠀⠀⢠⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠸⣧⠀⠀⠀⠀⠀⠀⠀⠀
#⠠⢤⣤⣤⣤⣤⣤⣴⡿⠀⠀⢻⣦⣤⣤⣤⣤⣤⡤⠄ Tyler Starr (starr-dusT)
#⠀⠀⠙⠻⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⠟⠋⠀⠀ https://github.com/starr-dusT/dotfiles
#⠀⠀⠀⠀⠀⠙⣿⡆⠀⠀⠀⠀⠰⣿⠋⠀⠀⠀⠀⠀ https://tstarr.us
#⠀⠀⠀⠀⠀⢰⡟⠀⣀⣴⣦⣀⠀⢻⡆⠀⠀⠀⠀⠀
#⠀⠀⠀⠀⢀⣾⣧⡾⠛⠁⠈⠙⠷⣼⣿⡀⠀⠀⠀⠀
# ⠀⠀⠀⡸⠟⠁⠀⠀⠀⠀⠀⠀⠈⠛⢧⠀⠀⠀⠀
#
# https://github.com/starr-dusT/dotfiles
# vim style tmux config
# use C-a, since it's on the home row and easier to hit than C-b