Compare commits
14 Commits
78a32b5616
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 3a832eec36 | |||
| 116ab17242 | |||
| 5c1ae1da4a | |||
| be35b62a87 | |||
| 95d80c31d5 | |||
| 51515037b3 | |||
| 0a6a42e0b7 | |||
| 1820a8eff5 | |||
| e43d39b957 | |||
| f83ad4c21e | |||
| 0659773daf | |||
| 88f0c9b0b9 | |||
| 153d829677 | |||
| d0ccffc8d0 |
@ -2,22 +2,22 @@
|
||||
TERM = "xterm-256color"
|
||||
|
||||
[font]
|
||||
size = 12.0
|
||||
size = 14
|
||||
|
||||
[font.normal]
|
||||
family = "Input Nerd Font"
|
||||
family = "Hack Nerd Font Mono"
|
||||
style = "Regular"
|
||||
|
||||
[font.bold]
|
||||
family = "Input Nerd Font"
|
||||
family = "Hack Nerd Font Mono"
|
||||
style = "Bold"
|
||||
|
||||
[font.bold_italic]
|
||||
family = "Input Nerd Font"
|
||||
family = "Hack Nerd Font Mono"
|
||||
style = "Bold Italic"
|
||||
|
||||
[font.italic]
|
||||
family = "Input Nerd Font"
|
||||
family = "Hack Nerd Font Mono"
|
||||
style = "Italic"
|
||||
|
||||
[font.offset]
|
||||
|
||||
@ -10,4 +10,5 @@ def_key "l"
|
||||
enter_directory
|
||||
def_key "h"
|
||||
jump_to_parent_directory
|
||||
|
||||
def_key "4"
|
||||
show_lyrics
|
||||
|
||||
@ -49,5 +49,8 @@ keymap("n", "<S-h>", ":tabprevious<CR>", opts)
|
||||
-- Copy to clipboard
|
||||
keymap("v", "<C-c>", "\"+y", opts)
|
||||
|
||||
-- Copy relative path of current ile to clipboard
|
||||
keymap("n", "<C-y>", ":let @+ = expand(\"%\")<CR>", opts)
|
||||
|
||||
--Close buffer
|
||||
-- keymap("n", "<C-w>", ":bd | bp <CR>", opts)
|
||||
|
||||
@ -4,16 +4,7 @@ return {
|
||||
config = true
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
event = "BufReadPre BufNewFile",
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"nvimtools/none-ls.nvim",
|
||||
},
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
config = function()
|
||||
require("user.plugins.lsp.mason_lsp_config")
|
||||
require("user.plugins.lsp.diagnostics_config").setup()
|
||||
@ -33,16 +24,22 @@ return {
|
||||
|
||||
vim.cmd([[ command! Format execute 'lua vim.lsp.buf.format{async=true}' ]])
|
||||
end,
|
||||
dependencies = {
|
||||
{ "mason-org/mason.nvim", opts = {} },
|
||||
"neovim/nvim-lspconfig",
|
||||
},
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
event = "BufReadPre BufNewFile",
|
||||
dependencies = {
|
||||
"nvimtools/none-ls.nvim",
|
||||
},
|
||||
},
|
||||
{
|
||||
"lukas-reineke/lsp-format.nvim",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
local on_attach = function(client)
|
||||
require("lsp-format").on_attach(client)
|
||||
end
|
||||
|
||||
require("lspconfig").gopls.setup { on_attach = on_attach }
|
||||
end
|
||||
},
|
||||
{
|
||||
|
||||
@ -4,6 +4,8 @@ vim.lsp.enable({
|
||||
"omnisharp",
|
||||
"pylsp",
|
||||
"rust_analyzer",
|
||||
"luals",
|
||||
"vimls"
|
||||
})
|
||||
|
||||
-- TODO: this does not work, need to install pylsp-mypy plugin manually
|
||||
@ -45,4 +47,20 @@ vim.lsp.config('rust_analyzer', {
|
||||
}
|
||||
})
|
||||
|
||||
vim.lsp.config('luals', {
|
||||
settings = {
|
||||
Lua = {}
|
||||
}
|
||||
})
|
||||
|
||||
vim.lsp.config('rust_analyzer', {
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
cargo = {
|
||||
features = "all",
|
||||
},
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
mason_lspconfig.setup()
|
||||
|
||||
@ -1,11 +1,18 @@
|
||||
return {
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
event = "VeryLazy",
|
||||
config = true,
|
||||
lazy = false,
|
||||
opts = {
|
||||
region_check_events = "CursorHold,InsertLeave,InsertEnter",
|
||||
-- those are for removing deleted snippets, also a common problem
|
||||
delete_check_events = "TextChanged,InsertEnter",
|
||||
},
|
||||
config = function(_, opts)
|
||||
local luasnip = require("luasnip")
|
||||
luasnip.setup(opts)
|
||||
end,
|
||||
dependencies = {
|
||||
"rafamadriz/friendly-snippets",
|
||||
-- "dsznajder/vscode-es7-javascript-react-snippets",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@ function FindProxyForURL(url, host) {
|
||||
// Proxy server (customize this line)
|
||||
var proxy = "PROXY 91.199.147.158:3128";
|
||||
|
||||
// Domains related to ChatGPT/OpenAI
|
||||
var proxy_domains = [
|
||||
// Domains related to ChatGPT/OpenAI
|
||||
"chatgpt.com",
|
||||
"chat.openai.com",
|
||||
"openai.com",
|
||||
@ -11,6 +11,7 @@ function FindProxyForURL(url, host) {
|
||||
"platform.openai.com",
|
||||
"auth0.openai.com",
|
||||
|
||||
// Youtube related domains
|
||||
"*.youtube.com",
|
||||
"youtube.com",
|
||||
"*.googlevideo.com",
|
||||
|
||||
@ -28,10 +28,11 @@ exec xrandr --output DP-2 --primary
|
||||
|
||||
bar {
|
||||
id 1
|
||||
mode hide
|
||||
tray_output none
|
||||
font Input Nerd Font 9
|
||||
font Hack Nerd Font 9
|
||||
status_command "~/Scripts/sway/bar.sh"
|
||||
gaps 0 6 0 0
|
||||
gaps 0 0 0 0
|
||||
colors {
|
||||
# focused_workspace #7E9CD8 #7E9CD8 #AAAAAA
|
||||
}
|
||||
@ -76,6 +77,9 @@ bindsym --to-code $mod+m exec $term msg create-window --class in_scratchpad -e n
|
||||
bindsym --to-code $mod+e exec $term msg create-window -e neomutt || $term -e neomutt
|
||||
bindsym --to-code $mod+n exec $term msg create-window -e newsboat || $term -e newsboat
|
||||
|
||||
# toggle showing bar
|
||||
bindsym --to-code $mod+minus exec "swaymsg bar 1 mode toggle"
|
||||
|
||||
# open windows with id "in_scratchpad" in scratchpad
|
||||
for_window [app_id="in_scratchpad"] move container to scratchpad, focus
|
||||
|
||||
|
||||
@ -57,6 +57,8 @@ set -g pane-active-border-style "fg=#938AA9"
|
||||
|
||||
# status bar
|
||||
set-option -g status-style bg=default
|
||||
set -g message-command-style bg=default
|
||||
set -g message-style bg=default
|
||||
set -g status-left '| #S | '
|
||||
set -g status-right ''
|
||||
set -g status-left-length 500
|
||||
|
||||
@ -3,9 +3,15 @@ export PATH=~/.local/bin:~/.cargo/bin:$PATH
|
||||
export EDITOR=nvim
|
||||
export SUDO_EDITOR=/usr/bin/nvim
|
||||
export XDG_CURRENT_DESKTOP=Sway
|
||||
export XDG_SESSION_DESKTOP=sway
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
export HOMEBREW_NO_AUTO_UPDATE=true
|
||||
export ELECTRON_OZONE_PLATFORM_HINT=auto
|
||||
|
||||
if command -v dbus-update-activation-environment >/dev/null; then
|
||||
dbus-update-activation-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE
|
||||
fi
|
||||
|
||||
if [[ -z $DISPLAY && $TTY = /dev/tty1 ]]; then
|
||||
exec sway
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user