Compare commits
10 Commits
dac65222bf
...
8990ecef57
Author | SHA1 | Date | |
---|---|---|---|
8990ecef57 | |||
97d8c5d5d8 | |||
9a6ef5beb4 | |||
2a8dac507f | |||
16a613c2bd | |||
12aad4b49d | |||
34daf110e5 | |||
1fabf984c8 | |||
2f5e1f8f04 | |||
c81e517a87 |
41
.bashrc
41
.bashrc
@@ -13,11 +13,8 @@ alias bat="bat -f"
|
||||
alias grep="grep --color=auto"
|
||||
alias shutdown="shutdown now"
|
||||
alias l="ls"
|
||||
alias nvim="hx"
|
||||
alias vim="hx"
|
||||
alias vi="hx"
|
||||
alias nano="hx"
|
||||
|
||||
alias zed="zeditor"
|
||||
alias sudo="sudo -E"
|
||||
alias q="hyprland"
|
||||
alias reload="source ~/.bashrc"
|
||||
alias update="paru -Syu --noconfirm && flatpak update --noninteractive"
|
||||
@@ -25,6 +22,27 @@ alias paru="paru --bottomup --assume-installed ttf-font"
|
||||
alias lah='ls -lah'
|
||||
alias fd='fd -H'
|
||||
|
||||
if [ "$TERM" = "linux" ]; then
|
||||
printf "
|
||||
\033]P0191724
|
||||
\033]P1eb6f92
|
||||
\033]P231748f
|
||||
\033]P3f6c177
|
||||
\033]P49ccfd8
|
||||
\033]P5c4a7e7
|
||||
\033]P6ebbcba
|
||||
\033]P7e0def4
|
||||
\033]P86e6a86
|
||||
\033]P9eb6f92
|
||||
\033]PA31748f
|
||||
\033]PBf6c177
|
||||
\033]PC9ccfd8
|
||||
\033]PDc4a7e7
|
||||
\033]PEebbcba
|
||||
\033]PFe0def4
|
||||
"
|
||||
fi
|
||||
|
||||
clear
|
||||
tfetch
|
||||
|
||||
@@ -32,12 +50,17 @@ PS1='\n[ \e[35;1m\u \e[34m\w\e[0m ]\n\e[1m\$ \e[0m'
|
||||
complete -cf sudo
|
||||
|
||||
export GDK_SCALE=1
|
||||
export EDITOR=helix
|
||||
export VISUAL=helix
|
||||
export EDITOR=nvim
|
||||
export VISUAL=nvim
|
||||
export INPUTRC=~/.inputrc
|
||||
|
||||
export FZF_DEFAULT_OPTS="
|
||||
--color=fg:#908caa,bg:#191724,hl:#ebbcba
|
||||
--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
|
||||
--color=border:#403d52,header:#31748f,gutter:#191724
|
||||
--color=spinner:#f6c177,info:#9ccfd8
|
||||
--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
|
||||
|
||||
eval "$(starship init bash)"
|
||||
eval "$(fzf --bash)"
|
||||
eval "$(zoxide init --cmd cd bash)"
|
||||
|
||||
bind 'set mark-symlinked-directories on'
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
|
||||
#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
|
||||
color_theme = "/usr/share/btop/themes/matcha-dark-sea.theme"
|
||||
color_theme = "/usr/share/btop/themes/rose-pine.theme"
|
||||
|
||||
#* If the theme set background should be shown, set to False if you want terminal background transparency.
|
||||
theme_background = False
|
||||
|
119
.config/btop/themes/rose-pine.theme
Normal file
119
.config/btop/themes/rose-pine.theme
Normal file
@@ -0,0 +1,119 @@
|
||||
# Main background, empty for terminal default, need to be empty if you want transparent background
|
||||
theme[main_bg]="#191724"
|
||||
# Base
|
||||
|
||||
# Main text color
|
||||
theme[main_fg]="#e0def4"
|
||||
# Text
|
||||
|
||||
# Title color for boxes
|
||||
theme[title]="#908caa"
|
||||
# Subtle
|
||||
|
||||
# Highlight color for keyboard shortcuts
|
||||
theme[hi_fg]="#e0def4"
|
||||
# Text
|
||||
|
||||
# Background color of selected item in processes box
|
||||
theme[selected_bg]="#524f67"
|
||||
# HL High
|
||||
|
||||
# Foreground color of selected item in processes box
|
||||
theme[selected_fg]="#f6c177"
|
||||
# Gold
|
||||
|
||||
# Color of inactive/disabled text
|
||||
theme[inactive_fg]="#403d52"
|
||||
# HL Med
|
||||
|
||||
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
|
||||
theme[graph_text]="#9ccfd8"
|
||||
# Foam
|
||||
|
||||
# Background color of the percentage meters
|
||||
theme[meter_bg]="#9ccfd8"
|
||||
# Foam
|
||||
|
||||
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
|
||||
theme[proc_misc]="#c4a7e7"
|
||||
# Iris
|
||||
|
||||
# Cpu box outline color
|
||||
theme[cpu_box]="#ebbcba"
|
||||
# Rose
|
||||
|
||||
# Memory/disks box outline color
|
||||
theme[mem_box]="#31748f"
|
||||
# Pine
|
||||
|
||||
# Net up/down box outline color
|
||||
theme[net_box]="#c4a7e7"
|
||||
# Iris
|
||||
|
||||
# Processes box outline color
|
||||
theme[proc_box]="#eb6f92"
|
||||
# Love
|
||||
|
||||
# Box divider line and small boxes line color
|
||||
theme[div_line]="#6e6a86"
|
||||
# Muted
|
||||
|
||||
# Temperature graph colors
|
||||
theme[temp_start]="#ebbcba"
|
||||
# Rose
|
||||
theme[temp_mid]="#f6c177"
|
||||
# Gold
|
||||
theme[temp_end]="#eb6f92"
|
||||
# Love
|
||||
|
||||
# CPU graph colors
|
||||
theme[cpu_start]="#f6c177"
|
||||
# Gold
|
||||
theme[cpu_mid]="#ebbcba"
|
||||
# Rose
|
||||
theme[cpu_end]="#eb6f92"
|
||||
# Love
|
||||
|
||||
# Mem/Disk free meter
|
||||
# all love
|
||||
theme[free_start]="#eb6f92"
|
||||
theme[free_mid]="#eb6f92"
|
||||
theme[free_end]="#eb6f92"
|
||||
|
||||
# Mem/Disk cached meter
|
||||
# all iris
|
||||
theme[cached_start]="#c4a7e7"
|
||||
theme[cached_mid]="#c4a7e7"
|
||||
theme[cached_end]="#c4a7e7"
|
||||
|
||||
# Mem/Disk available meter
|
||||
# all pine
|
||||
theme[available_start]="#31748f"
|
||||
theme[available_mid]="#31748f"
|
||||
theme[available_end]="#31748f"
|
||||
|
||||
# Mem/Disk used meter
|
||||
# all rose
|
||||
theme[used_start]="#ebbcba"
|
||||
theme[used_mid]="#ebbcba"
|
||||
theme[used_end]="#ebbcba"
|
||||
|
||||
# Download graph colors
|
||||
# Pine for start, foam for the rest
|
||||
theme[download_start]="#31748f"
|
||||
theme[download_mid]="#9ccfd8"
|
||||
theme[download_end]="#9ccfd8"
|
||||
|
||||
# Upload graph colors
|
||||
theme[upload_start]="#ebbcba"
|
||||
# Rose for start
|
||||
theme[upload_mid]="#eb6f92"
|
||||
# Love for mid and end
|
||||
theme[upload_end]="#eb6f92"
|
||||
|
||||
# Process box color gradient for threads, mem and cpu usage
|
||||
theme[process_start]="#31748f"
|
||||
# Pine
|
||||
theme[process_mid]="#9ccfd8"
|
||||
# Foam for mid and end
|
||||
theme[process_end]="#9ccfd8"
|
@@ -28,10 +28,11 @@ font=IosevkaTerm Nerd Font:size=11
|
||||
# initial-window-size-pixels=700x500 # Or,
|
||||
# initial-window-size-chars=<COLSxROWS>
|
||||
# initial-window-mode=windowed
|
||||
Also, "only" having 2 million users confirms my belief that it's mostly scrips creating the load. 3 billion requests / 2 million users is an average of 1,500 req/user. A normal user might make 10-20 requests when loading a map and editing over one place for a long time, so some of these are extremely high, scripted use cases.
|
||||
pad=16x16 center
|
||||
# resize-by-cells=yes
|
||||
# resize-keep-grid=yes
|
||||
resize-delay-ms=1
|
||||
resize-delay-ms=0
|
||||
|
||||
# bold-text-in-bright=no
|
||||
# word-delimiters=,│`|:"'()[]{}<>
|
||||
@@ -86,8 +87,8 @@ resize-delay-ms=1
|
||||
# regex-copy=[your-fancy-name] Control+Alt+Shift+q
|
||||
|
||||
[cursor]
|
||||
style=beam
|
||||
blink=yes
|
||||
style=block
|
||||
blink=no
|
||||
# blink-rate=500
|
||||
# beam-thickness=1.5
|
||||
# underline-thickness=<font underline thickness>
|
||||
@@ -99,75 +100,31 @@ hide-when-typing=yes
|
||||
[touch]
|
||||
# long-press-delay=400
|
||||
|
||||
# Rosé Pine
|
||||
[colors]
|
||||
alpha=0.8
|
||||
# alpha-mode=default # Can be `default`, `matching` or `all`
|
||||
background=000000
|
||||
# foreground=ffffff
|
||||
# flash=7f7f00
|
||||
# flash-alpha=0.5
|
||||
cursor=191724 e0def4
|
||||
background=191724
|
||||
foreground=e0def4
|
||||
|
||||
# cursor=<inverse foreground/background>
|
||||
regular0=26233a # black (Overlay)
|
||||
regular1=eb6f92 # red (Love)
|
||||
regular2=9ccfd8 # green (Foam)
|
||||
regular3=f6c177 # yellow (Gold)
|
||||
regular4=31748f # blue (Pine)
|
||||
regular5=c4a7e7 # magenta (Iris)
|
||||
regular6=ebbcba # cyan (Rose)
|
||||
regular7=e0def4 # white (Text)
|
||||
|
||||
## Normal/regular colors (color palette 0-7)
|
||||
# regular0=242424 # black
|
||||
# regular1=f62b5a # red
|
||||
# regular2=47b413 # green
|
||||
# regular3=e3c401 # yellow
|
||||
# regular4=24acd4 # blue
|
||||
# regular5=f2affd # magenta
|
||||
# regular6=13c299 # cyan
|
||||
# regular7=e6e6e6 # white
|
||||
bright0=47435d # bright black (lighter Overlay)
|
||||
bright1=ff98ba # bright red (lighter Love)
|
||||
bright2=c5f9ff # bright green (lighter Foam)
|
||||
bright3=ffeb9e # bright yellow (lighter Gold)
|
||||
bright4=5b9ab7 # bright blue (lighter Pine)
|
||||
bright5=eed0ff # bright magenta (lighter Iris)
|
||||
bright6=ffe5e3 # bright cyan (lighter Rose)
|
||||
bright7=fefcff # bright white (lighter Text)
|
||||
|
||||
## Bright colors (color palette 8-15)
|
||||
# bright0=616161 # bright black
|
||||
# bright1=ff4d51 # bright red
|
||||
# bright2=35d450 # bright green
|
||||
# bright3=e9e836 # bright yellow
|
||||
# bright4=5dc5f8 # bright blue
|
||||
# bright5=feabf2 # bright magenta
|
||||
# bright6=24dfc4 # bright cyan
|
||||
# bright7=ffffff # bright white
|
||||
|
||||
## dimmed colors (see foot.ini(5) man page)
|
||||
# dim0=<not set>
|
||||
# ...
|
||||
# dim7=<not-set>
|
||||
|
||||
## The remaining 256-color palette
|
||||
# 16 = <256-color palette #16>
|
||||
# ...
|
||||
# 255 = <256-color palette #255>
|
||||
|
||||
## Sixel colors
|
||||
# sixel0 = 000000
|
||||
# sixel1 = 3333cc
|
||||
# sixel2 = cc2121
|
||||
# sixel3 = 33cc33
|
||||
# sixel4 = cc33cc
|
||||
# sixel5 = 33cccc
|
||||
# sixel6 = cccc33
|
||||
# sixel7 = 878787
|
||||
# sixel8 = 424242
|
||||
# sixel9 = 545499
|
||||
# sixel10 = 994242
|
||||
# sixel11 = 549954
|
||||
# sixel12 = 995499
|
||||
# sixel13 = 549999
|
||||
# sixel14 = 999954
|
||||
# sixel15 = cccccc
|
||||
|
||||
## Misc colors
|
||||
# selection-foreground=<inverse foreground/background>
|
||||
# selection-background=<inverse foreground/background>
|
||||
# jump-labels=<regular0> <regular3> # black-on-yellow
|
||||
# scrollback-indicator=<regular0> <bright4> # black-on-bright-blue
|
||||
# search-box-no-match=<regular0> <regular1> # black-on-red
|
||||
# search-box-match=<regular0> <regular3> # black-on-yellow
|
||||
# urls=<regular3>
|
||||
|
||||
[colors2]
|
||||
# Alternative color theme, see man page foot.ini(5)
|
||||
flash=f6c177 # yellow (Gold)
|
||||
|
||||
[csd]
|
||||
# preferred=server
|
||||
@@ -216,7 +173,7 @@ background=000000
|
||||
# unicode-input=Control+Shift+u
|
||||
# color-theme-switch-1=none
|
||||
# color-theme-switch-2=none
|
||||
# color-theme-toggle=none
|
||||
color-theme-toggle=Control+Shift+p
|
||||
# noop=none
|
||||
# quit=none
|
||||
|
||||
|
@@ -14,7 +14,8 @@
|
||||
################
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
monitor=eDP-1, 1920x1080@144, auto, 1
|
||||
monitor=eDP-1, 1920x1080@144.00, auto, 1
|
||||
monitor=HDMI-A-1, 1920x1080@60.00, auto, 1
|
||||
# monitor=HDMI-A-1, 1920x1080@60.02Hz, auto, 1, mirror, eDP-1
|
||||
# monitor=HDMI-A-1, 1920x1080@60, auto, 1, mirror, eDP-1
|
||||
# monitor=HDMI-A-1, 2560x1080@60.00, auto, 1
|
||||
@@ -38,6 +39,7 @@ $color_pick = hyprpicker --autocopy
|
||||
$messaging = vesktop
|
||||
$calculator = flatpak run org.gnome.Calculator
|
||||
$refresh = random-paper && hyprctl hyprpaper reload ,"~/wallpapers/active.png"
|
||||
$email = thunderbird
|
||||
|
||||
|
||||
#################
|
||||
@@ -55,8 +57,9 @@ execr-once = eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,se
|
||||
exec-once = [workspace 1 silent] $browser
|
||||
exec-once = [workspace 11 silent] $messaging
|
||||
exec-once = [workspace 12 silent] foot bluetui
|
||||
exec-once = [workspace 13 silent] foot nmtuii
|
||||
exec-once = [workspace 13 silent] foot -o colors.regular4=191724 nmtuii
|
||||
exec-once = [workspace 14 silent] foot btop
|
||||
exec-once = [workspace 15 silent] $email
|
||||
|
||||
|
||||
#############################
|
||||
@@ -91,10 +94,10 @@ cursor:no_hardware_cursors = true
|
||||
|
||||
# https://wiki.hyprland.org/Configuring/Variables/#general
|
||||
general {
|
||||
gaps_in = 4
|
||||
gaps_out = 8
|
||||
gaps_in = 2
|
||||
gaps_out = 4
|
||||
|
||||
border_size = 2
|
||||
border_size = 0
|
||||
|
||||
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
|
||||
col.active_border = rgba(e6003aff) rgba(3c3ce6ff) 45deg
|
||||
@@ -115,7 +118,7 @@ decoration {
|
||||
|
||||
# Change transparency of focused and unfocused windows
|
||||
active_opacity = 1.0
|
||||
inactive_opacity = 1.0
|
||||
inactive_opacity = 0.9
|
||||
|
||||
# https://wiki.hyprland.org/Configuring/Variables/#blur
|
||||
blur {
|
||||
@@ -134,7 +137,7 @@ animations {
|
||||
# Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
|
||||
|
||||
animation = windows, 1, 2, default, slide
|
||||
animation = fade, 0
|
||||
animation = fade, 1, 2, default
|
||||
animation = workspaces, 1, 2, default
|
||||
}
|
||||
|
||||
@@ -174,7 +177,7 @@ input {
|
||||
repeat_rate = 50
|
||||
|
||||
follow_mouse = 1
|
||||
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
|
||||
sensitivity = 0.3 # -1.0 - 1.0, 0 means no modification.
|
||||
|
||||
touchpad {
|
||||
natural_scroll = false
|
||||
@@ -183,7 +186,7 @@ input {
|
||||
|
||||
# https://wiki.hyprland.org/Configuring/Variables/#gestures
|
||||
gestures {
|
||||
workspace_swipe = false
|
||||
workspace_swipe = true
|
||||
}
|
||||
|
||||
# Example per-device config
|
||||
@@ -193,6 +196,11 @@ gestures {
|
||||
# sensitivity = -0.5
|
||||
# }
|
||||
|
||||
device {
|
||||
name=wacom-one-pen-display-13-pen
|
||||
output=HDMI-A-1
|
||||
}
|
||||
|
||||
|
||||
###################
|
||||
### KEYBINDINGS ###
|
||||
@@ -206,7 +214,7 @@ bind = $mainMod SHIFT, RETURN, exec, $terminal
|
||||
bind = $mainMod, Y, exec, $browser
|
||||
bind = $mainMod, C, killactive,
|
||||
bind = $mainMod SHIFT, Q, exit,
|
||||
bind = $mainMod, E, exec, $fileManager
|
||||
bind = $mainMod, R, exec, $fileManager
|
||||
bind = $mainMod, O, togglefloating,
|
||||
bind = $mainMod, SPACE, exec, $menu
|
||||
bind = $mainMod, P, pseudo, # dwindle
|
||||
@@ -236,10 +244,13 @@ bind = $mainMod, B, workspace, 12
|
||||
bind = $mainMod, B, exec, ps aux | grep "foot bluetui" | grep -v grep || foot bluetui
|
||||
# Network control (nmtui)
|
||||
bind = $mainMod, N, workspace, 13
|
||||
bind = $mainMod, N, exec, ps aux | grep "foot nmtuii" | grep -v grep || foot nmtuii
|
||||
bind = $mainMod, N, exec, ps aux | grep "foot -o colors.regular4=191724 nmtuii" | grep -v grep || foot -o colors.regular4=191724 nmtuii
|
||||
# Memory and system control (BTOP)
|
||||
bind = $mainMod, M, workspace, 14
|
||||
bind = $mainMod, M, exec, ps aux | grep "foot btop" | grep -v grep || foot btop
|
||||
# Email
|
||||
bind = $mainMod, E, workspace, 15
|
||||
bind = $mainMod, E, exec, ps aux | grep "thunderbird" | grep -v grep || thunderbird
|
||||
|
||||
# Switch workspaces with mainMod + [0-9]
|
||||
bind = $mainMod, 1, workspace, 1
|
||||
@@ -297,6 +308,8 @@ bindl = , XF86AudioNext, exec, playerctl next
|
||||
bindl = , XF86AudioPause, exec, playerctl play-pause
|
||||
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
||||
bindl = , XF86AudioPrev, exec, playerctl previous
|
||||
# Lock when lid closed
|
||||
bindl = , switch:on:Lid Switch, exec, loginctl lock-session
|
||||
|
||||
# Flag "e" means it will repeat when held down
|
||||
bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
|
||||
@@ -334,6 +347,7 @@ windowrule = float,class:^(notification)$
|
||||
windowrule = float,class:^(error)$
|
||||
windowrule = float,class:^(confirmreset)$
|
||||
windowrule = float,title:^(Open File)$
|
||||
windowrule = float,title:^(Save File)$
|
||||
windowrule = float,title:^(branchdialog)$
|
||||
windowrule = float,title:^(Confirm to replace files)
|
||||
windowrule = float,title:^(File Operation Progress)
|
||||
@@ -353,6 +367,7 @@ windowrule = noanim, workspace:11
|
||||
windowrule = noanim, workspace:12
|
||||
windowrule = noanim, workspace:13
|
||||
windowrule = noanim, workspace:14
|
||||
windowrule = noanim, workspace:20
|
||||
# Control panel workspaces have no borders
|
||||
workspace = r[11-14], border:false, gapsin:0, gapsout:0
|
||||
|
||||
@@ -369,3 +384,4 @@ windowrule = noinitialfocus,class:^jetbrains-.*$,floating:1,title:^$|^\s$|^win\d
|
||||
workspace = w[tv1], gapsout:0, gapsin:0
|
||||
workspace = f[1], gapsout:0, gapsin:0
|
||||
|
||||
workspace = r[20], monitor:"HDMI-A-1"
|
||||
|
186
.config/nvim/init.lua
Normal file
186
.config/nvim/init.lua
Normal file
@@ -0,0 +1,186 @@
|
||||
local lazypath = vim.fn.stdpath("data") .. "/site/pack/packer/start/lazy.nvim"
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("lazy").setup({
|
||||
{
|
||||
"windwp/nvim-autopairs",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("nvim-autopairs").setup({})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
lazy = false,
|
||||
},
|
||||
{
|
||||
"rose-pine/neovim",
|
||||
name = "rose-pine",
|
||||
config = function()
|
||||
vim.cmd("colorscheme rose-pine")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"stevearc/oil.nvim",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"numToStr/Comment.nvim",
|
||||
opts = {},
|
||||
lazy = false,
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
opts = {
|
||||
preset = "helix",
|
||||
},
|
||||
},
|
||||
{
|
||||
"kylechui/nvim-surround",
|
||||
version = "main",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("nvim-surround").setup({})
|
||||
end,
|
||||
},
|
||||
{ "lewis6991/gitsigns.nvim" },
|
||||
{ "neovim/nvim-lspconfig" },
|
||||
{ "hrsh7th/nvim-cmp" },
|
||||
{ "hrsh7th/cmp-nvim-lsp" },
|
||||
{ "hrsh7th/cmp-buffer" },
|
||||
{ "hrsh7th/cmp-path" },
|
||||
{ "saadparwaiz1/cmp_luasnip" },
|
||||
{ "L3MON4D3/LuaSnip" },
|
||||
{ "rafamadriz/friendly-snippets" },
|
||||
})
|
||||
|
||||
local cmp = require("cmp")
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body) -- Use LuaSnip for snippets
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
-- ["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-Space>"] = cmp.mapping.close(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
},
|
||||
sources = {
|
||||
{ name = "nvim_lsp" }, -- LSP completion
|
||||
{ name = "buffer" }, -- Buffer completion
|
||||
{ name = "path" }, -- Path completion
|
||||
{ name = "luasnip" }, -- Snippet completion
|
||||
},
|
||||
})
|
||||
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = { "go", "html", "css", "javascript", "hyprlang", "sql", "gomod", "gosum", "bash", "c", "rust" },
|
||||
highlight = {
|
||||
enable = true,
|
||||
},
|
||||
})
|
||||
|
||||
-- nvim-lspconfig - Providing basic, default Nvim LSP client configurations for various LSP servers.
|
||||
local lspconfig = require("lspconfig")
|
||||
lspconfig.pyright.setup({})
|
||||
lspconfig.ts_ls.setup({})
|
||||
lspconfig.gopls.setup({})
|
||||
lspconfig.bashls.setup({})
|
||||
local luasnip = require("luasnip")
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
require("luasnip").config.set_config({
|
||||
history = true,
|
||||
updateevents = "TextChanged,TextChangedI",
|
||||
})
|
||||
|
||||
-- native vim options
|
||||
local vim = vim
|
||||
local opt = vim.opt
|
||||
|
||||
opt.foldmethod = "expr"
|
||||
opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
|
||||
vim.wo.number = true
|
||||
vim.wo.relativenumber = true
|
||||
|
||||
opt.tabstop = 2
|
||||
opt.shiftwidth = 2
|
||||
opt.expandtab = true
|
||||
|
||||
vim.keymap.set("ca", "o", "tabnew")
|
||||
|
||||
-- Comment.vim - Smart and Powerful commenting plugin for neovim
|
||||
require("Comment").setup()
|
||||
|
||||
-- conform.nvim - Lightweight yet powerful formatter plugin for neovim
|
||||
require("conform").setup({
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
python = { "isort", "black" },
|
||||
rust = { "rustfmt" },
|
||||
javascript = { "prettier" },
|
||||
html = { "prettier" },
|
||||
go = { "gofmt" },
|
||||
bash = { "shfmt" },
|
||||
},
|
||||
format_on_save = {
|
||||
timeout_ms = 500,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
})
|
||||
|
||||
-- Hyprlang LSP
|
||||
vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
|
||||
pattern = { "*.hl", "hypr*.conf" },
|
||||
callback = function(event)
|
||||
vim.lsp.start({
|
||||
name = "hyprlang",
|
||||
cmd = { "hyprls" },
|
||||
root_dir = vim.fn.getcwd(),
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
-- enable diagnostics
|
||||
vim.diagnostic.config({
|
||||
virtual_text = {
|
||||
prefix = "▎",
|
||||
},
|
||||
severity_sort = true,
|
||||
float = {
|
||||
source = "always",
|
||||
},
|
||||
})
|
||||
|
||||
-- save and format on insertleave
|
||||
vim.api.nvim_create_autocmd({ "InsertLeave", "FocusLost" }, {
|
||||
pattern = "*",
|
||||
callback = function()
|
||||
require("conform").format()
|
||||
vim.cmd("silent! write")
|
||||
end,
|
||||
})
|
20
.config/nvim/lazy-lock.json
Normal file
20
.config/nvim/lazy-lock.json
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
|
||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "c7d37ca22b461f64e26f8f6701b2586128ed0bef" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "d6dc63670d3dc5204b1e874af4cbf340cb5d9d18" },
|
||||
"nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
|
||||
"nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
|
||||
"rose-pine": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
@@ -102,7 +102,7 @@
|
||||
# alternate-result-background-corner-radius = 0
|
||||
|
||||
# Selection text
|
||||
selection-color = #F92672
|
||||
selection-color = #EBBCBA
|
||||
selection-background = #00000000
|
||||
selection-background-padding = 0
|
||||
selection-background-corner-radius = 0
|
||||
@@ -171,13 +171,13 @@
|
||||
height = 360
|
||||
|
||||
# Window background color
|
||||
background-color = #000000CC
|
||||
background-color = #191724
|
||||
|
||||
# Width of the border outlines in pixels.
|
||||
outline-width = 1
|
||||
|
||||
# Border outline color
|
||||
outline-color = #fcbfff
|
||||
outline-color = #31748F
|
||||
|
||||
# Width of the border in pixels.
|
||||
border-width = 0
|
||||
|
@@ -18,4 +18,8 @@
|
||||
|
||||
#app-mount > div.appAsidePanelWrapper_a3002d > div.notAppAsidePanel_a3002d > div.app_a3002d > div > div.layers__960e4.layers__160d8 > div > div > div > div.content_c48ade > div.sidebar_c48ade.theme-dark.theme-darker.images-dark > div.sidebarList_c48ade.sidebarListRounded_c48ade > nav > div.scroller__99e7c.thin__99f8c.scrollerBase__99f8c.fade__99f8c > ul > div.sectionDivider__35e86 {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
#app-mount > div.appAsidePanelWrapper_a3002d > div > div.app_a3002d > div > div.layers__960e4.layers__160d8 > div > div > div > div.content_c48ade > div.sidebar_c48ade.theme-dark.theme-darker.images-dark > section > div.mask__0d616 > div {
|
||||
display: none;
|
||||
}
|
@@ -3,7 +3,9 @@
|
||||
"autoUpdateNotification": true,
|
||||
"useQuickCss": true,
|
||||
"themeLinks": [],
|
||||
"enabledThemes": [],
|
||||
"enabledThemes": [
|
||||
"rose-pine.css"
|
||||
],
|
||||
"enableReactDevtools": false,
|
||||
"frameless": false,
|
||||
"transparent": false,
|
||||
@@ -142,7 +144,7 @@
|
||||
"enabled": false
|
||||
},
|
||||
"CustomRPC": {
|
||||
"enabled": true,
|
||||
"enabled": false,
|
||||
"type": 3,
|
||||
"timestampMode": 1,
|
||||
"appID": "1399864028825915413",
|
||||
@@ -219,7 +221,7 @@
|
||||
"enabled": true
|
||||
},
|
||||
"FriendInvites": {
|
||||
"enabled": false
|
||||
"enabled": true
|
||||
},
|
||||
"FriendsSince": {
|
||||
"enabled": true
|
||||
@@ -665,7 +667,7 @@
|
||||
"authenticated": false,
|
||||
"url": "https://api.vencord.dev/",
|
||||
"settingsSync": false,
|
||||
"settingsSyncVersion": 1753905075755
|
||||
"settingsSyncVersion": 1754939753550
|
||||
},
|
||||
"eagerPatches": false
|
||||
}
|
@@ -7,16 +7,28 @@
|
||||
// custom settings, run `zed: open default settings` from the
|
||||
// command palette (cmd-shift-p / ctrl-shift-p)
|
||||
{
|
||||
"icon_theme": "Material Icon Theme",
|
||||
"telemetry": {
|
||||
"metrics": false,
|
||||
"diagnostics": false
|
||||
},
|
||||
"ui_font_size": 15,
|
||||
"buffer_font_size": 15,
|
||||
"theme": {
|
||||
"mode": "system",
|
||||
"light": "One Dark",
|
||||
"dark": "One Dark"
|
||||
}
|
||||
"autosave": "on_window_change",
|
||||
"ssh_connections": [
|
||||
{
|
||||
"host": "miningtcup.me",
|
||||
"projects": [
|
||||
{
|
||||
"paths": ["/home/ted/tmp"]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"icon_theme": "Material Icon Theme",
|
||||
"tab_size": 4,
|
||||
"telemetry": {
|
||||
"metrics": false,
|
||||
"diagnostics": false
|
||||
},
|
||||
"ui_font_size": 15,
|
||||
"buffer_font_size": 15,
|
||||
"theme": {
|
||||
"mode": "system",
|
||||
"light": "One Dark",
|
||||
"dark": "One Dark"
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user