Merge branch 'master' of https://git.terminallychill.xyz/clint/dotfiles
This commit is contained in:
commit
c0816fabee
|
@ -0,0 +1,406 @@
|
|||
# import = ["/home/clint/.alacritty-colorscheme/themes/base16_default_dark.yaml"]
|
||||
|
||||
[font]
|
||||
size = 12
|
||||
|
||||
[font.normal]
|
||||
family = "FiraCode Nerd Font"
|
||||
style = "Regular"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Ba"
|
||||
key = "A"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bb"
|
||||
key = "B"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bc"
|
||||
key = "C"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bd"
|
||||
key = "D"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Be"
|
||||
key = "E"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bf"
|
||||
key = "F"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bg"
|
||||
key = "G"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bh"
|
||||
key = "H"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bi"
|
||||
key = "I"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bj"
|
||||
key = "J"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bk"
|
||||
key = "K"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bl"
|
||||
key = "L"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bm"
|
||||
key = "M"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bn"
|
||||
key = "N"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bo"
|
||||
key = "O"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bp"
|
||||
key = "P"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bq"
|
||||
key = "Q"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Br"
|
||||
key = "R"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bs"
|
||||
key = "S"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bt"
|
||||
key = "T"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bu"
|
||||
key = "U"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bv"
|
||||
key = "V"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bw"
|
||||
key = "W"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bx"
|
||||
key = "X"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001By"
|
||||
key = "Y"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001Bz"
|
||||
key = "Z"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BA"
|
||||
key = "A"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BB"
|
||||
key = "B"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BC"
|
||||
key = "C"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BD"
|
||||
key = "D"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BE"
|
||||
key = "E"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BF"
|
||||
key = "F"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BG"
|
||||
key = "G"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BH"
|
||||
key = "H"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BI"
|
||||
key = "I"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BJ"
|
||||
key = "J"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BK"
|
||||
key = "K"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BL"
|
||||
key = "L"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BM"
|
||||
key = "M"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BN"
|
||||
key = "N"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BO"
|
||||
key = "O"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BP"
|
||||
key = "P"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BQ"
|
||||
key = "Q"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BR"
|
||||
key = "R"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BS"
|
||||
key = "S"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BT"
|
||||
key = "T"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BU"
|
||||
key = "U"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BV"
|
||||
key = "V"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BW"
|
||||
key = "W"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BX"
|
||||
key = "X"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BY"
|
||||
key = "Y"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001BZ"
|
||||
key = "Z"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B1"
|
||||
key = "Key1"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B2"
|
||||
key = "Key2"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B3"
|
||||
key = "Key3"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B4"
|
||||
key = "Key4"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B5"
|
||||
key = "Key5"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B6"
|
||||
key = "Key6"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B7"
|
||||
key = "Key7"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B8"
|
||||
key = "Key8"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B9"
|
||||
key = "Key9"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B0"
|
||||
key = "Key0"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u0000"
|
||||
key = "Space"
|
||||
mods = "Control"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B`"
|
||||
key = "`"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B~"
|
||||
key = "`"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B."
|
||||
key = "Period"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B*"
|
||||
key = "Key8"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B#"
|
||||
key = "Key3"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B>"
|
||||
key = "Period"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B<"
|
||||
key = "Comma"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B_"
|
||||
key = "Minus"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B%"
|
||||
key = "Key5"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B^"
|
||||
key = "Key6"
|
||||
mods = "Alt|Shift"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B\\"
|
||||
key = "Backslash"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B/"
|
||||
key = "Slash"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B[1;3D"
|
||||
key = "Left"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B[1;3C"
|
||||
key = "Right"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B["
|
||||
key = "LBracket"
|
||||
mods = "Alt"
|
||||
|
||||
[[keyboard.bindings]]
|
||||
chars = "\u001B]"
|
||||
key = "RBracket"
|
||||
mods = "Alt"
|
||||
|
||||
[window]
|
||||
opacity = 0.7
|
|
@ -1,8 +1,8 @@
|
|||
window:
|
||||
opacity: 0.85
|
||||
opacity: 0.7
|
||||
|
||||
font:
|
||||
size: 20
|
||||
size: 12
|
||||
normal:
|
||||
family: FiraCode Nerd Font
|
||||
style: Regular
|
||||
|
|
|
@ -90,12 +90,22 @@ fi
|
|||
|
||||
unset use_color safe_term match_lhs sh
|
||||
|
||||
# aliases
|
||||
alias python="python3"
|
||||
alias cp="cp -i" # confirm before overwriting something
|
||||
alias df='df -h' # human-readable sizes
|
||||
alias free='free -m' # show sizes in MB
|
||||
alias np='nano -w PKGBUILD'
|
||||
alias more=less
|
||||
alias more="less"
|
||||
alias rofi='rofi -m 1'
|
||||
alias weather="curl wttr.in"
|
||||
alias ls="exa -lhg --group-directories-first"
|
||||
alias ll="exa -lhga --group-directories-first"
|
||||
alias vim="nvim"
|
||||
alias docs="python ~/scripts/stock_price.py -s docs"
|
||||
alias stock="python ~/scripts/stock_price.py -s "
|
||||
alias cls="clear & ls"
|
||||
alias r="ranger"
|
||||
|
||||
xhost +local:root > /dev/null 2>&1
|
||||
|
||||
|
@ -139,9 +149,7 @@ ex ()
|
|||
fi
|
||||
}
|
||||
|
||||
alias weather="curl wttr.in"
|
||||
alias ll="ls -la"
|
||||
PATH=$PATH:/usr/local/bin
|
||||
export EDITOR=/usr/local/bin/nvim
|
||||
|
||||
EDITOR=vim
|
||||
|
||||
pfetch
|
||||
pfetch || neofetch
|
||||
|
|
|
@ -44,8 +44,12 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
|
|||
# Use Mouse+$mod to drag floating windows to their wanted position
|
||||
floating_modifier $mod
|
||||
|
||||
# this might mess things up idk lol
|
||||
set $term alacritty
|
||||
|
||||
|
||||
# start a terminal
|
||||
bindsym $mod+Return exec --no-startup-id alacritty
|
||||
bindsym $mod+Return exec --no-startup-id $term
|
||||
|
||||
# kill focused window
|
||||
bindsym $mod+Shift+q kill
|
||||
|
@ -162,9 +166,14 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
|
|||
|
||||
# tryin some stuff, not sure if this is what i want
|
||||
workspace $ws1 output HDMI-0
|
||||
workspace $ws2 output HDMI-1
|
||||
workspace $ws2 output DP-3
|
||||
workspace $ws3 output HDMI-0
|
||||
workspace $ws4 output HDMI-1
|
||||
workspace $ws4 output DP-3
|
||||
workspace $ws5 output HDMI-0
|
||||
workspace $ws6 output DP-3
|
||||
workspace $ws7 output HDMI-0
|
||||
workspace $ws8 output DP-3
|
||||
workspace $ws9 output HDMI-0
|
||||
|
||||
# set which programs open in which workspaces
|
||||
# to find the class, run xprop in a terminal and click on a program
|
||||
|
@ -244,14 +253,14 @@ set $bar-inactive_workspace #755B69
|
|||
#}
|
||||
|
||||
# set background on startup
|
||||
set $wallpaper ~/Pictures/wallpapers/rennaissance.jpg
|
||||
set $wallpaper ~/Pictures/wallpapers/trees_snow.jpg
|
||||
exec --no-startup-id feh --bg-fill $wallpaper
|
||||
|
||||
# turn picom on on start up
|
||||
exec_always --no-startup-id picom &
|
||||
|
||||
# turn off borders (required for i3-gaps)
|
||||
for_window [class=".*"] border pixel 1
|
||||
for_window [class=".*"] border pixel 2
|
||||
|
||||
# gaps
|
||||
gaps inner 10
|
||||
|
@ -269,12 +278,13 @@ client.focused_inactive $bd-color #111111 #ffffff #333333 #333333
|
|||
client.unfocused $bd-color #111111 #ffffff #333333 #333333
|
||||
|
||||
# lock screen
|
||||
bindsym $mod+l exec ~/.scripts/lock.sh
|
||||
bindsym $mod+l exec ~/scripts/lock.sh
|
||||
|
||||
# dmenu stuff
|
||||
bindsym $mod+c exec ~/.scripts/dmenu_configs.sh
|
||||
bindsym $mod+p exec ~/.scripts/dmenu_wallpaper.sh
|
||||
bindsym $mod+x exec ~/.scripts/dmenu_shutdown.sh
|
||||
bindsym $mod+c exec ~/scripts/dmenu_configs.sh
|
||||
bindsym $mod+p exec ~/scripts/dmenu_wallpaper.sh
|
||||
bindsym $mod+x exec ~/scripts/dmenu_shutdown.sh
|
||||
bindsym $mod+n exec ~/scripts/dmenu_notes.sh >>~/tmp_log.txt 2>&1
|
||||
|
||||
# common programs
|
||||
bindsym $mod+Shift+w exec firefox
|
||||
|
@ -285,3 +295,6 @@ bindsym $mod+Shift+m exec killall spt; exec killall spotifyd
|
|||
|
||||
# polybar
|
||||
exec_always --no-startup-id $HOME/.config/polybar/launch.sh
|
||||
|
||||
# monitor
|
||||
exec xrandr --output HDMI-0 --left-of DP-3
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
-- local dap = require('dap')
|
||||
-- dap.configurations.python = {
|
||||
-- {
|
||||
-- -- The first three options are required by nvim-dap
|
||||
-- type = 'python'; -- the type here established the link to the adapter definition: `dap.adapters.python`
|
||||
-- request = 'launch';
|
||||
-- name = "Launch file";
|
||||
--
|
||||
-- -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options
|
||||
--
|
||||
-- program = "${file}"; -- This configuration will launch the current file if used.
|
||||
-- pythonPath = function()
|
||||
-- -- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself.
|
||||
-- -- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within.
|
||||
-- -- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable.
|
||||
-- local cwd = vim.fn.getcwd()
|
||||
-- if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
|
||||
-- return cwd .. '/venv/bin/python'
|
||||
-- elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
|
||||
-- return cwd .. '/.venv/bin/python'
|
||||
-- else
|
||||
-- return '/usr/bin/python'
|
||||
-- end
|
||||
-- end;
|
||||
-- },
|
||||
-- }
|
|
@ -1,2 +0,0 @@
|
|||
require("mason").setup()
|
||||
require("mason-lspconfig").setup()
|
|
@ -1,8 +0,0 @@
|
|||
local null_ls = require('null-ls')
|
||||
|
||||
require('null-ls').setup({
|
||||
sources = {
|
||||
null_ls.builtins.diagnostics.selene, -- i forgot what this is, can i delete it?
|
||||
null_ls.builtins.formatting.black,
|
||||
}
|
||||
})
|
|
@ -1,11 +0,0 @@
|
|||
require("neo-tree").setup({
|
||||
close_if_last_window = true,
|
||||
filesystem = {
|
||||
filtered_items = {
|
||||
hide_dotfiles = false
|
||||
}
|
||||
},
|
||||
window = {
|
||||
width = 40
|
||||
}
|
||||
})
|
|
@ -1 +0,0 @@
|
|||
require('mini.surround').setup()
|
|
@ -1,16 +0,0 @@
|
|||
-- require("telescope").setup{
|
||||
-- defaults = {
|
||||
-- prompt_prefix = "$ ",
|
||||
-- mappings = {
|
||||
-- i = {
|
||||
-- ["C-a"] = function() print("asdf") end
|
||||
-- }
|
||||
-- }
|
||||
-- }
|
||||
-- }
|
||||
--
|
||||
-- require("telescope").load_extension("fzf")
|
||||
-- require("telescope").load_extension("file_browser")
|
||||
-- require("telescope").load_extension("neoclip")
|
||||
-- require("telescope").load_extension("possession")
|
||||
-- require("telescope").load_extension("repo")
|
|
@ -1,26 +0,0 @@
|
|||
-- require('nvim-treesitter').setup({
|
||||
-- -- enable syntax highlighting
|
||||
-- highlight = {
|
||||
-- enable = true,
|
||||
-- },
|
||||
-- -- enable indentation
|
||||
-- indent = { enable = true },
|
||||
-- -- enable autotagging (w/ nvim-ts-autotag plugin)
|
||||
-- autotag = { enable = true },
|
||||
-- -- ensure these language parsers are installed
|
||||
-- ensure_installed = {
|
||||
-- "json",
|
||||
-- "yaml",
|
||||
-- "html",
|
||||
-- "css",
|
||||
-- "markdown",
|
||||
-- "bash",
|
||||
-- "lua",
|
||||
-- "vim",
|
||||
-- "dockerfile",
|
||||
-- "gitignore",
|
||||
-- "python",
|
||||
-- },
|
||||
-- -- auto install above language parsers
|
||||
-- auto_install = true,
|
||||
-- })
|
|
@ -1,12 +1,6 @@
|
|||
vim.g.mapleader = '\\'
|
||||
|
||||
require("clint/lazy_bootstrap") -- bootstraps folke/lazy
|
||||
|
||||
----------------------------------------------[[ User Settings ]]
|
||||
|
||||
|
||||
----------------------------------------------[[ Load Plugins ]]
|
||||
|
||||
require("lazy").setup(
|
||||
{
|
||||
spec = "plugins",
|
||||
|
@ -15,4 +9,3 @@ require("lazy").setup(
|
|||
) -- loads each lua/plugin/*
|
||||
vim.cmd 'hi Normal guibg=NONE ctermbg=NONE'
|
||||
require("clint") -- loads lua/clint/init.lua
|
||||
-- require('dap-python').setup('~/.virtualenvs/debugpy/bin/python')
|
||||
|
|
|
@ -1,60 +0,0 @@
|
|||
local cmp = require'cmp'
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
|
||||
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered({
|
||||
col_offset = -3, -- align the abbr and word on cursor (due to fields order below)
|
||||
side_padding = 0,
|
||||
}),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<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' },
|
||||
})
|
||||
})
|
||||
|
||||
-- Set configuration for specific filetype.
|
||||
cmp.setup.filetype('gitcommit', {
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
})
|
||||
})
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
|
||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
})
|
||||
})
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
-- local dap = require('dap')
|
||||
-- dap.adapters.python = {
|
||||
-- type = 'executable';
|
||||
-- command = '~/.virtualenvs/debugpy/bin/python';
|
||||
-- args = { '-m', 'debugpy.adapter' };
|
||||
-- }
|
||||
--
|
||||
--
|
||||
-- local dap = require('dap')
|
||||
-- dap.configurations.python = {
|
||||
-- {
|
||||
-- -- The first three options are required by nvim-dap
|
||||
-- type = 'python'; -- the type here established the link to the adapter definition: `dap.adapters.python`
|
||||
-- request = 'launch';
|
||||
-- name = "Launch file";
|
||||
--
|
||||
-- -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options
|
||||
--
|
||||
-- program = "${file}"; -- This configuration will launch the current file if used.
|
||||
-- pythonPath = function()
|
||||
-- -- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself.
|
||||
-- -- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within.
|
||||
-- -- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable.
|
||||
-- local cwd = vim.fn.getcwd()
|
||||
-- if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
|
||||
-- return cwd .. '/venv/bin/python'
|
||||
-- elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
|
||||
-- return cwd .. '/.venv/bin/python'
|
||||
-- else
|
||||
-- return 'python3'
|
||||
-- end
|
||||
-- end;
|
||||
-- },
|
||||
-- }
|
|
@ -1,5 +1,5 @@
|
|||
require("clint.autocmds")
|
||||
require("clint.keybindings")
|
||||
require("clint.settings")
|
||||
require("clint.lsp")
|
||||
require("clint.statusline")
|
||||
require("clint.which-key")
|
||||
-- require("clint.statusline")
|
||||
|
|
|
@ -5,6 +5,10 @@
|
|||
local keymap = vim.api.nvim_set_keymap
|
||||
local default_ops = { noremap = true, silent = true }
|
||||
|
||||
-- Paste timestamp
|
||||
keymap('n', '<leader>tt', ":pu=strftime('%X')<CR>", default_ops)
|
||||
keymap('n', '<leader>td', ":pu=strftime('%a %d %b %Y')<CR>", default_ops)
|
||||
|
||||
-- Quick escape insert mode
|
||||
keymap('i', 'jk', '<Esc>', default_ops)
|
||||
|
||||
|
@ -27,7 +31,7 @@ keymap('n', ']b', ':bn<CR>', default_ops)
|
|||
|
||||
-- Enter lines
|
||||
keymap('n', '<Enter>', 'o<Esc>', default_ops)
|
||||
keymap('n', '<s-Enter>', 'O<Esc>', default_ops)
|
||||
keymap('n', '<A-Enter>', 'O<Esc>', default_ops)
|
||||
|
||||
-- Folding
|
||||
keymap('n', '<space>', 'za', default_ops)
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
# Probably mostly leave this alone - just Lazy stuff
|
||||
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
|
|
|
@ -1,107 +0,0 @@
|
|||
local cmp = require 'cmp'
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
local on_attach = function()
|
||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = 0 })
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = 0 })
|
||||
vim.keymap.set("n", "<Leader>r", vim.lsp.buf.rename, { buffer = 0 })
|
||||
vim.keymap.set("n", "<Leader>fo", vim.lsp.buf.format, { buffer = 0 })
|
||||
end
|
||||
|
||||
require 'lspconfig'.pyright.setup {
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach
|
||||
}
|
||||
|
||||
-- require 'lspconfig'.black.setup {
|
||||
-- capabilities = capabilities,
|
||||
-- on_attach = on_attach
|
||||
-- }
|
||||
|
||||
require 'lspconfig'.lua_ls.setup {
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach,
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = { 'vim' }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
|
||||
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered({
|
||||
col_offset = -3, -- align the abbr and word on cursor (due to fields order below)
|
||||
side_padding = 0,
|
||||
}),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
|
||||
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
-- elseif has_words_before() then
|
||||
-- cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
|
||||
['<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' },
|
||||
})
|
||||
})
|
||||
|
||||
-- Set configuration for specific filetype.
|
||||
cmp.setup.filetype('gitcommit', {
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
})
|
||||
})
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
--
|
||||
-- -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||
-- cmp.setup.cmdline(':', {
|
||||
-- mapping = cmp.mapping.preset.cmdline(),
|
||||
-- sources = cmp.config.sources({
|
||||
-- { name = 'path' }
|
||||
-- }, {
|
||||
-- { name = 'cmdline' }
|
||||
-- })
|
||||
-- })
|
|
@ -1,43 +0,0 @@
|
|||
require('lualine').setup {
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'auto',
|
||||
-- theme = 'gruvbox',
|
||||
component_separators = { left = '', right = '' },
|
||||
section_separators = { left = '', right = '' },
|
||||
disabled_filetypes = {
|
||||
statusline = {},
|
||||
winbar = {},
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 1000,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { 'mode' },
|
||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
||||
lualine_c = { { 'filename', path = 1, file_status = true } },
|
||||
lualine_x = { 'encoding', 'fileformat', },
|
||||
lualine_y = { 'filetype' },
|
||||
lualine_z = {}
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b = {},
|
||||
lualine_c = { 'filename' },
|
||||
lualine_x = { 'location' },
|
||||
lualine_y = {},
|
||||
lualine_z = {}
|
||||
},
|
||||
tabline = {
|
||||
lualine_a = { 'buffers' }
|
||||
},
|
||||
winbar = {},
|
||||
inactive_winbar = {},
|
||||
extensions = {}
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
-- Using this strictly to document for now. Actual mappings are in
|
||||
-- Using this strictly to document for now. Actual mappings are in:
|
||||
-- lua/clint/keybindings.lua
|
||||
|
||||
local wk = require("which-key")
|
||||
|
@ -27,6 +27,11 @@ wk.register({
|
|||
name = "+repl",
|
||||
p = "Run Python"
|
||||
},
|
||||
t = {
|
||||
name = "+timestamps",
|
||||
t = "Print time",
|
||||
d = "Print date+time"
|
||||
},
|
||||
-- Misc
|
||||
c = "Change Color Scheme",
|
||||
y = "Yank to system clipboard",
|
|
@ -1,7 +0,0 @@
|
|||
return {}
|
||||
-- return {
|
||||
-- { 'mfussenegger/nvim-dap' },
|
||||
-- { 'rcarriga/nvim-dap-ui', config = true },
|
||||
-- { "mfussenegger/nvim-dap-python" },
|
||||
-- { "theHamsta/nvim-dap-virtual-text", config = true },
|
||||
-- }
|
|
@ -4,7 +4,6 @@ return
|
|||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
config = function()
|
||||
-- require('alpha').setup()
|
||||
|
||||
-- local status_ok, alpha = pcall(require, "alpha")
|
||||
-- if not status_ok then
|
||||
-- return
|
||||
|
|
|
@ -1,202 +0,0 @@
|
|||
return {
|
||||
|
||||
--------------------
|
||||
-- LSP
|
||||
--------------------
|
||||
|
||||
{ "williamboman/mason.nvim" },
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
{ 'hrsh7th/cmp-nvim-lsp' },
|
||||
{ 'hrsh7th/cmp-nvim-lua' },
|
||||
{ 'hrsh7th/cmp-buffer' },
|
||||
{ 'hrsh7th/cmp-path' },
|
||||
{ 'hrsh7th/nvim-cmp' },
|
||||
{ 'saadparwaiz1/cmp_luasnip' },
|
||||
|
||||
-- Linter
|
||||
{
|
||||
'jose-elias-alvarez/null-ls.nvim',
|
||||
config = function()
|
||||
local nls = require("null-ls")
|
||||
nls.setup({
|
||||
sources = {
|
||||
nls.builtins.formatting.black,
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
-- Debugging
|
||||
-- { 'mfussenegger/nvim-dap' },
|
||||
-- { 'rcarriga/nvim-dap-ui', config = true },
|
||||
-- { "mfussenegger/nvim-dap-python" },
|
||||
-- { "theHamsta/nvim-dap-virtual-text", config = true },
|
||||
|
||||
--------------------
|
||||
-- Color schemes
|
||||
--------------------
|
||||
|
||||
-- { "glepnir/oceanic-material" },
|
||||
-- { "savq/melange-nvim" },
|
||||
{ 'ayu-theme/ayu-vim' },
|
||||
-- { 'ellisonleao/gruvbox.nvim' },
|
||||
-- { 'jacoborus/tender.vim' },
|
||||
-- { 'jpo/vim-railscasts-theme' },
|
||||
-- { 'rainux/vim-desert-warm-256' },
|
||||
-- { 'ajmwagar/vim-deus' },
|
||||
-- { "rebelot/kanagawa.nvim" },
|
||||
-- { "folke/tokyonight.nvim" },
|
||||
|
||||
--------------------
|
||||
-- Utility
|
||||
--------------------
|
||||
|
||||
-- Git
|
||||
{ 'kdheepak/lazygit.nvim' },
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
config = {
|
||||
signs = {
|
||||
add = { hl = 'GitSignsAdd', text = '+', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
|
||||
change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr',
|
||||
linehl = 'GitSignsChangeLn' },
|
||||
delete = { hl = 'GitSignsDelete', text = '-', numhl = 'GitSignsDeleteNr',
|
||||
linehl = 'GitSignsDeleteLn' },
|
||||
topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr',
|
||||
linehl = 'GitSignsDeleteLn' },
|
||||
changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr',
|
||||
linehl = 'GitSignsChangeLn' },
|
||||
untracked = { hl = 'GitSignsAdd', text = '┆', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
|
||||
},
|
||||
current_line_blame = true,
|
||||
show_deleted = true,
|
||||
}
|
||||
},
|
||||
|
||||
-- Sessions
|
||||
{ "tpope/vim-obsession" },
|
||||
|
||||
-- SuperTab
|
||||
{ 'ervandew/supertab' },
|
||||
|
||||
-- Surround
|
||||
-- { 'tpope/vim-surround' },
|
||||
{ 'echasnovski/mini.surround', version = '*' },
|
||||
|
||||
-- Slime, for tmux repl-ing
|
||||
{ 'jpalardy/vim-slime' },
|
||||
|
||||
-- Telescope, fuzzy finding
|
||||
{ 'nvim-lua/plenary.nvim' },
|
||||
{ 'nvim-telescope/telescope.nvim' },
|
||||
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
|
||||
{ "nvim-telescope/telescope-file-browser.nvim" },
|
||||
|
||||
|
||||
-- Registry history
|
||||
{
|
||||
"AckslD/nvim-neoclip.lua",
|
||||
dependencies = {
|
||||
{ 'kkharji/sqlite.lua', module = 'sqlite' },
|
||||
{ 'nvim-telescope/telescope.nvim' },
|
||||
},
|
||||
config = {
|
||||
enable_persistent_history = true,
|
||||
continuous_sync = true
|
||||
},
|
||||
},
|
||||
|
||||
-- Auto pairs
|
||||
{ "windwp/nvim-autopairs", config = true }, -- See `config` under https://github.com/folke/lazy.nvim#-plugin-spec
|
||||
|
||||
-- Comment / uncomment
|
||||
{ "numToStr/Comment.nvim", config = true },
|
||||
|
||||
-- Git Repo Telescope
|
||||
{ 'cljoly/telescope-repo.nvim' },
|
||||
|
||||
-- Which-Key
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
config = true,
|
||||
},
|
||||
|
||||
-- Terminal
|
||||
{
|
||||
'akinsho/toggleterm.nvim',
|
||||
version = "*",
|
||||
config = {
|
||||
open_mapping = [[<c-\>]],
|
||||
direction = 'horizontal',
|
||||
insert_mappings = true
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"iamcco/markdown-preview.nvim",
|
||||
build = "cd app && npm install",
|
||||
enabled = true,
|
||||
-- ft = "markdown",
|
||||
},
|
||||
|
||||
--------------------
|
||||
-- Aesthetics
|
||||
--------------------
|
||||
|
||||
-- status line
|
||||
{ 'nvim-lualine/lualine.nvim' },
|
||||
|
||||
-- Devicons
|
||||
{ 'nvim-tree/nvim-web-devicons' },
|
||||
|
||||
-- Indent lines
|
||||
{
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
config =
|
||||
{
|
||||
show_end_of_line = true,
|
||||
space_char_blankline = " ",
|
||||
show_current_context = true,
|
||||
show_current_context_start = true,
|
||||
}
|
||||
},
|
||||
|
||||
-- Cursor line
|
||||
{
|
||||
'yamatsum/nvim-cursorline',
|
||||
config =
|
||||
{
|
||||
cursorline = {
|
||||
enable = true,
|
||||
timeout = 0,
|
||||
number = true,
|
||||
},
|
||||
cursorword = {
|
||||
enable = false,
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
-- Greeter
|
||||
{
|
||||
'goolord/alpha-nvim',
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
-- config = function(},
|
||||
-- require 'alpha'.setup(require 'alpha.themes.startify'.config},
|
||||
-- end
|
||||
},
|
||||
|
||||
-- Scroll bar
|
||||
-- { 'petertriho/nvim-scrollbar', config = true },
|
||||
|
||||
-- Start up time
|
||||
{
|
||||
'dstein64/vim-startuptime',
|
||||
},
|
||||
|
||||
-- maybe this helps startup
|
||||
{
|
||||
'nathom/filetype.nvim',
|
||||
},
|
||||
}
|
|
@ -1,6 +1,10 @@
|
|||
return
|
||||
{
|
||||
{ "williamboman/mason.nvim" },
|
||||
{ "williamboman/mason.nvim",
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
end
|
||||
},
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
{ 'hrsh7th/cmp-nvim-lsp' },
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
local M = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
event = "BufReadPost",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter-refactor",
|
||||
},
|
||||
opts = {
|
||||
highlight = {
|
||||
enable = true,
|
||||
disable = function(lang, buf)
|
||||
local max_filesize = 100 * 1024 -- 100 KB
|
||||
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,
|
||||
},
|
||||
autopairs = { enable = true },
|
||||
autotag = { enable = true },
|
||||
indent = { enable = true },
|
||||
ensure_installed = {
|
||||
"json",
|
||||
"yaml",
|
||||
"html",
|
||||
"css",
|
||||
"markdown",
|
||||
"bash",
|
||||
"lua",
|
||||
"vim",
|
||||
"dockerfile",
|
||||
"gitignore",
|
||||
"python"
|
||||
},
|
||||
sync_install = true,
|
||||
ignore_install = {}, -- List of parsers to ignore installation
|
||||
refactor = {
|
||||
highlight_definitions = {
|
||||
enable = true,
|
||||
-- Set to false if you have an `updatetime` of ~100.
|
||||
clear_on_cursor_move = true,
|
||||
},
|
||||
highlight_current_scope = { enable = false },
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
}
|
||||
|
||||
return M
|
|
@ -1,7 +1,53 @@
|
|||
return {
|
||||
|
||||
-- status line
|
||||
{ 'nvim-lualine/lualine.nvim' },
|
||||
{ 'nvim-lualine/lualine.nvim',
|
||||
config = function()
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'auto',
|
||||
-- theme = 'gruvbox',
|
||||
component_separators = { left = '', right = '' },
|
||||
section_separators = { left = '', right = '' },
|
||||
disabled_filetypes = {
|
||||
statusline = {},
|
||||
winbar = {},
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 1000,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { 'mode' },
|
||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
||||
lualine_c = { { 'filename', path = 1, file_status = true } },
|
||||
lualine_x = { 'encoding', 'fileformat', },
|
||||
lualine_y = { 'filetype' },
|
||||
lualine_z = {}
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b = {},
|
||||
lualine_c = { 'filename' },
|
||||
lualine_x = { 'location' },
|
||||
lualine_y = {},
|
||||
lualine_z = {}
|
||||
},
|
||||
tabline = {
|
||||
lualine_a = { 'buffers' }
|
||||
},
|
||||
winbar = {},
|
||||
inactive_winbar = {},
|
||||
extensions = {}
|
||||
})
|
||||
end
|
||||
},
|
||||
|
||||
-- Devicons
|
||||
{ 'nvim-tree/nvim-web-devicons' },
|
||||
|
@ -9,13 +55,8 @@ return {
|
|||
-- Indent lines
|
||||
{
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
config =
|
||||
{
|
||||
show_end_of_line = true,
|
||||
space_char_blankline = " ",
|
||||
show_current_context = true,
|
||||
show_current_context_start = true,
|
||||
}
|
||||
main = "ibl",
|
||||
opts = {}
|
||||
},
|
||||
|
||||
-- Cursor line
|
||||
|
@ -34,7 +75,6 @@ return {
|
|||
}
|
||||
},
|
||||
|
||||
-- Greeter
|
||||
-- Scroll bar
|
||||
-- { 'petertriho/nvim-scrollbar', config = true },
|
||||
{ 'petertriho/nvim-scrollbar', config = true },
|
||||
}
|
||||
|
|
|
@ -26,12 +26,6 @@ return {
|
|||
-- Slime, for tmux repl-ing
|
||||
{ 'jpalardy/vim-slime' },
|
||||
|
||||
-- -- Telescope, fuzzy finding
|
||||
-- { 'nvim-lua/plenary.nvim' },
|
||||
-- { 'nvim-telescope/telescope.nvim' },
|
||||
-- { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
|
||||
-- { "nvim-telescope/telescope-file-browser.nvim" },
|
||||
--
|
||||
-- Treesitter
|
||||
{
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
|
@ -98,16 +92,20 @@ return {
|
|||
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
config = function()
|
||||
require("neo-tree").setup({
|
||||
close_if_last_window = true,
|
||||
popup_border_style = "rounded",
|
||||
window = {
|
||||
width = 40
|
||||
},
|
||||
mappings = {
|
||||
["P"] = "toggle_preview", -- enter preview mode, which shows the current node without focusing
|
||||
}
|
||||
})
|
||||
end
|
||||
},
|
||||
|
||||
-- -- Object Explorer
|
||||
-- {
|
||||
-- 'simrat39/symbols-outline.nvim',
|
||||
-- config = {
|
||||
-- auto_preview = true,
|
||||
-- }
|
||||
-- },
|
||||
|
||||
-- Terminal
|
||||
{
|
||||
'akinsho/toggleterm.nvim',
|
||||
|
@ -118,6 +116,7 @@ return {
|
|||
}
|
||||
},
|
||||
|
||||
-- Markdown Preview
|
||||
{
|
||||
"iamcco/markdown-preview.nvim",
|
||||
build = "cd app && npm install",
|
||||
|
|
|
@ -23,4 +23,3 @@ def subtract(x: int, y: int) -> int:
|
|||
# open terminal 100: f1
|
||||
add(1, 2)
|
||||
subtract(1, 2)
|
||||
|
||||
|
|
|
@ -221,7 +221,7 @@ backend = "xrender";
|
|||
|
||||
# Enable/disable VSync.
|
||||
# vsync = false
|
||||
vsync = true
|
||||
vsync = false
|
||||
|
||||
# Enable remote control via D-Bus. See the *D-BUS API* section below for more details.
|
||||
# dbus = false
|
||||
|
@ -252,7 +252,7 @@ detect-client-opacity = true;
|
|||
# try detecting this with X RandR extension.
|
||||
#
|
||||
# refresh-rate = 60
|
||||
refresh-rate = 0
|
||||
# refresh-rate = 0
|
||||
|
||||
# Limit picom to repaint at most once every 1 / 'refresh_rate' second to
|
||||
# boost performance. This should not be used with
|
||||
|
|
|
@ -77,8 +77,10 @@ module-margin-left = 1
|
|||
module-margin-right = 2
|
||||
|
||||
;font-0 = fixed:pixelsize=10;1
|
||||
font-0 = CodeNewRoman Nerd Font:pixelsize=10:style=Bold
|
||||
font-1 = Source Han Sans JP,源ノ角ゴシック JP:style=Regular
|
||||
font-0 = FiraCode Nerd Font
|
||||
; font-0 = CodeNewRoman Nerd Font:pixelsize=10:style=Bold
|
||||
; font-1 = Source Han Sans JP,源ノ角ゴシック JP:style=Regular
|
||||
font-1 = Source Han Code JP
|
||||
font-2 = NotoSansMono Nerd Font:style=Regular
|
||||
font-3 = FontAwesome6Free
|
||||
font-4 = FontAwesome6Free:style=Solid
|
||||
|
@ -214,13 +216,13 @@ exec = ~/scripts/i3_finance.sh
|
|||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
interval = 3600
|
||||
|
||||
[module/pacman]
|
||||
type = custom/script
|
||||
exec = ~/scripts/i3_pacman.sh
|
||||
interval = 3600
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
click-left = alacritty --hold --class update,update -e sudo pacman -Syu
|
||||
#[module/pacman]
|
||||
#type = custom/script
|
||||
#exec = ~/scripts/i3_pacman.sh
|
||||
#interval = 3600
|
||||
#format-prefix = " "
|
||||
#format-prefix-foreground = ${colors.foreground-alt}
|
||||
#click-left = alacritty --hold --class update,update -e sudo pacman -Syu
|
||||
|
||||
[module/volume]
|
||||
type = custom/script
|
||||
|
|
|
@ -6,4 +6,6 @@ configuration {
|
|||
}
|
||||
//@theme "/usr/share/rofi/themes/gruvbox-dark-hard.rasi"
|
||||
//@theme "/usr/share/rofi/themes/glue_pro_blue.rasi"
|
||||
@theme "/usr/share/rofi/themes/clint.rasi"
|
||||
//@theme "/usr/share/rofi/themes/clint.rasi"
|
||||
//@theme "/usr/share/rofi/themes/lb.rasi"
|
||||
@theme "/usr/share/rofi/themes/fancy.rasi"
|
||||
|
|
|
@ -2,24 +2,25 @@
|
|||
set -g default-terminal "screen-256color"
|
||||
|
||||
# left status
|
||||
set-window-option -g status-left " #S #[fg=brightred bg=black]>> "
|
||||
set-window-option -g status-left " Session[#S] #[fg=brightred bg=black]>> "
|
||||
set-window-option -g status-left-style "fg=white bg=black"
|
||||
set-window-option -g status-left-length 30
|
||||
|
||||
# right status
|
||||
set-window-option -g status-right "#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%m%p"
|
||||
set-window-option -g status-right-length 300
|
||||
set-window-option -g status-right "#[bg=white fg=black bold][`F]#[bg=black fg=white] Search #[bg=white fg=black bold][`C-r]#[bg=black fg=white] Restore #[bg=white fg=black bold][`C-s]#[bg=black fg=white] Save#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%m%p"
|
||||
set-window-option -g status-right-style "fg=white bg=black"
|
||||
set-option -g status-right
|
||||
# set-option -g status-right
|
||||
|
||||
# inactive windows
|
||||
set-window-option -g window-status-format " #I: #W "
|
||||
set-window-option -g window-status-style "bg=black fg=white"
|
||||
|
||||
# active windows
|
||||
set-window-option -g window-status-current-format " #I: #W "
|
||||
set-window-option -g window-status-current-format " #I: #W #[bg=black fg=white]"
|
||||
set-window-option -g window-status-current-style "bg=white fg=black bold"
|
||||
|
||||
# main bg color
|
||||
set -g status-bg black
|
||||
|
||||
##
|
||||
##
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
# remap prefix from 'C-b' to '`'
|
||||
|
||||
unbind C-b
|
||||
set-option -g prefix '`'
|
||||
bind-key '`' send-prefix
|
||||
|
@ -24,6 +25,9 @@ unbind %
|
|||
# reload config file (change file location to your the tmux.conf you want to use)
|
||||
bind r source-file ~/.config/tmux/tmux.conf\; display ' Reloaded tmux config.'
|
||||
|
||||
# Create a new session
|
||||
bind S command-prompt -p "New Session:" "new-session -A -s '%%'"
|
||||
|
||||
# # switch panes using Alt-arrow without prefix
|
||||
# bind -n M-Left select-pane -L
|
||||
# bind -n M-Right select-pane -R
|
||||
|
@ -51,6 +55,7 @@ set-option -g detach-on-destroy off
|
|||
# Paste instantly: upper case letter
|
||||
# Paste from tmux register: <leader>=
|
||||
set -g @plugin 'fcsonline/tmux-thumbs'
|
||||
set -g @thumbs-key F
|
||||
|
||||
# Weather data
|
||||
set -g @plugin 'xamut/tmux-weather'
|
||||
|
@ -70,6 +75,24 @@ source ~/.config/tmux/statusline.conf
|
|||
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||
set -g @plugin 'tmux-plugins/tmux-continuum'
|
||||
set -g @resurrect-strategy-nvim 'session'
|
||||
set -g @continuum-restore 'on'
|
||||
|
||||
|
||||
# testing this idk lol
|
||||
set -g pane-active-border-style bg=terminal
|
||||
set -g pane-border-style bg=terminal
|
||||
set-window-option -g window-active-style bg=black
|
||||
set-window-option -g window-style bg=terminal
|
||||
|
||||
# adding ssh support
|
||||
set -g @plugin 'pschmitt/tmux-ssh-split'
|
||||
set-option -g @ssh-split-h-key "|"
|
||||
set-option -g @ssh-split-v-key "-"
|
||||
set-option -g @ssh-split-w-key "C"
|
||||
|
||||
# Make /bin/bash the default shell, which will hopefully make it souce bashrc on startup
|
||||
set-option -g default-shell "/bin/bash"
|
||||
set-option -g default-command bash
|
||||
|
||||
# Initializes tmux plugin manager - keep this at the bottom
|
||||
run '~/.config/tmux/plugins/tpm/tpm'
|
||||
|
|
Loading…
Reference in New Issue