freya/dotfiles-guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge dots updates from arch laptop

Browse source
This commit is contained in:
Freya Murphy 2024-10-18 00:04:03 -04:00
parent 6b4766c893
commit de5b374490
Signed by: freya
GPG key ID: 744AB800E383AE52
15 changed files with 349 additions and 307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/config/hypr/config.d/keybinds.conf
View file

@ -24,7 +24,7 @@ binde =, XF86AudioPrev, exec, playerctl previous
binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%- binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+ binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard" bind = $mod SHIFT, s, exec, grimblast copy area && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard" bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard"
bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy

1
home/config/hypr/config.d/plugins.conf
View file

@ -1,3 +1,2 @@
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so
#exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprbars.so
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so

12
home/config/hypr/config.d/theme.conf
View file

@ -32,18 +32,6 @@ plugin {
enable = true enable = true
} }
} }
#hyprbars {
# bar_height = 24
# bar_part_of_window = true
# bar_color = $base_color
# col.text = $text_color
# bar_text_size = 9
# bar_text_font = JetBrains Mono Nerd Font Mono Bold
# bar_button_padding = 12
# bar_padding = 10
# bar_precedence_over_border = true
#}
} }
decoration { decoration {

6
home/config/hypr/monitors.conf
View file

@ -1,4 +1,2 @@
# Generated by nwg-displays on 2024-06-18 at 20:22:23. Do not edit manually. monitor=HDMI-A-1,1920x1080@60.0,0x0,1.0
monitor=DP-2,2560x1440@59.95,1920x0,1.0
monitor=eDP-1,2560x1600@90.0,0x0,1.25
monitor=DP-2,2560x1440@59.95,2048x0,1.0

2
home/config/kitty/kitty.conf
View file

@ -14,7 +14,7 @@ show_hyperlink_targets yes
show_hyperlink_targets no show_hyperlink_targets no
background_opacity 0.85 background_opacity 0.75
window_padding_width 10 window_padding_width 10

44
home/config/nvim/lua/lsp.lua
View file

@ -3,7 +3,6 @@ local lsp = require('lsp-zero').preset('recommended')
require('mason').setup({}) require('mason').setup({})
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
ensure_installed = { ensure_installed = {
'tsserver',
'eslint', 'eslint',
'rust_analyzer', 'rust_analyzer',
'clangd', 'clangd',
@ -15,6 +14,7 @@ require('mason-lspconfig').setup({
'jdtls', 'jdtls',
'bashls', 'bashls',
'lua_ls', 'lua_ls',
'csharp_ls',
}, },
handlers = { handlers = {
lsp.default_setup, lsp.default_setup,
@ -25,10 +25,10 @@ local cmp = require('cmp')
local cmp_select = {behavior = cmp.SelectBehavior.Select} local cmp_select = {behavior = cmp.SelectBehavior.Select}
local cmp_mappings = cmp.mapping.preset.insert({ local cmp_mappings = cmp.mapping.preset.insert({
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-n>'] = cmp.mapping.select_next_item(cmp_select), ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
['<CR>'] = cmp.mapping.confirm({ select = true }), ['<CR>'] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
}) })
cmp_mappings['<Tab>'] = nil cmp_mappings['<Tab>'] = nil
@ -39,13 +39,13 @@ cmp.setup({
}) })
lsp.set_preferences({ lsp.set_preferences({
suggest_lsp_servers = false, suggest_lsp_servers = false,
sign_icons = { sign_icons = {
error = 'E', error = 'E',
warn = 'W', warn = 'W',
hint = 'H', hint = 'H',
info = 'I' info = 'I'
} }
}) })
lsp.on_attach(function(client, bufnr) lsp.on_attach(function(client, bufnr)
@ -53,15 +53,15 @@ lsp.on_attach(function(client, bufnr)
local keymap = vim.keymap.set local keymap = vim.keymap.set
keymap("n", "gd", function() vim.lsp.buf.definition() end, opts) keymap("n", "gd", function() vim.lsp.buf.definition() end, opts)
keymap("n", "K", function() vim.lsp.buf.hover() end, opts) keymap("n", "K", function() vim.lsp.buf.hover() end, opts)
keymap("n", "<leader>ls", function() vim.lsp.buf.workspace_symbol() end, opts) keymap("n", "<leader>ls", function() vim.lsp.buf.workspace_symbol() end, opts)
keymap("n", "<leader>lf", function() vim.diagnostic.open_float() end, opts) keymap("n", "<leader>lf", function() vim.diagnostic.open_float() end, opts)
keymap("n", "[d", function() vim.diagnostic.goto_next() end, opts) keymap("n", "[d", function() vim.diagnostic.goto_next() end, opts)
keymap("n", "]d", function() vim.diagnostic.goto_prev() end, opts) keymap("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
keymap("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts) keymap("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts)
keymap("n", "<leader>lr", function() vim.lsp.buf.references() end, opts) keymap("n", "<leader>lr", function() vim.lsp.buf.references() end, opts)
keymap("n", "<leader>ln", function() vim.lsp.buf.rename() end, opts) keymap("n", "<leader>ln", function() vim.lsp.buf.rename() end, opts)
keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts) keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
end) end)
require('lspconfig/prolog_lsp') require('lspconfig/prolog_lsp')
@ -87,7 +87,7 @@ require('phpactor').setup {
} }
vim.diagnostic.config({ vim.diagnostic.config({
virtual_text = true virtual_text = true
}) })
require("neodev").setup() require("neodev").setup()

338
home/config/nvim/lua/menu.lua
View file

@ -1,6 +1,6 @@
local path_ok, plenary_path = pcall(require, "plenary.path") local path_ok, plenary_path = pcall(require, "plenary.path")
if not path_ok then if not path_ok then
return return
end end
local dashboard = require("alpha.themes.dashboard") local dashboard = require("alpha.themes.dashboard")
@ -8,226 +8,226 @@ local cdir = vim.fn.getcwd()
local if_nil = vim.F.if_nil local if_nil = vim.F.if_nil
local nvim_web_devicons = { local nvim_web_devicons = {
enabled = true, enabled = true,
highlight = true, highlight = true,
} }
local function get_extension(fn) local function get_extension(fn)
local match = fn:match("^.+(%..+)$") local match = fn:match("^.+(%..+)$")
local ext = "" local ext = ""
if match ~= nil then if match ~= nil then
ext = match:sub(2) ext = match:sub(2)
end end
return ext return ext
end end
local function icon(fn) local function icon(fn)
local nwd = require("nvim-web-devicons") local nwd = require("nvim-web-devicons")
local ext = get_extension(fn) local ext = get_extension(fn)
return nwd.get_icon(fn, ext, { default = true }) return nwd.get_icon(fn, ext, { default = true })
end end
local function file_button(fn, sc, short_fn,autocd) local function file_button(fn, sc, short_fn,autocd)
short_fn = short_fn or fn short_fn = short_fn or fn
local ico_txt local ico_txt
local fb_hl = {} local fb_hl = {}
if nvim_web_devicons.enabled then if nvim_web_devicons.enabled then
local ico, hl = icon(fn) local ico, hl = icon(fn)
local hl_option_type = type(nvim_web_devicons.highlight) local hl_option_type = type(nvim_web_devicons.highlight)
if hl_option_type == "boolean" then if hl_option_type == "boolean" then
if hl and nvim_web_devicons.highlight then if hl and nvim_web_devicons.highlight then
table.insert(fb_hl, { hl, 0, #ico }) table.insert(fb_hl, { hl, 0, #ico })
end end
end end
if hl_option_type == "string" then if hl_option_type == "string" then
table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico }) table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico })
end end
ico_txt = ico .. " " ico_txt = ico .. " "
else else
ico_txt = "" ico_txt = ""
end end
local cd_cmd = (autocd and " | cd %:p:h" or "") local cd_cmd = (autocd and " | cd %:p:h" or "")
local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "<cmd>e " .. vim.fn.fnameescape(fn) .. cd_cmd .." <CR>") local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "<cmd>e " .. vim.fn.fnameescape(fn) .. cd_cmd .." <CR>")
local fn_start = short_fn:match(".*[/\\]") local fn_start = short_fn:match(".*[/\\]")
if fn_start ~= nil then if fn_start ~= nil then
table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt }) table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt })
end end
file_button_el.opts.hl = fb_hl file_button_el.opts.hl = fb_hl
return file_button_el return file_button_el
end end
local default_mru_ignore = { "gitcommit" } local default_mru_ignore = { "gitcommit" }
local mru_opts = { local mru_opts = {
ignore = function(path, ext) ignore = function(path, ext)
return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext)) return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext))
end, end,
autocd = false autocd = false
} }
--- @param start number --- @param start number
--- @param cwd string? optional --- @param cwd string? optional
--- @param items_number number? optional number of items to generate, default = 10 --- @param items_number number? optional number of items to generate, default = 10
local function mru(start, cwd, items_number, opts) local function mru(start, cwd, items_number, opts)
opts = opts or mru_opts opts = opts or mru_opts
items_number = if_nil(items_number, 10) items_number = if_nil(items_number, 10)
local oldfiles = {} local oldfiles = {}
for _, v in pairs(vim.v.oldfiles) do for _, v in pairs(vim.v.oldfiles) do
if #oldfiles == items_number then if #oldfiles == items_number then
break break
end end
local cwd_cond local cwd_cond
if not cwd then if not cwd then
cwd_cond = true cwd_cond = true
else else
cwd_cond = vim.startswith(v, cwd) cwd_cond = vim.startswith(v, cwd)
end end
local ignore = (opts.ignore and opts.ignore(v, get_extension(v))) or false local ignore = (opts.ignore and opts.ignore(v, get_extension(v))) or false
if (vim.fn.filereadable(v) == 1) and cwd_cond and not ignore then if (vim.fn.filereadable(v) == 1) and cwd_cond and not ignore then
oldfiles[#oldfiles + 1] = v oldfiles[#oldfiles + 1] = v
end end
end end
local target_width = 35 local target_width = 35
local tbl = {} local tbl = {}
for i, fn in ipairs(oldfiles) do for i, fn in ipairs(oldfiles) do
local short_fn local short_fn
if cwd then if cwd then
short_fn = vim.fn.fnamemodify(fn, ":.") short_fn = vim.fn.fnamemodify(fn, ":.")
else else
short_fn = vim.fn.fnamemodify(fn, ":~") short_fn = vim.fn.fnamemodify(fn, ":~")
end end
if #short_fn > target_width then if #short_fn > target_width then
short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 }) short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 })
if #short_fn > target_width then if #short_fn > target_width then
short_fn = plenary_path.new(short_fn):shorten(1, { -1 }) short_fn = plenary_path.new(short_fn):shorten(1, { -1 })
end end
end end
local shortcut = tostring(i + start - 1) local shortcut = tostring(i + start - 1)
local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd) local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd)
tbl[i] = file_button_el tbl[i] = file_button_el
end end
return { return {
type = "group", type = "group",
val = tbl, val = tbl,
opts = {}, opts = {},
} }
end end
local cats = { local cats = {
{ {
[[ ,-. _,---._ __ / \]], [[ ,-. _,---._ __ / \]],
[[ / ) .-' `./ / \]], [[ / ) .-' `./ / \]],
[[( ( ,' `/ /|]], [[( ( ,' `/ /|]],
[[ \ `-" \'\ / |]], [[ \ `-" \'\ / |]],
[[ `. , \ \ / |]], [[ `. , \ \ / |]],
[[ /`. ,'-`----Y |]], [[ /`. ,'-`----Y |]],
[[ ( ; | ']], [[ ( ; | ']],
[[ | ,-. ,-' | /]], [[ | ,-. ,-' | /]],
[[ | | ( | hjw | /]], [[ | | ( | hjw | /]],
[[ ) | \ `.___________|/]], [[ ) | \ `.___________|/]],
[[ `--' `--']], [[ `--' `--']],
}, },
{ {
[[ _]], [[ _]],
[[ \`*-. ]], [[ \`*-. ]],
[[ ) _`-. ]], [[ ) _`-. ]],
[[ . : `. . ]], [[ . : `. . ]],
[[ : _ ' \ ]], [[ : _ ' \ ]],
[[ ; *` _. `*-._ ]], [[ ; *` _. `*-._ ]],
[[ `-.-' `-. ]], [[ `-.-' `-. ]],
[[ ; ` `. ]], [[ ; ` `. ]],
[[ :. . \ ]], [[ :. . \ ]],
[[ . \ . : .-' . ]], [[ . \ . : .-' . ]],
[[ ' `+.; ; ' : ]], [[ ' `+.; ; ' : ]],
[[ : ' | ; ;-. ]], [[ : ' | ; ;-. ]],
[[ ; ' : :`-: _.`* ;]], [[ ; ' : :`-: _.`* ;]],
[[[bug] .*' / .*' ; .*`- +' `*' ]], [[[bug] .*' / .*' ; .*`- +' `*' ]],
[[ `*-* `*-* `*-*']], [[ `*-* `*-* `*-*']],
}, },
} }
math.randomseed(os.time()) math.randomseed(os.time())
local header = { local header = {
type = "text", type = "text",
val = cats[math.random(1, #cats)], val = cats[math.random(1, #cats)],
opts = { opts = {
position = "center", position = "center",
hl = "Type", hl = "Type",
}, },
} }
local section_mru = { local section_mru = {
type = "group", type = "group",
val = { val = {
{ {
type = "text", type = "text",
val = "Recent files", val = "Recent files",
opts = { opts = {
hl = "SpecialComment", hl = "SpecialComment",
shrink_margin = false, shrink_margin = false,
position = "center", position = "center",
}, },
}, },
{ type = "padding", val = 1 }, { type = "padding", val = 1 },
{ {
type = "group", type = "group",
val = function() val = function()
return { mru(0, cdir) } return { mru(0, cdir) }
end, end,
opts = { shrink_margin = false }, opts = { shrink_margin = false },
}, },
}, },
} }
local buttons = { local buttons = {
type = "group", type = "group",
val = { val = {
{ type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } }, { type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } },
{ type = "padding", val = 1 }, { type = "padding", val = 1 },
dashboard.button("e", " New file", "<cmd>ene<CR>"), dashboard.button("e", " New file", "<cmd>ene<CR>"),
dashboard.button("SPC f f", "󰈞 Find file"), dashboard.button("SPC f f", "󰈞 Find file"),
dashboard.button("SPC f g", "󰊄 Live grep"), dashboard.button("SPC f g", "󰊄 Live grep"),
dashboard.button("SPC p", " Update plugins", "<cmd>PlugUpdate<CR>"), dashboard.button("SPC p", " Update plugins", "<cmd>PlugUpdate<CR>"),
dashboard.button("c", " Configuration", "<cmd>cd ~/.config/nvim/ <CR>"), dashboard.button("c", " Configuration", "<cmd>cd ~/.config/nvim/ <CR>"),
dashboard.button("q", "󰅚 Quit", "<cmd>qa<CR>"), dashboard.button("q", "󰅚 Quit", "<cmd>qa<CR>"),
}, },
position = "center", position = "center",
} }
local config = { local config = {
layout = { layout = {
{ type = "padding", val = 2 }, { type = "padding", val = 2 },
header, header,
{ type = "padding", val = 2 }, { type = "padding", val = 2 },
section_mru, section_mru,
{ type = "padding", val = 2 }, { type = "padding", val = 2 },
buttons, buttons,
}, },
opts = { opts = {
margin = 5, margin = 5,
setup = function() setup = function()
vim.api.nvim_create_autocmd('DirChanged', { vim.api.nvim_create_autocmd('DirChanged', {
pattern = '*', pattern = '*',
group = "alpha_temp", group = "alpha_temp",
callback = function () require('alpha').redraw() end, callback = function () require('alpha').redraw() end,
}) })
end, end,
}, },
} }
return { return {
header = header, header = header,
buttons = buttons, buttons = buttons,
mru = mru, mru = mru,
config = config, config = config,
-- theme specific config -- theme specific config
mru_opts = mru_opts, mru_opts = mru_opts,
leader = dashboard.leader, leader = dashboard.leader,
nvim_web_devicons = nvim_web_devicons, nvim_web_devicons = nvim_web_devicons,
} }

2
home/config/nvim/lua/plugin.lua
View file

@ -9,7 +9,6 @@ Plug('ryanoasis/vim-devicons')
Plug('SirVer/ultisnips') Plug('SirVer/ultisnips')
Plug('honza/vim-snippets') Plug('honza/vim-snippets')
Plug('preservim/nerdcommenter') Plug('preservim/nerdcommenter')
Plug('neoclide/coc.nvim', { branch = 'release' })
Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' }) Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' })
Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
Plug('nvim-lua/plenary.nvim') Plug('nvim-lua/plenary.nvim')
@ -41,5 +40,6 @@ Plug('folke/todo-comments.nvim')
Plug('gbprod/phpactor.nvim') Plug('gbprod/phpactor.nvim')
Plug('gleam-lang/gleam.vim') Plug('gleam-lang/gleam.vim')
Plug('edluffy/hologram.nvim') Plug('edluffy/hologram.nvim')
Plug('lukas-reineke/virt-column.nvim')
vim.call('plug#end') vim.call('plug#end')

32
home/config/nvim/lua/theme.lua
View file

@ -11,12 +11,11 @@ catppuccin.setup({
lsp = false lsp = false
}, },
barbecue = { barbecue = {
dim_dirname = true, -- directory name is dimmed by default dim_dirname = true, -- directory name is dimmed by default
bold_basename = true, bold_basename = true,
dim_context = false, dim_context = false,
alt_background = false, alt_background = false,
}, },
coc_nvim = true,
fidget = true, fidget = true,
markdown = true, markdown = true,
notify = true, notify = true,
@ -28,12 +27,12 @@ local colorscheme = "catppuccin"
local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
vim.o.background = "dark" -- or "light" for light mode vim.o.background = "dark" -- or "light" for light mode
if not ok then if not ok then
vim.notify("colorscheme " .. colorscheme .. " not found!") vim.notify("colorscheme " .. colorscheme .. " not found!")
return return
end end
require('lualine').setup { require('lualine').setup {
options = { options = {
theme = colorscheme, theme = colorscheme,
icons_enabled = true, icons_enabled = true,
globalstatus = true, globalstatus = true,
@ -43,9 +42,9 @@ require('lualine').setup {
require('todo-comments').setup() require('todo-comments').setup()
require('indent-o-matic').setup { require('indent-o-matic').setup {
max_lines = 2048, max_lines = 2048,
standard_widths = { 2, 4, 8 }, standard_widths = { 2, 4, 8 },
skip_multiline = true, skip_multiline = true,
} }
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
@ -55,9 +54,9 @@ vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
vim.opt.termguicolors = true vim.opt.termguicolors = true
require("bufferline").setup {} require("bufferline").setup {}
require("fidget").setup { require("fidget").setup {
window = { window = {
blend = 0, blend = 0,
}, },
} }
local theme = require('menu') local theme = require('menu')
@ -66,3 +65,8 @@ require('alpha').setup(theme.config)
require('hologram').setup { require('hologram').setup {
auto_display = true auto_display = true
} }
require("virt-column").setup {
enabled = true,
virtcolumn = "80"
}

74
home/config/nvim/lua/tree.lua
View file

@ -27,17 +27,17 @@ local function on_attach(bufnr)
end end
require("nvim-tree").setup({ require("nvim-tree").setup({
sort_by = "case_sensitive", sort_by = "case_sensitive",
view = { view = {
adaptive_size = false, adaptive_size = false,
centralize_selection = true, centralize_selection = true,
width = 30, width = 30,
side = "left", side = "left",
preserve_window_proportions = false, preserve_window_proportions = false,
number = false, number = false,
relativenumber = false, relativenumber = false,
signcolumn = "yes", signcolumn = "yes",
float = { float = {
enable = false, enable = false,
quit_on_focus_loss = true, quit_on_focus_loss = true,
open_win_config = { open_win_config = {
@ -48,23 +48,23 @@ require("nvim-tree").setup({
row = 1, row = 1,
col = 1, col = 1,
}, },
}, },
}, },
renderer = { renderer = {
group_empty = true, group_empty = true,
}, },
actions = { actions = {
use_system_clipboard = true, use_system_clipboard = true,
change_dir = { change_dir = {
enable = true, enable = true,
global = false, global = false,
restrict_above_cwd = false, restrict_above_cwd = false,
}, },
expand_all = { expand_all = {
max_folder_discovery = 300, max_folder_discovery = 300,
exclude = {}, exclude = {},
}, },
file_popup = { file_popup = {
open_win_config = { open_win_config = {
col = 1, col = 1,
row = 1, row = 1,
@ -72,7 +72,7 @@ require("nvim-tree").setup({
border = "shadow", border = "shadow",
style = "minimal", style = "minimal",
}, },
}, },
open_file = { open_file = {
window_picker = { window_picker = {
enable = false, enable = false,
@ -86,30 +86,30 @@ require("nvim-tree").setup({
}, },
remove_file = { remove_file = {
close_window = true, close_window = true,
}, },
}, },
tab = { tab = {
sync = { sync = {
open = false, open = false,
close = false, close = false,
ignore = {}, ignore = {},
}, },
}, },
git = { git = {
enable = true, enable = true,
ignore = false, ignore = false,
show_on_dirs = true, show_on_dirs = true,
show_on_open_dirs = true, show_on_open_dirs = true,
timeout = 200, timeout = 200,
}, },
filters = { filters = {
dotfiles = false, dotfiles = false,
git_clean = false, git_clean = false,
no_buffer = false, no_buffer = false,
custom = { "node_modules", "\\.cache" }, custom = { "node_modules", "\\.cache" },
exclude = {}, exclude = {},
}, },
update_cwd = true, update_cwd = true,
respect_buf_cwd = true, respect_buf_cwd = true,
update_focused_file = { update_focused_file = {

36
home/config/nvim/lua/treesitter.lua
View file

@ -11,22 +11,22 @@ local lsps = {
}; };
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
ensure_installed = lsps, ensure_installed = lsps,
sync_install = false, sync_install = false,
auto_install = true, auto_install = true,
ignore_install = { "javascript" }, ignore_install = { "javascript" },
highlight = { highlight = {
enable = true, enable = true,
disable = function(lang, buf) disable = function(lang, buf)
local max_filesize = 1000 * 1024 -- 1 MiB local max_filesize = 1000 * 1024 -- 1 MiB
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then if ok and stats and stats.size > max_filesize then
return true return true
end end
end, end,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
}, },
indent = { indent = {
enable = true enable = true
} }
} }

16
home/config/nvim/lua/vimopt.lua
View file

@ -1,8 +1,8 @@
local set = vim.opt local set = vim.opt
set.tabstop = 4 set.tabstop = 8
set.softtabstop = 4 set.softtabstop = 8
set.shiftwidth = 4 set.shiftwidth = 8
--set.noexpandtab = true set.expandtab = false
set.mouse = "a" set.mouse = "a"
set.clipboard = "unnamedplus" set.clipboard = "unnamedplus"
set.hlsearch = true set.hlsearch = true
@ -22,11 +22,11 @@ vim.filetype.add({
}) })
vim.api.nvim_create_autocmd({ "BufWritePre" }, { vim.api.nvim_create_autocmd({ "BufWritePre" }, {
pattern = { "*" }, pattern = { "*" },
command = [[%s/\s\+$//e]], command = [[%s/\s\+$//e]],
}) })
vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.api.nvim_create_autocmd({ "BufWritePost" }, {
pattern = { "*.md" }, pattern = { "*.md" },
command = 'silent !pandoc % --output=/home/freya/.temp.pdf' command = 'silent !pandoc % --output=/home/freya/.temp.pdf'
}) })

69
home/config/ssh/config
View file

@ -1,31 +1,64 @@
Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
Host icarus Host shun*
HostName icarus.freya.cat HostName shun.freya.cat
User freya user freya
Host tardis Host *.in.freya.cat
HostName tardis.freya.cat User root
User freya
Host lenga
HostName 10.2.0.8
User root
Port 1111 Port 1111
Host ospf.lenga*
HostName ospf.lenga.in.freya.cat
User root
Port 22
Host router.lenga*
HostName router.lenga.in.freya.cat
User root
Port 22
Host services.lenga*
HostName services.lenga.in.freya.cat
User root
Port 22
Host plex.lenga*
HostName plex.lenga.in.freya.cat
User root
Port 22
Host minecraft.lenga*
HostName minecraft.lenga.in.freya.cat
User root
Port 22
Host tangela*
HostName tangela.in.freya.cat
User root
Port 22
Host router.tangela*
HostName router.tangela.in.freya.cat
User root
Port 22
Host stationery Host stationery
HostName stationery.faith HostName stationery.faith
User freya User freya
Host queeg Host redcom
Hostname queeg.cs.rit.edu HostName fmurphy-dev.redcom.com
User tam2214 User fmurphy
Host nitron Host *.cs.rit.edu
Hostname nitron.cs.rit.edu
User tam2214 User tam2214
Host github.com
Hostname github.com
User tam2214
IdentityFile /home/freya/.ssh/id_rit
Host * Host *
HostkeyAlgorithms +ssh-rsa
PubkeyAcceptedKeyTypes +ssh-rsa
KexAlgorithms -sntrup761x25519-sha512@openssh.com KexAlgorithms -sntrup761x25519-sha512@openssh.com

11
home/config/zsh/zprofile
View file

@ -27,7 +27,16 @@ export EDITOR=nvim
export CC=$(which gcc) export CC=$(which gcc)
export LD=$(which gcc) export LD=$(which gcc)
# theming # nvidia
#export LIBVA_DRIVER_NAME=nvidia
#export GBM_BACKEND=nvidia-drm
#export __GLX_VENDOR_LIBRARY_NAME=nvidia
#export __NV_PRIME_RENDER_OFFLOAD=1
#export __VK_LAYER_NV_optimus=NVIDIA_only
# nvk
#export MESA_LOADER_DRIVER_OVERRIDE=zink
#export NOUVEAU_USE_ZINK=1
# ricing # ricing
export QT_QPA_PLATFORM_THEME=gtk2 export QT_QPA_PLATFORM_THEME=gtk2

11
home/config/zsh/zshrc
View file

@ -101,6 +101,17 @@ _wine() {
alias wine32="_wine 32" alias wine32="_wine 32"
alias wine64="_wine 64" alias wine64="_wine 64"
_winetricks() {
export WINEPREFIX="$HOME/.wine$1"
export WINEARCH="win$1"
/usr/bin/winetricks "${@:2}"
unset WINEARCH
unset WINEPREFIX
}
alias winetricks32="_winetricks 32"
alias winetricks64="_winetricks 64"
proton() { proton() {
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
return return