diff --git a/home/config/hypr/config.d/keybinds.conf b/home/config/hypr/config.d/keybinds.conf index f7ecf4e..a3ce255 100644 --- a/home/config/hypr/config.d/keybinds.conf +++ b/home/config/hypr/config.d/keybinds.conf @@ -24,7 +24,7 @@ binde =, XF86AudioPrev, exec, playerctl previous binde =, XF86MonBrightnessDown, 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 = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy diff --git a/home/config/hypr/config.d/plugins.conf b/home/config/hypr/config.d/plugins.conf index 1d6c18b..ca47d35 100644 --- a/home/config/hypr/config.d/plugins.conf +++ b/home/config/hypr/config.d/plugins.conf @@ -1,3 +1,2 @@ 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 diff --git a/home/config/hypr/config.d/theme.conf b/home/config/hypr/config.d/theme.conf index 5076cfb..3461047 100644 --- a/home/config/hypr/config.d/theme.conf +++ b/home/config/hypr/config.d/theme.conf @@ -32,18 +32,6 @@ plugin { 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 { diff --git a/home/config/hypr/monitors.conf b/home/config/hypr/monitors.conf index 5448cc3..f912a5f 100644 --- a/home/config/hypr/monitors.conf +++ b/home/config/hypr/monitors.conf @@ -1,4 +1,2 @@ -# Generated by nwg-displays on 2024-06-18 at 20:22:23. Do not edit manually. - -monitor=eDP-1,2560x1600@90.0,0x0,1.25 -monitor=DP-2,2560x1440@59.95,2048x0,1.0 +monitor=HDMI-A-1,1920x1080@60.0,0x0,1.0 +monitor=DP-2,2560x1440@59.95,1920x0,1.0 diff --git a/home/config/kitty/kitty.conf b/home/config/kitty/kitty.conf index 299d17d..90c096a 100644 --- a/home/config/kitty/kitty.conf +++ b/home/config/kitty/kitty.conf @@ -14,7 +14,7 @@ show_hyperlink_targets yes show_hyperlink_targets no -background_opacity 0.85 +background_opacity 0.75 window_padding_width 10 diff --git a/home/config/nvim/lua/lsp.lua b/home/config/nvim/lua/lsp.lua index a548518..b9579dd 100644 --- a/home/config/nvim/lua/lsp.lua +++ b/home/config/nvim/lua/lsp.lua @@ -3,7 +3,6 @@ local lsp = require('lsp-zero').preset('recommended') require('mason').setup({}) require('mason-lspconfig').setup({ ensure_installed = { - 'tsserver', 'eslint', 'rust_analyzer', 'clangd', @@ -15,6 +14,7 @@ require('mason-lspconfig').setup({ 'jdtls', 'bashls', 'lua_ls', + 'csharp_ls', }, handlers = { lsp.default_setup, @@ -25,10 +25,10 @@ local cmp = require('cmp') local cmp_select = {behavior = cmp.SelectBehavior.Select} local cmp_mappings = cmp.mapping.preset.insert({ - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.select_next_item(cmp_select), - [''] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping.complete(), + [''] = cmp.mapping.select_prev_item(cmp_select), + [''] = cmp.mapping.select_next_item(cmp_select), + [''] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete(), }) cmp_mappings[''] = nil @@ -39,13 +39,13 @@ cmp.setup({ }) lsp.set_preferences({ - suggest_lsp_servers = false, - sign_icons = { - error = 'E', - warn = 'W', - hint = 'H', - info = 'I' - } + suggest_lsp_servers = false, + sign_icons = { + error = 'E', + warn = 'W', + hint = 'H', + info = 'I' + } }) lsp.on_attach(function(client, bufnr) @@ -53,15 +53,15 @@ lsp.on_attach(function(client, bufnr) local keymap = vim.keymap.set keymap("n", "gd", function() vim.lsp.buf.definition() end, opts) - keymap("n", "K", function() vim.lsp.buf.hover() end, opts) - keymap("n", "ls", function() vim.lsp.buf.workspace_symbol() end, opts) - keymap("n", "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_prev() end, opts) - keymap("n", "la", function() vim.lsp.buf.code_action() end, opts) - keymap("n", "lr", function() vim.lsp.buf.references() end, opts) - keymap("n", "ln", function() vim.lsp.buf.rename() end, opts) - keymap("i", "", function() vim.lsp.buf.signature_help() end, opts) + keymap("n", "K", function() vim.lsp.buf.hover() end, opts) + keymap("n", "ls", function() vim.lsp.buf.workspace_symbol() end, opts) + keymap("n", "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_prev() end, opts) + keymap("n", "la", function() vim.lsp.buf.code_action() end, opts) + keymap("n", "lr", function() vim.lsp.buf.references() end, opts) + keymap("n", "ln", function() vim.lsp.buf.rename() end, opts) + keymap("i", "", function() vim.lsp.buf.signature_help() end, opts) end) require('lspconfig/prolog_lsp') @@ -87,7 +87,7 @@ require('phpactor').setup { } vim.diagnostic.config({ - virtual_text = true + virtual_text = true }) require("neodev").setup() diff --git a/home/config/nvim/lua/menu.lua b/home/config/nvim/lua/menu.lua index e3e74bd..2a95209 100644 --- a/home/config/nvim/lua/menu.lua +++ b/home/config/nvim/lua/menu.lua @@ -1,6 +1,6 @@ local path_ok, plenary_path = pcall(require, "plenary.path") if not path_ok then - return + return end local dashboard = require("alpha.themes.dashboard") @@ -8,226 +8,226 @@ local cdir = vim.fn.getcwd() local if_nil = vim.F.if_nil local nvim_web_devicons = { - enabled = true, - highlight = true, + enabled = true, + highlight = true, } local function get_extension(fn) - local match = fn:match("^.+(%..+)$") - local ext = "" - if match ~= nil then - ext = match:sub(2) - end - return ext + local match = fn:match("^.+(%..+)$") + local ext = "" + if match ~= nil then + ext = match:sub(2) + end + return ext end local function icon(fn) - local nwd = require("nvim-web-devicons") - local ext = get_extension(fn) - return nwd.get_icon(fn, ext, { default = true }) + local nwd = require("nvim-web-devicons") + local ext = get_extension(fn) + return nwd.get_icon(fn, ext, { default = true }) end local function file_button(fn, sc, short_fn,autocd) - short_fn = short_fn or fn - local ico_txt - local fb_hl = {} + short_fn = short_fn or fn + local ico_txt + local fb_hl = {} - if nvim_web_devicons.enabled then - local ico, hl = icon(fn) - local hl_option_type = type(nvim_web_devicons.highlight) - if hl_option_type == "boolean" then - if hl and nvim_web_devicons.highlight then - table.insert(fb_hl, { hl, 0, #ico }) - end - end - if hl_option_type == "string" then - table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico }) - end - ico_txt = ico .. " " - else - ico_txt = "" - end - local cd_cmd = (autocd and " | cd %:p:h" or "") - local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "e " .. vim.fn.fnameescape(fn) .. cd_cmd .." ") - local fn_start = short_fn:match(".*[/\\]") - if fn_start ~= nil then - table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt }) - end - file_button_el.opts.hl = fb_hl - return file_button_el + if nvim_web_devicons.enabled then + local ico, hl = icon(fn) + local hl_option_type = type(nvim_web_devicons.highlight) + if hl_option_type == "boolean" then + if hl and nvim_web_devicons.highlight then + table.insert(fb_hl, { hl, 0, #ico }) + end + end + if hl_option_type == "string" then + table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico }) + end + ico_txt = ico .. " " + else + ico_txt = "" + end + local cd_cmd = (autocd and " | cd %:p:h" or "") + local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "e " .. vim.fn.fnameescape(fn) .. cd_cmd .." ") + local fn_start = short_fn:match(".*[/\\]") + if fn_start ~= nil then + table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt }) + end + file_button_el.opts.hl = fb_hl + return file_button_el end local default_mru_ignore = { "gitcommit" } local mru_opts = { - ignore = function(path, ext) - return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext)) - end, - autocd = false + ignore = function(path, ext) + return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext)) + end, + autocd = false } --- @param start number --- @param cwd string? optional --- @param items_number number? optional number of items to generate, default = 10 local function mru(start, cwd, items_number, opts) - opts = opts or mru_opts - items_number = if_nil(items_number, 10) + opts = opts or mru_opts + items_number = if_nil(items_number, 10) - local oldfiles = {} - for _, v in pairs(vim.v.oldfiles) do - if #oldfiles == items_number then - break - end - local cwd_cond - if not cwd then - cwd_cond = true - else - cwd_cond = vim.startswith(v, cwd) - end - 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 - oldfiles[#oldfiles + 1] = v - end - end - local target_width = 35 + local oldfiles = {} + for _, v in pairs(vim.v.oldfiles) do + if #oldfiles == items_number then + break + end + local cwd_cond + if not cwd then + cwd_cond = true + else + cwd_cond = vim.startswith(v, cwd) + end + 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 + oldfiles[#oldfiles + 1] = v + end + end + local target_width = 35 - local tbl = {} - for i, fn in ipairs(oldfiles) do - local short_fn - if cwd then - short_fn = vim.fn.fnamemodify(fn, ":.") - else - short_fn = vim.fn.fnamemodify(fn, ":~") - end + local tbl = {} + for i, fn in ipairs(oldfiles) do + local short_fn + if cwd then + short_fn = vim.fn.fnamemodify(fn, ":.") + else + short_fn = vim.fn.fnamemodify(fn, ":~") + end - if #short_fn > target_width then - short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 }) - if #short_fn > target_width then - short_fn = plenary_path.new(short_fn):shorten(1, { -1 }) - end - end + if #short_fn > target_width then + short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 }) + if #short_fn > target_width then + short_fn = plenary_path.new(short_fn):shorten(1, { -1 }) + 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) - tbl[i] = file_button_el - end - return { - type = "group", - val = tbl, - opts = {}, - } + local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd) + tbl[i] = file_button_el + end + return { + type = "group", + val = tbl, + opts = {}, + } end local cats = { { - [[ ,-. _,---._ __ / \]], - [[ / ) .-' `./ / \]], - [[( ( ,' `/ /|]], - [[ \ `-" \'\ / |]], - [[ `. , \ \ / |]], - [[ /`. ,'-`----Y |]], - [[ ( ; | ']], - [[ | ,-. ,-' | /]], - [[ | | ( | hjw | /]], + [[ ,-. _,---._ __ / \]], + [[ / ) .-' `./ / \]], + [[( ( ,' `/ /|]], + [[ \ `-" \'\ / |]], + [[ `. , \ \ / |]], + [[ /`. ,'-`----Y |]], + [[ ( ; | ']], + [[ | ,-. ,-' | /]], + [[ | | ( | hjw | /]], [[ ) | \ `.___________|/]], [[ `--' `--']], }, { [[ _]], - [[ \`*-. ]], - [[ ) _`-. ]], - [[ . : `. . ]], - [[ : _ ' \ ]], - [[ ; *` _. `*-._ ]], - [[ `-.-' `-. ]], - [[ ; ` `. ]], - [[ :. . \ ]], - [[ . \ . : .-' . ]], - [[ ' `+.; ; ' : ]], - [[ : ' | ; ;-. ]], - [[ ; ' : :`-: _.`* ;]], + [[ \`*-. ]], + [[ ) _`-. ]], + [[ . : `. . ]], + [[ : _ ' \ ]], + [[ ; *` _. `*-._ ]], + [[ `-.-' `-. ]], + [[ ; ` `. ]], + [[ :. . \ ]], + [[ . \ . : .-' . ]], + [[ ' `+.; ; ' : ]], + [[ : ' | ; ;-. ]], + [[ ; ' : :`-: _.`* ;]], [[[bug] .*' / .*' ; .*`- +' `*' ]], - [[ `*-* `*-* `*-*']], + [[ `*-* `*-* `*-*']], }, } math.randomseed(os.time()) local header = { - type = "text", + type = "text", val = cats[math.random(1, #cats)], - opts = { - position = "center", - hl = "Type", - }, + opts = { + position = "center", + hl = "Type", + }, } local section_mru = { - type = "group", - val = { - { - type = "text", - val = "Recent files", - opts = { - hl = "SpecialComment", - shrink_margin = false, - position = "center", - }, - }, - { type = "padding", val = 1 }, - { - type = "group", - val = function() - return { mru(0, cdir) } - end, - opts = { shrink_margin = false }, - }, - }, + type = "group", + val = { + { + type = "text", + val = "Recent files", + opts = { + hl = "SpecialComment", + shrink_margin = false, + position = "center", + }, + }, + { type = "padding", val = 1 }, + { + type = "group", + val = function() + return { mru(0, cdir) } + end, + opts = { shrink_margin = false }, + }, + }, } local buttons = { - type = "group", - val = { - { type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } }, - { type = "padding", val = 1 }, - dashboard.button("e", " New file", "ene"), - dashboard.button("SPC f f", "󰈞 Find file"), - dashboard.button("SPC f g", "󰊄 Live grep"), - dashboard.button("SPC p", " Update plugins", "PlugUpdate"), - dashboard.button("c", " Configuration", "cd ~/.config/nvim/ "), - dashboard.button("q", "󰅚 Quit", "qa"), - }, - position = "center", + type = "group", + val = { + { type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } }, + { type = "padding", val = 1 }, + dashboard.button("e", " New file", "ene"), + dashboard.button("SPC f f", "󰈞 Find file"), + dashboard.button("SPC f g", "󰊄 Live grep"), + dashboard.button("SPC p", " Update plugins", "PlugUpdate"), + dashboard.button("c", " Configuration", "cd ~/.config/nvim/ "), + dashboard.button("q", "󰅚 Quit", "qa"), + }, + position = "center", } local config = { - layout = { - { type = "padding", val = 2 }, - header, - { type = "padding", val = 2 }, - section_mru, - { type = "padding", val = 2 }, - buttons, - }, - opts = { - margin = 5, - setup = function() - vim.api.nvim_create_autocmd('DirChanged', { - pattern = '*', - group = "alpha_temp", - callback = function () require('alpha').redraw() end, - }) - end, - }, + layout = { + { type = "padding", val = 2 }, + header, + { type = "padding", val = 2 }, + section_mru, + { type = "padding", val = 2 }, + buttons, + }, + opts = { + margin = 5, + setup = function() + vim.api.nvim_create_autocmd('DirChanged', { + pattern = '*', + group = "alpha_temp", + callback = function () require('alpha').redraw() end, + }) + end, + }, } return { - header = header, - buttons = buttons, - mru = mru, - config = config, - -- theme specific config - mru_opts = mru_opts, - leader = dashboard.leader, - nvim_web_devicons = nvim_web_devicons, + header = header, + buttons = buttons, + mru = mru, + config = config, + -- theme specific config + mru_opts = mru_opts, + leader = dashboard.leader, + nvim_web_devicons = nvim_web_devicons, } diff --git a/home/config/nvim/lua/plugin.lua b/home/config/nvim/lua/plugin.lua index 2ad8cdc..598b883 100644 --- a/home/config/nvim/lua/plugin.lua +++ b/home/config/nvim/lua/plugin.lua @@ -9,7 +9,6 @@ Plug('ryanoasis/vim-devicons') Plug('SirVer/ultisnips') Plug('honza/vim-snippets') Plug('preservim/nerdcommenter') -Plug('neoclide/coc.nvim', { branch = 'release' }) Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' }) Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) Plug('nvim-lua/plenary.nvim') @@ -41,5 +40,6 @@ Plug('folke/todo-comments.nvim') Plug('gbprod/phpactor.nvim') Plug('gleam-lang/gleam.vim') Plug('edluffy/hologram.nvim') +Plug('lukas-reineke/virt-column.nvim') vim.call('plug#end') diff --git a/home/config/nvim/lua/theme.lua b/home/config/nvim/lua/theme.lua index 79631c1..34a379b 100644 --- a/home/config/nvim/lua/theme.lua +++ b/home/config/nvim/lua/theme.lua @@ -11,12 +11,11 @@ catppuccin.setup({ lsp = false }, barbecue = { - dim_dirname = true, -- directory name is dimmed by default - bold_basename = true, - dim_context = false, - alt_background = false, + dim_dirname = true, -- directory name is dimmed by default + bold_basename = true, + dim_context = false, + alt_background = false, }, - coc_nvim = true, fidget = true, markdown = true, notify = true, @@ -28,12 +27,12 @@ local colorscheme = "catppuccin" local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) vim.o.background = "dark" -- or "light" for light mode if not ok then - vim.notify("colorscheme " .. colorscheme .. " not found!") - return + vim.notify("colorscheme " .. colorscheme .. " not found!") + return end require('lualine').setup { - options = { + options = { theme = colorscheme, icons_enabled = true, globalstatus = true, @@ -43,9 +42,9 @@ require('lualine').setup { require('todo-comments').setup() require('indent-o-matic').setup { - max_lines = 2048, - standard_widths = { 2, 4, 8 }, - skip_multiline = true, + max_lines = 2048, + standard_widths = { 2, 4, 8 }, + skip_multiline = true, } 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 require("bufferline").setup {} require("fidget").setup { - window = { - blend = 0, - }, + window = { + blend = 0, + }, } local theme = require('menu') @@ -66,3 +65,8 @@ require('alpha').setup(theme.config) require('hologram').setup { auto_display = true } + +require("virt-column").setup { + enabled = true, + virtcolumn = "80" +} diff --git a/home/config/nvim/lua/tree.lua b/home/config/nvim/lua/tree.lua index aef5023..cd41b19 100644 --- a/home/config/nvim/lua/tree.lua +++ b/home/config/nvim/lua/tree.lua @@ -27,17 +27,17 @@ local function on_attach(bufnr) end require("nvim-tree").setup({ - sort_by = "case_sensitive", - view = { + sort_by = "case_sensitive", + view = { adaptive_size = false, - centralize_selection = true, - width = 30, - side = "left", - preserve_window_proportions = false, - number = false, - relativenumber = false, - signcolumn = "yes", - float = { + centralize_selection = true, + width = 30, + side = "left", + preserve_window_proportions = false, + number = false, + relativenumber = false, + signcolumn = "yes", + float = { enable = false, quit_on_focus_loss = true, open_win_config = { @@ -48,23 +48,23 @@ require("nvim-tree").setup({ row = 1, col = 1, }, - }, - }, - renderer = { - group_empty = true, - }, + }, + }, + renderer = { + group_empty = true, + }, actions = { use_system_clipboard = true, change_dir = { enable = true, - global = false, + global = false, restrict_above_cwd = false, - }, - expand_all = { + }, + expand_all = { max_folder_discovery = 300, exclude = {}, - }, - file_popup = { + }, + file_popup = { open_win_config = { col = 1, row = 1, @@ -72,7 +72,7 @@ require("nvim-tree").setup({ border = "shadow", style = "minimal", }, - }, + }, open_file = { window_picker = { enable = false, @@ -86,30 +86,30 @@ require("nvim-tree").setup({ }, remove_file = { close_window = true, - }, + }, }, tab = { - sync = { + sync = { open = false, close = false, ignore = {}, - }, - }, + }, + }, git = { - enable = true, - ignore = false, - show_on_dirs = true, - show_on_open_dirs = true, - timeout = 200, - }, + enable = true, + ignore = false, + show_on_dirs = true, + show_on_open_dirs = true, + timeout = 200, + }, filters = { - dotfiles = false, - git_clean = false, - no_buffer = false, - custom = { "node_modules", "\\.cache" }, - exclude = {}, - }, + dotfiles = false, + git_clean = false, + no_buffer = false, + custom = { "node_modules", "\\.cache" }, + exclude = {}, + }, update_cwd = true, respect_buf_cwd = true, update_focused_file = { diff --git a/home/config/nvim/lua/treesitter.lua b/home/config/nvim/lua/treesitter.lua index 7b578d6..52fa327 100644 --- a/home/config/nvim/lua/treesitter.lua +++ b/home/config/nvim/lua/treesitter.lua @@ -11,22 +11,22 @@ local lsps = { }; require('nvim-treesitter.configs').setup { - ensure_installed = lsps, - sync_install = false, - auto_install = true, - ignore_install = { "javascript" }, - highlight = { - enable = true, - disable = function(lang, buf) - local max_filesize = 1000 * 1024 -- 1 MiB - 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 - return true - end - end, - additional_vim_regex_highlighting = false, - }, - indent = { - enable = true - } + ensure_installed = lsps, + sync_install = false, + auto_install = true, + ignore_install = { "javascript" }, + highlight = { + enable = true, + disable = function(lang, buf) + local max_filesize = 1000 * 1024 -- 1 MiB + 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 + return true + end + end, + additional_vim_regex_highlighting = false, + }, + indent = { + enable = true + } } diff --git a/home/config/nvim/lua/vimopt.lua b/home/config/nvim/lua/vimopt.lua index d205926..0c519d6 100644 --- a/home/config/nvim/lua/vimopt.lua +++ b/home/config/nvim/lua/vimopt.lua @@ -1,8 +1,8 @@ local set = vim.opt -set.tabstop = 4 -set.softtabstop = 4 -set.shiftwidth = 4 ---set.noexpandtab = true +set.tabstop = 8 +set.softtabstop = 8 +set.shiftwidth = 8 +set.expandtab = false set.mouse = "a" set.clipboard = "unnamedplus" set.hlsearch = true @@ -22,11 +22,11 @@ vim.filetype.add({ }) vim.api.nvim_create_autocmd({ "BufWritePre" }, { - pattern = { "*" }, - command = [[%s/\s\+$//e]], + pattern = { "*" }, + command = [[%s/\s\+$//e]], }) vim.api.nvim_create_autocmd({ "BufWritePost" }, { - pattern = { "*.md" }, - command = 'silent !pandoc % --output=/home/freya/.temp.pdf' + pattern = { "*.md" }, + command = 'silent !pandoc % --output=/home/freya/.temp.pdf' }) diff --git a/home/config/ssh/config b/home/config/ssh/config index 3377b18..2908047 100644 --- a/home/config/ssh/config +++ b/home/config/ssh/config @@ -1,31 +1,64 @@ -Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" +Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" -Host icarus - HostName icarus.freya.cat - User freya +Host shun* + HostName shun.freya.cat + user freya -Host tardis - HostName tardis.freya.cat - User freya +Host *.in.freya.cat + User root + +Host lenga + HostName 10.2.0.8 + User root 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 HostName stationery.faith User freya -Host queeg - Hostname queeg.cs.rit.edu - User tam2214 +Host redcom + HostName fmurphy-dev.redcom.com + User fmurphy -Host nitron - Hostname nitron.cs.rit.edu +Host *.cs.rit.edu User tam2214 -Host github.com - Hostname github.com - User tam2214 - IdentityFile /home/freya/.ssh/id_rit - Host * + HostkeyAlgorithms +ssh-rsa + PubkeyAcceptedKeyTypes +ssh-rsa KexAlgorithms -sntrup761x25519-sha512@openssh.com - diff --git a/home/config/zsh/zprofile b/home/config/zsh/zprofile index 18e9548..e0e165b 100644 --- a/home/config/zsh/zprofile +++ b/home/config/zsh/zprofile @@ -27,7 +27,16 @@ export EDITOR=nvim export CC=$(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 export QT_QPA_PLATFORM_THEME=gtk2 diff --git a/home/config/zsh/zshrc b/home/config/zsh/zshrc index 3dc32ef..7fe8642 100644 --- a/home/config/zsh/zshrc +++ b/home/config/zsh/zshrc @@ -101,6 +101,17 @@ _wine() { alias wine32="_wine 32" 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() { if [ $# -lt 1 ]; then return