Compare commits

...

8 Commits

13 changed files with 633 additions and 236 deletions

View File

@@ -1,24 +1,31 @@
#!/bin/zsh
# Vim is a disease
alias :q="exit"
# Zoxide cd replacement
alias cd="z"
# Eza ls replacement
alias ls="command eza"
# Easier navigation: .., ..., ...., .....
alias ..="cd .."
alias cd..="cd .."
alias ..="cd .."
alias ...="cd ../.."
alias ....="cd ../../.."
alias .....="cd ../../../.."
alias ......="cd ../../../../.."
##* Colours!
alias ls="command eza"
# Colours!
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
alias ip='ip --color=auto'
# Shortcuts
alias g="git"
alias h="history"
alias j="jobs"
# File movement
alias backup="rsync -vrltD --progress --stats"
alias mkdir='mkdir -pv' #Intuitive mkdir
# alternative to tail -f
alias lessf="less +F"
@@ -26,15 +33,12 @@ alias lessf="less +F"
# List all files colorized in long format
alias l="eza -G --icons"
alias ll="eza -l --icons"
alias lg="eza -lG"
alias la="eza -la --icons"
alias lg="eza -lG --icons"
alias lall="eza -lahF --icons --git"
alias lalg="eza -laGhF --icons --git"
alias latree="eza -laGghHT --git --icons"
# List all files colorized in long format, including dot files
alias la="eza -la"
# List only directories
alias lsd="eza -laD"
alias lsd="eza -laD" # only dirs
# Enable aliases to be sudoed
alias sudo='sudo '
@@ -47,6 +51,7 @@ alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date
# Dice for the undecided
alias dice='echo $[ 1 + $RANDOM % 6 ]'
alias d20='echo $[ 1 + $RANDOM % 20 ]'
# IP addresses
alias myip="dig +short myip.opendns.com @resolver1.opendns.com"
@@ -61,8 +66,6 @@ alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.ar
# Ring the terminal bell
alias ding="tput bel"
# Backs files up using rsync, not preserving linux perms (for external drives)
alias backup="rsync -vrltD --progress --stats"
# Intuitive map function
# For example, to list all directories that contain a certain file:
# find . -name .gitattributes | map dirname
@@ -71,11 +74,9 @@ alias map="xargs -n1"
# Reload the shell (i.e. invoke as a login shell)
alias reload="exec $SHELL -l"
alias p="ping 1.1.1.1" #See if connection works
alias pp="prettyping 1.1.1.1"
alias path='echo -e ${PATH//:/\\n}' #Print each PATH entry on a separate line
alias mkdir='mkdir -pv' #Intuitive mkdir
# get top process eating memory
alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -10'
@@ -84,15 +85,10 @@ alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10'
# top10 of the history
alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
alias cantbebothered='git add -a && git commit -m $(curl -s http://whatthecommit.com/index.txt | uwuify | cowsay -f $(ls /usr/share/cowsay/cows/ | shuf -n1) | lolcat ) && git push'
alias please='sudo'
alias simon-says='sudo'
alias runhis="anyframe-widget-execute-history"
alias please='sudo !!'
alias gitup='for dir in $(find . -name ".git"); do cd ${dir%/*}; pwd ; git pull ; cd -; done'
# Default xclip to use Ctrl-c/Ctrl-v clipboard
alias xclip="xclip -selection c"
alias :q="exit"
alias mirrorup='sudo reflector --verbose -c Poland -c Germany -c France -l 25 -a 2 -p https --sort rate --save /etc/pacman.d/mirrorlist'
alias lock="swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2"

View File

@@ -1,7 +1,9 @@
{
"from": "User",
"inherits": "0.16mm Optimal @Creality Ender-3 V3",
"internal_solid_infill_pattern": "hilbertcurve",
"internal_solid_infill_pattern": "zig-zag",
"ironing_pattern": "concentric",
"ironing_type": "topmost",
"is_custom_defined": "0",
"name": "0.16mm Optimal @Creality Ender-3 V3 - Copy",
"print_settings_id": "0.16mm Optimal @Creality Ender-3 V3 - Copy",

View File

@@ -96,7 +96,7 @@ bind=SUPERSHIFT,L,exec,hyprlock
bind=SUPER,T,togglefloating,
bind=SUPER,R,exec,wofi --show drun -o DP-3
bind=SUPER,P,pseudo,
bind=SUPER,SPACE,exec,rofi -modi drun,run,window,calc -show drun
bind=SUPER,SPACE,exec,uwsm app -- rofi -modi drun,run,window,calc -show drun
bind=SUPER,C,pin
bind=SUPER,left,movefocus,l
@@ -130,6 +130,8 @@ bind=SUPER_SHIFT,9,movetoworkspacesilent,9
bind=SUPER_SHIFT,0,movetoworkspacesilent,10
bind=SUPERSHIFT,S,exec,flameshot gui
bind=,PRINT,exec,flameshot full
bind=CTRL,PRINT,exec,flameshot gui
bind = SUPER, V, exec, nwg-clipman
# T14gen2 FN KEYS

106
.config/hypr/hyprlock.conf Normal file
View File

@@ -0,0 +1,106 @@
# sample hyprlock.conf
# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
#
# rendered text in all widgets supports pango markup (e.g. <b> or <i> tags)
# ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks
#
# shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace
#
# you can get started by copying this config to ~/.config/hypr/hyprlock.conf
#
$font = Lexend Deca
general {
hide_cursor = false
}
# uncomment to enable fingerprint authentication
auth {
fingerprint {
enabled = true
ready_message = Scan fingerprint to unlock
present_message = Scanning...
retry_delay = 250 # in milliseconds
}
}
animations {
enabled = true
bezier = linear, 1, 1, 0, 0
animation = fadeIn, 1, 5, linear
animation = fadeOut, 1, 5, linear
animation = inputFieldDots, 1, 2, linear
}
background {
monitor =
path = screenshot
blur_passes = 3
}
input-field {
monitor =
size = 20%, 5%
outline_thickness = 3
inner_color = rgba(0, 0, 0, 0.0) # no fill
outer_color = rgba(ee99a0ff)
check_color = rgba(8aadf4ff)
fail_color = rgba(ed8796ff)
font_color = rgba(cad3f5ff)
fade_on_empty = false
rounding = 15
font_family = $font
placeholder_text = Input password...
fail_text = $PAMFAIL
# uncomment to use a letter instead of a dot to indicate the typed password
# dots_text_format = *
# dots_size = 0.4
dots_spacing = 0.3
# uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator)
# hide_input = true
position = 0, -20
halign = center
valign = center
}
# TIME
label {
monitor =
text = $TIME # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution
font_size = 90
font_family = $font
position = -30, 0
halign = right
valign = top
}
# DATE
label {
monitor =
text = cmd[update:60000] date +"%A, %d %B %Y" # update every 60 seconds
font_size = 25
font_family = $font
position = -30, -150
halign = right
valign = top
}
label {
monitor =
text = $LAYOUT[en,pl]
font_size = 24
onclick = hyprctl switchxkblayout all next
position = 250, -20
halign = center
valign = center
}

View File

@@ -1,5 +1,5 @@
^sep()
Lock,loginctl lock-session,system-lock-screen
Lock,hyprlock,system-lock-screen
Exit,^checkout(exit),system-shutdown
^tag(exit)
Suspend,systemctl -i suspend,system-log-out
1 ^sep()
2 Lock,loginctl lock-session,system-lock-screen Lock,hyprlock,system-lock-screen
3 Exit,^checkout(exit),system-shutdown
4 ^tag(exit)
5 Suspend,systemctl -i suspend,system-log-out

View File

@@ -0,0 +1,171 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
end
vim.opt.rtp:prepend(lazypath)
--require("lazy").setup(pluginTable)
require("lazy").setup({
spec = {
-- import your plugins
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "catppuccin" } },
-- automatically check for plugin updates
checker = { enabled = true },
})
if vim.fn.has('persistent_undo') then
local target_path = vim.fn.stdpath('data') ..'/.nvimundodir'
if not vim.fn.isdirectory(target_path) then
vim.fn.mkpath(target_path, { mode = 0700 }) -- Use mkpath for parent creation
end
vim.opt.undodir = target_path
vim.api.nvim_set_option('undofile', true)
end
vim.api.nvim_create_autocmd("StdinReadPre", {
pattern = "*",
command = "let s:std_in=1"
})
--vim.api.nvim_create_autocmd("VimEnter", {
-- pattern = "*",
-- command = "if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') | execute 'Neotree current' | execute 'cd '.argv()[0] | endif"
--})
vim.g.airline_powerline_fonts = 1
--vim.g.coq_settings = {'clients.tabnine.enabled' = false}
--filetype plugin on
--vim.g.syntastic_python_python_exec = 'python3'
--vim.g.syntastic_python_checkers = ['bandit', 'python']
--" Keybinds
vim.keymap.set('n', '<F2>', ':Neotree toggle<CR>',{noremap=true})
vim.keymap.set('n', '<F3>', function() vim.lsp.buf.code_action() end,{noremap=true})
vim.keymap.set('n', '<F4>', ':ZenMode<CR>',{noremap=true})
vim.keymap.set('n', '<F5>', function() vim.lsp.buf.format() end,{noremap=true})
--nnoremap <F2> :CHADopen<CR>
--nnoremap <F3> :lua vim.lsp.buf.code_action()<CR>
--nnoremap <F4> :Goyo<CR>
--nnoremap <F5> :MundoToggle<CR>
--nnoremap <F6> :lua require("dapui").toggle()<CR>
require("mason").setup()
require("mason-lspconfig").setup()
--require("mason-lspconfig").setup_handlers({
-- function (server_name) -- default handler (optional)
-- require("lspconfig")[server_name].setup(require('coq').lsp_ensure_capabilities({}))
-- end})
local lsp = require "lspconfig"
local coq = require "coq" -- add this
local dap = require("dap")
dap.adapters.gdb = {
type = "executable",
command = "gdb",
args = { "-i", "dap" }
}
dap.configurations.cpp = {
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false,
},
}
-- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true }
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
-- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer
local on_attach = function(client, bufnr)
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap=true, silent=true, buffer=bufnr }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
end
local lsp_flags = {
-- This is the default in Nvim 0.7+
debounce_text_changes = 150,
}
--lsp.<server>.setup(<stuff...>) -- before
--lsp.<server>.setup(coq.lsp_ensure_capabilities(<stuff...>)) -- after
--lsp.pyright.setup(coq.lsp_ensure_capabilities({}))
--lsp.ccls.setup(coq.lsp_ensure_capabilities({}))
lsp.ltex.setup(coq.lsp_ensure_capabilities({settings = {ltex = {language = "pl-PL"}}}))
lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({
settings = {
["rust-analyzer"] = {
imports = {
granularity = {
group = "module",
},
prefix = "self",
},
cargo = {
buildScripts = {
enable = true,
},
},
procMacro = {
enable = true
},
}
}
}))
require("dapui").setup()
require("catppuccin").setup({flavour = "macchiato"})
require('colorizer').setup()
require("circles").setup()
vim.cmd.colorscheme "catppuccin"
vim.api.nvim_create_autocmd('VimEnter',
{callback =
function()
vim.api.nvim_command("COQnow -s")
end,
})
-- committia_open_only_vim_starting
vim.g.committia_open_only_vim_starting = 1
--autocmd VimEnter * execute 'COQnow -s'

View File

@@ -1,35 +1,36 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
end
vim.opt.rtp:prepend(lazypath)
--require("lazy").setup(pluginTable)
require("lazy").setup({
spec = {
-- import your plugins
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "catppuccin" } },
-- automatically check for plugin updates
checker = { enabled = true },
spec = {
-- import your plugins
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "catppuccin" } },
-- automatically check for plugin updates
checker = { enabled = true },
})
if vim.fn.has('persistent_undo') then
local target_path = vim.fn.stdpath('data') ..'/.nvimundodir'
if not vim.fn.isdirectory(target_path) then
vim.fn.mkpath(target_path, { mode = 0700 }) -- Use mkpath for parent creation
end
vim.opt.undodir = target_path
vim.api.nvim_set_option('undofile', true)
if vim.fn.has('persistent_undo') then
local target_path = vim.fn.stdpath('data') .. '/.nvimundodir'
if not vim.fn.isdirectory(target_path) then
vim.fn.mkpath(target_path, { mode = 0700 }) -- Use mkpath for parent creation
end
vim.opt.undodir = target_path
vim.api.nvim_set_option('undofile', true)
end
@@ -51,84 +52,78 @@ vim.g.airline_powerline_fonts = 1
--vim.g.syntastic_python_checkers = ['bandit', 'python']
--" Keybinds
vim.keymap.set('n', '<F2>', ':Neotree toggle<CR>',{noremap=true})
vim.keymap.set('n', '<F3>', function() vim.lsp.buf.code_action() end,{noremap=true})
vim.keymap.set('n', '<F4>', ':ZenMode<CR>',{noremap=true})
vim.keymap.set('n', '<F2>', ':Neotree toggle<CR>', { noremap = true })
vim.keymap.set('n', '<F3>', function() vim.lsp.buf.code_action() end, { noremap = true })
vim.keymap.set('n', '<F4>', ':ZenMode<CR>', { noremap = true })
vim.keymap.set('n', '<F5>', function() vim.lsp.buf.format() end, { noremap = true })
vim.keymap.set('n', '<F6>', ':MundoToggle<CR>', { noremap = true })
--nnoremap <F2> :CHADopen<CR>
--nnoremap <F3> :lua vim.lsp.buf.code_action()<CR>
--nnoremap <F4> :Goyo<CR>
--nnoremap <F5> :MundoToggle<CR>
--nnoremap <F6> :lua require("dapui").toggle()<CR>
require("neodev").setup({
override = function(_, library)
library.enabled = true
library.plugins = true
end,
})
require("mason").setup()
require("mason-lspconfig").setup()
require("mason-lspconfig").setup_handlers({
function (server_name) -- default handler (optional)
require("lspconfig")[server_name].setup(require('coq').lsp_ensure_capabilities({}))
end})
--require("mason-lspconfig").setup_handlers({
-- function (server_name) -- default handler (optional)
-- require("lspconfig")[server_name].setup(require('coq').lsp_ensure_capabilities({}))
-- end})
local lsp = require "lspconfig"
local coq = require "coq" -- add this
local dap = require("dap")
dap.adapters.gdb = {
type = "executable",
command = "gdb",
args = { "-i", "dap" }
type = "executable",
command = "gdb",
args = { "-i", "dap" }
}
dap.configurations.cpp = {
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false,
},
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false,
},
}
-- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true }
local opts = { noremap = true, silent = true }
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
-- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer
local on_attach = function(client, bufnr)
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap=true, silent=true, buffer=bufnr }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap = true, silent = true, buffer = bufnr }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
end
local lsp_flags = {
-- This is the default in Nvim 0.7+
debounce_text_changes = 150,
-- This is the default in Nvim 0.7+
debounce_text_changes = 150,
}
--lsp.<server>.setup(<stuff...>) -- before
@@ -136,41 +131,34 @@ local lsp_flags = {
--lsp.pyright.setup(coq.lsp_ensure_capabilities({}))
--lsp.ccls.setup(coq.lsp_ensure_capabilities({}))
--lsp.ltex.setup(coq.lsp_ensure_capabilities({settings = {ltex = {language = "pl-PL"}}}))
lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({
settings = {
["rust-analyzer"] = {
imports = {
granularity = {
group = "module",
},
prefix = "self",
},
cargo = {
buildScripts = {
enable = true,
},
},
procMacro = {
enable = true
},
}
}
}))
lsp.ltex.setup({ settings = { ltex = { language = "pl-PL" } } })
lsp.rust_analyzer.setup({
settings = {
["rust-analyzer"] = {
imports = {
granularity = {
group = "module",
},
prefix = "self",
},
cargo = {
buildScripts = {
enable = true,
},
},
procMacro = {
enable = true
},
}
}
})
require("dapui").setup()
require("catppuccin").setup({flavour = "macchiato"})
require("catppuccin").setup({ flavour = "macchiato" })
require('colorizer').setup()
require("circles").setup()
vim.cmd.colorscheme "catppuccin"
vim.api.nvim_create_autocmd('VimEnter',
{callback =
function()
vim.api.nvim_command("COQnow -s")
end,
})
-- committia_open_only_vim_starting
vim.g.committia_open_only_vim_starting = 1
--autocmd VimEnter * execute 'COQnow -s'

View File

@@ -1,46 +1,47 @@
{
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
"catppuccin": { "branch": "main", "commit": "76a8d0515024cc55d8bd26fc13f1af88faef3ebf" },
"circles.nvim": { "branch": "main", "commit": "01b9ac1dc6c181f6982eddd57deb1fc7f92d7a70" },
"codeium.vim": { "branch": "main", "commit": "272c6e2755e8faa90e26bcdcd9fde6b9e61751ea" },
"codeium.vim": { "branch": "main", "commit": "a8d47ec54fe82df920b2545559f767003e8a7f8d" },
"committia.vim": { "branch": "master", "commit": "c8c0f255e8090ed90dd9d5dd2e8672994f8e3671" },
"coq.artifacts": { "branch": "artifacts", "commit": "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b" },
"coq.thirdparty": { "branch": "3p", "commit": "6ee3c221c308dca7071387267ac76c9272b184a9" },
"coq_nvim": { "branch": "coq", "commit": "d83bc18d044cfcd65e91dc49740a353546bc143b" },
"ctrlp.vim": { "branch": "master", "commit": "475a864e7f01dfc5c93965778417cc66e77f3dcc" },
"firenvim": { "branch": "master", "commit": "c4ab7d2aeb145cd93db8660cb134f771722f2b5e" },
"formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
"git-messenger.vim": { "branch": "master", "commit": "edc603d4cda7894a743e383e16c638e206d03148" },
"image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" },
"firenvim": { "branch": "master", "commit": "c927486daff6d1eb8a0d61fd9e264bc1bf5f2c36" },
"formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"git-messenger.vim": { "branch": "master", "commit": "fd124457378a295a5d1036af4954b35d6b807385" },
"image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" },
"indentLine.vim": { "branch": "master", "commit": "988ba5557a9d1ff49d27c22a6b5f405075b3cebb" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
"neoconf.nvim": { "branch": "main", "commit": "750656e4f15d7b66ea9d374d76dcbae160ab9c78" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"nerdcommenter": { "branch": "master", "commit": "66c07e4083ab02ed2540ac289cc602c70b858c13" },
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
"nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
"nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" },
"mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
"neoconf.nvim": { "branch": "main", "commit": "b516f1ca1943de917e476224e7aa6b9151961991" },
"nerdcommenter": { "branch": "master", "commit": "02a3b6455fa07b61b9440a78732f1e9b7876c991" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-colorizer.lua": { "branch": "master", "commit": "16597180b4dd81fa3d23d88c4d2f1b49154f9479" },
"nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" },
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
"nvim-lightbulb": { "branch": "master", "commit": "aa3a8b0f4305b25cfe368f6c9be9923a7c9d0805" },
"nvim-lspconfig": { "branch": "master", "commit": "442e077e326ac467daf9cd63e72120fb450a850b" },
"nvim-lspconfig": { "branch": "master", "commit": "d6dc63670d3dc5204b1e874af4cbf340cb5d9d18" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
"nvim-web-devicons": { "branch": "master", "commit": "57dfa947cc88cdf1baa2c7e13ed31edddd8fb1d1" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"syntastic": { "branch": "master", "commit": "8d5e37c29cf5952fbf300b9230bffe424c61a488" },
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
"tree-sitter-c-sharp": { "branch": "master", "commit": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"tree-sitter-c-sharp": { "branch": "master", "commit": "3431444351c871dffb32654f1299a00019280f2f" },
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
"vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
"vim-gitgutter": { "branch": "main", "commit": "6620e5fbbe6a28de0bfed081f5bd2767023b7eea" },
"vim-gitgutter": { "branch": "main", "commit": "85ca3a087204e3a32cb2faa5d9d0451524e08720" },
"vim-mundo": { "branch": "master", "commit": "2ceda8c65f7b3f9066820729fc02003a09df91f9" },
"vim-polyglot": { "branch": "master", "commit": "f5393cfee07aeb666f4d75f9b3a83163862fb094" },
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
"webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
"window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
"yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" },
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
}

View File

@@ -2,88 +2,161 @@ return {
"mattn/webapi-vim",
"scrooloose/syntastic",
"sheerun/vim-polyglot",
"simnalamburt/vim-mundo",
"simnalamburt/vim-mundo",
"elkowar/yuck.vim",
{"glacambre/firenvim",
{
"glacambre/firenvim",
lazy = not vim.g.started_by_firenvim,
build = function()
vim.fn["firenvim#install"](0)
end
},
--'honza/vim-snippets',
--'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
'vim-scripts/indentLine.vim',
'rhysd/git-messenger.vim',
'junegunn/vim-easy-align',
"preservim/nerdcommenter",
"mg979/vim-visual-multi",
"airblade/vim-gitgutter",
--'vim-airline/vim-airline'
--'vim-airline/vim-airline-themes'
{'ctrlpvim/ctrlp.vim'},
--'godlygeek/tabular'
--'easymotion/vim-easymotion'
--'nathanaelkane/vim-indent-guides'
--'xuyuanp/nerdtree-git-plugin'
--'bronson/vim-trailing-whitespace'
--'tpope/vim-dadbod'
--'tpope/vim-eunuch'
--'tpope/vim-speeddating'
--'tpope/vim-repeat'
--'tpope/vim-rhubarb'
--'tpope/vim-unimpaired'
--'tpope/vim-abolish'
--'tpope/vim-obsession'
--'tpope/vim-fugitive'
--'tpope/vim-surround'
{
'Exafunction/codeium.vim',
event = 'BufEnter',
config = function ()
-- Change '<C-g>' here to any keycode you like.
vim.keymap.set('i', '<C-g>', function () return vim.fn['codeium#Accept']() end, { expr = true, silent = true })
vim.keymap.set('i', '<c-;>', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true, silent = true })
vim.keymap.set('i', '<c-,>', function() return vim.fn['codeium#CycleCompletions'](-1) end, { expr = true, silent = true })
vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true, silent = true })
end
},
--'lambdalisue/suda.vim'
{'tree-sitter/tree-sitter-c-sharp'},
{'nvim-treesitter/nvim-treesitter', build = ':TSUpdate'},
'nvim-lua/plenary.nvim',
'nvim-telescope/telescope.nvim',
--'honza/vim-snippets',
--'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
'vim-scripts/indentLine.vim',
'rhysd/git-messenger.vim',
'junegunn/vim-easy-align',
"preservim/nerdcommenter",
"mg979/vim-visual-multi",
"airblade/vim-gitgutter",
{
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
}
},
--'vim-airline/vim-airline'
--'vim-airline/vim-airline-themes'
{ 'ctrlpvim/ctrlp.vim' },
--'godlygeek/tabular'
--'easymotion/vim-easymotion'
--'nathanaelkane/vim-indent-guides'
--'xuyuanp/nerdtree-git-plugin'
--'bronson/vim-trailing-whitespace'
--'tpope/vim-dadbod'
--'tpope/vim-eunuch'
--'tpope/vim-speeddating'
--'tpope/vim-repeat'
--'tpope/vim-rhubarb'
--'tpope/vim-unimpaired'
--'tpope/vim-abolish'
--'tpope/vim-obsession'
--'tpope/vim-fugitive'
--'tpope/vim-surround'
{
'Exafunction/codeium.vim',
event = 'BufEnter',
config = function()
-- Change '<C-g>' here to any keycode you like.
vim.keymap.set('i', '<C-g>', function() return vim.fn['codeium#Accept']() end, { expr = true, silent = true })
vim.keymap.set('i', '<c-;>', function() return vim.fn['codeium#CycleCompletions'](1) end,
{ expr = true, silent = true })
vim.keymap.set('i', '<c-,>', function() return vim.fn['codeium#CycleCompletions'](-1) end,
{ expr = true, silent = true })
vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true, silent = true })
end
},
--'lambdalisue/suda.vim'
{ 'tree-sitter/tree-sitter-c-sharp' },
{ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' },
'nvim-lua/plenary.nvim',
'nvim-telescope/telescope.nvim',
'kosayoda/nvim-lightbulb',
--'antoinemadec/FixCursorHold.nvim'
'mhartington/formatter.nvim',
'NvChad/nvim-colorizer.lua',
'kosayoda/nvim-lightbulb',
--'antoinemadec/FixCursorHold.nvim'
'mhartington/formatter.nvim',
'NvChad/nvim-colorizer.lua',
--{'ms-jpq/chadtree', branch='chad', build='python3 -m chadtree deps'},
{'ms-jpq/coq_nvim', branch='coq'},
--" 9000+ Snippets
{'ms-jpq/coq.artifacts', branch='artifacts'},
{'ms-jpq/coq.thirdparty', branch='3p'},
{
'saghen/blink.cmp',
-- optional: provides snippets for the snippet source
dependencies = { 'rafamadriz/friendly-snippets' },
'nvim-tree/nvim-web-devicons',
'projekt0n/circles.nvim',
-- use a release tag to download pre-built binaries
version = '1.*',
-- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-- build = 'cargo build --release',
-- If you use nix, you can build from source using latest nightly rust with:
-- build = 'nix run .#build-plugin',
'nvim-neotest/nvim-nio',
---@module 'blink.cmp'
---@type blink.cmp.Config
opts = {
-- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
-- 'super-tab' for mappings similar to vscode (tab to accept)
-- 'enter' for enter to accept
-- 'none' for no mappings
--
-- All presets have the following mappings:
-- C-space: Open menu or open docs if already open
-- C-n/C-p or Up/Down: Select next/previous item
-- C-e: Hide menu
-- C-k: Toggle signature help (if signature.enabled = true)
--
-- See :h blink-cmp-config-keymap for defining your own keymap
keymap = { preset = 'super-tab' },
appearance = {
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-- Adjusts spacing to ensure icons are aligned
nerd_font_variant = 'mono'
},
--'uga-rosa/translate.nvim'
--'mechatroner/rainbow_csv'
--'christoomey/vim-system-copy'
--'eandrju/cellular-automaton.nvim'
-- (Default) Only show the documentation popup when manually triggered
completion = { documentation = { auto_show = false } },
-- Default list of enabled providers defined so that you can extend it
-- elsewhere in your config, without redefining it, due to `opts_extend`
sources = {
default = { 'lsp', 'path', 'snippets', 'buffer' },
},
-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
-- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
--
-- See the fuzzy documentation for more information
fuzzy = { implementation = "prefer_rust_with_warning" }
},
opts_extend = { "sources.default" }
},
-- { 'ms-jpq/coq_nvim', branch = 'coq' },
--" 9000+ Snippets
-- { 'ms-jpq/coq.artifacts', branch = 'artifacts' },
-- { 'ms-jpq/coq.thirdparty', branch = '3p' },
'nvim-tree/nvim-web-devicons',
'projekt0n/circles.nvim',
'nvim-neotest/nvim-nio',
--'uga-rosa/translate.nvim'
--'mechatroner/rainbow_csv'
--'christoomey/vim-system-copy'
--'eandrju/cellular-automaton.nvim'
--"neovim/nvim-lspconfig",
--"'ranjithshegde/ccls.nvim'
--"'ranjithshegde/ccls.nvim'
"mfussenegger/nvim-dap",
"rcarriga/nvim-dap-ui",
"folke/neodev.nvim",
"folke/which-key.nvim",
{ "folke/neoconf.nvim", cmd = "Neoconf" },
{"neovim/nvim-lspconfig",
dependencies = {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
{ "folke/neodev.nvim", opts = {} },
}, },
{"folke/lazydev.nvim",
ft = "lua", -- only load on lua files
opts = {
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
},
},
},
{ "folke/neoconf.nvim", cmd = "Neoconf" },
{
"neovim/nvim-lspconfig",
dependencies = {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
},
},
}

View File

@@ -5,8 +5,56 @@ return {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
"3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
}
{"3rd/image.nvim",
opts={
backend = "kitty",
processor = "magick_rock", -- or "magick_cli"
integrations = {
markdown = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
floating_windows = false, -- if true, images will be rendered in floating markdown windows
filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
},
neorg = {
enabled = true,
filetypes = { "norg" },
},
typst = {
enabled = true,
filetypes = { "typst" },
},
html = {
enabled = false,
},
css = {
enabled = false,
},
},
max_width = nil,
max_height = nil,
max_width_window_percentage = nil,
max_height_window_percentage = 50,
window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
}
}, -- Optional image support in preview window: See `# Preview Mode` for more information
},
opts={
window = {
mappings = {
["P"] = { "toggle_preview", config = { use_float = false, use_image_nvim = true } },
["l"] = "focus_preview",
["<C-b>"] = { "scroll_preview", config = {direction = 10} },
["<C-f>"] = { "scroll_preview", config = {direction = -10} },
}
}
}
},
{"catppuccin/nvim", lazy=true, name="catppuccin"},
{
@@ -147,4 +195,13 @@ return {
end,
},
{"rhysd/committia.vim"},
{
's1n7ax/nvim-window-picker',
name = 'window-picker',
event = 'VeryLazy',
version = '2.*',
config = function()
require'window-picker'.setup()
end,
},
}

View File

@@ -5,7 +5,7 @@
// "width": 1280, // Waybar width
"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": ["custom/archicon","hyprland/workspaces", "custom/media", ],
"modules-left": ["custom/archicon","hyprland/workspaces", "custom/media"],
"modules-center": ["hyprland/window"],
"modules-right": ["mpris", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "battery", "clock", "tray"],
// Modules configuration

View File

@@ -14,7 +14,7 @@ charset = utf-8
indent_style = space
indent_size = 4
[*.{c,h}pp,tex]
[*.{c,h}pp,tex,lua,scad]
indent_style = space
indent_size = 2

13
.zshrc
View File

@@ -196,13 +196,14 @@ zinit pack"binary" for fzf
# GPG-SSH INTEGRATION
unset SSH_AGENT_PID
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi
export GPG_TTY=$(tty)
gpg-connect-agent updatestartuptty /bye >/dev/null
#unset SSH_AGENT_PID
#if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
#export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
#fi
#export GPG_TTY=$(tty)
#gpg-connect-agent updatestartuptty /bye >/dev/null
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/openpgp-card/ssh-agent.sock"
[ "$TERM" = "xterm-kitty" ] && (alias ssh="command kitten ssh";)
[ "$TERMUX_APK_RELEASE" = "F_DROID" ] && (eval `okc-ssh-agent`)