Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
d2fc8672d0
7 changed files with 110 additions and 623 deletions
3
.luarc.json
Normal file
3
.luarc.json
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"workspace.checkThirdParty": false
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
344
i3config
344
i3config
|
|
@ -1,344 +0,0 @@
|
||||||
# This file has been auto-generated by i3-config-wizard(1).
|
|
||||||
# It will not be overwritten, so edit it as you like.
|
|
||||||
#
|
|
||||||
# Should you change your keyboard layout some time, delete
|
|
||||||
# this file and re-run i3-config-wizard(1).
|
|
||||||
#
|
|
||||||
|
|
||||||
# i3 config file (v4)
|
|
||||||
#
|
|
||||||
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
|
|
||||||
|
|
||||||
set $mod Mod4
|
|
||||||
|
|
||||||
# Font for window titles. Will also be used by the bar unless a different font
|
|
||||||
# is used in the bar {} block below.
|
|
||||||
font pango:FiraCode Nerd Font 16
|
|
||||||
|
|
||||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
|
||||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
|
||||||
#font pango:DejaVu Sans Mono 8
|
|
||||||
|
|
||||||
# Start XDG autostart .desktop files using dex. See also
|
|
||||||
# https://wiki.archlinux.org/index.php/XDG_Autostart
|
|
||||||
exec --no-startup-id dex --autostart --environment i3
|
|
||||||
exec --no-startup-id dunst
|
|
||||||
exec --no-startup-id flatpak run com.spotify.Client
|
|
||||||
exec --no-startup-id thunderbird
|
|
||||||
exec --no-startup-id flatpak run com.sindresorhus.Caprine
|
|
||||||
exec --no-startup-id flatpak run com.discordapp.Discord
|
|
||||||
exec --no-startup-id pavucontrol
|
|
||||||
exec --no-startup-id flatpak run dev.lizardbyte.app.Sunshine
|
|
||||||
|
|
||||||
# The combination of xss-lock, nm-applet and pactl is a popular choice, so
|
|
||||||
|
|
||||||
# they are included here as an example. Modify as you see fit.
|
|
||||||
|
|
||||||
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
|
|
||||||
# screen before suspend. Use loginctl lock-session to lock your screen.
|
|
||||||
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork -i ~/Pictures/wallpaper.jpg
|
|
||||||
|
|
||||||
# NetworkManager is the most popular way to manage wireless networks on Linux,
|
|
||||||
# and nm-applet is a desktop environment-independent system tray GUI for it.
|
|
||||||
exec --no-startup-id nm-applet
|
|
||||||
|
|
||||||
# Use pactl to adjust volume in PulseAudio.
|
|
||||||
# set $refresh_i3status killall -SIGUSR1 i3status
|
|
||||||
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +3% && $refresh_i3status
|
|
||||||
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -3% && $refresh_i3status
|
|
||||||
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
|
|
||||||
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
|
|
||||||
|
|
||||||
bindsym XF86AudioNext exec --no-startup-id playerctl next
|
|
||||||
bindsym XF86AudioPrev exec --no-startup-id playerctl previous
|
|
||||||
bindsym XF86AudioPause exec --no-startup-id playerctl play-pause
|
|
||||||
|
|
||||||
# Use Mouse+$mod to drag floating windows to their wanted position
|
|
||||||
floating_modifier $mod
|
|
||||||
|
|
||||||
# move tiling windows via drag & drop by left-clicking into the title bar,
|
|
||||||
# or left-clicking anywhere into the window while holding the floating modifier.
|
|
||||||
# tiling_drag modifier titlebar
|
|
||||||
|
|
||||||
# start a terminal
|
|
||||||
bindsym $mod+Return exec kitty
|
|
||||||
bindsym $mod+backslash exec codium
|
|
||||||
|
|
||||||
# kill focused window
|
|
||||||
bindsym $mod+Shift+q [con_id="__focused__" title="^(?!Messenger).*$" class="^(?!thunderbird|Caprine|discord|Spotify|Pavucontrol).*$"] kill
|
|
||||||
|
|
||||||
# start dmenu (a program launcher)
|
|
||||||
# A more modern dmenu replacement is rofi:
|
|
||||||
bindcode $mod+40 exec "rofi -modi drun,run -show drun"
|
|
||||||
# bindsym $mod+d exec "dmenu_run -l 10 -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'FiraCode Nerd Font-20' -p 'run:'"
|
|
||||||
|
|
||||||
# There also is i3-dmenu-desktop which only displays applications shipping a
|
|
||||||
# .desktop file. It is a wrapper around dmenu, so you need that installed.
|
|
||||||
# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
|
|
||||||
|
|
||||||
# change focus
|
|
||||||
bindsym $mod+h focus left
|
|
||||||
bindsym $mod+j focus down
|
|
||||||
bindsym $mod+k focus up
|
|
||||||
bindsym $mod+l focus right
|
|
||||||
|
|
||||||
# alternatively, you can use the cursor keys:
|
|
||||||
bindsym $mod+Left focus left
|
|
||||||
bindsym $mod+Down focus down
|
|
||||||
bindsym $mod+Up focus up
|
|
||||||
bindsym $mod+Right focus right
|
|
||||||
|
|
||||||
# move focused window
|
|
||||||
bindsym $mod+Shift+h move left
|
|
||||||
bindsym $mod+Shift+j move down
|
|
||||||
bindsym $mod+Shift+k move up
|
|
||||||
bindsym $mod+Shift+l move right
|
|
||||||
|
|
||||||
# split in horizontal orientation
|
|
||||||
bindsym $mod+b split h
|
|
||||||
|
|
||||||
# split in vertical orientation
|
|
||||||
bindsym $mod+v split v
|
|
||||||
|
|
||||||
# enter fullscreen mode for the focused container
|
|
||||||
bindsym $mod+f fullscreen toggle
|
|
||||||
|
|
||||||
# change container layout (stacked, tabbed, toggle split)
|
|
||||||
bindsym $mod+s layout stacking
|
|
||||||
bindsym $mod+w layout tabbed
|
|
||||||
bindsym $mod+e layout toggle split
|
|
||||||
|
|
||||||
# toggle tiling / floating
|
|
||||||
bindsym $mod+Shift+space floating toggle
|
|
||||||
|
|
||||||
# change focus between tiling / floating windows
|
|
||||||
bindsym $mod+space focus mode_toggle
|
|
||||||
|
|
||||||
# focus the parent container
|
|
||||||
bindsym $mod+a focus parent
|
|
||||||
|
|
||||||
# focus the child container
|
|
||||||
#bindsym $mod+d focus child
|
|
||||||
|
|
||||||
# Define names for default workspaces for which we configure key bindings later on.
|
|
||||||
# We use variables to avoid repeating the names in multiple places.
|
|
||||||
set $ws1 "1"
|
|
||||||
set $ws2 "2"
|
|
||||||
set $ws3 "3"
|
|
||||||
set $ws4 "4"
|
|
||||||
set $ws5 "5"
|
|
||||||
set $ws6 "6"
|
|
||||||
set $ws7 "7"
|
|
||||||
set $ws8 "8"
|
|
||||||
set $ws9 "9"
|
|
||||||
set $ws10 "10"
|
|
||||||
|
|
||||||
# switch to workspace
|
|
||||||
bindsym $mod+1 workspace number $ws1
|
|
||||||
bindsym $mod+2 workspace number $ws2
|
|
||||||
bindsym $mod+3 workspace number $ws3
|
|
||||||
bindsym $mod+4 workspace number $ws4
|
|
||||||
bindsym $mod+5 workspace number $ws5
|
|
||||||
bindsym $mod+6 workspace number $ws6
|
|
||||||
bindsym $mod+7 workspace number $ws7
|
|
||||||
bindsym $mod+8 workspace number $ws8
|
|
||||||
bindsym $mod+9 workspace number $ws9
|
|
||||||
bindsym $mod+0 workspace number $ws10
|
|
||||||
|
|
||||||
# move focused container to workspace
|
|
||||||
bindsym $mod+Shift+1 move container to workspace number $ws1
|
|
||||||
bindsym $mod+Shift+2 move container to workspace number $ws2
|
|
||||||
bindsym $mod+Shift+3 move container to workspace number $ws3
|
|
||||||
bindsym $mod+Shift+4 move container to workspace number $ws4
|
|
||||||
bindsym $mod+Shift+5 move container to workspace number $ws5
|
|
||||||
bindsym $mod+Shift+6 move container to workspace number $ws6
|
|
||||||
bindsym $mod+Shift+7 move container to workspace number $ws7
|
|
||||||
bindsym $mod+Shift+8 move container to workspace number $ws8
|
|
||||||
bindsym $mod+Shift+9 move container to workspace number $ws9
|
|
||||||
bindsym $mod+Shift+0 move container to workspace number $ws10
|
|
||||||
|
|
||||||
# reload the configuration file
|
|
||||||
bindsym $mod+Shift+c reload
|
|
||||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
|
||||||
bindsym $mod+Shift+r restart
|
|
||||||
# exit i3 (logs you out of your X session)
|
|
||||||
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
|
|
||||||
|
|
||||||
# resize window (you can also use the mouse for that)
|
|
||||||
mode "resize" {
|
|
||||||
# These bindings trigger as soon as you enter the resize mode
|
|
||||||
|
|
||||||
# Pressing left will shrink the window’s width.
|
|
||||||
# Pressing right will grow the window’s width.
|
|
||||||
# Pressing up will shrink the window’s height.
|
|
||||||
# Pressing down will grow the window’s height.
|
|
||||||
bindsym h resize shrink width 2 px or 2 ppt
|
|
||||||
bindsym j resize grow height 2 px or 2 ppt
|
|
||||||
bindsym k resize shrink height 2 px or 2 ppt
|
|
||||||
bindsym l resize grow width 2 px or 2 ppt
|
|
||||||
|
|
||||||
# back to normal: Enter or Escape or $mod+r
|
|
||||||
bindsym Return mode "default"
|
|
||||||
bindsym Escape mode "default"
|
|
||||||
bindsym $mod+r mode "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
bindsym $mod+r mode "resize"
|
|
||||||
|
|
||||||
# set primary gruvbox colorscheme colors
|
|
||||||
# set $bg #282828CC
|
|
||||||
# set $red #cc241d
|
|
||||||
# set $green #4E562C
|
|
||||||
# set $yellow #d79921
|
|
||||||
# set $blue #458588
|
|
||||||
# set $purple #b16286
|
|
||||||
# set $aqua #689d68
|
|
||||||
# set $gray #a89984
|
|
||||||
# set $darkgray #1d2021
|
|
||||||
|
|
||||||
# green gruvbox
|
|
||||||
# class border|backgr|text|indicator|child_border
|
|
||||||
# client.focused $aqua $aqua $aqua $aqua $aqua
|
|
||||||
# client.focused_inactive $darkgray $darkgray $darkgray $darkgray $darkgray
|
|
||||||
# client.unfocused $darkgray $darkgray $darkgray $darkgray $darkgray
|
|
||||||
# client.urgent $red $red $red $red $red
|
|
||||||
#
|
|
||||||
# bar {
|
|
||||||
# i3bar_command i3bar --transparency
|
|
||||||
# position top
|
|
||||||
# status_command SCRIPT_DIR=~/.config/i3blocks i3blocks
|
|
||||||
# tray_padding 5px
|
|
||||||
# padding 5px
|
|
||||||
# colors {
|
|
||||||
# # bar background color
|
|
||||||
# background $bg
|
|
||||||
# # text color used for blocks that do not have a color specified.
|
|
||||||
# statusline $aqua
|
|
||||||
# # workspaces section
|
|
||||||
# # border backgr. text
|
|
||||||
# focused_workspace $aqua $aqua $darkgray
|
|
||||||
# inactive_workspace $darkgray $darkgray $yellow
|
|
||||||
# active_workspace $darkgray $darkgray $yellow
|
|
||||||
# urgent_workspace $red $red $bg
|
|
||||||
# }
|
|
||||||
# }
|
|
||||||
|
|
||||||
exec_always xrandr --output HDMI-1 --mode 3840x1200 -r 99.00
|
|
||||||
exec_always setxkbmap -option caps:escape
|
|
||||||
exec_always --no-startup-id picom -bc
|
|
||||||
exec_always --no-startup-id xset dpms 180 360 720
|
|
||||||
|
|
||||||
# bindsym $mod+d exec "dmenu_run -l 10 -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'FiraCode Nerd Font-20' -p 'run:'"
|
|
||||||
|
|
||||||
exec_always feh --bg-fill ~/Pictures/wallpaper.jpg
|
|
||||||
for_window [instance="Godot_Engine"] floating enable
|
|
||||||
for_window [title="Desktop @ QRect(0,0 3840x1200) — Plasma"] kill, floating enable, border none
|
|
||||||
for_window [class="plasmashell"] floating enable
|
|
||||||
for_window [title="Bevy App"] floating enable
|
|
||||||
for_window [class="Pavucontrol"] floating enable
|
|
||||||
for_window [class="Plasma"] floating enable, border none
|
|
||||||
for_window [title="plasma-desktop"] floating enable, border none
|
|
||||||
for_window [title="win7"] floating enable, border none
|
|
||||||
for_window [class="krunner"] floating enable, border none
|
|
||||||
for_window [class="Kmix"] floating enable, border none
|
|
||||||
for_window [class="Klipper"] floating enable, border none
|
|
||||||
for_window [class="Plasmoidviewer"] floating enable, border none
|
|
||||||
for_window [class="(?i)*nextcloud*"] floating disable
|
|
||||||
for_window [class="plasmashell" window_type="notification"] floating enable, border none, move right 700px, move down 450px
|
|
||||||
no_focus [class="plasmashell" window_type="notification"]
|
|
||||||
|
|
||||||
for_window [class="Spotify"] floating enable
|
|
||||||
for_window [class="Bitwarden"] floating enable
|
|
||||||
for_window [class="steam"] floating enable
|
|
||||||
for_window [class="dolphin"] floating enable
|
|
||||||
for_window [class="Caprine"] floating enable move scratchpad
|
|
||||||
# for_window [title="Messenger"] floating enable move scratchpad
|
|
||||||
for_window [class="discord"] floating enable move scratchpad
|
|
||||||
for_window [class="Spotify"] floating enable move scratchpad
|
|
||||||
for_window [class="Pavucontrol"] floating enable move scratchpad
|
|
||||||
for_window [class="thunderbird"] floating enable move scratchpad
|
|
||||||
for_window [class="Slack"] floating enable move scratchpad
|
|
||||||
for_window [class="spectacle"] floating enable
|
|
||||||
for_window [class="zoom"] floating enable
|
|
||||||
for_window [class="Gpick"] floating enable
|
|
||||||
for_window [title="Overview – Home Assistant"] floating enable
|
|
||||||
for_window [title="Outlook"] floating enable
|
|
||||||
for_window [title="Netflix"] floating enable
|
|
||||||
for_window [title="Welcome to Prime Video"] floating enable
|
|
||||||
for_window [title="floating_window"] floating enable
|
|
||||||
|
|
||||||
bindsym $mod+Shift+minus move scratchpad
|
|
||||||
bindsym $mod+minus scratchpad show
|
|
||||||
|
|
||||||
bindsym Print exec --no-startup-id maim "/home/$USER/Pictures/$(date)"
|
|
||||||
bindsym $mod+Print exec --no-startup-id maim --window $(xdotool getactivewindow) "/home/$USER/Pictures/$(date)"
|
|
||||||
bindsym Shift+Print exec --no-startup-id maim --select "/home/$USER/Pictures/$(date)"
|
|
||||||
|
|
||||||
## Clipboard Screenshots
|
|
||||||
bindsym Ctrl+Print exec --no-startup-id maim | xclip -selection clipboard -t image/png
|
|
||||||
bindsym Ctrl+$mod+Print exec --no-startup-id maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png
|
|
||||||
bindsym Ctrl+Shift+Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png
|
|
||||||
|
|
||||||
default_border pixel 6
|
|
||||||
default_floating_border pixel 6
|
|
||||||
|
|
||||||
smart_borders on
|
|
||||||
|
|
||||||
gaps inner 20
|
|
||||||
|
|
||||||
no_focus [all]
|
|
||||||
focus_on_window_activation none
|
|
||||||
|
|
||||||
## Base16 Kanagawa
|
|
||||||
# Scheme author: Tommaso Laurenzi (https://github.com/rebelot)
|
|
||||||
# Template author: Tinted Theming (https://github.com/tinted-theming)
|
|
||||||
#
|
|
||||||
# You can use these variables anywhere in the i3 configuration file.
|
|
||||||
|
|
||||||
set $base00 #1f1f28
|
|
||||||
set $base01 #16161d
|
|
||||||
set $base02 #223249
|
|
||||||
set $base03 #54546d
|
|
||||||
set $base04 #727169
|
|
||||||
set $base05 #dcd7ba
|
|
||||||
set $base06 #c8c093
|
|
||||||
set $base07 #717c7c
|
|
||||||
set $base08 #c34043
|
|
||||||
set $base09 #ffa066
|
|
||||||
set $base0A #c0a36e
|
|
||||||
set $base0B #76946a
|
|
||||||
set $base0C #6a9589
|
|
||||||
set $base0D #7e9cd8
|
|
||||||
set $base0E #957fb8
|
|
||||||
set $base0F #d27e99
|
|
||||||
|
|
||||||
# Basic bar configuration using the Base16 variables.
|
|
||||||
bar {
|
|
||||||
i3bar_command i3bar --transparency
|
|
||||||
position top
|
|
||||||
status_command SCRIPT_DIR=~/.config/i3blocks i3blocks
|
|
||||||
tray_padding 5px
|
|
||||||
padding 5px
|
|
||||||
|
|
||||||
colors {
|
|
||||||
background $base00
|
|
||||||
separator $base01
|
|
||||||
statusline $base04
|
|
||||||
|
|
||||||
# State Border BG Text
|
|
||||||
focused_workspace $base05 $base0D $base00
|
|
||||||
active_workspace $base05 $base03 $base00
|
|
||||||
inactive_workspace $base03 $base01 $base05
|
|
||||||
urgent_workspace $base08 $base08 $base00
|
|
||||||
binding_mode $base00 $base0A $base00
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Basic color configuration using the Base16 variables for windows and borders.
|
|
||||||
# Property Name Border BG Text Indicator Child Border
|
|
||||||
client.focused $base05 $base0D $base00 $base0D $base0C
|
|
||||||
client.focused_inactive $base01 $base01 $base05 $base03 $base01
|
|
||||||
client.unfocused $base01 $base00 $base05 $base01 $base01
|
|
||||||
client.urgent $base08 $base08 $base00 $base08 $base08
|
|
||||||
client.placeholder $base00 $base00 $base05 $base00 $base00
|
|
||||||
client.background $base07
|
|
||||||
173
init.lua
173
init.lua
|
|
@ -11,15 +11,6 @@ if not vim.loop.fs_stat(lazypath) then
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
if vim.g.vscode then
|
|
||||||
require("lazy").setup({
|
|
||||||
"terrortylor/nvim-comment",
|
|
||||||
})
|
|
||||||
require("nvim_comment").setup()
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
vim.opt.cursorline = true
|
vim.opt.cursorline = true
|
||||||
|
|
@ -32,27 +23,34 @@ vim.g.loaded_netrwPlugin = 1
|
||||||
vim.wo.number = true
|
vim.wo.number = true
|
||||||
vim.opt.shortmess:append("sI")
|
vim.opt.shortmess:append("sI")
|
||||||
vim.opt.wrap = false
|
vim.opt.wrap = false
|
||||||
|
vim.opt.title = true
|
||||||
|
vim.opt.titlestring = [[%{fnamemodify(getcwd(), ':t')}]]
|
||||||
|
|
||||||
|
if vim.g.vscode then
|
||||||
|
require("lazy").setup({
|
||||||
|
{
|
||||||
|
"terrortylor/nvim-comment",
|
||||||
|
config = function()
|
||||||
|
require("nvim_comment").setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
|
||||||
{
|
{
|
||||||
"benlubas/molten-nvim",
|
"benlubas/molten-nvim",
|
||||||
version = "^1.0.0", -- use version <2.0.0 to avoid breaking changes
|
version = "^1.0.0",
|
||||||
build = ":UpdateRemotePlugins",
|
build = ":UpdateRemotePlugins",
|
||||||
init = function()
|
init = function()
|
||||||
-- this is an example, not a default. Please see the readme for more configuration options
|
|
||||||
vim.g.molten_output_win_max_height = 12
|
vim.g.molten_output_win_max_height = 12
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim"
|
"williamboman/mason.nvim",
|
||||||
},
|
opts = {}
|
||||||
{
|
|
||||||
"vhyrro/luarocks.nvim",
|
|
||||||
priority = 1000,
|
|
||||||
opts = {
|
|
||||||
rocks = { "magick" },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
"rcarriga/nvim-notify",
|
"rcarriga/nvim-notify",
|
||||||
{
|
{
|
||||||
|
|
@ -68,8 +66,20 @@ require("lazy").setup({
|
||||||
'hrsh7th/cmp-vsnip',
|
'hrsh7th/cmp-vsnip',
|
||||||
'hrsh7th/vim-vsnip',
|
'hrsh7th/vim-vsnip',
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
|
{
|
||||||
"terrortylor/nvim-comment",
|
"terrortylor/nvim-comment",
|
||||||
|
config = function()
|
||||||
|
require("nvim_comment").setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{
|
||||||
"nvim-tree/nvim-tree.lua",
|
"nvim-tree/nvim-tree.lua",
|
||||||
|
opts = {},
|
||||||
|
init = function()
|
||||||
|
vim.keymap.set('n', '<leader>tt', require("nvim-tree.api").tree.toggle)
|
||||||
|
end
|
||||||
|
|
||||||
|
},
|
||||||
{
|
{
|
||||||
'romgrk/barbar.nvim',
|
'romgrk/barbar.nvim',
|
||||||
dependencies = {
|
dependencies = {
|
||||||
|
|
@ -78,6 +88,7 @@ require("lazy").setup({
|
||||||
},
|
},
|
||||||
init = function() vim.g.barbar_auto_setup = false end,
|
init = function() vim.g.barbar_auto_setup = false end,
|
||||||
opts = {
|
opts = {
|
||||||
|
no_name_title = "unnamed",
|
||||||
icons = {
|
icons = {
|
||||||
pinned = { button = '', filename = true },
|
pinned = { button = '', filename = true },
|
||||||
}
|
}
|
||||||
|
|
@ -88,27 +99,52 @@ require("lazy").setup({
|
||||||
"kylechui/nvim-surround",
|
"kylechui/nvim-surround",
|
||||||
version = "*",
|
version = "*",
|
||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
config = function()
|
opts = {}
|
||||||
require("nvim-surround").setup({})
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'nvim-telescope/telescope.nvim',
|
'nvim-telescope/telescope.nvim',
|
||||||
tag = '0.1.6',
|
tag = '0.1.6',
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||||
},
|
},
|
||||||
"lewis6991/gitsigns.nvim",
|
{
|
||||||
{ "folke/neodev.nvim", opts = {} },
|
"lewis6991/gitsigns.nvim", opts = {}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"folke/neodev.nvim",
|
||||||
|
opts = {
|
||||||
|
override = function(_, library)
|
||||||
|
library.enabled = true
|
||||||
|
library.plugins = true
|
||||||
|
end,
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
'nvim-lualine/lualine.nvim',
|
'nvim-lualine/lualine.nvim',
|
||||||
|
opts = {
|
||||||
|
sections = {
|
||||||
|
lualine_c = {
|
||||||
|
function()
|
||||||
|
return require('lsp-progress').progress()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
dependencies = { 'nvim-tree/nvim-web-devicons' }
|
dependencies = { 'nvim-tree/nvim-web-devicons' }
|
||||||
},
|
},
|
||||||
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
|
{
|
||||||
|
"catppuccin/nvim",
|
||||||
|
name = "catppuccin",
|
||||||
|
priority = 1000,
|
||||||
|
config = function()
|
||||||
|
vim.cmd.colorscheme "catppuccin-mocha"
|
||||||
|
end
|
||||||
|
},
|
||||||
{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
|
{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
|
||||||
{
|
{
|
||||||
'mrcjkb/rustaceanvim',
|
'mrcjkb/rustaceanvim',
|
||||||
version = '^4', -- Recommended
|
version = '^4',
|
||||||
lazy = false, -- This plugin is already lazy
|
lazy = false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"folke/trouble.nvim",
|
"folke/trouble.nvim",
|
||||||
|
|
@ -123,29 +159,19 @@ require("lazy").setup({
|
||||||
vim.o.timeout = true
|
vim.o.timeout = true
|
||||||
vim.o.timeoutlen = 300
|
vim.o.timeoutlen = 300
|
||||||
end,
|
end,
|
||||||
opts = {
|
opts = {}
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"dstein64/nvim-scrollview",
|
"dstein64/nvim-scrollview",
|
||||||
"sindrets/diffview.nvim"
|
"sindrets/diffview.nvim",
|
||||||
|
'nvim-lua/plenary.nvim',
|
||||||
|
'nvim-pack/nvim-spectre',
|
||||||
|
{
|
||||||
|
'linrongbin16/lsp-progress.nvim',
|
||||||
|
opts = {}
|
||||||
|
},
|
||||||
|
{ "cappyzawa/trim.nvim", opts = {} },
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.cmd.colorscheme "catppuccin-mocha"
|
|
||||||
|
|
||||||
local dap = require('dap')
|
|
||||||
dap.adapters.lldb = {
|
|
||||||
type = 'executable',
|
|
||||||
command = '/usr/bin/lldb-dap',
|
|
||||||
name = 'lldb'
|
|
||||||
}
|
|
||||||
|
|
||||||
require("dapui").setup()
|
|
||||||
|
|
||||||
require('lualine').setup({})
|
|
||||||
|
|
||||||
require 'nvim-treesitter.configs'.setup({
|
require 'nvim-treesitter.configs'.setup({
|
||||||
ensure_installed = {},
|
ensure_installed = {},
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
|
|
@ -157,8 +183,6 @@ require 'nvim-treesitter.configs'.setup({
|
||||||
modules = {}
|
modules = {}
|
||||||
})
|
})
|
||||||
|
|
||||||
require('gitsigns').setup()
|
|
||||||
|
|
||||||
local cmp = require('cmp')
|
local cmp = require('cmp')
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
snippet = {
|
snippet = {
|
||||||
|
|
@ -183,36 +207,24 @@ cmp.setup({
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
require("nvim_comment").setup()
|
|
||||||
|
|
||||||
require("neodev").setup({
|
|
||||||
override = function(_, library)
|
|
||||||
library.enabled = true
|
|
||||||
library.plugins = true
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
require('lspconfig').lua_ls.setup({})
|
require('lspconfig').lua_ls.setup({})
|
||||||
|
|
||||||
require("lspconfig").pyright.setup({})
|
require("lspconfig").pyright.setup({})
|
||||||
vim.api.nvim_create_autocmd('BufWritePre', {
|
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.lsp.buf.format()
|
vim.lsp.buf.format()
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
require('lspconfig').ruff_lsp.setup {
|
require('lspconfig').ruff.setup {
|
||||||
on_attach = function(client)
|
on_attach = function(client)
|
||||||
client.server_capabilities.hoverProvider = false
|
client.server_capabilities.hoverProvider = false
|
||||||
end,
|
end,
|
||||||
init_options = {
|
init_options = {
|
||||||
settings = {
|
settings = {
|
||||||
-- Any extra CLI arguments for `ruff` go here.
|
|
||||||
args = {},
|
args = {},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
require 'lspconfig'.gdscript.setup {}
|
require 'lspconfig'.gdscript.setup {}
|
||||||
|
|
||||||
|
|
||||||
local on_attach = function(bufnr)
|
local on_attach = function(bufnr)
|
||||||
local function buf_set_option(...)
|
local function buf_set_option(...)
|
||||||
vim.api.nvim_buf_set_option(bufnr, ...)
|
vim.api.nvim_buf_set_option(bufnr, ...)
|
||||||
|
|
@ -247,6 +259,13 @@ vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
local dap = require('dap')
|
||||||
|
dap.adapters.lldb = {
|
||||||
|
type = 'executable',
|
||||||
|
command = '/usr/bin/lldb-dap',
|
||||||
|
name = 'lldb'
|
||||||
|
}
|
||||||
|
require("dapui").setup()
|
||||||
vim.keymap.set('n', '<leader>dd', require("dapui").toggle, {})
|
vim.keymap.set('n', '<leader>dd', require("dapui").toggle, {})
|
||||||
vim.keymap.set('n', '<leader>db', require("dap").toggle_breakpoint, {})
|
vim.keymap.set('n', '<leader>db', require("dap").toggle_breakpoint, {})
|
||||||
vim.keymap.set('n', '<leader>dr', function()
|
vim.keymap.set('n', '<leader>dr', function()
|
||||||
|
|
@ -271,13 +290,9 @@ vim.api.nvim_set_hl(0, 'DapStopped', { ctermbg = 0, fg = '#98c379', bg = '#31353
|
||||||
|
|
||||||
local builtin = require('telescope.builtin')
|
local builtin = require('telescope.builtin')
|
||||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
|
||||||
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
|
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
|
||||||
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
|
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
|
||||||
|
|
||||||
require("nvim-tree").setup()
|
|
||||||
vim.keymap.set('n', '<leader>tt', require("nvim-tree.api").tree.toggle)
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>mi", ":MoltenInit<CR>",
|
vim.keymap.set("n", "<leader>mi", ":MoltenInit<CR>",
|
||||||
{ silent = true, desc = "Initialize the plugin" })
|
{ silent = true, desc = "Initialize the plugin" })
|
||||||
vim.keymap.set("n", "<leader>e", ":MoltenEvaluateOperator<CR>",
|
vim.keymap.set("n", "<leader>e", ":MoltenEvaluateOperator<CR>",
|
||||||
|
|
@ -288,12 +303,9 @@ vim.keymap.set("n", "<leader>rr", ":MoltenReevaluateCell<CR>",
|
||||||
{ silent = true, desc = "re-evaluate cell" })
|
{ silent = true, desc = "re-evaluate cell" })
|
||||||
vim.keymap.set("v", "<leader>r", ":<C-u>MoltenEvaluateVisual<CR>gv",
|
vim.keymap.set("v", "<leader>r", ":<C-u>MoltenEvaluateVisual<CR>gv",
|
||||||
{ silent = true, desc = "evaluate visual selection" })
|
{ silent = true, desc = "evaluate visual selection" })
|
||||||
vim.g.molten_image_provider = "image.nvim"
|
|
||||||
|
|
||||||
local opts = { noremap = true, silent = true }
|
local opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
local map = vim.api.nvim_set_keymap
|
local map = vim.api.nvim_set_keymap
|
||||||
|
|
||||||
map('n', '<leader>bdo', "<Cmd>BufferCloseAllButCurrentOrPinned<CR>", opts);
|
map('n', '<leader>bdo', "<Cmd>BufferCloseAllButCurrentOrPinned<CR>", opts);
|
||||||
map('n', '<leader>bp', '<Cmd>BufferPin<CR>', opts)
|
map('n', '<leader>bp', '<Cmd>BufferPin<CR>', opts)
|
||||||
map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
|
map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
|
||||||
|
|
@ -303,7 +315,13 @@ map('n', '<A-m>', '<Cmd>BufferMoveNext<CR>', opts)
|
||||||
map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
|
map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
|
||||||
map('n', '<A-p>', '<Cmd>BufferPick<CR>', opts)
|
map('n', '<A-p>', '<Cmd>BufferPick<CR>', opts)
|
||||||
|
|
||||||
require("mason").setup()
|
vim.keymap.set('n', '<leader>fg', '<cmd>lua require("spectre").toggle()<CR>', {
|
||||||
|
desc = "Toggle Spectre"
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<leader>bf', function()
|
||||||
|
print(vim.api.nvim_buf_get_name(0))
|
||||||
|
end)
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('BufEnter', {
|
vim.api.nvim_create_autocmd('BufEnter', {
|
||||||
pattern = { "*.gd" },
|
pattern = { "*.gd" },
|
||||||
|
|
@ -311,3 +329,20 @@ vim.api.nvim_create_autocmd('BufEnter', {
|
||||||
vim.api.nvim_buf_set_option(0, "commentstring", "# %s")
|
vim.api.nvim_buf_set_option(0, "commentstring", "# %s")
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('BufEnter', {
|
||||||
|
pattern = { "/home/jaroslaw/notes/**" },
|
||||||
|
callback = function()
|
||||||
|
vim.loop.spawn("git", { args = { "pull" } })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('BufWritePost', {
|
||||||
|
pattern = { "/home/jaroslaw/notes/**" },
|
||||||
|
callback = function()
|
||||||
|
local filename = vim.fn.expand('%')
|
||||||
|
local command = 'git add ' .. filename .. '; git commit -m "Auto-commit: saved ' .. filename .. '"'
|
||||||
|
vim.fn.system(command)
|
||||||
|
vim.loop.spawn("git", { args = { "push" } })
|
||||||
|
end
|
||||||
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
nvim --listen ~/.cache/nvim/server.pipe $@
|
|
||||||
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
import os
|
|
||||||
from .targets.file_target import FileTarget
|
|
||||||
from .actions.send_to_vim_in_tmux_pane_action import SendToVimInTmuxPaneAction
|
|
||||||
from .actions.action import Action
|
|
||||||
from .targets.target_payload import EditorOpenable
|
|
||||||
|
|
||||||
class VimRemoteOpen(Action):
|
|
||||||
def __init__(self, target_payload: EditorOpenable):
|
|
||||||
self.target_payload = target_payload
|
|
||||||
|
|
||||||
def perform(self):
|
|
||||||
path = self.target_payload.file_path
|
|
||||||
|
|
||||||
if self.target_payload.line_number:
|
|
||||||
path += f':{self.target_payload.line_number}'
|
|
||||||
|
|
||||||
os.system(f'nvim --server ~/.cache/nvim/server.pipe --remote {path}')
|
|
||||||
|
|
||||||
FileTarget.primary_action = VimRemoteOpen
|
|
||||||
184
polybar
184
polybar
|
|
@ -1,184 +0,0 @@
|
||||||
;==========================================================
|
|
||||||
;
|
|
||||||
;
|
|
||||||
; ██████╗ ██████╗ ██╗ ██╗ ██╗██████╗ █████╗ ██████╗
|
|
||||||
; ██╔══██╗██╔═══██╗██║ ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
|
|
||||||
; ██████╔╝██║ ██║██║ ╚████╔╝ ██████╔╝███████║██████╔╝
|
|
||||||
; ██╔═══╝ ██║ ██║██║ ╚██╔╝ ██╔══██╗██╔══██║██╔══██╗
|
|
||||||
; ██║ ╚██████╔╝███████╗██║ ██████╔╝██║ ██║██║ ██║
|
|
||||||
; ╚═╝ ╚═════╝ ╚══════╝╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝
|
|
||||||
;
|
|
||||||
;
|
|
||||||
; To learn more about how to configure Polybar
|
|
||||||
; go to https://github.com/polybar/polybar
|
|
||||||
;
|
|
||||||
; The README contains a lot of information
|
|
||||||
;
|
|
||||||
;==========================================================
|
|
||||||
|
|
||||||
[colors]
|
|
||||||
# background = #282A2E
|
|
||||||
# background-alt = #373B41
|
|
||||||
# foreground = #C5C8C6
|
|
||||||
# primary = #F0C674
|
|
||||||
# secondary = #8ABEB7
|
|
||||||
# alert = #A54242
|
|
||||||
# disabled = #707880
|
|
||||||
|
|
||||||
background = #282828
|
|
||||||
foreground = #ebdbb2
|
|
||||||
red = #fb4934
|
|
||||||
green = #b8bb26
|
|
||||||
yellow = #fabd2f
|
|
||||||
blue = #83a598
|
|
||||||
purple = #d3869b
|
|
||||||
teal = #8ec07c
|
|
||||||
orange = #fe8019
|
|
||||||
gray = #a89984
|
|
||||||
|
|
||||||
|
|
||||||
[bar/example]
|
|
||||||
width = 100%
|
|
||||||
height = 32pt
|
|
||||||
radius = 6
|
|
||||||
|
|
||||||
; dpi = 96
|
|
||||||
|
|
||||||
background = ${colors.background}
|
|
||||||
foreground = ${colors.foreground}
|
|
||||||
|
|
||||||
line-size = 3pt
|
|
||||||
|
|
||||||
border-size = 4pt
|
|
||||||
border-color = #00000000
|
|
||||||
|
|
||||||
padding-left = 0
|
|
||||||
padding-right = 1
|
|
||||||
|
|
||||||
module-margin = 1
|
|
||||||
|
|
||||||
separator = |
|
|
||||||
separator-foreground = ${colors.disabled}
|
|
||||||
|
|
||||||
font-0 = "FiraCode Nerd Font;size=12"
|
|
||||||
|
|
||||||
modules-left = xworkspaces xwindow
|
|
||||||
modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth date
|
|
||||||
|
|
||||||
cursor-click = pointer
|
|
||||||
cursor-scroll = ns-resize
|
|
||||||
|
|
||||||
enable-ipc = true
|
|
||||||
|
|
||||||
tray-position = left
|
|
||||||
|
|
||||||
; wm-restack = generic
|
|
||||||
; wm-restack = bspwm
|
|
||||||
; wm-restack = i3
|
|
||||||
|
|
||||||
; override-redirect = true
|
|
||||||
|
|
||||||
[module/xworkspaces]
|
|
||||||
type = internal/xworkspaces
|
|
||||||
|
|
||||||
label-active = %name%
|
|
||||||
label-active-background = ${colors.background-alt}
|
|
||||||
label-active-underline= ${colors.primary}
|
|
||||||
label-active-padding = 1
|
|
||||||
|
|
||||||
label-occupied = %name%
|
|
||||||
label-occupied-padding = 1
|
|
||||||
|
|
||||||
label-urgent = %name%
|
|
||||||
label-urgent-background = ${colors.alert}
|
|
||||||
label-urgent-padding = 1
|
|
||||||
|
|
||||||
label-empty = %name%
|
|
||||||
label-empty-foreground = ${colors.disabled}
|
|
||||||
label-empty-padding = 1
|
|
||||||
|
|
||||||
[module/xwindow]
|
|
||||||
type = internal/xwindow
|
|
||||||
label = %title:0:60:...%
|
|
||||||
|
|
||||||
[module/filesystem]
|
|
||||||
type = internal/fs
|
|
||||||
interval = 25
|
|
||||||
|
|
||||||
mount-0 = /
|
|
||||||
|
|
||||||
label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
|
|
||||||
|
|
||||||
label-unmounted = %mountpoint% not mounted
|
|
||||||
label-unmounted-foreground = ${colors.disabled}
|
|
||||||
|
|
||||||
[module/pulseaudio]
|
|
||||||
type = internal/pulseaudio
|
|
||||||
|
|
||||||
format-volume-prefix = "VOL "
|
|
||||||
format-volume-prefix-foreground = ${colors.primary}
|
|
||||||
format-volume = <label-volume>
|
|
||||||
|
|
||||||
label-volume = %percentage%%
|
|
||||||
|
|
||||||
label-muted = muted
|
|
||||||
label-muted-foreground = ${colors.disabled}
|
|
||||||
|
|
||||||
[module/xkeyboard]
|
|
||||||
type = internal/xkeyboard
|
|
||||||
blacklist-0 = num lock
|
|
||||||
|
|
||||||
label-layout = %layout%
|
|
||||||
label-layout-foreground = ${colors.primary}
|
|
||||||
|
|
||||||
label-indicator-padding = 2
|
|
||||||
label-indicator-margin = 1
|
|
||||||
label-indicator-foreground = ${colors.background}
|
|
||||||
label-indicator-background = ${colors.secondary}
|
|
||||||
|
|
||||||
[module/memory]
|
|
||||||
type = internal/memory
|
|
||||||
interval = 2
|
|
||||||
format-prefix = "RAM "
|
|
||||||
format-prefix-foreground = ${colors.primary}
|
|
||||||
label = %percentage_used:2%%
|
|
||||||
|
|
||||||
[module/cpu]
|
|
||||||
type = internal/cpu
|
|
||||||
interval = 2
|
|
||||||
format-prefix = "CPU "
|
|
||||||
format-prefix-foreground = ${colors.primary}
|
|
||||||
label = %percentage:2%%
|
|
||||||
|
|
||||||
[network-base]
|
|
||||||
type = internal/network
|
|
||||||
interval = 5
|
|
||||||
format-connected = <label-connected>
|
|
||||||
format-disconnected = <label-disconnected>
|
|
||||||
label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
|
|
||||||
|
|
||||||
[module/wlan]
|
|
||||||
inherit = network-base
|
|
||||||
interface-type = wireless
|
|
||||||
label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
|
|
||||||
|
|
||||||
[module/eth]
|
|
||||||
inherit = network-base
|
|
||||||
interface-type = wired
|
|
||||||
label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
|
|
||||||
|
|
||||||
[module/date]
|
|
||||||
type = internal/date
|
|
||||||
interval = 1
|
|
||||||
|
|
||||||
date = %H:%M
|
|
||||||
date-alt = %Y-%m-%d %H:%M:%S
|
|
||||||
|
|
||||||
label = %date%
|
|
||||||
label-foreground = ${colors.primary}
|
|
||||||
|
|
||||||
[settings]
|
|
||||||
screenchange-reload = true
|
|
||||||
pseudo-transparency = true
|
|
||||||
|
|
||||||
; vim:ft=dosini
|
|
||||||
Loading…
Reference in a new issue