changes lmao

main
Ayush Mukherjee 1 year ago
parent 3b9cd52924
commit 3056d26281

@ -28,6 +28,7 @@ export XDG_SESSION_DESKTOP=Sway
export WLR_NO_HARDWARE_CURSORS=1 export WLR_NO_HARDWARE_CURSORS=1
# fix for slow loads on igpu-only mode # fix for slow loads on igpu-only mode
#
export __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json:/usr/share/glvnd/egl_vendor.d/10_nvidia.json export __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json:/usr/share/glvnd/egl_vendor.d/10_nvidia.json
# gnome keyring # gnome keyring
@ -38,7 +39,7 @@ export SSH_AUTH_SOCK
#status=$(sudo cat /sys/class/drm/card1-HDMI-A-2/status) #status=$(sudo cat /sys/class/drm/card1-HDMI-A-2/status)
#if [ "$status" = "connected" ]; then #if [ "$status" = "connected" ]; then
# export WLR_RENDERER=vulkan # export WLR_RENDERER=vulkan
# export WLR_DRM_DEVICES=/dev/dri/card1 #export WLR_DRM_DEVICES=/dev/dri/card0:/dev/dri/card1
#fi #fi
sway --unsupported-gpu sway --unsupported-gpu

@ -1,85 +1,85 @@
local use = require('packer').use local use = require("packer").use
require('packer').startup(function() require("packer").startup(function()
-- required -- required
use 'wbthomason/packer.nvim' use("wbthomason/packer.nvim")
use 'nvim-lua/plenary.nvim' use("nvim-lua/plenary.nvim")
-- common/visual plugins -- common/visual plugins
use 'powerline/powerline-fonts' use("powerline/powerline-fonts")
use { use({
'nvim-lualine/lualine.nvim', "nvim-lualine/lualine.nvim",
requires = { 'kyazdani42/nvim-web-devicons', opt = true } requires = { "kyazdani42/nvim-web-devicons", opt = true },
} })
use 'kdheepak/tabline.nvim' use("kdheepak/tabline.nvim")
use 'junegunn/goyo.vim' use("junegunn/goyo.vim")
use 'gpanders/editorconfig.nvim' use("gpanders/editorconfig.nvim")
use { use({
'nvim-telescope/telescope-fzf-native.nvim', "nvim-telescope/telescope-fzf-native.nvim",
run = 'make' run = "make",
} })
use { use({
'nvim-telescope/telescope.nvim', "nvim-telescope/telescope.nvim",
tag = '0.1.0', tag = "0.1.0",
} })
use { use({
'williamboman/mason.nvim', "williamboman/mason.nvim",
'williamboman/mason-lspconfig.nvim', "williamboman/mason-lspconfig.nvim",
'RubixDev/mason-update-all', "RubixDev/mason-update-all",
'neovim/nvim-lspconfig' "neovim/nvim-lspconfig",
} })
use { use({
'catppuccin/nvim', "catppuccin/nvim",
as = 'catpuccin' as = "catpuccin",
} })
use 'nvim-treesitter/nvim-treesitter' use("nvim-treesitter/nvim-treesitter")
use 'jose-elias-alvarez/null-ls.nvim' use("jose-elias-alvarez/null-ls.nvim")
use 'RRethy/vim-illuminate' use("RRethy/vim-illuminate")
-- cmp -- cmp
use "hrsh7th/nvim-cmp" use("hrsh7th/nvim-cmp")
use "hrsh7th/cmp-buffer" use("hrsh7th/cmp-buffer")
use "hrsh7th/cmp-path" use("hrsh7th/cmp-path")
use "hrsh7th/cmp-nvim-lsp" use("hrsh7th/cmp-nvim-lsp")
use 'L3MON4D3/LuaSnip' use("L3MON4D3/LuaSnip")
use 'saadparwaiz1/cmp_luasnip' use("saadparwaiz1/cmp_luasnip")
use "hrsh7th/cmp-nvim-lua" use("hrsh7th/cmp-nvim-lua")
-- indent lines -- indent lines
use "lukas-reineke/indent-blankline.nvim" use("lukas-reineke/indent-blankline.nvim")
end) end)
require("user.basics") require("user.basics")
vim.cmd.colorscheme 'catppuccin-macchiato' vim.cmd.colorscheme("catppuccin-macchiato")
vim.opt.guicursor = 'n:block-Number,i:ver30' vim.opt.guicursor = "n:block-Number,i:ver30"
local function map(mode, shortcut, command) local function map(mode, shortcut, command)
vim.keymap.set(mode, shortcut, command, { noremap = true }) vim.keymap.set(mode, shortcut, command, { noremap = true })
end end
local function nmap(shortcut, command) local function nmap(shortcut, command)
map('n', shortcut, command) map("n", shortcut, command)
end end
local use builtin = require("telescope.builtin") local use
builtin = require("telescope.builtin")
nmap("<C-P>", builtin.find_files) nmap("<C-P>", builtin.find_files)
require("lualine").setup{ require("lualine").setup({
options = { options = {
theme = 'auto' theme = "auto",
} },
} })
require("tabline").setup{ require("tabline").setup({
vim.cmd([[ vim.cmd([[
set guioptions-=e set guioptions-=e
set sessionoptions+=tabpages,globals set sessionoptions+=tabpages,globals
]]) ]]),
} })
local status_ok, configs = pcall(require, "nvim-treesitter.configs") local status_ok, configs = pcall(require, "nvim-treesitter.configs")
if not status_ok then if not status_ok then
@ -95,18 +95,20 @@ configs.setup({
disable = { "" }, disable = { "" },
additional_vim_regex_highlighting = true, additional_vim_regex_highlighting = true,
}, },
indent = { enable = true, disable = { "yaml" } } indent = { enable = true, disable = { "yaml" } },
}) })
-- indent blankline plugin -- indent blankline plugin
vim.opt.list = true vim.opt.list = true
vim.opt.listchars:append "space:⋅" vim.opt.listchars:append("space:⋅")
vim.opt.listchars:append "eol:↴" vim.opt.listchars:append("eol:↴")
require("indent_blankline").setup { ---require("ibl").setup({
show_end_of_line = true, --- show_end_of_line = true,
show_current_context = true, --- show_current_context = true,
show_current_context_start = true, --- show_current_context_start = true,
} ---})
require("ibl").setup()
nmap("<C-T>", "<cmd>TablineTabNew<cr>") nmap("<C-T>", "<cmd>TablineTabNew<cr>")
nmap("<C-L>", "<cmd>TablineBufferNext<cr>") nmap("<C-L>", "<cmd>TablineBufferNext<cr>")
@ -116,6 +118,5 @@ nmap("<C-S-Q>", "<cmd>bd!<cr>")
nmap("<C-B>", "<cmd>ls<cr>") nmap("<C-B>", "<cmd>ls<cr>")
nmap("<C-G>", "<cmd>Goyo<cr>") nmap("<C-G>", "<cmd>Goyo<cr>")
require('user.cmp') require("user.cmp")
require('user.lsp') require("user.lsp")

@ -60,7 +60,7 @@ local function lsp_keymaps(bufnr)
keymap(bufnr, "n", "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts) keymap(bufnr, "n", "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts) keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", opts) keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
keymap(bufnr, "n", "<leader>lf", "<cmd>lua vim.lsp.buf.format<cr>", opts) keymap(bufnr, "n", "<leader>lf", "<cmd>lua vim.lsp.buf.format()<cr>", opts)
keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts) keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts)
keymap(bufnr, "n", "<leader>lI", "<cmd>LspInstallInfo<cr>", opts) keymap(bufnr, "n", "<leader>lI", "<cmd>LspInstallInfo<cr>", opts)
keymap(bufnr, "n", "<leadr>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts) keymap(bufnr, "n", "<leadr>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)

@ -1,25 +1,25 @@
local servers = { local servers = {
'lua_ls', "lua_ls",
'pyright', "pyright",
'tsserver', "tsserver",
'terraformls', "terraformls",
} }
require('mason').setup() require("mason").setup()
require('mason-lspconfig').setup({ require("mason-lspconfig").setup({
ensure_installed = servers, ensure_installed = servers,
automatic_installation = true, automatic_installation = true,
}) })
require('mason-update-all').setup() require("mason-update-all").setup()
vim.api.nvim_create_autocmd('User', { vim.api.nvim_create_autocmd("User", {
pattern = 'MasonUpdateAllComplete', pattern = "MasonUpdateAllComplete",
callback = function() callback = function()
print('mason-update-all has finished') print("mason-update-all has finished")
end, end,
}) })
local lsp_status_ok, lspconfig = pcall(require, 'lspconfig') local lsp_status_ok, lspconfig = pcall(require, "lspconfig")
if not lsp_status_ok then if not lsp_status_ok then
return return
end end
@ -28,13 +28,13 @@ local opts = {}
for _, server in pairs(servers) do for _, server in pairs(servers) do
opts = { opts = {
on_attach = require('user.lsp.handlers').on_attach, on_attach = require("user.lsp.handlers").on_attach,
capabilities = require('user.lsp.handlers').capabilities, capabilities = require("user.lsp.handlers").capabilities,
} }
server = vim.split(server, '@')[1] server = vim.split(server, "@")[1]
local require_ok, conf_opts = pcall(require, 'user.lsp.settings.' .. server) local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
if require_ok then if require_ok then
opts = vim.tbl_deep_extend("force", conf_opts, opts) opts = vim.tbl_deep_extend("force", conf_opts, opts)
end end

@ -0,0 +1,9 @@
return {
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
},
},
},
}

@ -1,15 +0,0 @@
return {
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
},
workspace = {
library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
[vim.fn.stdpath("config") .. "/lua"] = true,
},
},
},
},
}

@ -49,8 +49,8 @@ local function save_profiles(threshold)
end end
time([[Luarocks path setup]], true) time([[Luarocks path setup]], true)
local package_path_str = "/home/ayush/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/ayush/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/ayush/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/ayush/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" local package_path_str = "/home/ayush/.cache/nvim/packer_hererocks/2.1.1694285958/share/lua/5.1/?.lua;/home/ayush/.cache/nvim/packer_hererocks/2.1.1694285958/share/lua/5.1/?/init.lua;/home/ayush/.cache/nvim/packer_hererocks/2.1.1694285958/lib/luarocks/rocks-5.1/?.lua;/home/ayush/.cache/nvim/packer_hererocks/2.1.1694285958/lib/luarocks/rocks-5.1/?/init.lua"
local install_cpath_pattern = "/home/ayush/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" local install_cpath_pattern = "/home/ayush/.cache/nvim/packer_hererocks/2.1.1694285958/lib/lua/5.1/?.so"
if not string.find(package.path, package_path_str, 1, true) then if not string.find(package.path, package_path_str, 1, true) then
package.path = package.path .. ';' .. package_path_str package.path = package.path .. ';' .. package_path_str
end end
@ -74,6 +74,16 @@ end
time([[try_loadstring definition]], false) time([[try_loadstring definition]], false)
time([[Defining packer_plugins]], true) time([[Defining packer_plugins]], true)
_G.packer_plugins = { _G.packer_plugins = {
LuaSnip = {
loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/LuaSnip",
url = "https://github.com/L3MON4D3/LuaSnip"
},
catpuccin = {
loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/catpuccin",
url = "https://github.com/catppuccin/nvim"
},
["cmp-buffer"] = { ["cmp-buffer"] = {
loaded = true, loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/cmp-buffer", path = "/home/ayush/.local/share/nvim/site/pack/packer/start/cmp-buffer",
@ -109,6 +119,11 @@ _G.packer_plugins = {
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/goyo.vim", path = "/home/ayush/.local/share/nvim/site/pack/packer/start/goyo.vim",
url = "https://github.com/junegunn/goyo.vim" url = "https://github.com/junegunn/goyo.vim"
}, },
["indent-blankline.nvim"] = {
loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
url = "https://github.com/lukas-reineke/indent-blankline.nvim"
},
["lualine.nvim"] = { ["lualine.nvim"] = {
loaded = true, loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/lualine.nvim", path = "/home/ayush/.local/share/nvim/site/pack/packer/start/lualine.nvim",
@ -119,6 +134,11 @@ _G.packer_plugins = {
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", path = "/home/ayush/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
url = "https://github.com/williamboman/mason-lspconfig.nvim" url = "https://github.com/williamboman/mason-lspconfig.nvim"
}, },
["mason-update-all"] = {
loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/mason-update-all",
url = "https://github.com/RubixDev/mason-update-all"
},
["mason.nvim"] = { ["mason.nvim"] = {
loaded = true, loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/mason.nvim", path = "/home/ayush/.local/share/nvim/site/pack/packer/start/mason.nvim",
@ -150,11 +170,6 @@ _G.packer_plugins = {
path = "/home/ayush/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", path = "/home/ayush/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
url = "https://github.com/kyazdani42/nvim-web-devicons" url = "https://github.com/kyazdani42/nvim-web-devicons"
}, },
["onedark.vim"] = {
loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/onedark.vim",
url = "https://github.com/joshdick/onedark.vim"
},
["packer.nvim"] = { ["packer.nvim"] = {
loaded = true, loaded = true,
path = "/home/ayush/.local/share/nvim/site/pack/packer/start/packer.nvim", path = "/home/ayush/.local/share/nvim/site/pack/packer/start/packer.nvim",

@ -3,15 +3,22 @@ output eDP-1 {
#mode 1920x1080@60.004Hz #mode 1920x1080@60.004Hz
mode 1920x1080@144.003Hz mode 1920x1080@144.003Hz
scale 1.0 scale 1.0
adaptive_sync off adaptive_sync on
} }
output DP-1 { output DP-1 {
mode 2560x1440@144.000Hz
scale 1.0
adaptive_sync on
}
output HDMI-A-2 {
mode 2560x1440@144.000Hz mode 2560x1440@144.000Hz
scale 1.0 scale 1.0
adaptive_sync off adaptive_sync off
} }
# set mouse # set mouse
input type:pointer { input type:pointer {
accel_profile flat accel_profile flat
@ -217,6 +224,7 @@ gaps inner 20
# set smart gaps # set smart gaps
#smart_gaps on #smart_gaps on
bindsym $mod+g exec "swaymsg gaps inner current toggle 20"
# set desktop bg # set desktop bg
exec_always swaybg -i ~/.config/sway/wall.jpg -m stretch exec_always swaybg -i ~/.config/sway/wall.jpg -m stretch

Loading…
Cancel
Save